diff --git a/glicid/packages/nginx.scm b/glicid/packages/nginx.scm index 54ab64b..95790f4 100644 --- a/glicid/packages/nginx.scm +++ b/glicid/packages/nginx.scm @@ -9,8 +9,11 @@ #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages curl) + #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) #:use-module (gnu packages gd) #:use-module (gnu packages geo) + #:use-module (gnu packages lua) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -155,16 +158,46 @@ ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("openssl" ,openssl) - ("pcre" ,pcre) ("pcre:bin" ,pcre "bin") + ("pcre2" ,pcre2) ("zlib" ,zlib) ("pkg-config" ,pkg-config) + ("yajl" ,yajl) + ("lmdb" ,lmdb) + ("ssdeep" ,ssdeep) + ("lua" ,lua) ("nginx-sources" ,(package-source nginx)))) (arguments `(#:configure-flags (list (string-append "--with-curl=" (assoc-ref %build-inputs "curl")) - (string-append "--with-pcre=" (assoc-ref %build-inputs "pcre:bin") "/bin/pcre-config") + (string-append "--with-yajl=" (assoc-ref %build-inputs "yajl")) + (string-append "--with-lmdb=" (assoc-ref %build-inputs "lmdb")) + (string-append "--with-ssdeep=" (assoc-ref %build-inputs "ssdeep")) + (string-append "--with-lua=" (assoc-ref %build-inputs "lua")) + (string-append "--with-pcre2=" (assoc-ref %build-inputs "pcre2")) (string-append "--with-libxml=" (assoc-ref %build-inputs "libxml2")) - "--enable-standalone-module"))))) + "--with-geoip=no" + "--with-maxmind=no" + "--disable-doxygen-doc" + "--enable-standalone-module") + #:phases (modify-phases %standard-phases + (add-before 'check 'cleaning-tests + (lambda* (#:key input #:allow-other-keys) + ; remote tests won't work + (with-output-to-file "test/test-cases/regression/action-exec.json" + (lambda () + (invoke "echo" "'[]'"))) + (with-output-to-file "test/test-cases/regression/config-secremoterules.json" + (lambda () + (invoke "echo" "'[]'"))) + (with-output-to-file "test/test-cases/regression/operator-inpectFile.json" + (lambda () + (invoke "echo" "'[]'"))) + (with-output-to-file "test/test-cases/regression/operator-ipMatchFromFile.json" + (lambda () + (invoke "echo" "'[]'"))) + (with-output-to-file "test/test-cases/secrules-language-tests/operators/geoLookup.json" + (lambda () + (invoke "echo" "'[]'")))))) )))) (define-public nginx-modsecurity-module (package @@ -301,3 +334,4 @@ (install-file "objs/ngx_http_vhost_traffic_status_module.so" modules-dir) #t))) (delete 'fix-root-dirs) (delete 'install-man-page))))))) +