From bd395db3f1ee6984cd6ffae093446db418017187 Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 9 Jun 2026 09:08:14 +0000 Subject: [PATCH] update to squid-7.6 (oops, forgot to commit -current when I did -stable) --- www/squid/Makefile | 4 ++-- www/squid/distinfo | 4 ++-- www/squid/patches/patch-include_md5_h | 23 ----------------------- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 www/squid/patches/patch-include_md5_h diff --git a/www/squid/Makefile b/www/squid/Makefile index bc9d907ceb9..bdae3f09ade 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,13 +1,13 @@ COMMENT-main= WWW and FTP proxy cache and accelerator COMMENT-ldap= LDAP authentication/ACL support for Squid -V= 7.5 +V= 7.6 DISTNAME= squid-$V EXTRACT_SUFX= .tar.xz DPB_PROPERTIES= parallel +# keep above 7.9-stable; security/libnettle -> security/nettle REVISION-main= 0 -REVISION-ldap= 0 # subpackages aren't flavoured, so overwrite the default name/path FULLPKGNAME-ldap= squid-ldap-$V diff --git a/www/squid/distinfo b/www/squid/distinfo index 13b2be7e40b..ac5bd0eab51 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,2 +1,2 @@ -SHA256 (squid-7.5.tar.xz) = 9gWJB9sBUNL10ihIK1qeVniSDPNorgzLzszrL/TDUQY= -SIZE (squid-7.5.tar.xz) = 2432664 +SHA256 (squid-7.6.tar.xz) = hSF4/cN8WweGqTT8mQx9L//IKs8ZsihL4gm5ZDHSWZI= +SIZE (squid-7.6.tar.xz) = 2436896 diff --git a/www/squid/patches/patch-include_md5_h b/www/squid/patches/patch-include_md5_h deleted file mode 100644 index 47b2d919113..00000000000 --- a/www/squid/patches/patch-include_md5_h +++ /dev/null @@ -1,23 +0,0 @@ -Fix with nettle >=4 - -Index: include/md5.h ---- include/md5.h.orig -+++ include/md5.h -@@ -11,12 +11,17 @@ - - #if HAVE_NETTLE_MD5_H - #include -+#include - - typedef struct md5_ctx SquidMD5_CTX; - - #define SquidMD5Init(c) md5_init((c)) - #define SquidMD5Update(c,b,l) md5_update((c), (l), (const uint8_t *)(b)) -+#if NETTLE_VERSION_MAJOR > 3 -+#define SquidMD5Final(d,c) md5_digest((c), (uint8_t *)(d)) -+#else - #define SquidMD5Final(d,c) md5_digest((c), MD5_DIGEST_SIZE, (uint8_t *)(d)) -+#endif - - #define SQUID_MD5_DIGEST_LENGTH MD5_DIGEST_SIZE -