pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/www/squid26 Importing squid-2.6.21 (2.6.STABLE21) pack...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/084dc50577fd
branches:  trunk
changeset: 547126:084dc50577fd
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Sep 12 15:09:19 2008 +0000

description:
Importing squid-2.6.21 (2.6.STABLE21) package as www/squid26.

* This is legacy stable release but I keep it for a while.
* Switch to new squid package frame work.
* Drop RunCache support.

Bump PKGREVISION.

diffstat:

 www/squid26/DESCR            |    6 ++
 www/squid26/Makefile         |   22 ++++++++
 www/squid26/PLIST            |   41 ++++++++++++++++
 www/squid26/PLIST.common_end |    5 +
 www/squid26/distinfo         |   19 +++++++
 www/squid26/patches/patch-aa |   15 +++++
 www/squid26/patches/patch-ab |   56 ++++++++++++++++++++++
 www/squid26/patches/patch-ac |  109 +++++++++++++++++++++++++++++++++++++++++++
 www/squid26/patches/patch-ad |   16 ++++++
 www/squid26/patches/patch-ae |   20 +++++++
 www/squid26/patches/patch-af |   14 +++++
 www/squid26/patches/patch-ag |   22 ++++++++
 www/squid26/patches/patch-ah |   13 +++++
 www/squid26/patches/patch-ai |   26 ++++++++++
 www/squid26/patches/patch-aj |   64 +++++++++++++++++++++++++
 www/squid26/patches/patch-ak |   38 ++++++++++++++
 www/squid26/patches/patch-al |   17 ++++++
 www/squid26/patches/patch-am |   12 ++++
 www/squid26/patches/patch-an |   13 +++++
 19 files changed, 528 insertions(+), 0 deletions(-)

diffs (truncated from 604 to 300 lines):

diff -r b2bc37e688fe -r 084dc50577fd www/squid26/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid26/DESCR Fri Sep 12 15:09:19 2008 +0000
@@ -0,0 +1,6 @@
+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.
+
+This Squid 2.6 is legacy release for now and it will retire in the future.
diff -r b2bc37e688fe -r 084dc50577fd www/squid26/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid26/Makefile      Fri Sep 12 15:09:19 2008 +0000
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $
+
+DISTNAME=      squid-2.6.STABLE21
+PKGNAME=       ${DISTNAME:S/STABLE//}
+PKGREVISION=   1
+CATEGORIES=    www
+MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.6/
+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_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 b2bc37e688fe -r 084dc50577fd www/squid26/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid26/PLIST Fri Sep 12 15:09:19 2008 +0000
@@ -0,0 +1,41 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $
+${PLIST.coss}bin/cossdump
+bin/squidclient
+libexec/cachemgr.cgi
+${PLIST.da_ldap}libexec/digest_ldap_auth
+${PLIST.da_password}libexec/digest_pw_auth
+${PLIST.diskd}libexec/diskd-daemon
+${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 b2bc37e688fe -r 084dc50577fd www/squid26/PLIST.common_end
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid26/PLIST.common_end      Fri Sep 12 15:09:19 2008 +0000
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $
+@dirrm share/squid/icons
+@dirrm share/squid
+@dirrm share/doc/squid
+@dirrm share/examples/squid
diff -r b2bc37e688fe -r 084dc50577fd www/squid26/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid26/distinfo      Fri Sep 12 15:09:19 2008 +0000
@@ -0,0 +1,19 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $
+
+SHA1 (squid-2.6.STABLE21.tar.bz2) = 727196f92d168c7594bc19f908aef762aeb85ea8
+RMD160 (squid-2.6.STABLE21.tar.bz2) = 54f27e08ecdff1cf7b13e4c029596e5a02fa4a6e
+Size (squid-2.6.STABLE21.tar.bz2) = 1294517 bytes
+SHA1 (patch-aa) = b7c4019a0f71e473c150f25da4abf8f36e4b8be1
+SHA1 (patch-ab) = 8938b3ac064b10cccae43b37aa972c330905678c
+SHA1 (patch-ac) = 910b2467ab948180b2d9ba02ab8c72cf21a6375b
+SHA1 (patch-ad) = 20eec1bcc0a12e3ea47fda7a6ff14d781c0334c5
+SHA1 (patch-ae) = a78e762c1ad928eef66b12395d48bc69542e32d9
+SHA1 (patch-af) = 22e5a32ef7992fa10db8a124a22325a4ae2a44fb
+SHA1 (patch-ag) = 0b87eb5f4ccc06a0e59ed298fc3203b1b2641969
+SHA1 (patch-ah) = fef3dc16ef9e3177bd2e3b27778b3bcd765bf30e
+SHA1 (patch-ai) = 3d83a89909148c7f960abe379538f7832d55b8bb
+SHA1 (patch-aj) = 533c4cdd3b5cb9f060d5c61c6e06e1d7d6059187
+SHA1 (patch-ak) = 8b50cc1a631b86442619ba16a356de697c78cf5c
+SHA1 (patch-al) = 79593e8f2cd5f5c3e58901a69e2d0376fd634bab
+SHA1 (patch-am) = f6913c9898e7242e3317597ca5847b63d49ac6be
+SHA1 (patch-an) = 985c192662d41264012a76248e9bea0662cec8f5
diff -r b2bc37e688fe -r 084dc50577fd www/squid26/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid26/patches/patch-aa      Fri Sep 12 15:09:19 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $
+
+--- Makefile.in.orig   2007-08-12 21:40:44.000000000 +0900
++++ Makefile.in
+@@ -727,8 +727,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 b2bc37e688fe -r 084dc50577fd www/squid26/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid26/patches/patch-ab      Fri Sep 12 15:09:19 2008 +0000
@@ -0,0 +1,56 @@
+$NetBSD: patch-ab,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $
+
+--- configure.in.orig  2008-06-28 06:55:39.000000000 +0900
++++ configure.in
+@@ -1609,11 +1609,13 @@ AC_CHECK_HEADERS(
+       linux/netfilter_ipv4.h \
+       linux/netfilter_ipv4/ip_tproxy.h \
+       malloc.h \
++      machine/byte_swap.h \
+       math.h \
+       memory.h \
+       mount.h \
+       net/if.h \
+       net/pfvar.h \
++      net/pf/pfvar.h \
+       netdb.h \
+       netinet/if_ether.h \
+       netinet/tcp.h \
+@@ -1975,7 +1977,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)
+-AC_CHECK_SYSTYPE(fd_mask, int)
++
++dnl Check for type fd_mask
++AC_CACHE_CHECK(for fd_set,ac_cv_have_fd_mask, [
++  AC_TRY_COMPILE([#include <sys/types.h>
++#include <sys/time.h>
++#include <sys/unistd.h>],
++    [fd_mask fds;],
++    ac_cv_have_fd_mask="yes",
++    ac_cv_have_fd_mask="no")
++])
+ 
+ AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
+ AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
+@@ -2254,8 +2265,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
+@@ -2649,7 +2660,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, [Enable support for Transparent Proxy on systems using PF address
+       redirection. This provides "masquerading" support for OpenBSD.])
diff -r b2bc37e688fe -r 084dc50577fd www/squid26/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid26/patches/patch-ac      Fri Sep 12 15:09:19 2008 +0000
@@ -0,0 +1,109 @@
+$NetBSD: patch-ac,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $
+
+--- configure.orig     2008-06-28 06:55:39.000000000 +0900
++++ configure
+@@ -8040,11 +8040,13 @@ for ac_header in sys/types.h \
+       linux/netfilter_ipv4.h \
+       linux/netfilter_ipv4/ip_tproxy.h \
+       malloc.h \
++      machine/byte_swap.h \
+       math.h \
+       memory.h \
+       mount.h \
+       net/if.h \
+       net/pfvar.h \
++      net/pf/pfvar.h \
+       netdb.h \
+       netinet/if_ether.h \
+       netinet/tcp.h \
+@@ -21448,11 +21450,13 @@ _ACEOF
+ fi
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for fd_mask" >&5
+-echo $ECHO_N "checking for fd_mask... $ECHO_C" >&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; }
++if test "${ac_cv_have_fd_mask+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21460,35 +21464,14 @@ 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
+-
+-
++#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;
+   return 0;
+ }
+ _ACEOF
+@@ -21509,30 +21492,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+        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
+   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
+ 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; }
+-if test $ac_cv_type_fd_mask = yes; then
+-  :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define fd_mask int
+-_ACEOF
+ 
+ fi
+-
+-
+-



Home | Main Index | Thread Index | Old Index