nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #177685 from Izorkin/update-modsecurity

Browse Source 
Update modsecurity packages
This commit is contained in:
ajs124 2022-06-17 14:50:44 +02:00 committed by GitHub
commit dcaa5dca4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/http/nginx/modules.nix
View File

@ -252,8 +252,8 @@ in
name = "modsecurity-nginx"; name = "modsecurity-nginx";
owner = "SpiderLabs"; owner = "SpiderLabs";
repo = "ModSecurity-nginx"; repo = "ModSecurity-nginx";
rev = "v1.0.2"; rev = "v1.0.3";
sha256 = "sha256-UXiitc3jZlgXlCsDPS+xEFLNRVgRbn8BCCXUEqAWlII="; sha256 = "sha256-xp0/eqi5PJlzb9NaUbNnzEqNcxDPyjyNwZOwmlv1+ag=";
}; };
inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ];
disableIPC = true; disableIPC = true;

15
pkgs/tools/security/libmodsecurity/default.nix
View File

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

4
pkgs/top-level/all-packages.nix
View File

@ -22174,7 +22174,9 @@ with pkgs;
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ]; 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 { }; ngircd = callPackage ../servers/irc/ngircd { };