Date: Tue, 30 Oct 2012 23:05:51 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306729 - in head: . www www/libecap www/squid31 www/squid32 www/squid32/files Message-ID: <201210302305.q9UN5p3Z097197@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Tue Oct 30 23:05:50 2012 New Revision: 306729 URL: http://svn.freebsd.org/changeset/ports/306729 Log: - add www/squid32 [1] - update www/libecap to 0.20 [2] - remove option ECAP from www/squid31 and add a note to UPDATING that you need to upgrade to squid32 if you need ECAP PR: ports/173152 [1] PR: ports/173156 [2] Submitted by: Thomas-Martin Seck <tmseck@web.de> Feature safe: yes Added: head/www/squid32/ - copied from r306706, head/www/squid31/ head/www/squid32/files/patch-configure (contents, props changed) head/www/squid32/files/patch-helpers-basic_auth-LDAP-config.test (contents, props changed) head/www/squid32/files/patch-helpers-basic_auth-SASL-config.test (contents, props changed) head/www/squid32/files/patch-helpers-external_acl-LDAP_group-config.test (contents, props changed) head/www/squid32/pkg-deinstall (contents, props changed) Deleted: head/www/squid32/files/pkg-deinstall.in Modified: head/UPDATING head/www/Makefile head/www/libecap/Makefile (contents, props changed) head/www/libecap/distinfo (contents, props changed) head/www/libecap/pkg-plist (contents, props changed) head/www/squid31/Makefile head/www/squid32/Makefile head/www/squid32/distinfo head/www/squid32/files/patch-src-cf.data.pre (contents, props changed) head/www/squid32/files/pkg-install.in (contents, props changed) head/www/squid32/files/pkg-message.in (contents, props changed) head/www/squid32/files/squid.in (contents, props changed) head/www/squid32/pkg-descr (contents, props changed) Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Oct 30 22:49:54 2012 (r306728) +++ head/UPDATING Tue Oct 30 23:05:50 2012 (r306729) @@ -5,6 +5,18 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20121030: + AFFECTS: users of www/squid31 + AUTHOR: flo@FreeBSD.org + + The WITH_SQUID_ECAP option was removed from the port. If you use ECAP + you need to update to www/squid32, you can do so by running one of the + following commands: + + # portmaster -o www/squid32 www/squid31 + or + # portupgrade -fo www/squid32 www/squid31 + 20121025: AFFECTS: users of net/activemq AUTHOR: tj@FreeBSD.org Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Tue Oct 30 22:49:54 2012 (r306728) +++ head/www/Makefile Tue Oct 30 23:05:50 2012 (r306729) @@ -1801,6 +1801,7 @@ SUBDIR += sqstat SUBDIR += squid SUBDIR += squid31 + SUBDIR += squid32 SUBDIR += squid_radius_auth SUBDIR += squidclamav SUBDIR += squidguard Modified: head/www/libecap/Makefile ============================================================================== --- head/www/libecap/Makefile Tue Oct 30 22:49:54 2012 (r306728) +++ head/www/libecap/Makefile Tue Oct 30 23:05:50 2012 (r306729) @@ -6,7 +6,7 @@ # PORTNAME= libecap -PORTVERSION= 0.1.0 +PORTVERSION= 0.2.0 CATEGORIES= www security MASTER_SITES= http://www.measurement-factory.com/tmp/ecap/ Modified: head/www/libecap/distinfo ============================================================================== --- head/www/libecap/distinfo Tue Oct 30 22:49:54 2012 (r306728) +++ head/www/libecap/distinfo Tue Oct 30 23:05:50 2012 (r306729) @@ -1,2 +1,2 @@ -SHA256 (libecap-0.1.0.tar.gz) = abd608132ca8842f50aa049c195f573bf8d3bec1451be0ca5607e17415f39f74 -SIZE (libecap-0.1.0.tar.gz) = 334999 +SHA256 (libecap-0.2.0.tar.gz) = 19e195d60cf67ec3b49fe4d109823d753546b5da115230499ad1a9cb65ca92d2 +SIZE (libecap-0.2.0.tar.gz) = 337696 Modified: head/www/libecap/pkg-plist ============================================================================== --- head/www/libecap/pkg-plist Tue Oct 30 22:49:54 2012 (r306728) +++ head/www/libecap/pkg-plist Tue Oct 30 23:05:50 2012 (r306729) @@ -6,7 +6,6 @@ include/libecap/common/autoconf.h include/libecap/common/body.h include/libecap/common/body_size.h include/libecap/common/call.h -include/libecap/common/config.h include/libecap/common/delay.h include/libecap/common/errors.h include/libecap/common/forward.h @@ -18,6 +17,7 @@ include/libecap/common/message.h include/libecap/common/name.h include/libecap/common/named_values.h include/libecap/common/names.h +include/libecap/common/options.h include/libecap/common/registry.h include/libecap/common/version.h include/libecap/host/host.h @@ -29,4 +29,6 @@ include/libecap/host/xaction.h lib/libecap.a lib/libecap.la lib/libecap.so -lib/libecap.so.0 +lib/libecap.so.2 +lib/pkgconfig/libecap.pc +@dirrmtry lib/pkgconfig Modified: head/www/squid31/Makefile ============================================================================== --- head/www/squid31/Makefile Tue Oct 30 22:49:54 2012 (r306728) +++ head/www/squid31/Makefile Tue Oct 30 23:05:50 2012 (r306729) @@ -230,7 +230,9 @@ CONFIGURE_ARGS= --with-default-user=${SQ --disable-linux-netfilter \ --disable-linux-tproxy \ --disable-epoll \ - --disable-translation + --disable-translation \ + --disable-ecap \ + --disable-loadable-modules .include <bsd.port.pre.mk> @@ -379,14 +381,6 @@ CONFIGURE_ARGS+= --enable-ipf-transparen .if defined(WITH_SQUID_FOLLOW_XFF) CONFIGURE_ARGS+= --enable-follow-x-forwarded-for .endif -.if defined(WITH_SQUID_ECAP) -CONFIGURE_ARGS+= --enable-ecap --enable-loadable-modules -LIB_DEPENDS+= ecap:${PORTSDIR}/www/libecap -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --disable-ecap --disable-loadable-modules -.endif .if defined(WITH_SQUID_ICAP) CONFIGURE_ARGS+= --enable-icap-client .endif Modified: head/www/squid32/Makefile ============================================================================== --- head/www/squid31/Makefile Tue Oct 30 19:48:15 2012 (r306706) +++ head/www/squid32/Makefile Tue Oct 30 23:05:50 2012 (r306729) @@ -1,19 +1,5 @@ -# 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. -# # Note: # Starting with Squid 3.1 SQUID_LANGUAGES and SQUID_DEFAULT_LANG are no longer # available and will be ignored. @@ -50,7 +36,7 @@ # requests. PORTNAME= squid -PORTVERSION= 3.1.${SQUID_STABLE_VER} +PORTVERSION= 3.2.${SQUID_STABLE_VER} CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ @@ -58,28 +44,27 @@ MASTER_SITES= ftp://ftp.squid-cache.org/ ftp://ftp.nl.uu.net/pub/unix/www/squid/ \ ftp://ftp.solnet.ch/mirror/squid/ \ ftp://ftp.ntua.gr/pub/www/Squid/squid/ \ - http://mirror.aarnet.edu.au/pub/squid/squid/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid,} \ - http://www.squid-cache.org/Versions/v3/3.1/ \ - http://www3.us.squid-cache.org/Versions/v3/3.1/ \ - http://www1.at.squid-cache.org/Versions/v3/3.1/ \ - http://www2.de.squid-cache.org/Versions/v3/3.1/ \ - http://www.eu.squid-cache.org/Versions/v3/3.1/ \ - http://www1.ie.squid-cache.org/Versions/v3/3.1/ \ - http://www1.jp.squid-cache.org/Versions/v3/3.1/ \ - http://www1.za.squid-cache.org/Versions/v3/3.1/ + http://www.squid-cache.org/Versions/v3/3.2/ \ + http://www2.us.squid-cache.org/Versions/v3/3.2/ \ + http://www3.us.squid-cache.org/Versions/v3/3.2/ \ + http://www1.at.squid-cache.org/Versions/v3/3.2/ \ + http://www.eu.squid-cache.org/Versions/v3/3.2/ \ + http://www1.ie.squid-cache.org/Versions/v3/3.2/ \ + http://www1.jp.squid-cache.org/Versions/v3/3.2/ \ + http://www1.za.squid-cache.org/Versions/v3/3.2/ MASTER_SITE_SUBDIR= squid -DIST_SUBDIR= squid3.1 +DIST_SUBDIR= squid3.2 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.de.squid-cache.org/%SUBDIR%/ \ http://www.eu.squid-cache.org/%SUBDIR%/ \ http://www1.ie.squid-cache.org/%SUBDIR%/ \ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www2.tw.squid-cache.org/%SUBDIR%/ -PATCH_SITE_SUBDIR= Versions/v3/3.1/changesets +PATCH_SITE_SUBDIR= Versions/v3/3.2/changesets PATCHFILES= # empty MAINTAINER= tmseck@web.de @@ -88,61 +73,68 @@ COMMENT= HTTP Caching Proxy LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LATEST_LINK= squid31 +LATEST_LINK= squid32 -SQUID_STABLE_VER= 21 +SQUID_STABLE_VER= 3 -CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]* +CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[!2].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes USE_BZIP2= yes USE_PERL5= yes USE_RC_SUBR= squid -SQUID_UID?= squid -SQUID_GID?= squid +USERS= squid +GROUPS= squid MAN1= squidclient.1 -MAN8= cachemgr.cgi.8 squid.8 squid_radius_auth.8 +MAN8= cachemgr.cgi.8 squid.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} +SUB_FILES+= pkg-install pkg-message -OPTIONS= SQUID_KERB_AUTH "Install Kerberos authentication helpers" on \ - SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \ - SQUID_NIS_AUTH "Install NIS/YP authentication helpers" on \ - SQUID_SASL_AUTH "Install SASL authentication helpers" off \ - SQUID_IPV6 "Enable IPv6 support" on \ - SQUID_DELAY_POOLS "Enable delay pools" off \ - SQUID_SNMP "Enable SNMP support" on \ - SQUID_SSL "Enable SSL support for reverse proxies" off \ - SQUID_SSL_CRTD "Enable SSL certificate daemon" off \ - SQUID_PINGER "Install the icmp helper" off \ - SQUID_DNS_HELPER "Use the old 'dnsserver' helper" off \ - SQUID_HTCP "Enable HTCP support" on \ - 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_FOLLOW_XFF "Follow X-Forwarded-For headers" off \ - SQUID_ECAP "En. loadable content adaptation modules" off \ - SQUID_ICAP "Enable ICAP client functionality" off \ - SQUID_ESI "Enable ESI support (experimental)" off \ - SQUID_AUFS "Enable the aufs storage scheme" on \ - 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 +OPTIONS_DEFINE= ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \ + CACHE_DIGESTS DEBUG DELAY_POOLS DNS_HELPER ECAP ESI \ + FOLLOW_XFF FS_AUFS FS_COSS HTCP ICAP ICMP IDENT IPV6 KQUEUE \ + LARGEFILE SNMP SSL SSL_CRTD STACKTRACES STRICT_HTTP \ + TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 + +ARP_ACL_DESC= Enable ARP/MAC/EUI based authentification +AUTH_KERB_DESC= Install Kerberos authentication helpers +AUTH_LDAP_DESC= Install LDAP authentication helpers +AUTH_NIS_DESC= Install NIS/YP authentication helpers +AUTH_SASL_DESC= Install SASL authentication helpers +AUTH_SMB_DESC= Install SMB auth. helpers (req. Samba) +CACHE_DIGESTS_DESC= Use cache digests +DEBUG_DESC= Build with extended debugging support +DELAY_POOLS_DESC= Enable delay pools (bandwidth limiting) +DNS_HELPER_DESC= Use external dnsserver processes for DNS +ECAP_DESC= Enable loadable content adaptation modules +ESI_DESC= Enable support for ESI +FOLLOW_XFF_DESC= Enable support for the X-Following-For header +FS_AUFS_DESC= Enable AUFS (async-io) support +FS_COSS_DESC= Enable COSS (not stable yet) +HTCP_DESC= Enable HTCP support +ICAP_DESC= Enable the ICAP client +ICMP_DESC= Enable ICMP pinging and network measurement +IDENT_DESC= Enable Ident lookups (RFC 931) +IPV6_DESC= Enable IPv6 support +KQUEUE_DESC= Enable kqueue(2) support +LARGEFILE_DESC= Support large (>2GB) cache and log files +SNMP_DESC= Enable SNMP support +SSL_CRTD_DESC= Use ssl_crtd to handle SSL cert requests +SSL_DESC= Enable SSL gatewaying support +STACKTRACES_DESC= Enable automatic backtraces on fatal errors +STRICT_HTTP_DESC= Make Squid strictly HTTP compliant +TP_IPFW_DESC= Enable transparent proxying with IPFW +TP_IPF_DESC= Enable transparent proxying with IPFilter +TP_PF_DESC= Enable transparent proxying with PF +VIA_DB_DESC= Enable Forward/Via database +WCCPV2_DESC= Enable Web Cache Coordination Protocol v2 +WCCP_DESC= Enable Web Cache Coordination Protocol + +OPTIONS_DEFAULT= AUTH_KERB AUTH_NIS FS_AUFS HTCP IDENT IPV6 KQUEUE \ + SNMP WCCP WCCPV2 etc_files= squid/cachemgr.conf.default \ squid/errorpage.css.default \ @@ -152,21 +144,29 @@ etc_files= squid/cachemgr.conf.default \ squid/squid.conf.default \ squid/squid.conf.documented -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 +icon_silk_files= application.png arrow_up.png bomb.png box.png \ + bricks.png bullet_red.png cd.png chart_line.png \ + compress.png computer_link.png css.png cup.png \ + database.png database_table.png drive_disk.png \ + film.png film_key.png folder.png folder_table.png \ + image.png information.png layers.png layout.png \ + link.png music.png package.png package_go.png \ + page_code.png page_excel.png page_green.png \ + page_white.png page_white_acrobat.png page_white_c.png \ + page_white_cplusplus.png page_white_flash.png \ + page_white_magnify.png page_white_picture.png \ + page_white_powerpoint.png page_white_stack.png \ + page_white_text.png page_world.png \ + page_white_word.png page_white_zip.png photo.png \ + picture.png plugin.png plugin_add.png script.png \ + script_gear.png script_palette.png error_files= ERR_ACCESS_DENIED ERR_ACL_TIME_QUOTA_EXCEEDED \ ERR_AGENT_CONFIGURE ERR_AGENT_WPAD \ ERR_CACHE_ACCESS_DENIED \ - ERR_CACHE_MGR_ACCESS_DENIED ERR_CANNOT_FORWARD \ - ERR_CONNECT_FAIL ERR_DIR_LISTING ERR_DNS_FAIL \ + ERR_CACHE_MGR_ACCESS_DENIED ERR_CONFLICT_HOST \ + ERR_CANNOT_FORWARD ERR_CONNECT_FAIL \ + ERR_DIR_LISTING 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 \ @@ -207,17 +207,17 @@ error_dir_links= ar-ae ar-bh ar-dz ar-eg sk-sk sl-si sr sr-latn-cs sr-sp sv-fi sv-se \ th-th tr-tr uk-ua vi-vn zh-hk zh-mo zh-sg -libexec= cachemgr.cgi digest_pw_auth diskd ip_user_check \ - msnt_auth ncsa_auth ntlm_smb_lm_auth pam_auth smb_auth \ - smb_auth.sh squid_db_auth squid_radius_auth squid_session \ - squid_unix_group wbinfo_group.pl +libexec= cachemgr.cgi \ + diskd \ + helper-mux.pl + .if !defined(SQUID_CONFIGURE_ARGS) || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == "" libexec+= unlinkd .endif -sbin= squidclient squid +sbin= purge squidclient squid -CONFIGURE_ARGS= --with-default-user=${SQUID_UID} \ +CONFIGURE_ARGS= --with-default-user=squid \ --bindir=${PREFIX}/sbin \ --sbindir=${PREFIX}/sbin \ --datadir=${ETCDIR} \ @@ -226,178 +226,248 @@ CONFIGURE_ARGS= --with-default-user=${SQ --sysconfdir=${ETCDIR} \ --with-logdir=/var/log/squid \ --with-pidfile=/var/run/squid/squid.pid \ + --enable-auth \ + --enable-build-info \ + --enable-loadable-modules \ --enable-removal-policies="lru heap" \ + --disable-epoll \ --disable-linux-netfilter \ --disable-linux-tproxy \ - --disable-epoll \ --disable-translation +.include <bsd.port.options.mk> .include <bsd.port.pre.mk> # Authentication methods and modules: +# TODO: external-session hängt wovon ab? -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) +basic_auth= DB MSNT MSNT-multi-domain NCSA PAM POP3 RADIUS \ + fake getpwnam +digest_auth= file +external_acl= file_userip unix_group +ntlm_auth= fake smb_lm +libexec+= basic_db_auth \ + basic_fake_auth \ + basic_getpwnam_auth \ + basic_ncsa_auth \ + basic_msnt_auth \ + basic_msnt_multi_domain_auth \ + basic_pam_auth \ + basic_pop3_auth \ + basic_radius_auth \ + digest_file_auth \ + ext_file_userip_acl \ + ext_unix_group_acl \ + ntlm_fake_auth \ + ntlm_smb_lm_auth +MAN8+= basic_getpwnam_auth.8 basic_ncsa_auth.8 basic_pam_auth.8 \ + basic_radius_auth.8 basic_db_auth.8 \ + digest_file_auth.8 \ + ext_file_userip_acl.8 ext_unix_group_acl.8 +.if ${PORT_OPTIONS:MAUTH_LDAP} USE_OPENLDAP= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN8+= squid_ldap_auth.8 squid_ldap_group.8 +MAN8+= basic_ldap_auth.8 ext_ldap_group_acl.8 basic_auth+= LDAP -digest_auth+= ldap -external_acl+= ldap_group -libexec+= digest_ldap_auth squid_ldap_auth squid_ldap_group +external_acl+= LDAP_group +libexec+= basic_ldap_auth ext_ldap_group_acl .endif -.if defined(WITH_SQUID_SASL_AUTH) +.if ${PORT_OPTIONS:MAUTH_SASL} LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +MAN8+= basic_sasl_auth.8 basic_auth+= SASL -libexec+= sasl_auth +libexec+= basic_sasl_auth +.endif +.if ${PORT_OPTIONS:MAUTH_SMB} +# TODO: build-depends entfernen, wird nur für den configure-check gebraucht +BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba36 +RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba36 +basic_auth+= SMB +external_acl+= wbinfo_group +libexec+= basic_smb_auth basic_smb_auth.sh \ + ext_wbinfo_group_acl +MAN8+= ext_wbinfo_group_acl.8 .endif # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too: -.if defined(WITH_SQUID_NIS_AUTH) && !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}" \ +.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS) +basic_auth+= NIS +libexec+= basic_nis_auth +.endif +CONFIGURE_ARGS+= --enable-auth-basic="${basic_auth}" \ + --enable-auth-digest="${digest_auth}" \ --enable-external-acl-helpers="${external_acl}" \ - --enable-ntlm-auth-helpers="smb_lm" + --enable-auth-ntlm="${ntlm_auth}" +# TODO: +# - configure-Skript auf bashisms prüfen +# - external/kerberos_ldap_group immer mit installieren? +# - gehört wrapper auch zu kerberos oder kann man den immer installieren? +# - negotiate_auth-Variable einführen # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too: -.if defined(WITH_SQUID_KERB_AUTH) && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS) -CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth" -libexec+= negotiate_kerb_auth negotiate_kerb_auth_test \ - squid_kerb_auth squid_kerb_auth_test +.if ${PORT_OPTIONS:MAUTH_KERB} && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS) +CONFIGURE_ARGS+= --enable-auth-negotiate="kerberos wrapper" +libexec+= negotiate_kerberos_auth negotiate_kerberos_auth_test \ + negotiate_wrapper_auth +MAN8+= negotiate_kerberos_auth.8 +.else +CONFIGURE_ARGS+= --enable-auth-negotiate="none" .endif # Storage schemes: -storage_schemes= ufs diskd -# TODO: should AIO be optional as well? -diskio_modules= AIO Blocking DiskDaemon -.if defined(WITH_SQUID_AUFS) +storage_schemes= diskd rock ufs +diskio_modules= AIO Blocking DiskDaemon IpcIo Mmapped +.if ${PORT_OPTIONS:MFS_AUFS} storage_schemes+= aufs diskio_modules+= DiskThreads # Only document switching from libpthread to libthr using libmap.conf -# where lipthread is the default threading library: +# where lipthread is still 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, # e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} .else CONFIGURE_ARGS+= --without-pthreads .endif -.if defined(WITH_SQUID_COSS) -# COSS is currently disabled in Squid-3 until fixes from the 2.x series are -# backported to 3.x. -#storage_schemes+= coss +.if ${PORT_OPTIONS:MFS_COSS} +storage_schemes+= coss .endif CONFIGURE_ARGS+= --enable-storeio="${storage_schemes}" CONFIGURE_ARGS+= --enable-disk-io="${diskio_modules}" +# Log daemon helpers: + +logdaemon_helpers= file +CONFIGURE_ARGS+= --enable-log-daemon-helpers="${logdaemon_helpers}" +libexec+= log_file_daemon + +# Rewrite helpers: + +rewrite_helpers= fake +CONFIGURE_ARGS+= --enable-url-rewrite-helpers="${rewrite_helpers}" +libexec+= url_fake_rewrite url_fake_rewrite.sh + # Other options set via 'make config': -.if defined(WITHOUT_SQUID_IPV6) || defined(WITHOUT_IPV6) +.if empty(PORT_OPTIONS:MIPV6) || defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(WITH_SQUID_DELAY_POOLS) +.if ${PORT_OPTIONS:MDELAY_POOLS} CONFIGURE_ARGS+= --enable-delay-pools .endif -.if defined(WITHOUT_SQUID_SNMP) +.if empty(PORT_OPTIONS:MSNMP) CONFIGURE_ARGS+= --disable-snmp .endif -.if defined(WITH_SQUID_SSL) +.if ${PORT_OPTIONS:MSSL} # 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. +# XXX: is this still true with OptionsNG as of 2012-10? .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+= --enable-ssl \ --with-openssl="${OPENSSLBASE}" CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .endif -.if defined(WITH_SQUID_SSL_CRTD) +.if ${PORT_OPTIONS:MSSL_CRTD} CONFIGURE_ARGS+= --enable-ssl-crtd libexec+= ssl_crtd .endif -.if defined(WITH_SQUID_PINGER) +.if ${PORT_OPTIONS:MICMP} CONFIGURE_ARGS+= --enable-icmp libexec+= pinger .endif -.if defined(WITH_SQUID_DNS_HELPER) +.if ${PORT_OPTIONS:MDNS_HELPER} CONFIGURE_ARGS+= --disable-internal-dns libexec+= dnsserver .endif -.if defined(WITHOUT_SQUID_HTCP) +.if empty(PORT_OPTIONS:MHTCP) CONFIGURE_ARGS+= --disable-htcp +.else +CONFIGURE_ARGS+= --enable-htcp .endif -.if defined(WITH_SQUID_VIA_DB) +.if ${PORT_OPTIONS:MVIA_DB} CONFIGURE_ARGS+= --enable-forw-via-db +.else +CONFIGURE_ARGS+= --disable-forw-via-db .endif -.if defined(WITH_SQUID_CACHE_DIGESTS) +.if ${PORT_OPTIONS:MCACHE_DIGESTS} CONFIGURE_ARGS+= --enable-cache-digests +.else +CONFIGURE_ARGS+= --disable-cache-digests .endif -.if defined(WITHOUT_SQUID_WCCP) +.if ${PORT_OPTIONS:MWCCP} +CONFIGURE_ARGS+= --enable-wccp +.else CONFIGURE_ARGS+= --disable-wccp .endif -.if defined(WITH_SQUID_WCCPV2) +.if ${PORT_OPTIONS:MWCCPV2} CONFIGURE_ARGS+= --enable-wccpv2 +.else +CONFIGURE_ARGS+= --disable-wccpv2 .endif -.if defined(WITH_SQUID_STRICT_HTTP) +.if ${PORT_OPTIONS:MSTRICT_HTTP} CONFIGURE_ARGS+= --disable-http-violations .endif -.if defined(WITHOUT_SQUID_IDENT) +.if empty(PORT_OPTIONS:MIDENT) 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 +.if ${PORT_OPTIONS:MARP_ACL} +CONFIGURE_ARGS+= --enable-eui +.else +CONFIGURE_ARGS+= --disable-eui .endif -.if defined(WITH_SQUID_IPFW) +.if ${PORT_OPTIONS:MTP_IPFW} CONFIGURE_ARGS+= --enable-ipfw-transparent +.else +CONFIGURE_ARGS+= --disable-ipfw-transparent .endif -.if defined(WITH_SQUID_PF) +.if ${PORT_OPTIONS:MTP_PF} CONFIGURE_ARGS+= --enable-pf-transparent +.else +CONFIGURE_ARGS+= --disable-pf-transparent .endif -.if defined(WITH_SQUID_IPFILTER) +.if ${PORT_OPTIONS:MTP_IPF} CONFIGURE_ARGS+= --enable-ipf-transparent +.else +CONFIGURE_ARGS+= --disable-ipf-transparent .endif -.if defined(WITH_SQUID_FOLLOW_XFF) +.if ${PORT_OPTIONS:MFOLLOW_XFF} CONFIGURE_ARGS+= --enable-follow-x-forwarded-for +.else +CONFIGURE_ARGS+= --disable-follow-x-forwarded-for .endif -.if defined(WITH_SQUID_ECAP) -CONFIGURE_ARGS+= --enable-ecap --enable-loadable-modules +.if ${PORT_OPTIONS:MECAP} +CONFIGURE_ARGS+= --enable-ecap LIB_DEPENDS+= ecap:${PORTSDIR}/www/libecap CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +USE_PKGCONFIG= build .else -CONFIGURE_ARGS+= --disable-ecap --disable-loadable-modules +CONFIGURE_ARGS+= --disable-ecap .endif -.if defined(WITH_SQUID_ICAP) +.if ${PORT_OPTIONS:MICAP} CONFIGURE_ARGS+= --enable-icap-client +.else +CONFIGURE_ARGS+= --disable-icap-client .endif -.if defined(WITH_SQUID_ESI) +.if ${PORT_OPTIONS:MESI} 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 +.else +CONFIGURE_ARGS+= --disable-esi .endif -.if defined(WITHOUT_SQUID_KQUEUE) +.if empty(PORT_OPTIONS:MKQUEUE) # 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: @@ -405,26 +475,26 @@ CONFIGURE_ARGS+= --disable-kqueue .else CONFIGURE_ARGS+= --enable-kqueue .endif -.if defined(WITH_SQUID_LARGEFILE) +.if ${PORT_OPTIONS:MLARGEFILE} CONFIGURE_ARGS+= --with-large-files .endif -.if defined(WITH_SQUID_STACKTRACES) +.if ${PORT_OPTIONS:MSTACKTRACES} 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 +.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG) +CONFIGURE_ARGS+= --disable-optimizations --enable-debug-cbdata WITH_DEBUG?= yes .endif # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} -PLIST_DIRS= %%ETCDIR%%/icons libexec/squid -PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \ +PLIST_DIRS= %%ETCDIR%%/icons/silk %%ETCDIR%%/icons libexec/squid +PLIST_FILES= ${etc_files:S,^,etc/,} \ + %%ETCDIR%%/icons/SN.png \ + ${icon_silk_files:S,^,%%ETCDIR%%/icons/silk/,} \ ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} PLIST_FILES+= %%ETCDIR%%/errors/COPYRIGHT %%ETCDIR%%/errors/TRANSLATORS @@ -439,9 +509,6 @@ PLIST_DIRSTRY+= %%ETCDIR%% 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. @@ -457,9 +524,9 @@ post-install: @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR} .endif -.if defined(WITH_SQUID_PINGER) +.if ${PORT_OPTIONS:MICMP} ${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \ - ${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger + ${CHGRP} squid ${PREFIX}/libexec/squid/pinger .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @@ -472,10 +539,5 @@ post-install: @${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> Modified: head/www/squid32/distinfo ============================================================================== --- head/www/squid31/distinfo Tue Oct 30 19:48:15 2012 (r306706) +++ head/www/squid32/distinfo Tue Oct 30 23:05:50 2012 (r306729) @@ -1,2 +1,2 @@ -SHA256 (squid3.1/squid-3.1.21.tar.bz2) = eb9e26ebc2f7d992d135a1212540d46ebced9ceb4a74972ee0065477c1dc2e25 -SIZE (squid3.1/squid-3.1.21.tar.bz2) = 2559469 +SHA256 (squid3.2/squid-3.2.3.tar.bz2) = 1741c3ef647f5b0960498b7bb3e44af4a4409c321afe2d141c67d2b5c85ed5a1 +SIZE (squid3.2/squid-3.2.3.tar.bz2) = 2891753 Added: head/www/squid32/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid32/files/patch-configure Tue Oct 30 23:05:50 2012 (r306729) @@ -0,0 +1,47 @@ +--- configure.orig 2012-10-21 18:10:03.000000000 +0200 ++++ configure 2012-10-21 18:27:39.000000000 +0200 +@@ -22154,7 +22154,7 @@ + + done + +- if test "x$ac_heimdal" == "x" ; then ++ if test "x$ac_heimdal" = "x" ; then + for ac_header in gssapi/gssapi_generic.h + do : + ac_fn_cxx_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default" +@@ -22351,7 +22351,7 @@ + + + ac_com_error_message=no +- if test "x$ac_cv_header_com_err_h" == "xyes" ; then ++ if test "x$ac_cv_header_com_err_h" = "xyes" ; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <com_err.h> +@@ -22363,7 +22363,7 @@ + fi + rm -f conftest* + +- elif test "x$ac_cv_header_et_com_err_h" == "xyes" ; then ++ elif test "x$ac_cv_header_et_com_err_h" = "xyes" ; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <et/com_err.h> +@@ -22424,7 +22424,7 @@ + + fi + +- if test `echo $KRB5LIBS | grep -c com_err` -ne 0 -a "x$ac_com_error_message" == "xyes" ; then ++ if test `echo $KRB5LIBS | grep -c com_err` -ne 0 -a "x$ac_com_error_message" = "xyes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lcom_err" >&5 + $as_echo_n "checking for error_message in -lcom_err... " >&6; } + if ${ac_cv_lib_com_err_error_message+:} false; then : +@@ -22467,7 +22467,7 @@ + + fi + +- elif test "x$ac_com_error_message" == "xyes" ; then ++ elif test "x$ac_com_error_message" = "xyes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lkrb5" >&5 + $as_echo_n "checking for error_message in -lkrb5... " >&6; } + if ${ac_cv_lib_krb5_error_message+:} false; then : Added: head/www/squid32/files/patch-helpers-basic_auth-LDAP-config.test ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid32/files/patch-helpers-basic_auth-LDAP-config.test Tue Oct 30 23:05:50 2012 (r306729) @@ -0,0 +1,12 @@ +--- helpers/basic_auth/LDAP/config.test.orig 2012-10-20 14:39:49.000000000 +0200 ++++ helpers/basic_auth/LDAP/config.test 2012-10-21 20:49:49.000000000 +0200 +@@ -1,8 +1,2 @@ + #!/bin/sh +-if [ -f /usr/include/ldap.h ]; then +- exit 0 +-fi +-if [ -f /usr/include/winldap.h ]; then +- exit 0 +-fi +-exit 1 ++exit 0 Added: head/www/squid32/files/patch-helpers-basic_auth-SASL-config.test ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid32/files/patch-helpers-basic_auth-SASL-config.test Tue Oct 30 23:05:50 2012 (r306729) @@ -0,0 +1,12 @@ +--- helpers/basic_auth/SASL/config.test.orig 2012-10-20 14:39:49.000000000 +0200 ++++ helpers/basic_auth/SASL/config.test 2012-10-21 20:50:57.000000000 +0200 +@@ -1,8 +1,2 @@ + #!/bin/sh +-if [ -f /usr/include/sasl.h ]; then +- exit 0 +-fi +-if [ -f /usr/include/sasl/sasl.h ]; then +- exit 0 +-fi +-exit 1 ++exit 0 Added: head/www/squid32/files/patch-helpers-external_acl-LDAP_group-config.test ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid32/files/patch-helpers-external_acl-LDAP_group-config.test Tue Oct 30 23:05:50 2012 (r306729) @@ -0,0 +1,12 @@ +--- helpers/external_acl/LDAP_group/config.test.orig 2012-10-20 14:39:49.000000000 +0200 ++++ helpers/external_acl/LDAP_group/config.test 2012-10-21 20:51:53.000000000 +0200 +@@ -1,8 +1,2 @@ + #!/bin/sh +-if [ -f /usr/include/ldap.h ]; then +- exit 0 +-fi +-if [ -f /usr/include/winldap.h ]; then +- exit 0 +-fi +-exit 1 ++exit 0 Modified: head/www/squid32/files/patch-src-cf.data.pre ============================================================================== --- head/www/squid31/files/patch-src-cf.data.pre Tue Oct 30 19:48:15 2012 (r306706) +++ head/www/squid32/files/patch-src-cf.data.pre Tue Oct 30 23:05:50 2012 (r306729) @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/cf.data.pre.orig 2012-10-20 14:39:49.000000000 +0200 ++++ src/cf.data.pre 2012-10-28 11:28:18.000000000 +0100 +@@ -3479,6 +3479,10 @@ LOC: Config.pidFilename DOC_START A filename to write the process-id to. To disable, enter "none". @@ -10,4 +10,4 @@ + %%PREFIX%%/etc/rc.d/squid for details. DOC_END - + NAME: log_fqdn Modified: head/www/squid32/files/pkg-install.in ============================================================================== --- head/www/squid31/files/pkg-install.in Tue Oct 30 19:48:15 2012 (r306706) +++ head/www/squid32/files/pkg-install.in Tue Oct 30 23:05:50 2012 (r306729) @@ -10,49 +10,16 @@ squid_cachedir="${squid_base}/cache" squid_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/squid" squid_logdir="/var/log/squid" squid_rundir="/var/run/squid" -if [ -x /usr/sbin/nologin ]; then - nologin=/usr/sbin/nologin -else - nologin=/sbin/nologin -fi -squid_user="%%SQUID_UID%%" -squid_group="%%SQUID_GID%%" +# these are hardcoded, see /usr/ports/UIDs and /usr/ports/GIDs: +squid_user=squid +squid_group=squid 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} + ;; +POST-INSTALL) # Since we usually start the Squid master process as ${squid_user} # instead of root make sure that ${squid_base} is writable for it. if [ ! -d ${squid_base} ]; then @@ -67,24 +34,34 @@ PRE-INSTALL) echo "Creating ${squid_cachedir} ..." install -d -o ${squid_user} -g ${squid_group} \ -m 0750 ${squid_cachedir} + else + chown ${squid_user} ${squid_cachedir} + chgrp ${squid_group} ${squid_cachedir} + chmod 0750 ${squid_cachedir} fi if [ ! -d ${squid_confdir} ]; then echo "Creating ${squid_confdir}..." install -d -o root -g ${squid_group} \ -m 0755 ${squid_confdir} + else + chgrp ${squid_group} ${squid_confdir} fi if [ ! -d ${squid_logdir} ]; then echo "Creating ${squid_logdir}..." install -d -o ${squid_user} -g ${squid_group} \ -m 0750 ${squid_logdir} + else + chown ${squid_user} ${squid_logdir} + chgrp ${squid_group} ${squid_logdir} fi if [ ! -d ${squid_rundir} ]; then echo "Creating ${squid_rundir}..." install -d -o ${squid_user} -g ${squid_group} \ -m 0755 ${squid_rundir} + else + chown ${squid_user} ${squid_rundir} + chgrp ${squid_group} ${squid_rundir} fi - ;; -POST-INSTALL) for file in cachemgr.conf errorpage.css mime.conf msntauth.conf squid.conf; do if [ ! -f ${squid_confdir}/${file} \ -a -f ${squid_confdir}/${file}.default ]; then Modified: head/www/squid32/files/pkg-message.in ============================================================================== --- head/www/squid31/files/pkg-message.in Tue Oct 30 19:48:15 2012 (r306706) +++ head/www/squid32/files/pkg-message.in Tue Oct 30 23:05:50 2012 (r306729) @@ -6,7 +6,7 @@ Note: You must initialize new cache directories before you can start - squid. Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'. + squid. Do this by running "squid -z" as 'root' or 'squid'. If your cache directories are already initialized (e.g. after an upgrade of squid) you do not need to initialize them again. @@ -22,7 +22,7 @@ Note: If you just updated your Squid installation from an earlier version, - make sure to check your Squid configuration against the 3.1 default + make sure to check your Squid configuration against the 3.2 default configuration file %%PREFIX%%/etc/squid/squid.conf.default. %%PREFIX%%/etc/squid/squid.conf.documented is a fully annotated Modified: head/www/squid32/files/squid.in ============================================================================== --- head/www/squid31/files/squid.in Tue Oct 30 19:48:15 2012 (r306706) +++ head/www/squid32/files/squid.in Tue Oct 30 23:05:50 2012 (r306729) @@ -78,7 +78,7 @@ squid_conf=${squid_conf:-"%%PREFIX%%/etc squid_enable=${squid_enable:-"NO"} squid_fib=${squid_fib:-"NONE"} squid_pidfile=${squid_pidfile:-"/var/run/squid/squid.pid"} -squid_user=${squid_user:-%%SQUID_UID%%} +squid_user=${squid_user:-"squid"} pidfile=${squid_pidfile} required_dirs=${squid_chdir} Added: head/www/squid32/pkg-deinstall ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid32/pkg-deinstall Tue Oct 30 23:05:50 2012 (r306729) @@ -0,0 +1,49 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PATH=/bin:/usr/bin:/usr/sbin +squid_homedir="/var/squid" +squid_cache_basedir="${squid_homedir}/cache" +squid_state_basedir="${squid_homedir}/run" +squid_confdir=${PKG_PREFIX}/etc/squid +squid_logdir="/var/log/squid" +squid_rundir="/var/run/squid" + +case $2 in +DEINSTALL) + cd ${squid_confdir} || exit 1 + for f in cachemgr.conf errorpage.css mime.conf msntauth.conf squid.conf; do + cmp -s -z ${f} ${f}.default && rm ${f} + done *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210302305.q9UN5p3Z097197>