Merge branch 'devel' into 'main'

updating squid package and service

See merge request glicid-public/guix-glicid!31

glicid/packages/networking.scm

@@ -1,9 +1,30 @@
 (define-module (glicid packages networking)
   #:use-module ((gnu packages networking) #:prefix gnu:)
+  #:use-module (guix build-system gnu)
   #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
 )
 
+(define-public libecap
+  (package
+    (name "libecap")
+    (version "1.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://www.e-cap.org/archive/libecap-" version ".tar.gz"))
+        (sha256 (base32 "1gn44230z3n5vbwf1lb8ninjmhngc96criy6vc1qj8adw19bpiv4"))
+      )
+    )
+    (build-system gnu-build-system)
+    (synopsis "eCAP is a software interface that allows a network application, such as an HTTP proxy or an ICAP server, to outsource content analysis and adaptation to a loadable module.")
+    (description "eCAP is a software interface that allows a network application, such as an HTTP proxy or an ICAP server, to outsource content analysis and adaptation to a loadable module.")
+    (home-page "https://www.e-cap.org/")
+    (license license:gpl3+)
+  )
+)
+
 
 (define-public squid
   (package
@@ -17,5 +38,27 @@
         (sha256 (base32 "0v0h949l4wd1hl87a8wkk1fkvj8j44wifyxi9myxdgbnci6lh7af"))
       )
     )
+    (inputs
+     `(("libecap", libecap)
+       ,@(package-inputs gnu:squid)))
+    (arguments
+      '(
+        #:configure-flags (list
+        "--disable-arch-native" "--enable-icmp" "--enable-delay-pools" "--enable-ecap" "--enable-follow-x-forwarded-for"
+        "--enable-auth" "--enable-auth-basic" "--enable-auth-negotiate" "--enable-auth-ntlm"
+        "--enable-log-daemon-helpers"
+        )
+        #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fix-true-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "test-suite/testheaders.sh"
+               (("/bin/true") (search-input-file inputs "/bin/true"))
+              )
+            )
+          )
+        )
+      )
+    )
   )
 )

glicid/services/networking.scm

@@ -66,8 +66,6 @@
               (procedure #~(lambda _ (exec-command
                 (list
                   #$(file-append squid "/sbin/squid")
-                  "-d" #$loglevel
-                  "-N"
                   "-k" "reconfigure"
                   "-f" #$config-file
                 )
@@ -79,8 +77,6 @@
               (procedure #~(lambda _ (exec-command
                 (list
                   #$(file-append squid "/sbin/squid")
-                  "-d" #$loglevel
-                  "-N"
                   "-k" "parse"
                   "-f" #$config-file
                 )
@@ -92,8 +88,6 @@
               (procedure #~(lambda _ (exec-command
                 (list
                   #$(file-append squid "/sbin/squid")
-                  "-d" #$loglevel
-                  "-N"
                   "-k" "kill"
                   "-f" #$config-file
                 )