diff options
-rw-r--r-- | www/squid/Makefile | 6 | ||||
-rw-r--r-- | www/squid/distinfo | 9 | ||||
-rw-r--r-- | www/squid/patches/patch-bd | 40 |
3 files changed, 7 insertions, 48 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index dc52c282339..af8658efcbf 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.186 2006/12/12 14:46:56 taca Exp $ +# $NetBSD: Makefile,v 1.187 2007/01/14 04:12:12 taca Exp $ -DISTNAME= squid-2.6.STABLE6 -PKGNAME= squid-2.6.6 +DISTNAME= squid-2.6.STABLE7 +PKGNAME= ${DISTNAME:S/STABLE//} #PKGREVISION= CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.6/ \ diff --git a/www/squid/distinfo b/www/squid/distinfo index 2ebe971ea43..5fc2b49e849 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.124 2006/12/12 14:46:56 taca Exp $ +$NetBSD: distinfo,v 1.125 2007/01/14 04:12:12 taca Exp $ -SHA1 (squid-2.6.6/squid-2.6.STABLE6.tar.bz2) = c731b77df70fb1c6870c0ec6064271316ed75e27 -RMD160 (squid-2.6.6/squid-2.6.STABLE6.tar.bz2) = 12b536f39c7a5b1822d3a68286ca267a5da9e8a3 -Size (squid-2.6.6/squid-2.6.STABLE6.tar.bz2) = 1261599 bytes +SHA1 (squid-2.6.7/squid-2.6.STABLE7.tar.bz2) = 7c5a7f1fbcdb0a2adbdf4e5641abc0ef7efefae2 +RMD160 (squid-2.6.7/squid-2.6.STABLE7.tar.bz2) = f0f9b06351bc94ed2436145e74f2686230071d96 +Size (squid-2.6.7/squid-2.6.STABLE7.tar.bz2) = 1262361 bytes SHA1 (patch-aa) = bcbe4e0bf3cd632497dc8045c1b8d86842edf90c SHA1 (patch-ab) = e4b9213dcbae32b65d0fe69b9cf9cff49aae504e SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0 @@ -19,4 +19,3 @@ SHA1 (patch-ar) = a80477b24d02688f1f55ba1d4967bf340b5c04cb SHA1 (patch-as) = 87cfb6190bbdaa17ffbe3a877cf6f67fde3af1f1 SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2 SHA1 (patch-bc) = 87d67c6d00c0734eebc1d7c6a9bcd1e3331400d9 -SHA1 (patch-bd) = caff973dcceaf80c9c4b9104561f4f3b0eeb7150 diff --git a/www/squid/patches/patch-bd b/www/squid/patches/patch-bd deleted file mode 100644 index e3b68bfe904..00000000000 --- a/www/squid/patches/patch-bd +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-bd,v 1.3 2006/12/04 21:50:54 jdolecek Exp $ - ---- src/acl.c.orig 2006-10-16 22:11:41.000000000 +0200 -+++ src/acl.c -@@ -3083,7 +3083,7 @@ struct arpreq { - * token namespace crashing any structures or classes having members - * of the same names. - */ --#ifdef _SQUID_OPENBSD_ -+#if defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) - #undef free - #endif - #include <sys/sysctl.h> -@@ -3096,7 +3096,7 @@ struct arpreq { - #include <net/route.h> - #endif - #include <net/if.h> --#if defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_) -+#if defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) - #include <net/if_arp.h> - #endif - #if HAVE_NETINET_IF_ETHER_H -@@ -3318,7 +3318,7 @@ aclMatchArp(void *dataptr, struct in_add - inet_ntoa(c), splayLastResult ? "NOT found" : "found"); - return (0 == splayLastResult); - } --#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_) -+#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) - - struct arpreq arpReq; - struct sockaddr_in ipAddr; -@@ -3475,7 +3475,7 @@ aclArpCompare(const void *a, const void - return (d1[4] > d2[4]) ? 1 : -1; - if (d1[5] != d2[5]) - return (d1[5] > d2[5]) ? 1 : -1; --#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_) -+#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_) || defined(_SQUID_NETBSD_) - const unsigned char *d1 = a; - const unsigned char *d2 = b; - if (d1[0] != d2[0]) |