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

@ -1,88 +1,94 @@
(define-module (glicid packages networking) (define-module (glicid packages networking)
#:use-module ((gnu packages networking) #:use-module ((gnu packages networking)
#:prefix gnu:) #:prefix gnu:)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix licenses) #:use-module ((guix licenses)
#:prefix license:) #:prefix license:)
#:use-module (guix packages)) #:use-module (guix packages))
(define-public libecap (define-public libecap
(package (package
(name "libecap") (name "libecap")
(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 (build-system gnu-build-system)
(base32 (synopsis
"1gn44230z3n5vbwf1lb8ninjmhngc96criy6vc1qj8adw19bpiv4")))) "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.")
(build-system gnu-build-system) (description
(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.") (home-page "https://www.e-cap.org/")
(description (license license:gpl3+)))
"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 (define-public squid
(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")) (inputs `(("libecap" ,libecap)
(sha256 ,@(package-inputs gnu:squid)))
(base32 (arguments
"10fdgrdiycphs8ciyn1q5p6dcyngmr614rry6gylx72cpam561vb")))) '(#:configure-flags (list "--disable-arch-native"
(inputs `(("libecap" ,libecap) "--enable-icmp"
,@(package-inputs gnu:squid))) "--enable-delay-pools"
(arguments "--enable-ecap"
'(#:configure-flags (list "--disable-arch-native" "--enable-follow-x-forwarded-for"
"--enable-icmp" "--enable-auth"
"--enable-delay-pools" "--enable-auth-basic"
"--enable-ecap" "--enable-auth-negotiate"
"--enable-follow-x-forwarded-for" "--enable-auth-ntlm"
"--enable-auth" "--enable-log-daemon-helpers")
"--enable-auth-basic" #:phases (modify-phases %standard-phases
"--enable-auth-negotiate" (add-before 'build 'fix-true-path
"--enable-auth-ntlm" (lambda* (#:key inputs #:allow-other-keys)
"--enable-log-daemon-helpers") (substitute* "test-suite/testheaders.sh"
#:phases (modify-phases %standard-phases (("/bin/true")
(add-before 'build 'fix-true-path (search-input-file inputs "/bin/true"))))))))))
(lambda* (#:key inputs #:allow-other-keys) (define-public squid-6
(substitute* "test-suite/testheaders.sh" (package
(("/bin/true") (inherit gnu:squid)
(search-input-file inputs "/bin/true")))))))))) (name "squid")
(version "6.0.2")
(define-public squid-5.5 (source (origin
(package (method url-fetch)
(inherit squid) (uri (string-append "http://www.squid-cache.org/Versions/v6/squid-" version ".tar.xz"))
(name "squid") (sha256 (base32 "0fjv1in1n6i8bv4lbam9qpdbcqqdwkaypba37bpmdrngzlckimnm"))))
(version "5.5") (inputs `(("libecap" ,libecap)
(source (origin ,@(package-inputs gnu:squid)))
(method url-fetch) (arguments
(uri (string-append '(#:configure-flags (list "--disable-arch-native"
"http://www.squid-cache.org/Versions/v5/squid-" version "--enable-icmp"
".tar.xz")) "--enable-delay-pools"
(sha256 "--enable-ecap"
(base32 "--enable-follow-x-forwarded-for"
"0v0h949l4wd1hl87a8wkk1fkvj8j44wifyxi9myxdgbnci6lh7af")))))) "--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
(inherit gnu:openvswitch) (inherit gnu:openvswitch)
(name "openvswitch") (name "openvswitch")
(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"))))))