updating squid and adding squid-6

This commit is contained in:
Jean-François GUILLAUME 2023-05-11 09:53:58 +02:00
parent 7396b0f86a
commit b413661435
GPG key ID: 38751DAE145EFB5A

View file

@ -13,11 +13,8 @@
(version "1.0.0") (version "1.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.e-cap.org/archive/libecap-" (uri (string-append "https://www.e-cap.org/archive/libecap-" version ".tar.gz"))
version ".tar.gz")) (sha256 (base32 "1gn44230z3n5vbwf1lb8ninjmhngc96criy6vc1qj8adw19bpiv4"))))
(sha256
(base32
"1gn44230z3n5vbwf1lb8ninjmhngc96criy6vc1qj8adw19bpiv4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis (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.") "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.")
@ -30,15 +27,11 @@
(package (package
(inherit gnu:squid) (inherit gnu:squid)
(name "squid") (name "squid")
(version "5.7") (version "5.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "http://www.squid-cache.org/Versions/v5/squid-" version ".tar.xz"))
"http://www.squid-cache.org/Versions/v5/squid-" version (sha256 (base32 "1d84pd55q7k8xab978x9420j0jqm9ybyzdlimx378xd2gl0c5r9z"))))
".tar.xz"))
(sha256
(base32
"10fdgrdiycphs8ciyn1q5p6dcyngmr614rry6gylx72cpam561vb"))))
(inputs `(("libecap" ,libecap) (inputs `(("libecap" ,libecap)
,@(package-inputs gnu:squid))) ,@(package-inputs gnu:squid)))
(arguments (arguments
@ -58,20 +51,37 @@
(substitute* "test-suite/testheaders.sh" (substitute* "test-suite/testheaders.sh"
(("/bin/true") (("/bin/true")
(search-input-file inputs "/bin/true")))))))))) (search-input-file inputs "/bin/true"))))))))))
(define-public squid-6
(define-public squid-5.5
(package (package
(inherit squid) (inherit gnu:squid)
(name "squid") (name "squid")
(version "5.5") (version "6.0.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "http://www.squid-cache.org/Versions/v6/squid-" version ".tar.xz"))
"http://www.squid-cache.org/Versions/v5/squid-" version (sha256 (base32 "0fjv1in1n6i8bv4lbam9qpdbcqqdwkaypba37bpmdrngzlckimnm"))))
".tar.xz")) (inputs `(("libecap" ,libecap)
(sha256 ,@(package-inputs gnu:squid)))
(base32 (arguments
"0v0h949l4wd1hl87a8wkk1fkvj8j44wifyxi9myxdgbnci6lh7af")))))) '(#: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"
"--with-cap"
"--with-xml2"
"--with-ldap"
"--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"))))))))))
(define-public openvswitch-2.17 (define-public openvswitch-2.17
(package (package
@ -80,9 +90,5 @@
(version "2.17.2") (version "2.17.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://www.openvswitch.org/releases/openvswitch-" version ".tar.gz"))
"https://www.openvswitch.org/releases/openvswitch-" (sha256 (base32 "0sada2a9x9x7x6a45l7iklqh29wsbrdvvgpkyz5cpf5d5fs0sbka"))))))
version ".tar.gz"))
(sha256
(base32
"0sada2a9x9x7x6a45l7iklqh29wsbrdvvgpkyz5cpf5d5fs0sbka"))))))