pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/squid31 Import Squid 3.1.0.7 as "squid31" package:
details: https://anonhg.NetBSD.org/pkgsrc/rev/d417a6e2d601
branches: trunk
changeset: 391867:d417a6e2d601
user: tron <tron%pkgsrc.org@localhost>
date: Mon Apr 20 21:27:40 2009 +0000
description:
Import Squid 3.1.0.7 as "squid31" package:
* New Version Numbering System
* Minimal squid.conf improvements
* Native IPv6 Support
* Error Page Localization
* Connection Pinning (for NTLM Auth Passthrough)
* Quality of Service (QoS) Flow support
* SSL Bump (for HTTPS Filtering and Adaptation)
* eCAP Adaptation Module support
This package is heavily based on work by Michael van Elst which includes
fixes for the IPv6 support.
diffstat:
www/squid31/DESCR | 11 +++
www/squid31/Makefile | 31 ++++++++
www/squid31/PLIST | 40 +++++++++++
www/squid31/PLIST.common_end | 5 +
www/squid31/distinfo | 21 +++++
www/squid31/patches/patch-aa | 17 ++++
www/squid31/patches/patch-ab | 40 +++++++++++
www/squid31/patches/patch-ac | 42 +++++++++++
www/squid31/patches/patch-ad | 18 +++++
www/squid31/patches/patch-af | 27 +++++++
www/squid31/patches/patch-ag | 16 ++++
www/squid31/patches/patch-ah | 15 ++++
www/squid31/patches/patch-ai | 17 ++++
www/squid31/patches/patch-aj | 26 +++++++
www/squid31/patches/patch-ak | 28 +++++++
www/squid31/patches/patch-al | 13 +++
www/squid31/patches/patch-am | 151 +++++++++++++++++++++++++++++++++++++++++++
www/squid31/patches/patch-an | 29 ++++++++
www/squid31/patches/patch-ao | 29 ++++++++
www/squid31/patches/patch-ap | 13 +++
www/squid31/patches/patch-aq | 13 +++
21 files changed, 602 insertions(+), 0 deletions(-)
diffs (truncated from 686 to 300 lines):
diff -r b0ef1321b6ab -r d417a6e2d601 www/squid31/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/DESCR Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,11 @@
+Squid 3.1 represents a new feature release above 3.0.
+
+The most important of these new features are:
+* New Version Numbering System
+* Minimal squid.conf improvements
+* Native IPv6 Support
+* Error Page Localization
+* Connection Pinning (for NTLM Auth Passthrough)
+* Quality of Service (QoS) Flow support
+* SSL Bump (for HTTPS Filtering and Adaptation)
+* eCAP Adaptation Module support
diff -r b0ef1321b6ab -r d417a6e2d601 www/squid31/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/Makefile Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $
+
+DISTNAME= squid-3.1.0.7
+PKGNAME= ${DISTNAME} # Necessary for "pkgsrc/www/squid/options.mk"
+CATEGORIES= www
+MASTER_SITES= http://www.squid-cache.org/Versions/v3/3.1/
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= tron%NetBSD.org@localhost
+HOMEPAGE= http://www.squid-cache.org/
+COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
+
+LICENSE= gnu-gpl-v2
+USE_LANGUAGES= c c++
+USE_TOOLS+= perl gmake
+GNU_CONFIGURE= yes
+PKG_DESTDIR_SUPPORT= destdir
+
+.include "../../www/squid/Makefile.squid"
+
+CONFIGURE_ARGS+= --with-default-user=${SQUID_USER}
+
+SQUID_BACKENDS?= ufs
+SQUID_NTLM_AUTH_HELPERS?= fakeauth
+.include "../../www/squid/options.mk"
+
+post-build:
+ ${CP} -pf ${WRKSRC}/src/squid.conf.documented \
+ ${WRKSRC}/src/squid.conf.default
+
+.include "../../mk/bsd.pkg.mk"
diff -r b0ef1321b6ab -r d417a6e2d601 www/squid31/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/PLIST Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,40 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $
+bin/squidclient
+libexec/cachemgr.cgi
+${PLIST.da_ldap}libexec/digest_ldap_auth
+${PLIST.da_password}libexec/digest_pw_auth
+${PLIST.diskd}libexec/diskd
+${PLIST.na_fakeauth}libexec/fakeauth_auth
+${PLIST.ba_getpwnam}libexec/getpwname_auth
+${PLIST.eacl_ip_user}libexec/ip_user_check
+${PLIST.ba_MSNT}libexec/msnt_auth
+${PLIST.ba_NCSA}libexec/ncsa_auth
+${PLIST.na_SMB}libexec/ntlm_auth
+${PLIST.ba_PAM}libexec/pam_auth
+libexec/pinger
+${PLIST.ba_LDAP}libexec/squid_ldap_auth
+${PLIST.eacl_ldap_group}libexec/squid_ldap_group
+${PLIST.eacl_unix_group}libexec/squid_unix_group
+${PLIST.unlinkd}libexec/unlinkd
+${PLIST.ba_YP}libexec/yp_auth
+man/man8/cachemgr.cgi.8
+${PLIST.ba_NCSA}man/man8/ncsa_auth.8
+${PLIST.ba_PAM}man/man8/pam_auth.8
+man/man8/squid.8
+${PLIST.ba_LDAP}man/man8/squid_ldap_auth.8
+${PLIST.eacl_ldap_group}man/man8/squid_ldap_group.8
+${PLIST.eacl_unix_group}man/man8/squid_unix_group.8
+sbin/squid
+share/doc/squid/ChangeLog
+share/doc/squid/README.FreeBSD
+share/doc/squid/README.NetBSD
+share/doc/squid/README.OpenBSD
+share/doc/squid/README.Solaris
+share/doc/squid/RELEASENOTES.html
+share/doc/squid/debug-sections.txt
+share/examples/rc.d/squid
+share/examples/squid/cachemgr.conf
+share/examples/squid/mime.conf
+share/examples/squid/msntauth.conf
+share/examples/squid/squid.conf
+${PLIST.snmp}share/squid/mib.txt
diff -r b0ef1321b6ab -r d417a6e2d601 www/squid31/PLIST.common_end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/PLIST.common_end Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $
+@dirrm share/squid/icons
+@dirrm share/squid
+@dirrm share/doc/squid
+@dirrm share/examples/squid
diff -r b0ef1321b6ab -r d417a6e2d601 www/squid31/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/distinfo Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,21 @@
+$NetBSD: distinfo,v 1.1.1.1 2009/04/20 21:27:40 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) = 6e67574732b38d2ddf8b351854abfd78a5903420
+SHA1 (patch-af) = 4f584a053df4f59c55af7f06a31787c9e36c8aa6
+SHA1 (patch-ag) = 1d4172d406d3e34a9582d60ebab649dbe369d985
+SHA1 (patch-ah) = e4cb16cbd65f558146204e450e794ab247c7b617
+SHA1 (patch-ai) = 0390e101199a81f782aa94815098351000f300cf
+SHA1 (patch-aj) = fbdde957ef10fc87dad7b4486aba5a0f3625e49b
+SHA1 (patch-ak) = 8cb0aaa7ea9d2241096cf82cf3640eea060ae85c
+SHA1 (patch-al) = cd8eca5a945de8901d84beb432c3be59a6814e9c
+SHA1 (patch-am) = ca5280be592db8b4037f6f8e11866972cd44a6b9
+SHA1 (patch-an) = 940c7a212a5ecfc3a2ae3bb545d4c3de8a6d6e08
+SHA1 (patch-ao) = 38e056cbffccf0c38731403f6319cc0a51af0325
+SHA1 (patch-ap) = 3b307114608b898d6462ef193c0a8be8ac074772
+SHA1 (patch-aq) = 3a13380ab91a3d4fb15ff3548c6511990cde0bbc
diff -r b0ef1321b6ab -r d417a6e2d601 www/squid31/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/patches/patch-aa Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,17 @@
+$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 -r b0ef1321b6ab -r d417a6e2d601 www/squid31/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/patches/patch-ab Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,40 @@
+$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 -r b0ef1321b6ab -r d417a6e2d601 www/squid31/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/patches/patch-ac Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,42 @@
+$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 -r b0ef1321b6ab -r d417a6e2d601 www/squid31/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/patches/patch-ad Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $
+
+Don't install configuration files.
+
+--- helpers/basic_auth/MSNT/Makefile.in.orig 2008-06-22 12:35:48.000000000 +0900
++++ helpers/basic_auth/MSNT/Makefile.in
+@@ -590,9 +590,9 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-data-local
++install-data-am:
+
+-install-exec-am: install-libexecPROGRAMS install-sysconfDATA
++install-exec-am: install-libexecPROGRAMS
+
+ install-info: install-info-am
+
diff -r b0ef1321b6ab -r d417a6e2d601 www/squid31/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/patches/patch-af Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,27 @@
+$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 -r b0ef1321b6ab -r d417a6e2d601 www/squid31/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/patches/patch-ag Mon Apr 20 21:27:40 2009 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $
+
+Add support of machine/byte_swap.h.
+
Home |
Main Index |
Thread Index |
Old Index