3
0
Fork 0
forked from mirrors/nixpkgs

libmodsecurity: 3.0.6 -> 3.0.7

This commit is contained in:
Izorkin 2022-06-14 23:41:57 +03:00
parent 9ef09e0680
commit c64d9a23c7
No known key found for this signature in database
GPG key ID: 1436C1B3F3679F09
2 changed files with 13 additions and 6 deletions

View file

@ -1,34 +1,35 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, bison, flex, pkg-config
, curl, geoip, libmaxminddb, libxml2, lmdb, lua, pcre
, ssdeep, yajl
, curl, geoip, libmaxminddb, libxml2, lmdb, lua, pcre, pcre2, ssdeep, yajl
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "libmodsecurity";
version = "3.0.6";
version = "3.0.7";
src = fetchFromGitHub {
owner = "SpiderLabs";
repo = "ModSecurity";
rev = "v${version}";
sha256 = "sha256-V+NBT2YN8qO3Px8zEzSA2ZsjSf1pv8+VlLxYlrpqfGg=";
sha256 = "sha256-Xf+wtYg0ZKgP5qo891fCMML/7tgSM/fvBdrmsgJixY4=";
fetchSubmodules = true;
};
nativeBuildInputs = [ autoreconfHook bison flex pkg-config ];
buildInputs = [ curl geoip libmaxminddb libxml2 lmdb lua pcre ssdeep yajl ];
buildInputs = [ curl geoip libmaxminddb libxml2 lmdb lua pcre pcre2 ssdeep yajl ];
outputs = [ "out" "dev" ];
configureFlags = [
"--enable-parser-generation"
"--disable-doxygen-doc"
"--with-curl=${curl.dev}"
"--with-libxml=${libxml2.dev}"
"--with-lmdb=${lmdb.out}"
"--with-maxmind=${libmaxminddb}"
"--with-pcre=${pcre.dev}"
"--with-pcre2=${pcre2.out}"
"--with-ssdeep=${ssdeep}"
];
@ -36,6 +37,10 @@ stdenv.mkDerivation rec {
substituteInPlace build/lmdb.m4 \
--replace "\''${path}/include/lmdb.h" "${lmdb.dev}/include/lmdb.h" \
--replace "lmdb_inc_path=\"\''${path}/include\"" "lmdb_inc_path=\"${lmdb.dev}/include\""
substituteInPlace build/pcre2.m4 \
--replace "/usr/local/pcre2" "${pcre2.out}/lib" \
--replace "\''${path}/include/pcre2.h" "${pcre2.dev}/include/pcre2.h" \
--replace "pcre2_inc_path=\"\''${path}/include\"" "pcre2_inc_path=\"${pcre2.dev}/include\""
substituteInPlace build/ssdeep.m4 \
--replace "/usr/local/libfuzzy" "${ssdeep}/lib" \
--replace "\''${path}/include/fuzzy.h" "${ssdeep}/include/fuzzy.h" \

View file

@ -22157,7 +22157,9 @@ with pkgs;
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ];
};
libmodsecurity = callPackage ../tools/security/libmodsecurity { };
libmodsecurity = callPackage ../tools/security/libmodsecurity {
autoreconfHook = buildPackages.autoreconfHook269;
};
ngircd = callPackage ../servers/irc/ngircd { };