From 15b3203256c6d3e105abfbe44a60742b8ea33c15 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Sun, 1 Oct 2023 11:35:20 +0200 Subject: [PATCH] updating corefreq and squid --- glicid/packages/linux.scm | 6 ++---- glicid/packages/networking.scm | 39 +++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index 4cf44b5..2224a00 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -140,14 +140,14 @@ (package (inherit gnu:corefreq) (name "corefreq") - (version "1.96.4") + (version "1.96.5") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/cyring/CoreFreq") (commit version))) (file-name (git-file-name name version)) - (sha256 (base32 "11jjqfgyxq6vd264r812jyilghnaw9qyamfldy5wqfwwibbncjsm")))))) + (sha256 (base32 "15wi9v7zcd62ab03zji43l33f1mc70lsdvqylv33kfpaf3k72lm4")))))) (define-public lvm2-past-20311 (package @@ -246,5 +246,3 @@ mapper. Kernel components are part of Linux-libre.") (inherit lvm2-past-20311) (version "2.03.221-reallyoldversion") )) - - diff --git a/glicid/packages/networking.scm b/glicid/packages/networking.scm index 62931c5..41d9567 100644 --- a/glicid/packages/networking.scm +++ b/glicid/packages/networking.scm @@ -21,7 +21,7 @@ (home-page "https://www.e-cap.org/") (license license:gpl3+))) -(define-public squid +(define-public squid-5 (package (inherit gnu:squid) (name "squid") @@ -53,11 +53,42 @@ (package (inherit gnu:squid) (name "squid") - (version "6.0.2") + (version "6.3") (source (origin (method url-fetch) (uri (string-append "http://www.squid-cache.org/Versions/v6/squid-" version ".tar.xz")) - (sha256 (base32 "0fjv1in1n6i8bv4lbam9qpdbcqqdwkaypba37bpmdrngzlckimnm")))) + (sha256 (base32 "1yj869jnbdv1fb604j6g602dyvfnw7ahh9sh7mbqjpbsd9cgb83l")))) + (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" + "--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 squid-7 + (package + (inherit gnu:squid) + (name "squid") + (version "7.0.0-20230901-r3e50f1af7") + (source (origin + (method url-fetch) + (uri (string-append "http://www.squid-cache.org/Versions/v7/squid-" version ".tar.gz")) + (sha256 (base32 "0d761ykgd2ck0g0vbcw8pf57my13l41wfq4p248vcz9kvw19gjmn")))) (inputs `(("libecap" ,libecap) ,@(package-inputs gnu:squid))) (arguments @@ -81,6 +112,8 @@ (("/bin/true") (search-input-file inputs "/bin/true")))))))))) +(define-public squid squid-6) + (define-public openvswitch-2.17 (package (inherit gnu:openvswitch)