Received: by mail.netbsd.org (Postfix, from userid 605) id 6074884D6C; Sun, 10 Oct 2021 15:55:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9A4C584D4C for ; Sun, 10 Oct 2021 15:55:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id jz9N76efZrJL for ; Sun, 10 Oct 2021 15:55:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B185784C71 for ; Sun, 10 Oct 2021 15:55:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A0960FA97; Sun, 10 Oct 2021 15:55:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1633881347113530" MIME-Version: 1.0 Date: Sun, 10 Oct 2021 15:55:47 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/www/squid4 To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20211010155547.A0960FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1633881347113530 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Sun Oct 10 15:55:47 UTC 2021 Modified Files: pkgsrc/www/squid4: Makefile distinfo pkgsrc/www/squid4/patches: patch-configure Log Message: www/squid4: update to 4.17 Changes in squid-4.17 (03 Oct 2021): - WCCP: Validate packets better To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/squid4/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/squid4/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/squid4/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1633881347113530 Content-Disposition: inline Content-Length: 4969 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/squid4/Makefile diff -u pkgsrc/www/squid4/Makefile:1.21 pkgsrc/www/squid4/Makefile:1.22 --- pkgsrc/www/squid4/Makefile:1.21 Wed Sep 29 19:01:29 2021 +++ pkgsrc/www/squid4/Makefile Sun Oct 10 15:55:47 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2021/09/29 19:01:29 adam Exp $ +# $NetBSD: Makefile,v 1.22 2021/10/10 15:55:47 taca Exp $ -DISTNAME= squid-4.16 -PKGREVISION= 1 +DISTNAME= squid-4.17 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v4/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/www/squid4/distinfo diff -u pkgsrc/www/squid4/distinfo:1.13 pkgsrc/www/squid4/distinfo:1.14 --- pkgsrc/www/squid4/distinfo:1.13 Thu Oct 7 15:08:53 2021 +++ pkgsrc/www/squid4/distinfo Sun Oct 10 15:55:47 2021 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.13 2021/10/07 15:08:53 nia Exp $ +$NetBSD: distinfo,v 1.14 2021/10/10 15:55:47 taca Exp $ -RMD160 (squid-4.16.tar.xz) = c22206e9cfc82c4a5adf4c199ce3c4b719ccb5db -SHA512 (squid-4.16.tar.xz) = 3425dc0afffdea837bfe5aff49646378011b5a2dc664491da36cf30351de967285a667528b68ab25e630a7c54ac30865a065dc4160182419f6f2b0ccba24971e -Size (squid-4.16.tar.xz) = 2454396 bytes +RMD160 (squid-4.17.tar.xz) = bbd2ade0960eac70298b78a34bb85cdf6cce617c +SHA512 (squid-4.17.tar.xz) = cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a +Size (squid-4.17.tar.xz) = 2464204 bytes SHA1 (patch-compat_compat.h) = 839381a5e1f46e7d9b822bbb53d82a53c996ddc0 -SHA1 (patch-configure) = 0d204989666c36172f0765f2a44766d9194c7bb2 +SHA1 (patch-configure) = d19dcb189447f9693d29bf477ebb6c5a7d479ec8 SHA1 (patch-errors_Makefile.in) = 84cbf5c836f02ed5fbfff140888c6d3aadeac326 SHA1 (patch-src_Makefile.in) = afc5aefd97c46d1ffab43e97aeaeade3a5a8c648 SHA1 (patch-src_acl_external_kerberos__ldap__group_support__resolv.cc) = 0ea41d55e32d689a16e012391a9eea67631daf3a Index: pkgsrc/www/squid4/patches/patch-configure diff -u pkgsrc/www/squid4/patches/patch-configure:1.6 pkgsrc/www/squid4/patches/patch-configure:1.7 --- pkgsrc/www/squid4/patches/patch-configure:1.6 Fri Jun 19 13:44:28 2020 +++ pkgsrc/www/squid4/patches/patch-configure Sun Oct 10 15:55:47 2021 @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.6 2020/06/19 13:44:28 taca Exp $ +$NetBSD: patch-configure,v 1.7 2021/10/10 15:55:47 taca Exp $ * More support for OpenSSL 1.1; not only check SSL_Library_init() but also check OPENSSL_init_ssl(). @@ -6,9 +6,9 @@ $NetBSD: patch-configure,v 1.6 2020/06/1 * Utilize on BSD. * Do not override CFLAGS/CXXFLAGS except linux. ---- configure.orig 2020-06-09 07:15:48.000000000 +0000 +--- configure.orig 2021-10-03 17:15:01.000000000 +0000 +++ configure -@@ -23226,10 +23226,12 @@ do +@@ -24425,10 +24425,12 @@ do done # GLIBC 2.30 deprecates sysctl.h. Test with the same flags that (may) break includes later. @@ -24,17 +24,25 @@ $NetBSD: patch-configure,v 1.6 2020/06/1 ${TRUE} ;; mingw) -@@ -23269,6 +23271,7 @@ done - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " +@@ -24478,6 +24480,7 @@ then : + fi + + ac_fn_cxx_check_header_compile "$LINENO" "net/if_arp.h" "ac_cv_header_net_if_arp_h" " ++#include + #include + #include + +@@ -24488,6 +24491,7 @@ then : + + fi + ac_fn_cxx_check_header_compile "$LINENO" "net/route.h" "ac_cv_header_net_route_h" " +#include #include #include -@@ -24105,7 +24108,51 @@ if test "x$ac_cv_lib_ssl_SSL_CTX_new" = +@@ -25381,7 +25385,51 @@ then : LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS" - else + else $as_nop - as_fn_error $? "library 'ssl' is required for OpenSSL" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_ssl in -lssl" >&5 @@ -85,9 +93,9 @@ $NetBSD: patch-configure,v 1.6 2020/06/1 fi -@@ -24208,7 +24255,51 @@ if test "x$ac_cv_lib_ssl_SSL_CTX_new" = +@@ -25482,7 +25530,51 @@ then : LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS" - else + else $as_nop - as_fn_error $? "library 'ssl' is required for OpenSSL" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_ssl in -lssl" >&5 @@ -138,16 +146,16 @@ $NetBSD: patch-configure,v 1.6 2020/06/1 fi -@@ -39571,6 +39662,8 @@ else - # ifdef _MSC_VER +@@ -42202,6 +42294,8 @@ else + # elif defined _MSC_VER # include # define alloca _alloca +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +# include # else - # ifdef HAVE_ALLOCA_H - # include -@@ -42313,6 +42406,9 @@ ac_fn_cxx_check_header_compile "$LINENO" + # ifdef __cplusplus + extern "C" +@@ -45149,6 +45243,9 @@ printf "%s\n" "#define USE_SOLARIS_IPFIL #if USE_SOLARIS_IPFILTER_MINOR_T_HACK #define minor_t fubar #endif --_----------=_1633881347113530--