summaryrefslogtreecommitdiff
path: root/www/squid27
diff options
context:
space:
mode:
Diffstat (limited to 'www/squid27')
-rw-r--r--www/squid27/Makefile5
-rw-r--r--www/squid27/distinfo12
-rw-r--r--www/squid27/patches/patch-ab15
-rw-r--r--www/squid27/patches/patch-ac152
4 files changed, 131 insertions, 53 deletions
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index cf10f4f64d7..198e81fa7e1 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2009/01/01 19:26:35 tron Exp $
+# $NetBSD: Makefile,v 1.5 2009/02/05 13:43:06 taca Exp $
-DISTNAME= squid-2.7.STABLE5
-PKGREVISION= 1
+DISTNAME= squid-2.7.STABLE6
PKGNAME= ${DISTNAME:S/STABLE//}
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.7/
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 0a7e4adad54..0dcfe5c6df6 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2008/10/20 03:12:00 taca Exp $
+$NetBSD: distinfo,v 1.4 2009/02/05 13:43:06 taca Exp $
-SHA1 (squid-2.7.STABLE5.tar.bz2) = fe187a291050a907b5cc51e21d6304abcb703c16
-RMD160 (squid-2.7.STABLE5.tar.bz2) = 837ee1564be17f1f5c5d4d6c7e6855b305397221
-Size (squid-2.7.STABLE5.tar.bz2) = 1335599 bytes
+SHA1 (squid-2.7.STABLE6.tar.bz2) = b4b323be1ff3617a22070c243b2504f30d6b302d
+RMD160 (squid-2.7.STABLE6.tar.bz2) = d804175b95c6b026abed505b086eeaa2c479d2e2
+Size (squid-2.7.STABLE6.tar.bz2) = 1345472 bytes
SHA1 (patch-aa) = 7db6c34be31ecee1dd08486de14c3fbc3b21c5aa
-SHA1 (patch-ab) = cb8757a2f68f20284fdfefb29b84829c2b72fc0d
-SHA1 (patch-ac) = 47f2457400e03c26227d234064491bf8202c7916
+SHA1 (patch-ab) = 0d8e73eab50a54bd9c8662ee418c0640f30fdeea
+SHA1 (patch-ac) = 2218ce7f6abdc0a33bb6ac5f6116bb00d44bf53e
SHA1 (patch-ad) = 3b0a8cf357d97053c52cd7429db621ea61932ba2
SHA1 (patch-ae) = a78e762c1ad928eef66b12395d48bc69542e32d9
SHA1 (patch-af) = d8bfc5e92988ffa37d39c799e62176974fb9c27a
diff --git a/www/squid27/patches/patch-ab b/www/squid27/patches/patch-ab
index a36912cf9b0..433d3f75efb 100644
--- a/www/squid27/patches/patch-ab
+++ b/www/squid27/patches/patch-ab
@@ -1,12 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-ab,v 1.2 2009/02/05 13:43:06 taca Exp $
---- configure.in.orig 2008-06-26 07:18:55.000000000 +0900
+--- configure.in.orig 2009-02-04 09:44:06.000000000 +0900
+++ configure.in
-@@ -1629,10 +1629,12 @@ AC_CHECK_HEADERS(
+@@ -1635,11 +1635,13 @@ AC_CHECK_HEADERS(
+ libc.h \
linux/netfilter_ipv4.h \
linux/netfilter_ipv4/ip_tproxy.h \
- malloc.h \
+ machine/byte_swap.h \
+ malloc.h \
math.h \
memory.h \
mount.h \
@@ -15,7 +16,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
net/pfvar.h \
netdb.h \
netinet/if_ether.h \
-@@ -1997,7 +1999,16 @@ AC_CHECK_SYSTYPE(size_t, unsigned int)
+@@ -2004,7 +2006,16 @@ AC_CHECK_SYSTYPE(size_t, unsigned int)
AC_CHECK_SYSTYPE(ssize_t, int)
AC_CHECK_SYSTYPE(off_t, int)
AC_CHECK_SYSTYPE(mode_t, unsigned short)
@@ -33,7 +34,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -2292,8 +2303,8 @@ if test "$GCC" = "yes"; then
+@@ -2299,8 +2310,8 @@ if test "$GCC" = "yes"; then
GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'`
case "$GCCVER" in
[2.95.[123]])
@@ -44,7 +45,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
;;
esac
fi
-@@ -2689,7 +2700,7 @@ dnl PF support requires a header file.
+@@ -2697,7 +2708,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...
diff --git a/www/squid27/patches/patch-ac b/www/squid27/patches/patch-ac
index 4fc7094f56b..f5b378d48a4 100644
--- a/www/squid27/patches/patch-ac
+++ b/www/squid27/patches/patch-ac
@@ -1,12 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-ac,v 1.2 2009/02/05 13:43:06 taca Exp $
---- configure.orig 2008-06-26 07:18:55.000000000 +0900
+--- configure.orig 2009-02-04 09:44:06.000000000 +0900
+++ configure
-@@ -8046,10 +8046,12 @@ for ac_header in sys/types.h \
+@@ -8251,11 +8251,13 @@ for ac_header in sys/types.h \
+ libc.h \
linux/netfilter_ipv4.h \
linux/netfilter_ipv4/ip_tproxy.h \
- malloc.h \
+ machine/byte_swap.h \
+ malloc.h \
math.h \
memory.h \
mount.h \
@@ -15,32 +16,85 @@ $NetBSD: patch-ac,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
net/pfvar.h \
netdb.h \
netinet/if_ether.h \
-@@ -21456,11 +21458,13 @@ _ACEOF
+@@ -22934,98 +22936,25 @@ _ACEOF
fi
--{ echo "$as_me:$LINENO: checking for fd_mask" >&5
--echo $ECHO_N "checking for fd_mask... $ECHO_C" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for fd_mask" >&5
+-$as_echo_n "checking for fd_mask... " >&6; }
-if test "${ac_cv_type_fd_mask+set}" = set; then
-+
-+{ echo "$as_me:$LINENO: checking for fd_set" >&5
-+echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5
++$as_echo_n "checking for fd_set... " >&6; }
+if test "${ac_cv_have_fd_mask+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
-+
+- ac_cv_type_fd_mask=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* What a mess.. many systems have added the (now standard) bit types
+- * in their own ways, so we need to scan a wide variety of headers to
+- * find them..
+- */
+-#include <sys/types.h>
+-#if STDC_HEADERS
+-#include <stdlib.h>
+-#include <stddef.h>
+-#endif
+-#if HAVE_INTTYPES_H
+-#include <inttypes.h>
+-#endif
+-#if HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+-#if HAVE_SYS_BITYPES_H
+-#include <sys/bitypes.h>
+-#endif
+-
+-
+-int
+-main ()
+-{
+-if (sizeof (fd_mask))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21468,35 +21472,14 @@ cat confdefs.h >>conftest.$ac_ext
+ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+-
-/* What a mess.. many systems have added the (now standard) bit types
- * in their own ways, so we need to scan a wide variety of headers to
- * find them..
- */
--#include <sys/types.h>
+ #include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
@@ -49,7 +103,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
-#include <inttypes.h>
-#endif
-#if HAVE_SYS_TYPES_H
- #include <sys/types.h>
+-#include <sys/types.h>
-#endif
-#if HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
@@ -58,41 +112,45 @@ $NetBSD: patch-ac,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
-
+#include <sys/time.h>
+#include <sys/unistd.h>
- typedef fd_mask ac__type_new_;
int
main ()
{
--if ((ac__type_new_ *) 0)
-- return 0;
--if (sizeof (ac__type_new_))
-- return 0;
-- ;
-+ac__type_new_ fds;
+-if (sizeof ((fd_mask)))
+- return 0;
++fd_mask fds;
+ ;
return 0;
}
- _ACEOF
-@@ -21517,30 +21500,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23048,38 +22977,21 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
-- ac_cv_type_fd_mask=yes
-+ ac_cv_have_fd_mask=yes
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_fd_mask=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_cv_have_fd_mask="yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_type_fd_mask=no
-+ ac_cv_have_fd_mask=no
+-
++ ac_cv_have_fd_mask="no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_fd_mask" >&5
--echo "${ECHO_T}$ac_cv_type_fd_mask" >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_fd_mask" >&5
+-$as_echo "$ac_cv_type_fd_mask" >&6; }
-if test $ac_cv_type_fd_mask = yes; then
- :
-else
--
+
-cat >>confdefs.h <<_ACEOF
-#define fd_mask int
-_ACEOF
@@ -101,8 +159,28 @@ $NetBSD: patch-ac,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
-
-
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_fd_mask" >&5
-+echo "${ECHO_T}$ac_cv_have_fd_mask" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_fd_mask" >&5
++$as_echo "$ac_cv_have_fd_mask" >&6; }
+
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+@@ -26304,8 +26216,8 @@ if test "$GCC" = "yes"; then
+ GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'`
+ case "$GCCVER" in
+ 2.95.[123])
+- echo "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
+@@ -27437,7 +27349,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"
- { echo "$as_me:$LINENO: checking for off_t" >&5
- echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+ cat >>confdefs.h <<\_ACEOF
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 08:03:37 +0000