diff options
Diffstat (limited to 'www/squid31')
| -rw-r--r-- | www/squid31/Makefile | 444 | ||||
| -rw-r--r-- | www/squid31/distinfo | 3 | ||||
| -rw-r--r-- | www/squid31/files/extra-patch-src-cf.data.pre.aufs | 20 | ||||
| -rw-r--r-- | www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in | 11 | ||||
| -rw-r--r-- | www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh | 13 | ||||
| -rw-r--r-- | www/squid31/files/patch-squid_kerb_auth | 490 | ||||
| -rw-r--r-- | www/squid31/files/patch-src-cf.data.pre | 13 | ||||
| -rw-r--r-- | www/squid31/files/pkg-deinstall.in | 39 | ||||
| -rw-r--r-- | www/squid31/files/pkg-install.in | 81 | ||||
| -rw-r--r-- | www/squid31/files/pkg-message.in | 32 | ||||
| -rw-r--r-- | www/squid31/files/squid.in | 60 | ||||
| -rw-r--r-- | www/squid31/pkg-descr | 10 |
12 files changed, 0 insertions, 1216 deletions
diff --git a/www/squid31/Makefile b/www/squid31/Makefile deleted file mode 100644 index c99b5463eed2..000000000000 --- a/www/squid31/Makefile +++ /dev/null @@ -1,444 +0,0 @@ -# New ports collection makefile for: squid24 -# Date created: Tue Mar 27 14:56:08 CEST 2001 -# Whom: Adrian Chadd <adrian@FreeBSD.org> -# -# $FreeBSD$ -# -# Tunables not (yet) configurable via 'make config': -# SQUID_{U,G}ID -# Which user/group Squid should run as (default: squid/squid). -# The user and group will be created if they do not already exist using -# a uid:gid of 100:100. -# NOTE: older versions of Squid defaulted to nobody/nogroup. -# If you wish to run Squid as "nobody" (which is not recommended), please -# define SQUID_UID=nobody and SQUID_GID=nogroup in your make environment -# before you start the update or installation of this port. -# -# SQUID_LANGUAGES -# A list of languages for which error page files should be installed -# (default: all available) -# -# E.g. use `make SQUID_LANGUAGES="English French"' if you want to -# install the files for these languages only. -# Use `make -VSQUID_LANGUAGES' or scroll down to this variable's -# definition to see which values are valid. -# -# SQUID_DEFAULT_LANG -# If you define SQUID_LANGUAGES, select which language should be the default -# one (this variable defaults to "templates"). This setting can be overwritten -# with squid.conf's error_directory directive. -# -# SQUID_CONFIGURE_ARGS -# Additional configuration options. -# -# To enable them, use e.g -# `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install' -# -# The list below may be incomplete, please see the configure script -# in the Squid source distribution for the complete list of additional -# options. -# Note that you probably do not need to worry about these options in most -# cases, they are included in case you want to experiment with them. -# -# --enable-xmalloc-statistics -# Show malloc statistics in status page -# --enable-cachemgr-hostname=some.hostname -# Make cachemgr.cgi default to this host -# --disable-unlinkd -# Do not use "unlinkd" -# --with-aufs-threads=N_THREADS -# Tune the number of worker threads for the aufs object -# --with-filedescriptors=N -# Force Squid to use N filedescriptors. -# --enable-ntlm-fail-open -# Enable NTLM fail open, where a helper that fails one of the -# Authentication steps can allow Squid to still authenticate the user -# --enable-x-accelerator-vary -# Enable support for the X-Accelerator-Vary HTTP header. Can be used -# to indicate variance within an accelerator setup. Typically used -# together with other code that adds custom HTTP headers to the -# requests. - -PORTNAME= squid -PORTVERSION= 3.0.${SQUID_STABLE_VER} -CATEGORIES= www -MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ - ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ - ftp://ftp.belnet.be/packages/squid/pub/%SUBDIR%/ \ - ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \ - ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \ - ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \ - ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,} \ - http://www.squid-cache.org/Versions/v3/3.0/ \ - http://www3.us.squid-cache.org/Versions/v3/3.0/ \ - http://www1.at.squid-cache.org/Versions/v3/3.0/ \ - http://www2.nl.squid-cache.org/Versions/v3/3.0/ \ - http://www1.ru.squid-cache.org/Versions/v3/3.0/ \ - http://www1.uk.squid-cache.org/Versions/v3/3.0/ \ - http://www1.jp.squid-cache.org/Versions/v3/3.0/ \ - http://www2.tw.squid-cache.org/Versions/v3/3.0/ -MASTER_SITE_SUBDIR= squid-3/STABLE -DISTNAME= squid-3.0.STABLE${SQUID_STABLE_VER} -DIST_SUBDIR= squid3.0 - -PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ - http://www2.us.squid-cache.org/%SUBDIR%/ \ - http://www3.us.squid-cache.org/%SUBDIR%/ \ - http://www1.at.squid-cache.org/%SUBDIR%/ \ - http://www2.nl.squid-cache.org/%SUBDIR%/ \ - http://www1.ru.squid-cache.org/%SUBDIR%/ \ - http://www1.uk.squid-cache.org/%SUBDIR%/ \ - http://www1.jp.squid-cache.org/%SUBDIR%/ \ - http://www1.tw.squid-cache.org/%SUBDIR%/ -PATCH_SITE_SUBDIR= Versions/v3/3.0/changesets -PATCHFILES= - -MAINTAINER= tmseck@web.de -COMMENT= HTTP Caching Proxy - -LATEST_LINK= squid30 - -SQUID_STABLE_VER= 14 - -CONFLICTS= squid-2.[0-9].* cacheboy-[0-9]* -GNU_CONFIGURE= yes -USE_BZIP2= yes -USE_PERL5= yes -USE_RC_SUBR= squid - -SQUID_UID?= squid -SQUID_GID?= squid - -MAN8= cachemgr.cgi.8 squid.8 squid_radius_auth.8 -docs= QUICKSTART README RELEASENOTES.html doc/debug-sections.txt -PORTDOCS= ${docs:T} -PORTEXAMPLES= * -SUB_FILES+= pkg-deinstall pkg-install pkg-message -SUB_LIST+= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID} - -OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \ - SQUID_SASL_AUTH "Install SASL authentication helpers" off \ - SQUID_DELAY_POOLS "Enable delay pools" off \ - SQUID_SNMP "Enable SNMP support" on \ - SQUID_CARP "Enable CARP support" on \ - SQUID_SSL "Enable SSL support for reverse proxies" off \ - SQUID_PINGER "Install the icmp helper" off \ - SQUID_DNS_HELPER "Use the old 'dnsserver' helper" off \ - SQUID_HTCP "Enable HTCP support" off \ - SQUID_VIA_DB "Enable forward/via database" off \ - SQUID_CACHE_DIGESTS "Enable cache digests" off \ - SQUID_WCCP "Enable Web Cache Coordination Prot. v1" on \ - SQUID_WCCPV2 "Enable Web Cache Coordination Prot. v2" off \ - SQUID_STRICT_HTTP "Be strictly HTTP compliant" off \ - SQUID_IDENT "Enable ident (RFC 931) lookups" on \ - SQUID_REFERER_LOG "Enable Referer-header logging" off \ - SQUID_USERAGENT_LOG "Enable User-Agent-header logging" off \ - SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \ - SQUID_IPFW "Enable transparent proxying with IPFW" off \ - SQUID_PF "Enable transparent proxying with PF" off \ - SQUID_IPFILTER "Enable transp. proxying with IPFilter" off \ - SQUID_ICAP "Enable ICAP client functionality" off \ - SQUID_ESI "Enable ESI support (experimental)" off \ - SQUID_AUFS "Enable the aufs storage scheme" off \ - SQUID_COSS "Enable COSS (currently not available)" off \ - SQUID_KQUEUE "Use kqueue(2) (experimental)" on \ - SQUID_LARGEFILE "Support log and cache files >2GB" off \ - SQUID_STACKTRACES "Create backtraces on fatal errors" off \ - SQUID_DEBUG "Enable debugging options" off - -etc_files= squid/cachemgr.conf.default \ - squid/mib.txt squid/mime.conf.default \ - squid/msntauth.conf.default squid/squid.conf.default - -icon_files= anthony-binhex.gif anthony-bomb.gif anthony-box.gif \ - anthony-box2.gif anthony-c.gif anthony-compressed.gif \ - anthony-dir.gif anthony-dirup.gif anthony-dvi.gif \ - anthony-f.gif anthony-image.gif anthony-image2.gif \ - anthony-layout.gif anthony-link.gif anthony-movie.gif \ - anthony-pdf.gif anthony-portal.gif anthony-ps.gif \ - anthony-quill.gif anthony-script.gif anthony-sound.gif \ - anthony-tar.gif anthony-tex.gif anthony-text.gif \ - anthony-unknown.gif anthony-xbm.gif anthony-xpm.gif - -error_files= ERR_ACCESS_DENIED ERR_CACHE_ACCESS_DENIED \ - ERR_CACHE_MGR_ACCESS_DENIED ERR_CANNOT_FORWARD \ - ERR_CONNECT_FAIL ERR_DNS_FAIL ERR_ESI ERR_FORWARDING_DENIED \ - ERR_FTP_DISABLED ERR_FTP_FAILURE ERR_FTP_FORBIDDEN \ - ERR_FTP_NOT_FOUND ERR_FTP_PUT_CREATED \ - ERR_FTP_PUT_ERROR ERR_FTP_PUT_MODIFIED ERR_FTP_UNAVAILABLE \ - ERR_ICAP_FAILURE ERR_INVALID_REQ ERR_INVALID_RESP \ - ERR_INVALID_URL ERR_LIFETIME_EXP ERR_NO_RELAY \ - ERR_ONLY_IF_CACHED_MISS ERR_READ_ERROR ERR_READ_TIMEOUT \ - ERR_SHUTTING_DOWN ERR_SOCKET_FAILURE ERR_TOO_BIG ERR_UNSUP_REQ \ - ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT - -libexec= cachemgr.cgi digest_pw_auth diskd ip_user_check \ - msnt_auth ncsa_auth ntlm_auth pam_auth smb_auth \ - smb_auth.sh squid_db_auth squid_radius_auth squid_session \ - squid_unix_group wbinfo_group.pl -.if !defined(SQUID_CONFIGURE_ARGS) || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == "" -libexec+= unlinkd -.endif - -sbin= RunAccel RunCache squidclient squid - -CONFIGURE_ARGS= --with-default-user=${SQUID_UID} \ - --bindir=${PREFIX}/sbin \ - --sbindir=${PREFIX}/sbin \ - --datadir=${PREFIX}/etc/squid \ - --libexecdir=${PREFIX}/libexec/squid \ - --localstatedir=${PREFIX}/squid \ - --sysconfdir=${PREFIX}/etc/squid \ - --enable-removal-policies="lru heap" \ - --disable-linux-netfilter \ - --disable-linux-tproxy \ - --disable-epoll - -.include <bsd.port.pre.mk> - -# Authentication methods and modules: - -basic_auth= DB NCSA PAM MSNT SMB squid_radius_auth -digest_auth= password -external_acl= ip_user session unix_group wbinfo_group -MAN8+= ncsa_auth.8 pam_auth.8 squid_db_auth.8 squid_session.8 \ - squid_unix_group.8 -.if defined(WITH_SQUID_LDAP_AUTH) -USE_OPENLDAP= yes -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -MAN8+= squid_ldap_auth.8 squid_ldap_group.8 -basic_auth+= LDAP -digest_auth+= ldap -external_acl+= ldap_group -libexec+= digest_ldap_auth squid_ldap_auth squid_ldap_group -.endif -.if defined(WITH_SQUID_SASL_AUTH) -LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -basic_auth+= SASL -libexec+= sasl_auth -.endif -.if !defined(NO_NIS) && !defined(WITHOUT_NIS) -basic_auth+= YP -libexec+= yp_auth -.endif -CONFIGURE_ARGS+= --enable-auth="basic digest negotiate ntlm" \ - --enable-basic-auth-helpers="${basic_auth}" \ - --enable-digest-auth-helpers="${digest_auth}" \ - --enable-external-acl-helpers="${external_acl}" \ - --enable-ntlm-auth-helpers="SMB" -.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS) -# XXX This currently only works with heimdal from the base system, -# see files/patch-squid_kerb_auth: -CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth" -libexec+= squid_kerb_auth -.endif - -# Storage schemes: - -storage_schemes= ufs diskd null -.if defined(WITH_SQUID_AUFS) -storage_schemes+= aufs -# Only document switching from libpthread to libthr using libmap.conf -# where lipthread is the default threading library: -.if ${OSVERSION} < 700041 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs -.endif -# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS -CONFIGURE_ARGS+= --with-pthreads -CFLAGS+= ${PTHREAD_CFLAGS} -.endif -.if defined(WITH_SQUID_COSS) -# Starting with 3.0.STABLE9, COSS is disabled in Squid-3 until fixes -# from the 2.x series are backported to 3.x. -# storage_schemes+= coss -.endif -CONFIGURE_ARGS+= --enable-storeio="${storage_schemes}" - -# Other options set via 'make config': - -.if defined(WITH_SQUID_DELAY_POOLS) -CONFIGURE_ARGS+= --enable-delay-pools -.endif -.if defined(WITHOUT_SQUID_SNMP) -CONFIGURE_ARGS+= --disable-snmp -.endif -.if defined(WITHOUT_SQUID_CARP) -CONFIGURE_ARGS+= --disable-carp -.endif -.if defined(WITH_SQUID_SSL) -# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only -# works when it is defined before bsd.port{.pre}.mk is .included. -# This makes it currently impossible to combine this macro with OPTIONS to -# conditionally include OpenSSL support. -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -CONFIGURE_ARGS+= --enable-ssl \ - --with-openssl="${OPENSSLBASE}" -CFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} -.endif -.if defined(WITH_SQUID_PINGER) -CONFIGURE_ARGS+= --enable-icmp -libexec+= pinger -.endif -.if defined(WITH_SQUID_DNS_HELPER) -CONFIGURE_ARGS+= --disable-internal-dns -libexec+= dnsserver -.endif -.if defined(WITH_SQUID_HTCP) -CONFIGURE_ARGS+= --enable-htcp -.endif -.if defined(WITH_SQUID_VIA_DB) -CONFIGURE_ARGS+= --enable-forw-via-db -.endif -.if defined(WITH_SQUID_CACHE_DIGESTS) -CONFIGURE_ARGS+= --enable-cache-digests -.endif -.if defined(WITHOUT_SQUID_WCCP) -CONFIGURE_ARGS+= --disable-wccp -.endif -.if defined(WITH_SQUID_WCCPV2) -CONFIGURE_ARGS+= --enable-wccpv2 -.endif -.if defined(WITH_SQUID_STRICT_HTTP) -CONFIGURE_ARGS+= --disable-http-violations -.endif -.if defined(WITHOUT_SQUID_IDENT) -CONFIGURE_ARGS+= --disable-ident-lookups -.endif -.if defined(WITH_SQUID_REFERER_LOG) -CONFIGURE_ARGS+= --enable-referer-log -.endif -.if defined(WITH_SQUID_USERAGENT_LOG) -CONFIGURE_ARGS+= --enable-useragent-log -.endif -.if defined(WITH_SQUID_ARP_ACL) -CONFIGURE_ARGS+= --enable-arp-acl -.endif -.if defined(WITH_SQUID_IPFW) -CONFIGURE_ARGS+= --enable-ipfw-transparent -.endif -.if defined(WITH_SQUID_PF) -CONFIGURE_ARGS+= --enable-pf-transparent -.endif -.if defined(WITH_SQUID_IPFILTER) -CONFIGURE_ARGS+= --enable-ipf-transparent -.endif -.if defined(WITH_SQUID_ICAP) -CONFIGURE_ARGS+= --enable-icap-client -.endif -.if defined(WITH_SQUID_ESI) -CONFIGURE_ARGS+= --enable-esi -LIB_DEPENDS+= expat:${PORTSDIR}/textproc/expat2 \ - xml2:${PORTSDIR}/textproc/libxml2 -CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2 -LDFLAGS+= -L${LOCALBASE}/lib -.endif -.if defined(WITHOUT_SQUID_KQUEUE) -# Squid-3's kqueue support is still marked as experimental, so it is not yet -# enabled automatically as in Squid-2. We are explicit about disabling it, -# nonetheless: -CONFIGURE_ARGS+= --disable-kqueue -.else -CONFIGURE_ARGS+= --enable-kqueue -.endif -.if defined(WITH_SQUID_LARGEFILE) -CONFIGURE_ARGS+= --with-large-files -.endif -.if defined(WITH_SQUID_STACKTRACES) -CONFIGURE_ARGS+= --enable-stacktraces -CFLAGS+= -g -STRIP= -.endif -.if defined(WITH_SQUID_DEBUG) || defined(WITH_DEBUG) -# TODO: are there other useful options that can/should be set to help -# the developers in debugging failures? -CONFIGURE_ARGS+= --disable-optimizations -WITH_DEBUG?= yes -.endif -# Languages: -# -# If you do not define SQUID_LANGUAGES yourself, all available language files -# will be installed; the default language will be English. -SQUID_LANGUAGES?= Armenian Azerbaijani Bulgarian Catalan Czech Danish \ - Dutch English Estonian Finnish French German Greek \ - Hebrew Hungarian Italian Japanese Korean Lithuanian \ - Polish Portuguese Romanian Russian-1251 Russian-koi8-r \ - Serbian Simplify_Chinese Slovak Spanish Swedish \ - Traditional_Chinese Turkish Ukrainian-1251 \ - Ukrainian-koi8-u Ukrainian-utf8 -SQUID_DEFAULT_LANG?= templates -CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \ - --enable-default-err-language=${SQUID_DEFAULT_LANG} - -# Finally, add additional user specified configuration options: -CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} - -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}"\ - LDFLAGS="${LDFLAGS}" - -PLIST_DIRS= etc/squid/icons libexec/squid -PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \ - ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} - -.for d in ${SQUID_LANGUAGES} templates -PLIST_DIRS+= etc/squid/errors/${d} -PLIST_FILES+= ${error_files:S,^,etc/squid/errors/${d}/,} -.endfor -PLIST_DIRS+= etc/squid/errors etc/squid squid/logs squid/cache squid - -post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/src/cf.data.pre - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/helpers/basic_auth/SMB/Makefile.in \ - ${WRKSRC}/helpers/basic_auth/SMB/smb_auth.sh - -pre-install: -# Prevent installation of .orig files by deleting them. - @${FIND} ${WRKSRC} -name '*.bak' -delete - @${FIND} ${WRKSRC} -name '*.orig' -delete -# XXX: -# Remove error pages that were prematurely integrated into 3.0.STABLE. -# This is done to keep the package list manageable by installing the same -# set of error files for every language: - @for d in Ukrainian-1251 Ukrainian-koi8-u Ukrainian-utf8 templates; \ - do ${RM} -f ${WRKSRC}/errors/$${d}/ERR_SECURE_CONNECT_FAIL; \ - done - -pre-su-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -post-install: -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR} -.endif -.if defined(WITH_SQUID_PINGER) - ${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \ - ${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger -.endif -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR} -.endif - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - - @${ECHO_CMD} "===> post-installation information for ${PKGNAME}:" - @${ECHO_CMD} "" - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} "" -.if defined(WITH_SQUID_COSS) - @${ECHO_CMD} "Note: COSS support is currently not available in Squid-3." - @${ECHO_CMD} "Please check your squid.conf and comment out any 'cache_dir coss' definitions." - @${ECHO_CMD} "" -.endif - -.include <bsd.port.post.mk> diff --git a/www/squid31/distinfo b/www/squid31/distinfo deleted file mode 100644 index fe670367e6eb..000000000000 --- a/www/squid31/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (squid3.0/squid-3.0.STABLE14.tar.bz2) = 7aaff2319d2263404d788a82a10c8633 -SHA256 (squid3.0/squid-3.0.STABLE14.tar.bz2) = ac7612fb51cf1e83ae7f1a28435b89ff7eb80dc4d4cccf442c390bb554928146 -SIZE (squid3.0/squid-3.0.STABLE14.tar.bz2) = 1811878 diff --git a/www/squid31/files/extra-patch-src-cf.data.pre.aufs b/www/squid31/files/extra-patch-src-cf.data.pre.aufs deleted file mode 100644 index 019fdcac0fc7..000000000000 --- a/www/squid31/files/extra-patch-src-cf.data.pre.aufs +++ /dev/null @@ -1,20 +0,0 @@ ---- src/cf.data.pre.orig Wed Nov 1 15:12:02 2006 -+++ src/cf.data.pre Wed Nov 1 15:12:17 2006 -@@ -1097,6 +1100,17 @@ - - see argument descriptions under ufs above - -+ Note: -+ By default, FreeBSD uses the pthread(3) M:N threading library. -+ You can, however, map the thread library to the 1:1 libthr(3) -+ implementation by inserting the following lines into -+ /etc/libmap.conf and see whether this performs better on your -+ system: -+ -+ [%%PREFIX%%/sbin/squid] -+ libpthread.so.1 libthr.so.1 -+ libpthread.so.2 libthr.so.2 -+ - The diskd store type: - - "diskd" uses the same storage format as "ufs", utilizing a diff --git a/www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in b/www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in deleted file mode 100644 index 09a82638fd3c..000000000000 --- a/www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- helpers/basic_auth/SMB/Makefile.in.orig Tue Oct 4 07:29:26 2005 -+++ helpers/basic_auth/SMB/Makefile.in Tue Oct 4 07:29:49 2005 -@@ -129,7 +129,7 @@ - makesnmplib = @makesnmplib@ - - SMB_AUTH_HELPER = smb_auth.sh --SAMBAPREFIX = /usr/local/samba -+SAMBAPREFIX = %%LOCALBASE%% - SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) - - libexec_SCRIPTS = $(SMB_AUTH_HELPER) diff --git a/www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh b/www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh deleted file mode 100644 index 8f41fa2ff024..000000000000 --- a/www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh +++ /dev/null @@ -1,13 +0,0 @@ -*** helpers/basic_auth/SMB/smb_auth.sh.orig Thu Feb 26 20:58:22 2004 ---- helpers/basic_auth/SMB/smb_auth.sh Thu Feb 26 20:59:45 2004 -*************** -*** 17,22 **** ---- 17,24 ---- - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -+ SAMBAPREFIX=${SAMBAPREFIX:-%%LOCALBASE%%} -+ - read DOMAINNAME - read PASSTHROUGH - read NMBADDR diff --git a/www/squid31/files/patch-squid_kerb_auth b/www/squid31/files/patch-squid_kerb_auth deleted file mode 100644 index 371db4eaa383..000000000000 --- a/www/squid31/files/patch-squid_kerb_auth +++ /dev/null @@ -1,490 +0,0 @@ -This file contains various patches that in general try to enable the -compilation of the squid_kerb_auth authentication helper program on -all versions of FreeBSD that are currently supported by the FreeBSD -ports framework where Heimdal is part of the base system. - ---- configure.orig 2008-12-23 05:19:34.000000000 +0100 -+++ configure 2008-12-24 15:05:33.000000000 +0100 -@@ -964,6 +964,9 @@ - NTLM_AUTH_HELPERS - NEGOTIATE_AUTH_HELPERS - DIGEST_AUTH_HELPERS -+KRB5CONFIG -+KERBLIBS -+KERBINC - EXTERNAL_ACL_HELPERS - LIBSASL - ENABLE_UNLINKD_TRUE -@@ -23261,6 +23264,368 @@ - fi - - -+ -+if `echo "$NEGOTIATE_AUTH_HELPERS" | grep -q squid_kerb_auth`; then -+ # Extract the first word of "krb5-config", so it can be a program name with args. -+set dummy krb5-config; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_KRB5CONFIG+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $KRB5CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_KRB5CONFIG="$KRB5CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_KRB5CONFIG" && ac_cv_path_KRB5CONFIG="false" -+ ;; -+esac -+fi -+KRB5CONFIG=$ac_cv_path_KRB5CONFIG -+if test -n "$KRB5CONFIG"; then -+ { $as_echo "$as_me:$LINENO: result: $KRB5CONFIG" >&5 -+$as_echo "$KRB5CONFIG" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ if test -z "$KRB5CONFIG"; then -+ { { $as_echo "$as_me:$LINENO: error: sorry" >&5 -+$as_echo "$as_me: error: sorry" >&2;} -+ { (exit need krb5-config to determine compilation settings); exit need krb5-config to determine compilation settings; }; } -+ else -+ KERBLIBS=`$KRB5CONFIG --libs gssapi` -+ KERBINC=`$KRB5CONFIG --cflags` -+ -+ -+ fi -+ -+for ac_header in gssapi/gssapi.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_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 -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+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_cpp conftest.$ac_ext") 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); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ----------------------------------------------- ## -+## Report this to http://www.squid-cache.org/bugs/ ## -+## ----------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ -+fi -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ if test x"$ac_cv_header_gssapi_gssapi_h" != x"yes"; then -+ -+for ac_header in gssapi.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_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 -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+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_cpp conftest.$ac_ext") 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); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ----------------------------------------------- ## -+## Report this to http://www.squid-cache.org/bugs/ ## -+## ----------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ -+fi -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+else -+ { { $as_echo "$as_me:$LINENO: error: neither <gssapi/gssapi.h> nor <gssapi.h> found" >&5 -+$as_echo "$as_me: error: neither <gssapi/gssapi.h> nor <gssapi.h> found" >&2;} -+ { (exit 1); exit 1; }; } -+ -+fi -+ -+done -+ -+ fi -+fi -+ - # Check whether --enable-ntlm-fail-open was given. - if test "${enable_ntlm_fail_open+set}" = set; then - enableval=$enable_ntlm_fail_open; if test "$enableval" = "yes" ; then ---- include/autoconf.h.in.orig 2008-12-23 05:19:29.000000000 +0100 -+++ include/autoconf.h.in 2008-12-24 15:05:33.000000000 +0100 -@@ -188,6 +188,12 @@ - /* Define to 1 if you have the `htole16' function. */ - #undef HAVE_HTOLE16 - -+/* Define to 1 if you have the <gssapi/gssapi.h> header file. */ -+#undef HAVE_GSSAPI_GSSAPI_H -+ -+/* Define to 1 if you have the <gssapi.h> header file. */ -+#undef HAVE_GSSAPI_H -+ - /* Define to 1 if you have the `initgroups' function. */ - #undef HAVE_INITGROUPS - ---- helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig 2008-12-23 05:19:26.000000000 +0100 -+++ helpers/negotiate_auth/squid_kerb_auth/Makefile.in 2008-12-24 15:05:33.000000000 +0100 -@@ -154,6 +154,18 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+#-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) -+ -+# HEIMDAL -+#KERBINC = -DHEIMDAL -I/usr/include/heimdal -+#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken -+ -+# MIT -+#KERBINC = -+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err -+KERBINC = -DHEIMDAL @KERBINC@ -+KERBLIBS = @KERBLIBS@ -+KRB5CONFIG = @KRB5CONFIG@ - LDFLAGS = @LDFLAGS@ - LIBADD_DL = @LIBADD_DL@ - LIBOBJS = @LIBOBJS@ -@@ -305,15 +317,6 @@ - squid_kerb_auth_SOURCES = $(SOURCE) $(SPNEGO) - #-I$(top_srcdir)/include -I$(top_srcdir)/src - LDADD = $(KERBLIBS) --#-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) -- --# HEIMDAL --#KERBINC = -DHEIMDAL -I/usr/include/heimdal --#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken -- --# MIT --KERBINC = --KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err - all: all-am - - .SUFFIXES: ---- helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c.orig 2008-12-23 05:19:29.000000000 +0100 -+++ helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c 2008-12-24 15:05:33.000000000 +0100 -@@ -24,6 +24,7 @@ - /* - * Hosted at http://sourceforge.net/projects/squidkerbauth - */ -+#include "config.h" - #include <string.h> - #include <stdio.h> - #include <stdlib.h> -@@ -31,6 +32,7 @@ - #include <unistd.h> - #include <time.h> - #include <sys/time.h> -+#include <sys/param.h> - - #include "base64.h" - #ifndef HAVE_SPNEGO -@@ -51,7 +53,11 @@ - #define PROGRAM "squid_kerb_auth" - - #ifdef HEIMDAL -+#ifdef HAVE_GSSAPI_GSSAPI_H -+#include <gssapi/gssapi.h> -+#else - #include <gssapi.h> -+#endif - #define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE - #else - #include <gssapi/gssapi.h> ---- helpers/negotiate_auth/squid_kerb_auth/spnegohelp/derparse.c.orig 2009-03-28 17:01:45.000000000 +0100 -+++ helpers/negotiate_auth/squid_kerb_auth/spnegohelp/derparse.c 2009-03-28 17:06:55.000000000 +0100 -@@ -22,12 +22,19 @@ - // - ///////////////////////////////////////////////////////////// - -+#include "config.h" - #include <stdlib.h> - #include <stdio.h> - #include <memory.h> - #include "spnego.h" - #include "derparse.h" - -+#ifdef WORDS_BIGENDIAN -+#undef __LITTLE_ENDIAN__ -+#else -+#define __LITTLE_ENDIAN__ 1 -+#endif -+ - // - // The GSS Mechanism OID enumeration values (SPNEGO_MECH_OID) control which offset in - // the array below, that a mechanism can be found. diff --git a/www/squid31/files/patch-src-cf.data.pre b/www/squid31/files/patch-src-cf.data.pre deleted file mode 100644 index b2b4e55db81f..000000000000 --- a/www/squid31/files/patch-src-cf.data.pre +++ /dev/null @@ -1,13 +0,0 @@ ---- src/cf.data.pre.orig Sun Jun 24 13:42:25 2007 -+++ src/cf.data.pre Sun Jun 24 13:59:32 2007 -@@ -1417,6 +1417,10 @@ - LOC: Config.pidFilename - DOC_START - A filename to write the process-id to. To disable, enter "none". -+ -+ Note: If you change this setting, you need to set squid_pidfile -+ in /etc/rc.conf to reflect the new value. Please see -+ %%PREFIX%%/etc/rc.d/squid for details. - DOC_END - - diff --git a/www/squid31/files/pkg-deinstall.in b/www/squid31/files/pkg-deinstall.in deleted file mode 100644 index c775ba284cc2..000000000000 --- a/www/squid31/files/pkg-deinstall.in +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -PATH=/bin:/usr/bin:/usr/sbin - -case $2 in -DEINSTALL) - cd ${PKG_PREFIX}/etc/squid || exit 1 - for f in cachemgr.conf mime.conf msntauth.conf squid.conf; do - cmp -s -z ${f} ${f}.default && rm ${f} - done - ;; -POST-DEINSTALL) - echo "===> post-deinstallation information for $1:" - echo "" - echo " Note:" - echo " Squid related user accounts and groups were not removed." - echo "" - echo " To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were" - echo " created by a default installation of this package, run" - echo "" - echo " pw userdel -n %%SQUID_UID%% -u 100" - if [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then - echo "" - echo " In order to ease updates the cache and log directories" - echo " and all configuration files modified by you were preserved." - echo "" - echo " Please remove them manually if you do not want to use" - echo " Squid any longer." - fi - echo "" - ;; -*) - exit 64 - ;; -esac -exit 0 diff --git a/www/squid31/files/pkg-install.in b/www/squid31/files/pkg-install.in deleted file mode 100644 index 8e87a6c545c8..000000000000 --- a/www/squid31/files/pkg-install.in +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -PATH=/bin:/usr/bin:/usr/sbin -pkgname=$1 -squid_base="${PKG_PREFIX:-%%PREFIX%%}/squid" -squid_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/squid" -if [ -x /usr/sbin/nologin ]; then - nologin=/usr/sbin/nologin -else - nologin=/sbin/nologin -fi -squid_user="%%SQUID_UID%%" -squid_group="%%SQUID_GID%%" -squid_gid=100 -squid_uid=100 -case $2 in -PRE-INSTALL) - echo "===> Pre-installation configuration for ${pkgname}" - if ! pw groupshow ${squid_group} -q >/dev/null ; then - echo "There is no group '${squid_group}' on this system, so I will try to create it (using group id ${squid_gid}):" - if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then - echo "Failed to create group \"${squid_group}\"!" >&2 - echo "Please create it manually." >&2 - exit 1 - else - echo "Group '${squid_group}' created successfully:" - fi - else - echo "I will use the existing group '${squid_group}':" - fi - pw groupshow ${squid_group} - - if ! pw usershow ${squid_user} -q >/dev/null ; then - echo "There is no account '${squid_user}' on this system, so I will try to create it (using user id ${squid_uid}):" - if ! pw useradd -q -n ${squid_user} \ - -u ${squid_uid} -g ${squid_group} \ - -c "Squid caching-proxy pseudo user" \ - -d "${squid_base}" -s "${nologin}" \ - -h - ; then - echo "Failed to create user '${squid_user}'!" >&2 - echo "Please create it manually." >&2 - exit 1 - else - echo "User '${squid_user}' created successfully:" - fi - else - echo "I will use the existing user '${squid_user}':" - fi - pw usershow ${squid_user} - for dir in cache logs; do - if [ ! -d ${squid_base}/${dir} ]; then - echo "Creating ${squid_base}/${dir}..." - install -d -o ${squid_user} -g ${squid_group} \ - -m 0750 ${squid_base}/${dir} - fi - done - if [ ! -d ${squid_confdir} ]; then - echo "Creating ${squid_confdir}..." - install -d -o root -g ${squid_group} \ - -m 0750 ${squid_confdir} - fi - ;; -POST-INSTALL) - for file in cachemgr.conf mime.conf squid.conf; do - if [ ! -f ${squid_confdir}/${file} \ - -a -f ${squid_confdir}/${file}.default ]; then - echo "Creating ${file} from default..." - install -c -o root -g ${squid_group} -m 0640 \ - ${squid_confdir}/${file}.default \ - ${squid_confdir}/${file} - fi - done - ;; -*) - exit 64 - ;; -esac -exit 0 diff --git a/www/squid31/files/pkg-message.in b/www/squid31/files/pkg-message.in deleted file mode 100644 index 8a17b2772a7f..000000000000 --- a/www/squid31/files/pkg-message.in +++ /dev/null @@ -1,32 +0,0 @@ - o You can find the configuration files for this package in the - directory %%PREFIX%%/etc/squid. - - o A cache directory has been created in %%PREFIX%%/squid/cache. - Log files will be written to %%PREFIX%%/squid/logs. - - Note: - You must initialize new cache directories before you can start - squid. Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'. - If your cache directories are already initialized (e.g. after an - upgrade of squid) you do not need to initialize them again. - - o The default configuration will deny everyone access to the - proxy service. Edit the "http_access" directives in - %%PREFIX%%/etc/squid/squid.conf to suit your needs. - - Please note that the Squid start script is an rc.d style script. - This means that Squid will not start automatically at boot - time unless it is explicitly enabled. - - To enable Squid, set squid_enable=yes in either - /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid - Please see %%PREFIX%%/etc/rc.d/squid for further details. - - Note: - If you just updated your Squid installation from an earlier version, - make sure to check your Squid configuration against the 3.0 default - configuration file %%PREFIX%%/etc/squid/squid.conf.default. - - Additionally, you should check your configuration by calling - 'squid -f /path/to/squid.conf -k parse' before starting Squid. - diff --git a/www/squid31/files/squid.in b/www/squid31/files/squid.in deleted file mode 100644 index bd9483908ae6..000000000000 --- a/www/squid31/files/squid.in +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: squid -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Note: -# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or -# /etc/rc.conf.d/squid to make this script actually do something. There -# you can also set squid_chdir, squid_pidfile, squid_user, and squid_flags. -# -# Please see squid(8), rc.conf(5) and rc(8) for further details. -# - -squid_checkrunning() { - ${command} ${squid_flags} -k check 2>/dev/null -} - -squid_stop() { - echo "Stopping ${name}." - ${command} ${squid_flags} -k shutdown - run_rc_command poll -} - -. %%RC_SUBR%% - -name=squid -rcvar=${name}_enable - -command=%%PREFIX%%/sbin/squid -extra_commands=reload -reload_cmd="${command} ${squid_flags} -k reconfigure" -stop_precmd="squid_checkrunning" -stop_cmd="squid_stop" - -load_rc_config ${name} - -squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"} -squid_enable=${squid_enable:-"NO"} -squid_flags=${squid_flags-"-D"} -squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"} -squid_user=${squid_user:-%%SQUID_UID%%} -default_config=%%PREFIX%%/etc/squid/squid.conf - -pidfile=${squid_pidfile} -required_dirs=${squid_chdir} - -# squid(8) will not start if ${default_config} is not present so try -# to catch that beforehand via ${required_files} rather than make -# squid(8) crash. -# If you remove the default configuration file make sure to add -# '-f /path/to/your/squid.conf' to squid_flags - -if [ -z "${squid_flags}" ]; then - required_files=${default_config} -fi - -run_rc_command "$1" diff --git a/www/squid31/pkg-descr b/www/squid31/pkg-descr deleted file mode 100644 index 0cd02912d960..000000000000 --- a/www/squid31/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Squid is a high-performance proxy caching server for web clients, -supporting FTP, gopher, and HTTP data objects. Unlike traditional -caching software, Squid handles all requests in a single, non-blocking, -I/O-driven process. - -Squid supports SSL, extensive access controls, and full request logging. -By using the lightweight Internet Cache Protocol, Squid caches can be -arranged in a hierarchy or mesh for additional bandwidth savings. - -WWW: http://www.squid-cache.org/ |