pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/squid30 Importing squid-3.0.9 (3.0.STABLE9) packag...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2bc37e688fe
branches:  trunk
changeset: 547125:b2bc37e688fe
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Sep 12 15:05:57 2008 +0000

description:
Importing squid-3.0.9 (3.0.STABLE9) package as www/squid30, handles
PR pkg/39188.

New feature with Squid 3.0.

* Code converted to C++, with significant internal restructuring and rewrites.
* ICAP implementation (RFC 3507 and www.icap-forum.org)
* Edge Side Includes (ESI) implementation (www.esi.org)

Missing feature from squid 2.6

* refresh_stale_hit option. Not yet ported.
* ability to follow X-Forwarded-For. Not yet ported.
* Full caching of Vary/ETag using If-None-Match. Only basic Vary cache
  supported. Not yet ported.
* Mapping of server error messages. Not yet ported.
* http_access2 access directive. Not yet ported.
* Location header rewrites. Not yet ported.
* wais_relay. Feature dropped as it's equivalent to cache_peer +
  cache_peer_access.
* urlgroup. Not yet ported.
* collapsed forwarding. Not yet ported.
* stable Windows support. Irregularly maintained.

Currently, COSS backend support isn't available, too.

diffstat:

 www/squid30/DESCR            |  27 +++++++++++++++++++++++++++
 www/squid30/Makefile         |  22 ++++++++++++++++++++++
 www/squid30/PLIST            |  40 ++++++++++++++++++++++++++++++++++++++++
 www/squid30/PLIST.common_end |   5 +++++
 www/squid30/distinfo         |  17 +++++++++++++++++
 www/squid30/patches/patch-aa |  15 +++++++++++++++
 www/squid30/patches/patch-ab |  40 ++++++++++++++++++++++++++++++++++++++++
 www/squid30/patches/patch-ac |  40 ++++++++++++++++++++++++++++++++++++++++
 www/squid30/patches/patch-ad |  16 ++++++++++++++++
 www/squid30/patches/patch-ae |  20 ++++++++++++++++++++
 www/squid30/patches/patch-af |  24 ++++++++++++++++++++++++
 www/squid30/patches/patch-ag |  14 ++++++++++++++
 www/squid30/patches/patch-ah |  13 +++++++++++++
 www/squid30/patches/patch-ai |  17 +++++++++++++++++
 www/squid30/patches/patch-aj |  26 ++++++++++++++++++++++++++
 www/squid30/patches/patch-ak |  22 ++++++++++++++++++++++
 www/squid30/patches/patch-al |  13 +++++++++++++
 17 files changed, 371 insertions(+), 0 deletions(-)

diffs (truncated from 439 to 300 lines):

diff -r 5a05e30c1c82 -r b2bc37e688fe www/squid30/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/DESCR Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,27 @@
+Squid is a fully-featured HTTP/1.0 proxy which is almost (but not
+quite - we're getting there!) HTTP/1.1 compliant. Squid offers a rich
+access control, authorization and logging environment to develop web
+proxy and content serving applications.
+
+Major new features from Squid 2.6:
+
+* Code converted to C++, with significant internal restructuring and rewrites.
+* ICAP implementation (RFC 3507 and www.icap-forum.org)
+* Edge Side Includes (ESI) implementation (www.esi.org)
+
+This Squid 3.0 is stable release but some functinality lacks from 2.6.
+
+* refresh_stale_hit option. Not yet ported.
+* ability to follow X-Forwarded-For. Not yet ported.
+* Full caching of Vary/ETag using If-None-Match. Only basic Vary cache
+  supported. Not yet ported.
+* Mapping of server error messages. Not yet ported.
+* http_access2 access directive. Not yet ported.
+* Location header rewrites. Not yet ported.
+* wais_relay. Feature dropped as it's equivalent to cache_peer +
+  cache_peer_access.
+* urlgroup. Not yet ported.
+* collapsed forwarding. Not yet ported.
+* stable Windows support. Irregularly maintained.
+
+And COSS backend dosen't supported now.
diff -r 5a05e30c1c82 -r b2bc37e688fe www/squid30/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/Makefile      Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+
+DISTNAME=      squid-3.0.STABLE9
+PKGNAME=       ${DISTNAME:S/STABLE//}
+CATEGORIES=    www
+MASTER_SITES=  http://www.squid-cache.org/Versions/v3/3.0/
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    taca%NetBSD.org@localhost
+HOMEPAGE=      http://www.squid-cache.org/
+COMMENT=       Post-Harvest_cached WWW proxy cache and accelerator
+
+WRKSRC=                ${WRKDIR}/${DISTNAME:S/-src//}
+
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            perl
+GNU_CONFIGURE=         yes
+PKG_DESTDIR_SUPPORT=   destdir
+
+.include "../../www/squid/Makefile.squid"
+.include "../../www/squid/options.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 5a05e30c1c82 -r b2bc37e688fe www/squid30/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/PLIST Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,40 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/12 15:05:57 taca 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 5a05e30c1c82 -r b2bc37e688fe www/squid30/PLIST.common_end
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/PLIST.common_end      Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+@dirrm share/squid/icons
+@dirrm share/squid
+@dirrm share/doc/squid
+@dirrm share/examples/squid
diff -r 5a05e30c1c82 -r b2bc37e688fe www/squid30/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/distinfo      Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,17 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+
+SHA1 (squid-3.0.STABLE9.tar.bz2) = 3a06e62ef87caa23e64ee4192e6711dfe9d57591
+RMD160 (squid-3.0.STABLE9.tar.bz2) = 012f3a125624782a96c52694ed68baabe50029c8
+Size (squid-3.0.STABLE9.tar.bz2) = 1795406 bytes
+SHA1 (patch-aa) = 312e39b71cc8bc6985ca3cffe5398ad6d295f253
+SHA1 (patch-ab) = 83064bb50089496154a4d6ac9b29e42af7b97357
+SHA1 (patch-ac) = 66e97b32e01503e6c6fce054929f4936cecb0831
+SHA1 (patch-ad) = 4761de2f2e25d9ae243847623a69d31edac4f4a1
+SHA1 (patch-ae) = 11ef61a2154bd6841ee438531de7faf02d36709d
+SHA1 (patch-af) = fb7c26472abd4ab5368bcc79d64110a88568bcd4
+SHA1 (patch-ag) = f9a83f8011b6ceab7a1ef17f6db0c4c65975be29
+SHA1 (patch-ah) = 6590ac8377b5ceebd5930b7ac3a0f11bb716ea46
+SHA1 (patch-ai) = ff9fd6979c9c13b57f10fb30bd25f39b7b99029c
+SHA1 (patch-aj) = 5c68b5b6e9f916e78d6953ba8a0d2b42441940c1
+SHA1 (patch-ak) = 17c38f5d4a85a96cf75410facf8f97feb750baf9
+SHA1 (patch-al) = cd8eca5a945de8901d84beb432c3be59a6814e9c
diff -r 5a05e30c1c82 -r b2bc37e688fe www/squid30/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/patches/patch-aa      Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+
+--- Makefile.in.orig   2008-07-18 19:02:45.000000000 +0900
++++ Makefile.in
+@@ -768,8 +768,8 @@ dist-hook:
+       fi
+ 
+ install-pinger:
+-      chown root $(DEFAULT_PINGER) 
+-      chmod 4711 $(DEFAULT_PINGER)
++      chown root $(DESTDIR)$(DEFAULT_PINGER) 
++      chmod 4511 $(DESTDIR)$(DEFAULT_PINGER)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff -r 5a05e30c1c82 -r b2bc37e688fe www/squid30/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/patches/patch-ab      Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-ab,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+
+--- configure.in.orig  2008-06-22 12:35:54.000000000 +0900
++++ configure.in
+@@ -1868,6 +1868,7 @@ AC_CHECK_HEADERS( \
+       ipl.h \
+       libc.h \
+       limits.h \
++      machine/byte_swap.h \
+       malloc.h \
+       math.h \
+       memory.h \
+@@ -1949,6 +1950,7 @@ dnl *BSD dont include the depenencies fo
+ dnl We must include a few basic type headers for them to work.
+ AC_CHECK_HEADERS( \
+       net/if.h \
++      net/pf/pfvar.h \
+       net/pfvar.h \
+       netinet/if_ether.h\
+       netinet/ip.h\
+@@ -2434,8 +2444,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
+@@ -2819,7 +2829,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 5a05e30c1c82 -r b2bc37e688fe www/squid30/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/patches/patch-ac      Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+
+--- configure.orig     2008-06-22 12:35:54.000000000 +0900
++++ configure
+@@ -24288,6 +24288,7 @@ for ac_header in \
+       ipl.h \
+       libc.h \
+       limits.h \
++      machine/byte_swap.h \
+       malloc.h \
+       math.h \
+       memory.h \
+@@ -24602,6 +24603,7 @@ done
+ 
+ for ac_header in \
+       net/if.h \
++      net/pf/pfvar.h \
+       net/pfvar.h \
+       netinet/if_ether.h\
+       netinet/ip.h\
+@@ -42932,8 +42928,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
+@@ -44220,7 +44216,7 @@ if test "$PF_TRANSPARENT" ; then
+     { echo "$as_me:$LINENO: checking if PF header file is installed" >&5
+ echo $ECHO_N "checking if PF header file is installed... $ECHO_C" >&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 5a05e30c1c82 -r b2bc37e688fe www/squid30/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/patches/patch-ad      Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+
+--- 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 5a05e30c1c82 -r b2bc37e688fe www/squid30/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/patches/patch-ae      Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+
+--- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig    2008-06-22 12:35:49.000000000 +0900
++++ helpers/ntlm_auth/SMB/smbval/smblib-util.c
+@@ -61,6 +61,7 @@ static char *SMB_Prots[] =
+     "NT LANMAN 1.0",
+     NULL};
+ 
++#if 0
+ /* Print out an SMB pkt in all its gory detail ... */
+ 
+ void
+@@ -79,6 +80,7 @@ SMB_Print_Pkt(FILE fd, RFCNB_Pkt * pkt, 
+     /* etc                                                 */
+ 
+ }
++#endif
+ 
+ /* Convert a DOS Date_Time to a local host type date time for printing */
+ 
diff -r 5a05e30c1c82 -r b2bc37e688fe www/squid30/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid30/patches/patch-af      Fri Sep 12 15:05:57 2008 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+
+--- include/autoconf.h.in.orig 2008-06-22 12:35:50.000000000 +0900
++++ include/autoconf.h.in
+@@ -294,6 +294,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
+ 



Home | Main Index | Thread Index | Old Index