diff options
author | taca <taca> | 2008-09-12 14:59:51 +0000 |
---|---|---|
committer | taca <taca> | 2008-09-12 14:59:51 +0000 |
commit | 11ecbb2806bc9450b74c9a933ea0aa4eebd0c8d2 (patch) | |
tree | 8e7feab86410ca1675bd7b698461319e25c6d304 /www/squid | |
parent | 88d67df848b9ff303d44b638ab1f66bded4530a3 (diff) | |
download | pkgsrc-11ecbb2806bc9450b74c9a933ea0aa4eebd0c8d2.tar.gz |
Restructuring Squid package:
* Now www/squid directory is common directory for squid packages.
* package options clean up and all options are described.
* LDAP helper support. (PR pkg/39386)
* DESTDIR support.
* Move some MESSAGE to documation directory.
Next, I'll import squid26, squid27 and squid30 packages.
Diffstat (limited to 'www/squid')
28 files changed, 96 insertions, 823 deletions
diff --git a/www/squid/DESCR b/www/squid/DESCR deleted file mode 100644 index e3f0d65dab0..00000000000 --- a/www/squid/DESCR +++ /dev/null @@ -1,15 +0,0 @@ -This is the Squid Internet Object Cache developed by the National -Laboratory for Applied Networking Research (NLANR) and Internet -volunteers. This software is freely available for anyone to use. - -This software is based on the Harvest Object Cache developed by -the University of Colorado and the University of Southern California. -The Harvest home page is http://harvest.cs.colorado.edu/. - -ARPA funding for the Harvest project has ended, the squid project has -continued development of the cache where Harvest finished. - -PORTER'S NOTES. To this moment, Squid is not well documented. -But you aren't lost in space: there is a mailing list, -<squid-users@nlanr.net>, where you will find some support and help. -We also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid/MESSAGE.FreeBSD b/www/squid/MESSAGE.FreeBSD deleted file mode 100644 index a1fc932c61f..00000000000 --- a/www/squid/MESSAGE.FreeBSD +++ /dev/null @@ -1,15 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.FreeBSD,v 1.1 2003/12/25 16:28:14 taca Exp $ - -The following parameters should work for FreeBSD: - -options SYSVMSG # System V-like message queues -options SYSVSEM # System V-like semaphores -options SYSVSHM # System V-like memory sharing - -options SHMMAXPGS=8192 -options MSGMNB=8192 -options MSGSSZ=64 -options MSGTQL=2048 - -=========================================================================== diff --git a/www/squid/MESSAGE.NetBSD b/www/squid/MESSAGE.NetBSD deleted file mode 100644 index 464a8db6f3a..00000000000 --- a/www/squid/MESSAGE.NetBSD +++ /dev/null @@ -1,15 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.NetBSD,v 1.1 2003/12/25 16:28:14 taca Exp $ - -The following parameters should work for NetBSD: - -options SYSVMSG # System V-like message queues -options SYSVSEM # System V-like semaphores -options SYSVSHM # System V-like memory sharing - -options SHMMAXPGS=8192 -options MSGMNB=16384 -options MSGSSZ=64 -options MSGTQL=512 - -=========================================================================== diff --git a/www/squid/MESSAGE.OpenBSD b/www/squid/MESSAGE.OpenBSD deleted file mode 100644 index 9a32d148a80..00000000000 --- a/www/squid/MESSAGE.OpenBSD +++ /dev/null @@ -1,15 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.OpenBSD,v 1.1 2003/12/25 16:28:14 taca Exp $ - -The following parameters should work for OpenBSD: - -options SYSVMSG # System V-like message queues -options SYSVSEM # System V-like semaphores -options SYSVSHM # System V-like memory sharing - -options SHMMAXPGS=8192 -options MSGMNB=16384 -options MSGSSZ=64 -options MSGTQL=1024 - -=========================================================================== diff --git a/www/squid/MESSAGE.Solaris b/www/squid/MESSAGE.Solaris deleted file mode 100644 index db2322a5a6f..00000000000 --- a/www/squid/MESSAGE.Solaris +++ /dev/null @@ -1,10 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.Solaris,v 1.1 2003/12/25 16:28:14 taca Exp $ - -The following parameters in /etc/system should work for Solaris: - -set shmsys:shminfo_shmmax=2097152 -set shmsys:shminfo_shmmni=32 -set shmsys:shminfo_shmseg=16 - -=========================================================================== diff --git a/www/squid/MESSAGE.common b/www/squid/MESSAGE.common deleted file mode 100644 index 5314ede3ac3..00000000000 --- a/www/squid/MESSAGE.common +++ /dev/null @@ -1,14 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.common,v 1.2 2007/02/25 07:34:45 taca Exp $ - -You DO need running nameservice to start and run ${PKGNAME}. - -Use the ${PKGNAME} proxy and caching WWW Server by -configuring your WWW Navigator (Netscape, Mosaic, ...) -to use it as a proxy server. - -Please note that to use the diskd storage method, you'll likely have to -change SYSV-IPC parameters in the kernel config file (see -http://wiki.squid-cache.org/SquidFaq/DiskDaemon for details) - -=========================================================================== diff --git a/www/squid/Makefile b/www/squid/Makefile deleted file mode 100644 index 58266bf23c9..00000000000 --- a/www/squid/Makefile +++ /dev/null @@ -1,122 +0,0 @@ -# $NetBSD: Makefile,v 1.207 2008/06/29 01:02:08 taca Exp $ - -DISTNAME= squid-2.6.STABLE21 -PKGNAME= ${DISTNAME:S/STABLE//} -CATEGORIES= www -MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.6/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= taca@NetBSD.org -HOMEPAGE= http://www.squid-cache.org/ -COMMENT= Post-Harvest_cached WWW proxy cache and accelerator - -WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} - -DOCDIR= ${PREFIX}/share/doc/squid -EXAMPLESDIR= ${PREFIX}/share/examples/squid - -DOCFILES= ChangeLog RELEASENOTES.html doc/debug-sections.txt - -USE_TOOLS+= perl -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ - --localstatedir=${SQUID_DATADIR:Q} - -MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} -MAKE_ENV+= PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q} -PLIST_SRC= ${WRKDIR}/PLIST -RCD_SCRIPTS= squid - -CONF_FILES+= ${EXAMPLESDIR}/cachemgr.conf ${PKG_SYSCONFDIR}/cachemgr.conf -CONF_FILES+= ${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf -CONF_FILES+= ${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf -CONF_FILES+= ${EXAMPLESDIR}/msntauth.conf ${PKG_SYSCONFDIR}/msntauth.conf -OWN_DIRS= ${SQUID_DATADIR} -OWN_DIRS_PERMS+= ${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \ - ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750 -EXAMPLES_FILES= src/mime.conf.default src/squid.conf.default \ - helpers/basic_auth/MSNT/msntauth.conf.default \ - tools/cachemgr.conf - -.include "../../mk/bsd.prefs.mk" -.include "Makefile.common" - -BUILD_DEFS+= LOGDIR VARBASE - -CONFIGURE_ARGS+= --enable-auth=basic,digest,ntlm \ - --enable-cachemgr-hostname=localhost \ - --enable-delay-pools \ - --enable-removal-policies=lru,heap \ - --enable-poll \ - --enable-underscores \ - --enable-storeio=${SQUID_BACKENDS:Q} \ - --with-aio - -# -# generic helpers -# -OPTIONAL_FILES+= bin/cossdump libexec/diskd-daemon libexec/dnsserver -OPTIONAL_FILES+= libexec/pinger libexec/unlinkd -# -# basic auth helpers (except LDAP, multi-domain-NTLM and SASL) -# -OPTIONAL_FILES+= libexec/getpwname_auth libexec/msnt_auth libexec/ncsa_auth -OPTIONAL_FILES+= libexec/pam_auth ${PKGMANDIR}/man8/ncsa_auth.8 -OPTIONAL_FILES+= ${PKGMANDIR}/man8/pam_auth.8 -OPTIONAL_FILES+= libexec/smb_auth libexec/yp_auth libexec/wb_auth -# -# digest auth helpers -# -OPTIONAL_FILES+= libexec/digest_pw_auth -# -# ntlm auth helpers (except no_check and winbind) -# -OPTIONAL_FILES+= libexec/fakeauth_auth libexec/ntlm_auth -OPTIONAL_FILES+= libexec/wb_ntlmauth ${PKGMANDIR}/man8/squid_unix_group.8 -# -# external acl helpers (except ldap_group, wbinfo_group and winbind_group) -# -OPTIONAL_FILES+= libexec/ip_user_check libexec/squid_unix_group - -SUBST_CLASSES+= confs -SUBST_STAGE.confs= pre-configure -SUBST_FILES.confs= src/cf.data.pre -SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/" -SUBST_MESSAGE.confs= Fixing configuration files. - -CHECK_PORTABILITY_SKIP+= icons/icons.shar - -INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man8 sbin ${DOCDIR} \ - ${EXAMPLESDIR} share/squid/errors share/squid/icons - -post-install: -.for f in ${EXAMPLES_FILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}/`basename ${f} .default` -.endfor - ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} - cd ${WRKSRC}; \ - for i in ${DOCFILES}; do \ - ${INSTALL_DATA} $$i ${DOCDIR}; \ - done - ( \ - for i in ${OPTIONAL_FILES}; do \ - ${TEST} ! -r ${PREFIX}/$$i || ${ECHO} $$i; \ - done; \ - cd ${WRKSRC}/errors; \ - for i in *; do \ - ${TEST} -d $$i && \ - (${LS} $$i/ERR_* | \ - ${SED} -e 's@^@share/squid/errors/@'; \ - ${ECHO} "@dirrm share/squid/errors/$$i"); \ - done; \ - ${ECHO} "@dirrm share/squid/errors"; \ - cd ${WRKSRC}/icons; \ - ${LS} anthony-*.gif | \ - ${SED} -e 's@^@share/squid/icons/@'; \ - ${ECHO} "@dirrm share/squid/icons"; \ - ${ECHO} "share/squid/mib.txt"; \ - ${ECHO} "@dirrm share/squid" \ - ) >>${PLIST_SRC} - -.include "options.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/squid/Makefile.common b/www/squid/Makefile.common index 4ef1bd96d34..72e495cb65a 100644 --- a/www/squid/Makefile.common +++ b/www/squid/Makefile.common @@ -1,17 +1,26 @@ -# $NetBSD: Makefile.common,v 1.1 2007/12/20 03:17:14 taca Exp $ +# $NetBSD: Makefile.common,v 1.2 2008/09/12 14:59:52 taca Exp $ -SQUID_DATADIR= ${VARBASE}/squid -LOGDIR?= ${SQUID_DATADIR}/logs - -PKG_SYSCONFSUBDIR?= squid +BUILD_DEFS+= LOGDIR VARBASE +DOCDIR= share/doc/squid +EGDIR= share/examples/squid -SQUID_USER?= squid -SQUID_GROUP?= squid +SQUID_DATADIR= ${VARBASE}/squid -PKG_GROUPS_VARS+= SQUID_GROUP -PKG_USERS_VARS+= SQUID_USER +LOGDIR?= ${SQUID_DATADIR}/logs -PKG_GROUPS= ${SQUID_GROUP} -PKG_USERS= ${SQUID_USER}:${SQUID_GROUP} +# +MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} +MAKE_ENV+= PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q} -PKG_GECOS.${SQUID_USER}= Squid Web-Cache pseudo-user +CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR:Q} \ + --localstatedir=${SQUID_DATADIR:Q} \ + --datarootdir=${PREFIX}/share/squid \ + --enable-auth=basic,digest,ntlm \ + --enable-cachemgr-hostname=localhost \ + --enable-delay-pools \ + --enable-icmp \ + --enable-removal-policies=lru,heap \ + --enable-poll \ + --enable-underscores \ + --enable-storeio=${SQUID_BACKENDS:Q} \ + --with-aio diff --git a/www/squid/PLIST b/www/squid/PLIST deleted file mode 100644 index 28cb198afe8..00000000000 --- a/www/squid/PLIST +++ /dev/null @@ -1,17 +0,0 @@ -@comment $NetBSD: PLIST,v 1.21 2006/09/26 03:40:20 taca Exp $ -bin/squidclient -libexec/cachemgr.cgi -man/man8/cachemgr.cgi.8 -man/man8/squid.8 -sbin/RunCache -sbin/squid -share/doc/squid/ChangeLog -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 -@dirrm share/doc/squid -@dirrm share/examples/squid diff --git a/www/squid/distinfo b/www/squid/distinfo deleted file mode 100644 index b7013de243d..00000000000 --- a/www/squid/distinfo +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: distinfo,v 1.139 2008/06/29 01:02:08 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) = 06712292968ae808494007a722da5710660d0fec -SHA1 (patch-ab) = 42c3f2daa2294d346358c199a0c53d849d8b1c74 -SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0 -SHA1 (patch-ad) = 8975f707dd46832011d618b5a1f623df88171f36 -SHA1 (patch-ae) = fb32c403e3613595931abf7f7a8ce7cfd86d72a7 -SHA1 (patch-af) = a78e762c1ad928eef66b12395d48bc69542e32d9 -SHA1 (patch-aj) = fab8076c24a4e134b193fcdacc5240dfe7aa5504 -SHA1 (patch-ak) = 6df607714a7a043997ece1a56e43b326876f3d22 -SHA1 (patch-al) = d0a3b639147842ca5d07114b561d2431d8800971 -SHA1 (patch-an) = 2027360a5ae2e24802719d4fe8801b0eeeb8a681 -SHA1 (patch-ap) = 20eec1bcc0a12e3ea47fda7a6ff14d781c0334c5 -SHA1 (patch-ar) = 985c192662d41264012a76248e9bea0662cec8f5 -SHA1 (patch-as) = e09a5703cdc7343259c07e599c933a613172a9b3 -SHA1 (patch-at) = 7ce72c964345203876d56d003353a5213c327252 -SHA1 (patch-au) = 25f6c7e366e7dca2aeb55312bd2ccf51d7a7b725 -SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2 -SHA1 (patch-bc) = 0b87eb5f4ccc06a0e59ed298fc3203b1b2641969 diff --git a/www/squid/options.mk b/www/squid/options.mk index 3722f0ace18..13b2e8bd1e2 100644 --- a/www/squid/options.mk +++ b/www/squid/options.mk @@ -1,43 +1,71 @@ -# $NetBSD: options.mk,v 1.13 2007/08/02 15:45:10 taca Exp $ +# $NetBSD: options.mk,v 1.14 2008/09/12 14:59:52 taca Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.squid -PKG_SUPPORTED_OPTIONS= aufs carp coss icmp pam-helper snmp ssl unlinkd +PKG_SUPPORTED_OPTIONS= snmp ssl \ + squid-backend-aufs squid-backend-null \ + squid-backend-ufs squid-carp squid-unlinkd \ + squid-ldap-helper squid-pam-helper + +PKG_OPTIONS_LEGACY_OPTS= aufs:squid-backend-aufs \ + coss:squid-backend-coss diskd:squid-backend-diskd \ + null:squid-backend-null ufs:squid-backend-ufs \ + linux-netfilter:squid-netfilter ipf-transparent:squid-ipf \ + pf-transparent:squid-pf unlinkd:squid-unlinkd \ + arp-acl:squid-arp-acl pam-helper:squid-pam-helper carp:squid-carp + +PLIST_VARS+= coss diskd snmp unlinkd +PLIST_VARS+= ba_LDAP ba_MSNT ba_NCSA ba_PAM ba_YP ba_getpwnam +PLIST_VARS+= da_ldap da_password +PLIST_VARS+= na_SMB na_fakeauth +PLIST_VARS+= eacl_ip_user eacl_ldap_group eacl_unix_group + # # most of options are enabled by default except aufs. aufs backend isn't # tested well. -PKG_SUGGESTED_OPTIONS= carp icmp pam-helper snmp ssl unlinkd +PKG_SUGGESTED_OPTIONS= squid-carp snmp ssl squid-pam-helper squid-unlinkd + +.include "../../mk/bsd.prefs.mk" + +# +# Squid 3.0's COSS support is not stable now. +# +.if !empty(PKGNAME:Msquid-2.[0-9]*.[0-9]*) +PKG_SUPPORTED_OPTIONS+= squid-backend-coss +PKG_SUGGESTED_OPTIONS+= squid-backend-coss +.endif .if !empty(OPSYS:MLinux) -PKG_SUPPORTED_OPTIONS+= linux-netfilter +PKG_SUPPORTED_OPTIONS+= squid-netfilter .endif # some release of NetBSD lacks <ipl.h> header of IP Filter 4.x .if ${OPSYS} != "NetBSD" || ${OS_VERSION:M[01].*} || exists(/usr/include/netinet/ipl.h) -PKG_SUPPORTED_OPTIONS+= ipf-transparent +PKG_SUPPORTED_OPTIONS+= squid-ipf .endif .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" -PKG_SUPPORTED_OPTIONS+= pf-transparent +PKG_SUPPORTED_OPTIONS+= squid-pf .endif .if (${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD") && \ - !empty(PKG_SUPPORTED_OPTIONS:Mipf-transparent) -PKG_SUGGESTED_OPTIONS+= ipf-transparent + !empty(PKG_SUPPORTED_OPTIONS:Msquid-ipf) +PKG_SUGGESTED_OPTIONS+= squid-ipf .endif .if ${OPSYS} == "OpenBSD" -PKG_SUGGESTED_OPTIONS+= pf-transparent +PKG_SUGGESTED_OPTIONS+= squid-pf .endif # Darwin dosen't support System V IPC support. .if empty(OPSYS:MDarwin) -PKG_SUPPORTED_OPTIONS+= diskd -PKG_SUGGESTED_OPTIONS+= diskd +PKG_SUPPORTED_OPTIONS+= squid-backend-diskd +PKG_SUGGESTED_OPTIONS+= squid-backend-diskd +PLIST.diskd= yes .endif -# limited platform support arp-acl +# limited platform support squid-arp-acl .if !empty(OPSYS:MFreeBSD) || !empty(OPSYS:MNetBSD) || !empty(OPSYS:MOpenBSD) || !empty(OPSYS:MLinux) || !empty(OPSYS:MSunOS) -PKG_SUPPORTED_OPTIONS+= arp-acl +PKG_SUPPORTED_OPTIONS+= squid-arp-acl .endif .include "../../mk/bsd.options.mk" @@ -62,26 +90,29 @@ CONFIGURE_ARGS+= --enable-pf-transparent CONFIGURE_ARGS+= --enable-ipf-transparent .endif -.if !empty(PKG_OPTIONS:Marp-acl) +.if !empty(PKG_OPTIONS:Msquid-arp-acl) CONFIGURE_ARGS+= --enable-arp-acl .endif -.if !empty(PKG_OPTIONS:Mcarp) +.if !empty(PKG_OPTIONS:Msquid-carp) CONFIGURE_ARGS+= --enable-carp .endif -.if !empty(PKG_OPTIONS:Micmp) -CONFIGURE_ARGS+= --enable-icmp -INSTALL_TARGET+= install install-pinger +.if !empty(PKG_OPTIONS:Msquid-ldap-helper) +.include "../../databases/openldap-client/buildlink3.mk" +SQUID_BASIC_AUTH_HELPERS+= LDAP +SQUID_DIGEST_AUTH_HELPERS+= ldap +SQUID_EXTERNAL_ACL_HELPERS+= ldap_group .endif -.if !empty(PKG_OPTIONS:Mpam-helper) +.if !empty(PKG_OPTIONS:Msquid-pam-helper) . include "../../mk/pam.buildlink3.mk" SQUID_BASIC_AUTH_HELPERS+= PAM .endif .if !empty(PKG_OPTIONS:Msnmp) CONFIGURE_ARGS+= --enable-snmp +PLIST.snmp= yes .endif .if !empty(PKG_OPTIONS:Mssl) @@ -89,39 +120,57 @@ CONFIGURE_ARGS+= --enable-ssl --with-openssl=${SSLBASE:Q} .include "../../security/openssl/buildlink3.mk" .endif -.if !empty(PKG_OPTIONS:Maufs) +.if !empty(PKG_OPTIONS:Msquid-backend-aufs) SQUID_BACKENDS+= aufs PTHREAD_AUTO_VARS= yes .include "../../mk/pthread.buildlink3.mk" .endif -.if !empty(PKG_OPTIONS:Mcoss) -SQUID_BACKENDS+= coss -.if empty(PKG_OPTIONS:Maufs) -PKG_FAIL_REASON+= "The option needs aufs option, too." +.if !empty(PKG_OPTIONS:Msquid-backend-coss) +.if empty(PKG_OPTIONS:Msquid-backend-aufs) +SQUID_BACKENDS+= aufs +PTHREAD_AUTO_VARS= yes +.include "../../mk/pthread.buildlink3.mk" .endif +SQUID_BACKENDS+= coss +PLIST.coss= yes .endif -.if !empty(PKG_OPTIONS:Mdiskd) +.if !empty(PKG_OPTIONS:Msquid-backend-diskd) SQUID_BACKENDS+= diskd +PLIST.diskd= yes .endif -.if empty(PKG_OPTIONS:Munlinkd) +.if empty(PKG_OPTIONS:Msquid-unlinkd) CONFIGURE_ARGS+= --disable-unlinkd +.else +PLIST.unlinkd= yes .endif .if !empty(SQUID_BASIC_AUTH_HELPERS) CONFIGURE_ARGS+= --enable-basic-auth-helpers=${SQUID_BASIC_AUTH_HELPERS:Q} +.for i in ${SQUID_BASIC_AUTH_HELPERS} +PLIST.ba_${i}= yes +.endfor .endif .if !empty(SQUID_DIGEST_AUTH_HELPERS) CONFIGURE_ARGS+= --enable-digest-auth-helpers=${SQUID_DIGEST_AUTH_HELPERS:Q} +.for i in ${SQUID_DIGEST_AUTH_HELPERS} +PLIST.da_${i}= yes +.endfor .endif .if !empty(SQUID_NTLM_AUTH_HELPERS) CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=${SQUID_NTLM_AUTH_HELPERS:Q} +.for i in ${SQUID_NTLM_AUTH_HELPERS} +PLIST.na_${i}= yes +.endfor .endif .if !empty(SQUID_EXTERNAL_ACL_HELPERS) CONFIGURE_ARGS+= --enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:Q} +.for i in ${SQUID_EXTERNAL_ACL_HELPERS} +PLIST.eacl_${i}= yes +.endfor .endif diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa deleted file mode 100644 index 4d9d81d111d..00000000000 --- a/www/squid/patches/patch-aa +++ /dev/null @@ -1,90 +0,0 @@ -$NetBSD: patch-aa,v 1.22 2007/09/07 10:39:35 taca Exp $ - ---- src/Makefile.in.orig 2007-08-12 21:41:07.000000000 +0900 -+++ src/Makefile.in -@@ -628,14 +628,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo - DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log --DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid -+DEFAULT_PID_FILE = $(VARBASE)/run/squid.pid - DEFAULT_SWAP_DIR = $(localstatedir)/cache - DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'` --DEFAULT_ICON_DIR = $(datadir)/icons --DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@ --DEFAULT_MIB_PATH = $(datadir)/mib.txt -+DEFAULT_ICON_DIR = $(datadir)/squid/icons -+DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@ -+DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt - DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ - - # Don't automatically uninstall config files -@@ -883,20 +883,20 @@ distclean-compile: - uninstall-info-am: - install-dataDATA: $(data_DATA) - @$(NORMAL_INSTALL) -- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)" -+ test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)/squid" - @list='$(data_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \ -- $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \ -+ echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/squid/$$f'"; \ -+ $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/squid/$$f"; \ - done - - uninstall-dataDATA: - @$(NORMAL_UNINSTALL) - @list='$(data_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(datadir)/$$f"; \ -+ echo " rm -f '$(DESTDIR)$(datadir)/squid/$$f'"; \ -+ rm -f "$(DESTDIR)$(datadir)/squid/$$f"; \ - done - install-sysconfDATA: $(sysconf_DATA) - @$(NORMAL_INSTALL) -@@ -1149,8 +1149,7 @@ info-am: - - install-data-am: install-data-local install-dataDATA - --install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS \ -- install-sysconfDATA -+install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS - - install-info: install-info-recursive - -@@ -1177,7 +1176,7 @@ ps-am: - - uninstall-am: uninstall-dataDATA uninstall-info-am \ - uninstall-libexecPROGRAMS uninstall-local \ -- uninstall-sbinPROGRAMS uninstall-sysconfDATA -+ uninstall-sbinPROGRAMS - - uninstall-info: uninstall-info-recursive - -@@ -1261,20 +1260,7 @@ repl_modules.c: repl_modules.sh Makefile - auth_modules.c: auth_modules.sh Makefile - @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c - --install-data-local: install-sysconfDATA install-dataDATA -- @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ -- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \ -- else \ -- echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\ -- $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE); \ -- fi -- @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ -- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ -- else \ -- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ -- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ -- fi -- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) -+install-data-local: install-dataDATA - - uninstall-local: - @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ diff --git a/www/squid/patches/patch-ab b/www/squid/patches/patch-ab deleted file mode 100644 index f532f21d708..00000000000 --- a/www/squid/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.10 2007/09/07 10:39:35 taca Exp $ - ---- scripts/Makefile.in.orig 2007-08-12 21:41:06.000000000 +0900 -+++ scripts/Makefile.in -@@ -207,7 +207,7 @@ am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ - am__tar = @am__tar@ - am__untar = @am__untar@ --bindir = @bindir@ -+bindir = @sbindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ diff --git a/www/squid/patches/patch-ac b/www/squid/patches/patch-ac deleted file mode 100644 index e283068cc23..00000000000 --- a/www/squid/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2003/02/16 06:43:41 taca Exp $ - ---- scripts/RunCache.in.orig 2003-02-16 14:56:30.000000000 +0900 -+++ scripts/RunCache.in 2003-02-16 14:56:31.000000000 +0900 -@@ -16,10 +16,10 @@ fi - - failcount=0 - while : ; do -- echo "Running: squid -sY $conf >> $logdir/squid.out 2>&1" -+ echo "Running: squid -Y $conf >> $logdir/squid.out 2>&1" - echo "Startup: `date`" >> $logdir/squid.out - start=`date '+%d%H%M%S'` -- squid -NsY $conf >> $logdir/squid.out 2>&1 -+ squid -NY $conf >> $logdir/squid.out 2>&1 - stop=`date '+%d%H%M%S'` - t=`expr $stop - $start` - if test 0 -le $t -a $t -lt 5 ; then diff --git a/www/squid/patches/patch-ad b/www/squid/patches/patch-ad deleted file mode 100644 index 854dbe7f0a2..00000000000 --- a/www/squid/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.12 2007/09/07 10:39:35 taca Exp $ - ---- errors/Makefile.in.orig 2007-08-23 09:14:40.000000000 +0900 -+++ errors/Makefile.in -@@ -237,7 +237,7 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --errordir = $(datadir)/errors -+errordir = $(datadir)/squid/errors - DEFAULT_ERROR_DIR = $(errordir) - INSTALL_LANGUAGES = @ERR_LANGUAGES@ - LANGUAGES = \ diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae deleted file mode 100644 index e2e4450e6ab..00000000000 --- a/www/squid/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.12 2007/09/07 10:39:35 taca Exp $ - ---- icons/Makefile.in.orig 2007-08-12 21:41:05.000000000 +0900 -+++ icons/Makefile.in -@@ -274,7 +274,7 @@ ICON2 = anthony-bomb.gif \ - anthony-xbm.gif \ - anthony-xpm.gif - --icondir = $(datadir)/icons -+icondir = $(datadir)/squid/icons - icon_DATA = $(ICON1) $(ICON2) - EXTRA_DIST = $(ICON1) $(ICON2) icons.shar - DISTCLEANFILES = diff --git a/www/squid/patches/patch-af b/www/squid/patches/patch-af deleted file mode 100644 index f197c837961..00000000000 --- a/www/squid/patches/patch-af +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-af,v 1.6 2006/09/13 14:41:58 taca Exp $ - ---- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig 2005-05-18 01:56:33.000000000 +0900 -+++ helpers/ntlm_auth/SMB/smbval/smblib-util.c -@@ -60,6 +60,7 @@ static char *SMB_Prots[] = - "NT LANMAN 1.0", - NULL}; - -+#if 0 - /* Print out an SMB pkt in all its gory detail ... */ - - void -@@ -78,6 +79,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 --git a/www/squid/patches/patch-aj b/www/squid/patches/patch-aj deleted file mode 100644 index 5b4f4f3892e..00000000000 --- a/www/squid/patches/patch-aj +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-aj,v 1.8 2007/05/13 16:45:44 taca Exp $ - ---- src/access_log.c.orig 2007-02-04 06:59:24.000000000 +0900 -+++ src/access_log.c -@@ -90,6 +90,8 @@ log_quote(const char *header) - { - int c; - int i; -+ int log_all, check_name, log_this; -+ const struct _wordlist *wl; - char *buf; - char *buf_cursor; - if (header == NULL) { -@@ -99,13 +101,41 @@ log_quote(const char *header) - } - buf = xcalloc(1, (strlen(header) * 3) + 1); - buf_cursor = buf; -+ -+ /* if empty or first keyword is "all", log all mime headers */ -+ log_all = (!Config.log_mime_hdrs_list -+ || strcasecmp(Config.log_mime_hdrs_list->key, "all") == 0); -+ - /* - * We escape: \x00-\x1F"#%;<>?{}|\\\\^~`\[\]\x7F-\xFF - * which is the default escape list for the CPAN Perl5 URI module - * modulo the inclusion of space (x40) to make the raw logs a bit - * more readable. - */ -- while ((c = *(const unsigned char *) header++) != '\0') { -+ check_name = 1; -+ log_this = 1; -+ for(; (c = *(const unsigned char *) header) != '\0'; header++) { -+ if (!log_all && check_name) { -+ /* loop over configured header names and only continue -+ * if the current header is on the list */ -+ wl = Config.log_mime_hdrs_list; -+ log_this = 0; -+ for(; wl; wl = wl->next) { -+ if (strncasecmp(wl->key, header, strlen(wl->key)) == 0){ -+ log_this = 1; -+ break; -+ } -+ } -+ check_name = 0; -+ } -+ if (!log_this) { -+ if (c == '\n') { -+ /* check header name in next iteration */ -+ check_name = 1; -+ } -+ continue; -+ } -+ - #if !OLD_LOG_MIME - if (c == '\r') { - *buf_cursor++ = '\\'; -@@ -113,6 +143,7 @@ log_quote(const char *header) - } else if (c == '\n') { - *buf_cursor++ = '\\'; - *buf_cursor++ = 'n'; -+ check_name = 1; - } else - #endif - if (c <= 0x1F diff --git a/www/squid/patches/patch-ak b/www/squid/patches/patch-ak deleted file mode 100644 index 7f8f8e22ba3..00000000000 --- a/www/squid/patches/patch-ak +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ak,v 1.13 2007/09/07 10:39:36 taca Exp $ - ---- src/cf.data.pre.orig 2007-08-22 09:14:30.000000000 +0900 -+++ src/cf.data.pre -@@ -1318,6 +1318,18 @@ DOC_START - formats). To enable this logging set log_mime_hdrs to 'on'. - DOC_END - -+NAME: log_mime_hdrs_list -+TYPE: wordlist -+LOC: Config.log_mime_hdrs_list -+DEFAULT: all -+DOC_START -+ This list specifies which headers should be passed when -+ header logging is enabled by 'log_mime_hdrs on'. You can -+ specify list of header names or 'all'. -+ -+log_mime_hdrs_list all -+DOC_END -+ - NAME: useragent_log - TYPE: string - LOC: Config.Log.useragent -@@ -3352,12 +3364,12 @@ DOC_END - - NAME: cache_effective_user - TYPE: string --DEFAULT: nobody -+DEFAULT: @USER@ - LOC: Config.effectiveUser - DOC_START - If you start Squid as root, it will change its effective/real - UID/GID to the user specified below. The default is to change -- to UID to nobody. If you define cache_effective_user, but not -+ to UID to @USER@. If you define cache_effective_user, but not - cache_effective_group, Squid sets the GID to the effective - user's default group ID (taken from the password file) and - supplementary group list from the from groups membership of diff --git a/www/squid/patches/patch-al b/www/squid/patches/patch-al deleted file mode 100644 index 320ddcc5e0d..00000000000 --- a/www/squid/patches/patch-al +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-al,v 1.9 2007/05/13 16:45:44 taca Exp $ - ---- src/structs.h.orig 2007-04-27 08:11:51.000000000 +0900 -+++ src/structs.h -@@ -599,6 +599,7 @@ struct _SquidConfig { - wordlist *mcast_group_list; - wordlist *dns_testname_list; - wordlist *dns_nameservers; -+ wordlist *log_mime_hdrs_list; - peer *peers; - int npeers; - struct { diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an deleted file mode 100644 index cc44d3a8805..00000000000 --- a/www/squid/patches/patch-an +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-an,v 1.15 2007/09/07 10:39:36 taca Exp $ - ---- configure.in.orig 2007-08-31 23:55:13.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 \ -@@ -1974,7 +1976,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) -@@ -2253,8 +2264,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 -@@ -2648,7 +2659,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 --git a/www/squid/patches/patch-ap b/www/squid/patches/patch-ap deleted file mode 100644 index 854b6edb08a..00000000000 --- a/www/squid/patches/patch-ap +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ap,v 1.7 2007/09/07 10:39:36 taca Exp $ - ---- helpers/basic_auth/MSNT/Makefile.in.orig 2007-08-12 21:40:48.000000000 +0900 -+++ helpers/basic_auth/MSNT/Makefile.in -@@ -532,9 +532,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 --git a/www/squid/patches/patch-ar b/www/squid/patches/patch-ar deleted file mode 100644 index b5dfe944f1c..00000000000 --- a/www/squid/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.4 2007/09/07 10:39:36 taca Exp $ - ---- tools/Makefile.in.orig 2007-08-12 21:41:09.000000000 +0900 -+++ tools/Makefile.in -@@ -739,7 +739,7 @@ info: info-recursive - - info-am: - --install-data-am: install-data-local -+install-data-am: - - install-exec-am: install-binPROGRAMS install-libexecPROGRAMS - diff --git a/www/squid/patches/patch-as b/www/squid/patches/patch-as deleted file mode 100644 index ab8a8408adc..00000000000 --- a/www/squid/patches/patch-as +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-as,v 1.4 2007/09/07 10:39:36 taca Exp $ - ---- Makefile.in.orig 2007-08-12 21:40:44.000000000 +0900 -+++ Makefile.in -@@ -728,7 +728,7 @@ dist-hook: - - install-pinger: - chown root $(DEFAULT_PINGER) -- chmod 4711 $(DEFAULT_PINGER) -+ chmod 4511 $(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 --git a/www/squid/patches/patch-at b/www/squid/patches/patch-at deleted file mode 100644 index 2c9d1f2b3e5..00000000000 --- a/www/squid/patches/patch-at +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-at,v 1.2 2007/05/13 16:45:45 taca Exp $ - ---- src/client_side.c.orig 2007-03-21 06:26:34.000000000 +0900 -+++ src/client_side.c -@@ -88,8 +88,12 @@ - #include <sys/fcntl.h> - #include <net/if.h> - #include <netinet/in.h> -+#ifdef __DragonFly__ -+#include <net/pf/pfvar.h> -+#else - #include <net/pfvar.h> - #endif -+#endif - - #if LINUX_NETFILTER - #include <linux/netfilter_ipv4.h> diff --git a/www/squid/patches/patch-au b/www/squid/patches/patch-au deleted file mode 100644 index 6d76d949ea9..00000000000 --- a/www/squid/patches/patch-au +++ /dev/null @@ -1,109 +0,0 @@ -$NetBSD: patch-au,v 1.2 2007/09/07 10:39:36 taca Exp $ - ---- configure.orig 2007-08-31 23:55:13.000000000 +0900 -+++ configure -@@ -8039,11 +8039,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 \ -@@ -21446,11 +21448,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 -@@ -21458,35 +21462,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 -@@ -21507,30 +21490,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 -- -- -- -+{ echo "$as_me:$LINENO: result: $ac_cv_have_fd_mask" >&5 -+echo "${ECHO_T}$ac_cv_have_fd_mask" >&6; } - - { echo "$as_me:$LINENO: checking for off_t" >&5 - echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb deleted file mode 100644 index 9bb081fa966..00000000000 --- a/www/squid/patches/patch-bb +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bb,v 1.10 2006/09/13 14:41:58 taca Exp $ - ---- include/autoconf.h.in.orig 2006-07-13 00:00:31.000000000 +0900 -+++ include/autoconf.h.in -@@ -231,6 +231,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 - diff --git a/www/squid/patches/patch-bc b/www/squid/patches/patch-bc deleted file mode 100644 index f4c4c30c9f5..00000000000 --- a/www/squid/patches/patch-bc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bc,v 1.3 2007/03/17 15:14:27 taca Exp $ - ---- include/ntlmauth.h.orig 2007-03-13 11:12:39.000000000 +0900 -+++ include/ntlmauth.h -@@ -70,6 +70,9 @@ - #define bswap16(x) bswap_16(x) - #define bswap32(x) bswap_32(x) - #else /* HAVE_BISTWAP_H */ -+#ifdef HAVE_MACHINE_BYTE_SWAP_H -+#include <machine/byte_swap.h> -+#else /* HAVE_MACHINE_BYTE_SWAP_H */ - #ifndef bswap16 - #define bswap16(x) (((((u_int16_t)x) >> 8) & 0xff) | ((((u_int16_t)x) & 0xff) << 8)) - #endif -@@ -78,6 +81,7 @@ - (((((u_int32_t)x) & 0xff000000) >> 24) | ((((u_int32_t)x) & 0x00ff0000) >> 8) | \ - ((((u_int32_t)x) & 0x0000ff00) << 8) | ((((u_int32_t)x) & 0x000000ff) << 24)) - #endif -+#endif /* HAVE_MACHINE_BYTE_SWAP_H */ - #endif /* HAVE_BITSWAP_H */ - - /* Used internally. Microsoft seems to think this is right, I believe them. |