update to squid-7.6 (oops, forgot to commit -current when I did -stable)

This commit is contained in:
sthen
2026-06-09 09:08:14 +00:00
parent 5207bb373d
commit bd395db3f1
3 changed files with 4 additions and 27 deletions
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
-23
View File
@@ -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 <nettle/md5.h>
+#include <nettle/version.h>
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