pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/squid Update squid package to 2.5.10nb2.
details: https://anonhg.NetBSD.org/pkgsrc/rev/a19f7acb3c47
branches: trunk
changeset: 498834:a19f7acb3c47
user: taca <taca%pkgsrc.org@localhost>
date: Sun Sep 04 05:07:05 2005 +0000
description:
Update squid package to 2.5.10nb2.
- pkgsrc changes: check IP filter's header file <ipl.h> as well as
<netinet/ipl.h>.
- Apply recent official patches including a security fix for DoS noted by
http://secunia.com/advisories/16674/
* 2005-09-03 09:41 (Minor) E-mail sent when cache dies is blocked from many
antispam rules
* 2005-09-03 09:41 (Minor) Solaris 10 SPARC transparent proxy build problem
with ipfilter
* 2005-09-01 22:57 (Minor) snmo cacheClientTable fails on "long" IP addresses
* 2005-09-01 22:49 (Minor) squid_ldap_auth -U does not work
* 2005-09-01 22:44 (Major) assertion failed:
store.c:523: "e->store_status == STORE_PENDING"
* 2005-09-01 22:39 (Cosmetic) Greek translation of error messages
* 2005-09-01 22:31 (Minor) Some odd FTP servers respond with 250
where 226 is expected
* 2005-09-01 22:26 (Cosmetic) Fails to compile with glibc -D_FORTIFY_SOURCE=2
* 2005-09-01 22:18 (Cosmetic) Odd URLs when failing to forward request via
parent and several error messages inconsistent
in reported request details
* 2005-09-01 22:09 (Minor) More chroot_dir and squid -k reconfigure issues
* 2005-09-01 21:56 (Medium) assertion failed:
StatHist.c:93: ((int) floor (0.99L + statHistVal(H, 0) - min)) == 0
* 2005-09-01 20:27 (Major) Segmentation fault in sslConnectTimeout
* 2005-08-19 09:31 (Minor) sync redeclarations when support for ARP acls
* 2005-08-14 17:05 (Cosmetic) New 'mail_program' configuration option in
squid.conf
diffstat:
www/squid/Makefile | 20 +++++++++++++++--
www/squid/distinfo | 52 +++++++++++++++++++++++++++++++++++++++++----
www/squid/patches/patch-ag | 16 ++++++++-----
www/squid/patches/patch-an | 16 ++++++++-----
www/squid/patches/patch-bb | 16 +++++++++++--
www/squid/patches/patch-cd | 24 +++++++++++---------
6 files changed, 110 insertions(+), 34 deletions(-)
diffs (truncated from 314 to 300 lines):
diff -r 9c1a79a033ef -r a19f7acb3c47 www/squid/Makefile
--- a/www/squid/Makefile Sun Sep 04 05:00:36 2005 +0000
+++ b/www/squid/Makefile Sun Sep 04 05:07:05 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.156 2005/08/23 11:48:51 rillig Exp $
+# $NetBSD: Makefile,v 1.157 2005/09/04 05:07:05 taca Exp $
DISTNAME= squid-2.5.STABLE10
PKGNAME= squid-2.5.10
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.5/ \
ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
@@ -23,7 +23,21 @@
squid-2.5.STABLE10-wbinfo_groups.patch \
squid-2.5.STABLE10-64bit_cleanup.patch \
squid-2.5.STABLE10-wb_ntlm_auth_silent.patch \
- squid-2.5.STABLE10-buildenv.patch
+ squid-2.5.STABLE10-buildenv.patch \
+ squid-2.5.STABLE10-mail_program.patch \
+ squid-2.5.STABLE10-arp_ipfilter-2.patch \
+ squid-2.5.STABLE10-sslConnectTimeout.patch \
+ squid-2.5.STABLE10-statHistAssert.patch \
+ squid-2.5.STABLE10-chroot_dir.patch \
+ squid-2.5.STABLE10-errmsg.patch \
+ squid-2.5.STABLE10-FORTIFY_SOURCE.patch \
+ squid-2.5.STABLE10-ftp_250.patch \
+ squid-2.5.STABLE10-Greek.patch \
+ squid-2.5.STABLE10-STORE_PENDING.patch \
+ squid-2.5.STABLE10-ldap_auth-U.patch \
+ squid-2.5.STABLE10-cacheClientTable.patch \
+ squid-2.5.STABLE10-Solaris_IPFilter.patch \
+ squid-2.5.STABLE10-mail_from.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= taca%NetBSD.org@localhost
diff -r 9c1a79a033ef -r a19f7acb3c47 www/squid/distinfo
--- a/www/squid/distinfo Sun Sep 04 05:00:36 2005 +0000
+++ b/www/squid/distinfo Sun Sep 04 05:07:05 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.100 2005/08/09 15:48:29 taca Exp $
+$NetBSD: distinfo,v 1.101 2005/09/04 05:07:05 taca Exp $
SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10.tar.bz2) = a0092570938032f66e7f636d1a6a02dd2383a643
RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10.tar.bz2) = e1409a2fcd52e1c928d74740c98396886b5ef927
@@ -45,17 +45,59 @@
SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-buildenv.patch) = 433b03e172cde2e4893c8a1f943329a164f6bcc8
RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-buildenv.patch) = 67688fb7ee4aee8923439684053b08f742522a82
Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-buildenv.patch) = 4025 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_program.patch) = 8f3e593c93ca2c64b4ee7335ea17f9b3076cf33d
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_program.patch) = b108754a8152cd79e3ddc86320763378667df7c9
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_program.patch) = 1922 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-arp_ipfilter-2.patch) = cd24bc66430229eb22fdec387aa935d2b382dd99
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-arp_ipfilter-2.patch) = aace4c841ec36cd23112cd1ad1328e1d19ac40bf
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-arp_ipfilter-2.patch) = 883 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-sslConnectTimeout.patch) = eda5f6937e601b1ed93f964b7e6555c7f34fe833
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-sslConnectTimeout.patch) = 76e21355755b49752860dc46c02186eff7b0775f
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-sslConnectTimeout.patch) = 426 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-statHistAssert.patch) = 03a1df28b8f2aab047dd01635bf5776ffa3f63b6
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-statHistAssert.patch) = c973786d43e05d78336068f00e4b1e46ae3b8cfa
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-statHistAssert.patch) = 738 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot_dir.patch) = 8d4d087f55c10c0209e9cc35e24f21366d725db2
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot_dir.patch) = ec1c67faac72f4cd039bb417c4e7bc35534241c3
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot_dir.patch) = 685 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-errmsg.patch) = 95dbd1962bf67cda7b9923b01efba4f5f994e447
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-errmsg.patch) = 9ad6e2bf38d127ae6033aff34854288c789c8a80
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-errmsg.patch) = 19050 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-FORTIFY_SOURCE.patch) = 02acaa18f50953ab7f3a0598829722ee0048d422
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-FORTIFY_SOURCE.patch) = 8ee593bbac0621d96208263e14716709b6faafc5
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-FORTIFY_SOURCE.patch) = 2397 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_250.patch) = aecb14cf3b2d5502b86ed979f464597b25db5bac
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_250.patch) = 84969264f8aaa113c57965f72b15e57463ed0e00
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_250.patch) = 2090 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Greek.patch) = c0106d9327eb1d9a3d5cb28b5509886d8c4f1fa7
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Greek.patch) = b88104efac09ee808d4f606bd1855d680163ec81
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-Greek.patch) = 37463 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-STORE_PENDING.patch) = 8b0c50c5ae3d64382548620864736c340767484d
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-STORE_PENDING.patch) = dbfb58902943ff7f5f4e05f319f20685d3ae6179
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-STORE_PENDING.patch) = 9169 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ldap_auth-U.patch) = fc786458e8d56f2afc934f7d503d9af0e4cd358f
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ldap_auth-U.patch) = 6996acb25c3370140d114137a64a03e355e0336d
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-ldap_auth-U.patch) = 1380 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-cacheClientTable.patch) = 1b09b265c23955c008456276a09b291c567cae0c
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-cacheClientTable.patch) = 4773824bd1d5e47af3137f3ec4f851766e8738ee
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-cacheClientTable.patch) = 632 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter.patch) = 898720e6b412859232346317ff1d2df2c2486ec2
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter.patch) = 55003aba24e74f7a1e93dc56a2801f6e2b5e235f
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter.patch) = 1607 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_from.patch) = 92cbdc4ae9edf22f8eedd66603fed81ed4e300e6
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_from.patch) = 2aa39b1f4ccf940250514cef58609209878c39ff
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_from.patch) = 1863 bytes
SHA1 (patch-aa) = 25d47b8ab8618af2b1d2a40f1dc3630cdc14038c
SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c
SHA1 (patch-ae) = 860c8ad41ea09282bdb0d626260084354458f653
-SHA1 (patch-ag) = e0874f435b1741f9fbc88170198c4f1102ab1798
+SHA1 (patch-ag) = 815ea5faa2425aa66f5648f702148427bbfd53ad
SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7
SHA1 (patch-al) = 51d7c84b007ab9600ae911e1e9206cf91b937120
-SHA1 (patch-an) = 8c9fc0f542859341fe1790dd70be7e624d46fe99
+SHA1 (patch-an) = c5bfcd3d8955e5f58cf18bcdc412e05c89082e89
SHA1 (patch-ap) = f57cd1137c3e5419f3788c391292421ca8a91a57
-SHA1 (patch-bb) = 0fbd2ce31546289edad3b1e5ea5de408d359d3a1
+SHA1 (patch-bb) = 6bed55283acf8828de75b1fc05b20d6ef7ef965e
SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
-SHA1 (patch-cd) = ba012a5885de2906dfe7887863918721a81a79be
+SHA1 (patch-cd) = f97ae58a084b75a3dda558f6e8c7c306cbb6b625
diff -r 9c1a79a033ef -r a19f7acb3c47 www/squid/patches/patch-ag
--- a/www/squid/patches/patch-ag Sun Sep 04 05:00:36 2005 +0000
+++ b/www/squid/patches/patch-ag Sun Sep 04 05:07:05 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.19 2005/06/07 14:19:10 taca Exp $
+$NetBSD: patch-ag,v 1.20 2005/09/04 05:07:05 taca Exp $
---- configure.orig 2005-05-17 07:41:14.000000000 +0900
+--- configure.orig 2005-09-02 10:23:02.000000000 +0900
+++ configure
@@ -2241,7 +2241,7 @@ if test "${enable_snmp+set}" = set; then
#define SQUID_SNMP 1
@@ -11,7 +11,11 @@
if true; then
-@@ -4046,6 +4046,7 @@ for ac_hdr in \
+@@ -4046,9 +4046,11 @@ for ac_hdr in \
+ ip_fil_compat.h \
+ ip_fil.h \
+ ip_nat.h \
++ ipl.h \
libc.h \
limits.h \
linux/netfilter_ipv4.h \
@@ -19,7 +23,7 @@
malloc.h \
math.h \
memory.h \
-@@ -4060,6 +4061,7 @@ for ac_hdr in \
+@@ -4063,6 +4065,7 @@ for ac_hdr in \
netinet/ip_fil_compat.h \
netinet/ip_fil.h \
netinet/ip_nat.h \
@@ -27,7 +31,7 @@
openssl/err.h \
openssl/md5.h \
openssl/ssl.h \
-@@ -6291,43 +6293,38 @@ fi
+@@ -6294,43 +6297,38 @@ fi
echo "$ac_t""$ac_cv_type_mode_t" 1>&6
if test $ac_cv_type_mode_t = no; then
cat >> confdefs.h <<\EOF
@@ -85,7 +89,7 @@
echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-@@ -7643,8 +7640,8 @@ if test "$GCC" = "yes"; then
+@@ -7646,8 +7644,8 @@ if test "$GCC" = "yes"; then
GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'`
case "$GCCVER" in
2.95.[123])
diff -r 9c1a79a033ef -r a19f7acb3c47 www/squid/patches/patch-an
--- a/www/squid/patches/patch-an Sun Sep 04 05:00:36 2005 +0000
+++ b/www/squid/patches/patch-an Sun Sep 04 05:07:05 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.7 2005/06/07 14:19:10 taca Exp $
+$NetBSD: patch-an,v 1.8 2005/09/04 05:07:05 taca Exp $
---- configure.in.orig 2005-05-17 07:41:14.000000000 +0900
+--- configure.in.orig 2005-09-02 10:23:02.000000000 +0900
+++ configure.in
@@ -493,7 +493,7 @@ AC_ARG_ENABLE(snmp,
[ if test "$enableval" = "yes" ; then
@@ -11,7 +11,11 @@
AM_CONDITIONAL(USE_SNMP, true)
SNMP_MAKEFILE=./snmplib/Makefile
makesnmplib=snmplib
-@@ -1282,6 +1282,7 @@ AC_CHECK_HEADERS( \
+@@ -1282,9 +1282,11 @@ AC_CHECK_HEADERS( \
+ ip_fil_compat.h \
+ ip_fil.h \
+ ip_nat.h \
++ ipl.h \
libc.h \
limits.h \
linux/netfilter_ipv4.h \
@@ -19,7 +23,7 @@
malloc.h \
math.h \
memory.h \
-@@ -1296,6 +1297,7 @@ AC_CHECK_HEADERS( \
+@@ -1299,6 +1301,7 @@ AC_CHECK_HEADERS( \
netinet/ip_fil_compat.h \
netinet/ip_fil.h \
netinet/ip_nat.h \
@@ -27,7 +31,7 @@
openssl/err.h \
openssl/md5.h \
openssl/ssl.h \
-@@ -1507,8 +1509,17 @@ AC_CHECK_TYPE(pid_t, int)
+@@ -1510,8 +1513,17 @@ AC_CHECK_TYPE(pid_t, int)
AC_CHECK_TYPE(size_t, unsigned int)
AC_CHECK_TYPE(ssize_t, int)
AC_CHECK_TYPE(off_t, int)
@@ -47,7 +51,7 @@
AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -1716,8 +1727,8 @@ if test "$GCC" = "yes"; then
+@@ -1719,8 +1731,8 @@ if test "$GCC" = "yes"; then
GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'`
case "$GCCVER" in
[2.95.[123]])
diff -r 9c1a79a033ef -r a19f7acb3c47 www/squid/patches/patch-bb
--- a/www/squid/patches/patch-bb Sun Sep 04 05:00:36 2005 +0000
+++ b/www/squid/patches/patch-bb Sun Sep 04 05:07:05 2005 +0000
@@ -1,8 +1,18 @@
-$NetBSD: patch-bb,v 1.6 2005/06/07 14:19:10 taca Exp $
+$NetBSD: patch-bb,v 1.7 2005/09/04 05:07:05 taca Exp $
--- include/autoconf.h.in.orig 2005-04-23 10:32:27.000000000 +0900
+++ include/autoconf.h.in
-@@ -665,6 +665,9 @@
+@@ -656,6 +656,9 @@
+ /* Define if you have the <ip_nat.h> header file. */
+ #undef HAVE_IP_NAT_H
+
++/* Define if you have the <ipl.h> header file. */
++#undef HAVE_IPL_H
++
+ /* Define if you have the <libc.h> header file. */
+ #undef HAVE_LIBC_H
+
+@@ -665,6 +668,9 @@
/* Define if you have the <linux/netfilter_ipv4.h> header file. */
#undef HAVE_LINUX_NETFILTER_IPV4_H
@@ -12,7 +22,7 @@
/* Define if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
-@@ -707,6 +710,9 @@
+@@ -707,6 +713,9 @@
/* Define if you have the <netinet/ip_nat.h> header file. */
#undef HAVE_NETINET_IP_NAT_H
diff -r 9c1a79a033ef -r a19f7acb3c47 www/squid/patches/patch-cd
--- a/www/squid/patches/patch-cd Sun Sep 04 05:00:36 2005 +0000
+++ b/www/squid/patches/patch-cd Sun Sep 04 05:07:05 2005 +0000
@@ -1,18 +1,20 @@
-$NetBSD: patch-cd,v 1.10 2005/08/09 15:48:30 taca Exp $
+$NetBSD: patch-cd,v 1.11 2005/09/04 05:07:05 taca Exp $
---- src/client_side.c.orig 2005-07-13 01:16:03.000000000 +0900
+--- src/client_side.c.orig 2005-09-02 10:23:02.000000000 +0900
+++ src/client_side.c
-@@ -41,6 +41,9 @@
+@@ -55,6 +55,11 @@
+ #ifdef _SQUID_SOLARIS_
+ #undef free
#endif
- #include <netinet/tcp.h>
- #include <net/if.h>
-+#if HAVE_NETINET_IPL_H
++#ifdef HAVE_IPL_H
++#include <ipl.h>
++#elif HAVE_NETINET_IPL_H
+#include <netinet/ipl.h>
+#endif
#if HAVE_IP_FIL_COMPAT_H
#include <ip_fil_compat.h>
#elif HAVE_NETINET_IP_FIL_COMPAT_H
-@@ -2592,6 +2595,9 @@ parseHttpRequest(ConnStateData * conn, m
+@@ -2606,6 +2611,9 @@ parseHttpRequest(ConnStateData * conn, m
static int natfd = -1;
static int siocgnatl_cmd = SIOCGNATL & 0xff;
int x;
@@ -22,7 +24,7 @@
#endif
#if PF_TRANSPARENT
struct pfioc_natlook nl;
-@@ -2734,6 +2740,13 @@ parseHttpRequest(ConnStateData * conn, m
+@@ -2748,6 +2756,13 @@ parseHttpRequest(ConnStateData * conn, m
if (vhost_mode) {
#if IPF_TRANSPARENT
static time_t last_reported = 0;
@@ -36,7 +38,7 @@
natLookup.nl_inport = http->conn->me.sin_port;
natLookup.nl_outport = http->conn->peer.sin_port;
natLookup.nl_inip = http->conn->me.sin_addr;
-@@ -2742,8 +2755,8 @@ parseHttpRequest(ConnStateData * conn, m
+@@ -2756,8 +2771,8 @@ parseHttpRequest(ConnStateData * conn, m
if (natfd < 0) {
int save_errno;
enter_suid();
@@ -47,7 +49,7 @@
#else
natfd = open(IPL_NAT, O_RDONLY, 0);
#endif
Home |
Main Index |
Thread Index |
Old Index