diff options
author | tron <tron@pkgsrc.org> | 2009-06-07 08:36:36 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2009-06-07 08:36:36 +0000 |
commit | 8486e52b9d33d041ddd84086d52f1c997c8d9e0c (patch) | |
tree | ef715ab407bbd5cc12acb8f3afc9db3e48c6e84e | |
parent | aab9ed1659a5ae611f19beefc463a5e324ad4248 (diff) | |
download | pkgsrc-8486e52b9d33d041ddd84086d52f1c997c8d9e0c.tar.gz |
Update "squid31" package to version 3.1.0.8. Changes since version 3.1.0.7:
- Bug 2656: Pinger dies with general protection fault
- Bug 2650: configure requires epoll_ctl in libepoll when --enable-epoll used
- Bug 2648: Authentificator processes deferring and don't shutdown.
- Bug 2645: allow squid to ignore must-revalidate
- Bug 2644: auth scheme initialization is broken
- Bug 2632: Make number of reforwarding tries configurable
- Bug 2628: --with-pidfile=PATH option to override DEFAULT_PID_FILE
[This problem was reported for pkgsrc in PR pkg/41521.]
- Bug 2627: HTCP Logging
- Bug 2615: Call libecap::adapter::Service::start() when finalizing config.
- Bug 2589: SNMP returning no data - wrong oid decoded
- Bug 2571: Squid with IPv6 fails to start on kernel without IPv6
- Bug 2559: Problem parsing /0 and /0.0.0.0
- Bug 2404: WCCP in mask mode is broken
- ... also all bugs closed by 3.0.STABLE14, 3.0.STABLE15, 3.0.STABLE16-RC1
- Complete Interception multiple NAT support
- Add Content-Disposition to the known headers list.
- Make PEER_TCP_MAGIC_COUNT configurable
- Fix pinger install location
- Enable TPROXY v4 spoofing of CONNECT requests
- ... and much documentation and code polishing
-rw-r--r-- | www/squid31/Makefile | 5 | ||||
-rw-r--r-- | www/squid31/distinfo | 28 | ||||
-rw-r--r-- | www/squid31/patches/patch-aa | 17 | ||||
-rw-r--r-- | www/squid31/patches/patch-ab | 40 | ||||
-rw-r--r-- | www/squid31/patches/patch-ac | 42 | ||||
-rw-r--r-- | www/squid31/patches/patch-ad | 10 | ||||
-rw-r--r-- | www/squid31/patches/patch-af | 27 | ||||
-rw-r--r-- | www/squid31/patches/patch-ag | 16 | ||||
-rw-r--r-- | www/squid31/patches/patch-ah | 14 | ||||
-rw-r--r-- | www/squid31/patches/patch-ai | 17 | ||||
-rw-r--r-- | www/squid31/patches/patch-aj | 12 | ||||
-rw-r--r-- | www/squid31/patches/patch-ak | 28 | ||||
-rw-r--r-- | www/squid31/patches/patch-al | 12 | ||||
-rw-r--r-- | www/squid31/patches/patch-am | 2 | ||||
-rw-r--r-- | www/squid31/patches/patch-an | 29 | ||||
-rw-r--r-- | www/squid31/patches/patch-ao | 29 | ||||
-rw-r--r-- | www/squid31/patches/patch-ap | 13 |
17 files changed, 38 insertions, 303 deletions
diff --git a/www/squid31/Makefile b/www/squid31/Makefile index d2187708628..debc5425dd6 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:38 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2009/06/07 08:36:36 tron Exp $ -DISTNAME= squid-3.1.0.7 +DISTNAME= squid-3.1.0.8 PKGNAME= ${DISTNAME} # Necessary for "pkgsrc/www/squid/options.mk" -PKGREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v3/3.1/ EXTRACT_SUFX= .tar.bz2 diff --git a/www/squid31/distinfo b/www/squid31/distinfo index a487ae2faba..da39fa0755e 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,21 +1,11 @@ -$NetBSD: distinfo,v 1.3 2009/05/17 14:17:42 tron Exp $ +$NetBSD: distinfo,v 1.4 2009/06/07 08:36:36 tron Exp $ -SHA1 (squid-3.1.0.7.tar.bz2) = feba409242548f0ca2041ac1c968873453f3e0c6 -RMD160 (squid-3.1.0.7.tar.bz2) = a58496c69ee54e8495f2f959452ef8bed51a6f9e -Size (squid-3.1.0.7.tar.bz2) = 2254073 bytes -SHA1 (patch-aa) = 5f040d8e35cc1640633e0997363a6a615ae769b2 -SHA1 (patch-ab) = 7b89982f19c97398684dfca192a56e7077bfa21f -SHA1 (patch-ac) = bf2508739b8917d9d7bebba3deae01b8b49986da -SHA1 (patch-ad) = 81d173c37a635b09ae6ea5648fa0cd31f51f641a +SHA1 (squid-3.1.0.8.tar.bz2) = 23c582d7fa11fc63cf388f00d01611398453aab1 +RMD160 (squid-3.1.0.8.tar.bz2) = f6069174f118d79470f35bf7c11184e014984674 +Size (squid-3.1.0.8.tar.bz2) = 2345063 bytes +SHA1 (patch-ad) = 031e5de714610917ac0c575b42add980c0933c72 SHA1 (patch-ae) = b1833170580e93248af867f003c37ce8afbb5e6f -SHA1 (patch-af) = 4f584a053df4f59c55af7f06a31787c9e36c8aa6 -SHA1 (patch-ag) = 1d4172d406d3e34a9582d60ebab649dbe369d985 -SHA1 (patch-ah) = e4cb16cbd65f558146204e450e794ab247c7b617 -SHA1 (patch-ai) = 0390e101199a81f782aa94815098351000f300cf -SHA1 (patch-aj) = 71fc177631bffb38ed2ed9f6caef8dffbd53b335 -SHA1 (patch-ak) = 8cb0aaa7ea9d2241096cf82cf3640eea060ae85c -SHA1 (patch-al) = 996b30e87a595850b8b0532762c45eb82928026b -SHA1 (patch-am) = ca5280be592db8b4037f6f8e11866972cd44a6b9 -SHA1 (patch-an) = 940c7a212a5ecfc3a2ae3bb545d4c3de8a6d6e08 -SHA1 (patch-ao) = 38e056cbffccf0c38731403f6319cc0a51af0325 -SHA1 (patch-ap) = 3b307114608b898d6462ef193c0a8be8ac074772 +SHA1 (patch-ah) = e20f7b76d6d48041efbfe1a07dce756a818e6642 +SHA1 (patch-aj) = 349b5d49dec49430cff2a170ad53d3a16f2a4c76 +SHA1 (patch-al) = 6dd09cf75ed53a92616f4eed9f3e290232ff54a5 +SHA1 (patch-am) = 9dcfc9431d4397b87a72e0205487d89f9fa67233 diff --git a/www/squid31/patches/patch-aa b/www/squid31/patches/patch-aa deleted file mode 100644 index 2fff7788b3c..00000000000 --- a/www/squid31/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - -Add DESTDIR support. - ---- Makefile.in.orig 2009-01-21 10:59:00.000000000 +0900 -+++ Makefile.in -@@ -770,8 +770,8 @@ dist-hook: - fi - - install-pinger: -- chown root $(DEFAULT_PINGER) -- chmod 4711 $(DEFAULT_PINGER) -+ chown root $(DESTDIR)$(DEFAULT_PINGER) -+ chmod 4711 $(DESTDIR)$(DEFAULT_PINGER) - - all-am: - @echo "Build Successful." diff --git a/www/squid31/patches/patch-ab b/www/squid31/patches/patch-ab deleted file mode 100644 index 42636696964..00000000000 --- a/www/squid31/patches/patch-ab +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - ---- configure.in.orig 2009-04-08 12:51:47.000000000 +0200 -+++ configure.in -@@ -2231,6 +2231,7 @@ AC_CHECK_HEADERS( \ - libc.h \ - libgen.h \ - limits.h \ -+ machine/byte_swap.h \ - malloc.h \ - math.h \ - memory.h \ -@@ -2320,6 +2321,7 @@ AC_CHECK_HEADERS( \ - netinet/ip_icmp.h \ - netinet/ip_nat.h\ - netinet/ipl.h \ -+ net/pf/pfvar.h \ - net/pfvar.h \ - sys/mount.h\ - resolv.h \ -@@ -2770,8 +2772,8 @@ if test "$GCC" = "yes"; then - GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'` - case "$GCCVER" in - [2.95.[123]]) -- AC_MSG_NOTICE([Removing -O for gcc on $host with GCC $GCCVER]) -- CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`" -+ echo "Making -O\[[2-9\]] to -O for gcc on $host with GCC $GCCVER" -+ CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*/-O/'`" - ;; - esac - fi -@@ -3131,7 +3133,7 @@ dnl PF support requires a header file. - if test "$PF_TRANSPARENT" ; then - AC_MSG_CHECKING(if PF header file is installed) - # hold on to your hats... -- if test "$ac_cv_header_net_pfvar_h" = "yes"; then -+ if test "$ac_cv_header_net_pfvar_h" = "yes" || test "$ac_cv_header_net_pf_pfvar_h" = "yes"; then - PF_TRANSPARENT="yes" - AC_DEFINE(PF_TRANSPARENT, 1) - else diff --git a/www/squid31/patches/patch-ac b/www/squid31/patches/patch-ac deleted file mode 100644 index a03c54ebab7..00000000000 --- a/www/squid31/patches/patch-ac +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - ---- configure.orig 2009-04-08 12:51:47.000000000 +0200 -+++ configure -@@ -27447,6 +27447,7 @@ for ac_header in \ - libc.h \ - libgen.h \ - limits.h \ -+ machine/byte_swap.h \ - malloc.h \ - math.h \ - memory.h \ -@@ -27779,6 +27780,7 @@ for ac_header in \ - netinet/ip_icmp.h \ - netinet/ip_nat.h\ - netinet/ipl.h \ -+ net/pf/pfvar.h \ - net/pfvar.h \ - sys/mount.h\ - resolv.h \ -@@ -46608,9 +46610,9 @@ if test "$GCC" = "yes"; then - GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'` - case "$GCCVER" in - 2.95.[123]) -- { $as_echo "$as_me:$LINENO: Removing -O for gcc on $host with GCC $GCCVER" >&5 --$as_echo "$as_me: Removing -O for gcc on $host with GCC $GCCVER" >&6;} -- CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*//'`" -+ { $as_echo "$as_me:$LINENO: Making -O\[[2-9\]] to -O for gcc on $host with GCC $GCCVER" >&5 -+$as_echo "$as_me: Making -O\[[2-9\]] to -O for gcc on $host with GCC $GCCVER" >&6;} -+ CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*/-O/'`" - ;; - esac - fi -@@ -47708,7 +47710,7 @@ if test "$PF_TRANSPARENT" ; then - { $as_echo "$as_me:$LINENO: checking if PF header file is installed" >&5 - $as_echo_n "checking if PF header file is installed... " >&6; } - # hold on to your hats... -- if test "$ac_cv_header_net_pfvar_h" = "yes"; then -+ if test "$ac_cv_header_net_pfvar_h" = "yes" || test "$ac_cv_header_net_pf_pfvar_h" = "yes"; then - PF_TRANSPARENT="yes" - cat >>confdefs.h <<\_ACEOF - #define PF_TRANSPARENT 1 diff --git a/www/squid31/patches/patch-ad b/www/squid31/patches/patch-ad index f06a57cb942..aa5fb00bd75 100644 --- a/www/squid31/patches/patch-ad +++ b/www/squid31/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.3 2009/05/17 14:17:42 tron Exp $ +$NetBSD: patch-ad,v 1.4 2009/06/07 08:36:36 tron Exp $ ---- tools/Makefile.in.orig 2009-04-08 11:51:33.000000000 +0100 -+++ tools/Makefile.in 2009-05-17 14:24:36.000000000 +0100 -@@ -809,7 +809,7 @@ +--- tools/Makefile.in.orig 2009-05-23 13:31:26.000000000 +0100 ++++ tools/Makefile.in 2009-06-06 17:34:58.000000000 +0100 +@@ -752,7 +752,7 @@ info-am: -install-data-am: install-data-local +install-data-am: - install-exec-am: install-binPROGRAMS install-libexecPROGRAMS + install-dvi: install-dvi-recursive diff --git a/www/squid31/patches/patch-af b/www/squid31/patches/patch-af deleted file mode 100644 index 7820d6a7b44..00000000000 --- a/www/squid31/patches/patch-af +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - -Add support of existence of header files: - machine/byte_swap.h and net/pf/pfvar.h. - ---- include/autoconf.h.in.orig 2009-04-11 17:35:37.000000000 +0900 -+++ include/autoconf.h.in -@@ -306,6 +306,9 @@ - /* Define to 1 if you have the `lrand48' function. */ - #undef HAVE_LRAND48 - -+/* Define if you have the <machine/byte_swap.h> header file. */ -+#undef HAVE_MACHINE_BYTE_SWAP_H -+ - /* Define to 1 if you have the `mallinfo' function. */ - #undef HAVE_MALLINFO - -@@ -393,6 +396,9 @@ - /* Define to 1 if you have the <net/pfvar.h> header file. */ - #undef HAVE_NET_PFVAR_H - -+/* Define to 1 if you have the <net/pf/pfvar.h> header file. */ -+#undef HAVE_NET_PF_PFVAR_H -+ - /* off_t is defined by the system headers */ - #undef HAVE_OFF_T - diff --git a/www/squid31/patches/patch-ag b/www/squid31/patches/patch-ag deleted file mode 100644 index dad27b85f70..00000000000 --- a/www/squid31/patches/patch-ag +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - -Add support of machine/byte_swap.h. - ---- include/squid_endian.h.orig 2008-06-22 12:35:50.000000000 +0900 -+++ include/squid_endian.h -@@ -68,6 +68,9 @@ - #if HAVE_BYTESWAP_H - # include <byteswap.h> - #endif /* HAVE_BYTESWAP_H */ -+#ifdef HAVE_MACHINE_BYTE_SWAP_H -+#include <machine/byte_swap.h> -+#endif /* HAVE_MACHINE_BYTE_SWAP_H */ - #if HAVE_SYS_BSWAP_H - # include <sys/bswap.h> - #endif /* HAVE_MACHINE_BSWAP_H */ diff --git a/www/squid31/patches/patch-ah b/www/squid31/patches/patch-ah index 97ab0e4cf30..c2b71dea84d 100644 --- a/www/squid31/patches/patch-ah +++ b/www/squid31/patches/patch-ah @@ -1,15 +1,13 @@ -$NetBSD: patch-ah,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ +$NetBSD: patch-ah,v 1.2 2009/06/07 08:36:36 tron Exp $ -Don't install startup scripts. - ---- scripts/Makefile.in.orig 2008-07-18 19:02:51.000000000 +0900 -+++ scripts/Makefile.in -@@ -431,7 +431,7 @@ info-am: +--- scripts/Makefile.in.orig 2009-05-23 13:31:22.000000000 +0100 ++++ scripts/Makefile.in 2009-06-06 17:51:01.000000000 +0100 +@@ -376,7 +376,7 @@ - install-data-am: + install-dvi: install-dvi-am -install-exec-am: install-binSCRIPTS +install-exec-am: - install-info: install-info-am + install-html: install-html-am diff --git a/www/squid31/patches/patch-ai b/www/squid31/patches/patch-ai deleted file mode 100644 index accfc2c82f7..00000000000 --- a/www/squid31/patches/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - ---- src/ip/IpIntercept.cc.orig 2009-04-08 12:51:05.000000000 +0200 -+++ src/ip/IpIntercept.cc -@@ -79,7 +79,12 @@ - #include <sys/fcntl.h> - #include <net/if.h> - #include <netinet/in.h> -+#ifdef HAVE_NET_PF_PFVAR_H -+#include <net/pf/pfvar.h> -+#endif /* HAVE_NET_PF_PFVAR_H */ -+#ifdef HAVE_NET_PFVAR_H - #include <net/pfvar.h> -+#endif /* HAVE_NET_PFVAR_H */ - #endif /* PF_TRANSPARENT required headers */ - - #if LINUX_NETFILTER diff --git a/www/squid31/patches/patch-aj b/www/squid31/patches/patch-aj index 7209d6fb849..c12bb2b12e9 100644 --- a/www/squid31/patches/patch-aj +++ b/www/squid31/patches/patch-aj @@ -1,17 +1,19 @@ -$NetBSD: patch-aj,v 1.3 2009/05/05 07:49:48 tron Exp $ +$NetBSD: patch-aj,v 1.4 2009/06/07 08:36:36 tron Exp $ ---- src/Makefile.in.orig 2009-04-08 12:51:29.000000000 +0200 -+++ src/Makefile.in -@@ -4297,10 +4297,10 @@ info: info-recursive +--- src/Makefile.in.orig 2009-05-23 13:31:24.000000000 +0100 ++++ src/Makefile.in 2009-06-06 18:13:15.000000000 +0100 +@@ -4284,12 +4284,12 @@ info-am: -install-data-am: install-data-local install-dataDATA +install-data-am: install-dataDATA + install-dvi: install-dvi-recursive + install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \ - install-sbinPROGRAMS install-sysconfDATA + install-sbinPROGRAMS - install-info: install-info-recursive + install-html: install-html-recursive diff --git a/www/squid31/patches/patch-ak b/www/squid31/patches/patch-ak deleted file mode 100644 index 4f8c7da3b02..00000000000 --- a/www/squid31/patches/patch-ak +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - ---- src/ssl_support.cc.orig 2008-09-10 01:06:45.000000000 +0900 -+++ src/ssl_support.cc -@@ -535,7 +535,11 @@ SSL_CTX * - sslCreateServerContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *clientCA, const char *CAfile, const char *CApath, const char *CRLfile, const char *dhfile, const char *context) - { - int ssl_error; -+#if OPENSSL_VERSION_NUMBER < 0x00909000L - SSL_METHOD *method; -+#else -+ const SSL_METHOD *method; -+#endif - SSL_CTX *sslContext; - long fl = ssl_parse_flags(flags); - -@@ -732,7 +736,11 @@ SSL_CTX * - sslCreateClientContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *CAfile, const char *CApath, const char *CRLfile) - { - int ssl_error; -+#if OPENSSL_VERSION_NUMBER < 0x00909000L - SSL_METHOD *method; -+#else -+ const SSL_METHOD *method; -+#endif - SSL_CTX *sslContext; - long fl = ssl_parse_flags(flags); - diff --git a/www/squid31/patches/patch-al b/www/squid31/patches/patch-al index e7bb081338a..d3ebb68a073 100644 --- a/www/squid31/patches/patch-al +++ b/www/squid31/patches/patch-al @@ -1,16 +1,18 @@ -$NetBSD: patch-al,v 1.3 2009/05/17 14:17:42 tron Exp $ +$NetBSD: patch-al,v 1.4 2009/06/07 08:36:36 tron Exp $ ---- helpers/basic_auth/MSNT/Makefile.in.orig 2009-04-08 11:51:21.000000000 +0100 -+++ helpers/basic_auth/MSNT/Makefile.in 2009-05-17 14:52:58.000000000 +0100 -@@ -605,9 +605,9 @@ +--- helpers/basic_auth/MSNT/Makefile.in.orig 2009-05-23 13:31:17.000000000 +0100 ++++ helpers/basic_auth/MSNT/Makefile.in 2009-06-06 23:29:51.000000000 +0100 +@@ -542,11 +542,11 @@ info-am: -install-data-am: install-data-local +install-data-am: + install-dvi: install-dvi-am + -install-exec-am: install-libexecPROGRAMS install-sysconfDATA +install-exec-am: install-libexecPROGRAMS - install-info: install-info-am + install-html: install-html-am diff --git a/www/squid31/patches/patch-am b/www/squid31/patches/patch-am index 3b1b1b83f48..0ae499a935d 100644 --- a/www/squid31/patches/patch-am +++ b/www/squid31/patches/patch-am @@ -1,3 +1,5 @@ +$NetBSD: patch-am,v 1.2 2009/06/07 08:36:36 tron Exp $ + --- src/ip/IpAddress.cc.orig 2009-04-18 15:12:22.000000000 +0200 +++ src/ip/IpAddress.cc 2009-04-18 15:38:23.000000000 +0200 @@ -247,11 +247,7 @@ diff --git a/www/squid31/patches/patch-an b/www/squid31/patches/patch-an deleted file mode 100644 index d37f4cc80a6..00000000000 --- a/www/squid31/patches/patch-an +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - ---- helpers/negotiate_auth/squid_kerb_auth/configure.in.orig 2009-04-08 12:50:56.000000000 +0200 -+++ helpers/negotiate_auth/squid_kerb_auth/configure.in -@@ -286,21 +286,21 @@ if test "$enable_arg" = "no"; then - AC_CHECK_PROG(ac_krb5_config,krb5-config,yes,no) - case $sys in - Linux) rpm -q heimdal-lib >/dev/null 2>&1 -- if test $? == 0 ; then -+ if test $? = 0 ; then - check_heimdal - else - check_mit - fi - ;; - AIX) lslpp -L krb5.client.rte >/dev/null 2>&1 -- if test $? == 0 ; then -+ if test $? = 0 ; then - check_nas - else - check_mit - fi - ;; - SunOS) pkginfo SUNWgss >/dev/null 2>&1 -- if test $? == 0 ; then -+ if test $? = 0 ; then - check_seam - else - check_mit diff --git a/www/squid31/patches/patch-ao b/www/squid31/patches/patch-ao deleted file mode 100644 index f320fd213d6..00000000000 --- a/www/squid31/patches/patch-ao +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - ---- helpers/negotiate_auth/squid_kerb_auth/configure.orig 2009-04-08 12:51:47.000000000 +0200 -+++ helpers/negotiate_auth/squid_kerb_auth/configure -@@ -6330,21 +6330,21 @@ fi - - case $sys in - Linux) rpm -q heimdal-lib >/dev/null 2>&1 -- if test $? == 0 ; then -+ if test $? = 0 ; then - check_heimdal - else - check_mit - fi - ;; - AIX) lslpp -L krb5.client.rte >/dev/null 2>&1 -- if test $? == 0 ; then -+ if test $? = 0 ; then - check_nas - else - check_mit - fi - ;; - SunOS) pkginfo SUNWgss >/dev/null 2>&1 -- if test $? == 0 ; then -+ if test $? = 0 ; then - check_seam - else - check_mit diff --git a/www/squid31/patches/patch-ap b/www/squid31/patches/patch-ap deleted file mode 100644 index c36c0237c76..00000000000 --- a/www/squid31/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - ---- test-suite/testheaders.sh.orig 2009-04-08 12:51:07.000000000 +0200 -+++ test-suite/testheaders.sh -@@ -10,7 +10,7 @@ - # - cc="${1}" - --if [ "${2}" == "" ]; then -+if [ "${2}" = "" ]; then - dir="." - else - dir="${2}" |