Date: Wed, 1 May 2013 16:56:26 +0000 (UTC) From: Thomas-Martin Seck <tmseck@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317033 - in head/www: . squid33 squid33/files Message-ID: <201305011656.r41GuQWs024951@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tmseck Date: Wed May 1 16:56:25 2013 New Revision: 317033 URL: http://svnweb.freebsd.org/changeset/ports/317033 Log: Add www/squid33. Approved by: flo (mentor) Added: head/www/squid33/ - copied from r317029, head/www/squid32/ head/www/squid33/files/extra-patch-src-cf.data.pre.noipv6 (contents, props changed) Deleted: head/www/squid33/files/extra-patch-src-cf.data.pre.aufs head/www/squid33/files/patch-helpers-basic_auth-LDAP-config.test head/www/squid33/files/patch-helpers-basic_auth-SASL-config.test head/www/squid33/files/patch-helpers-external_acl-LDAP_group-config.test Modified: head/www/Makefile head/www/squid33/Makefile head/www/squid33/distinfo head/www/squid33/files/patch-configure head/www/squid33/files/patch-src-cf.data.pre head/www/squid33/files/squid.in Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Wed May 1 16:33:00 2013 (r317032) +++ head/www/Makefile Wed May 1 16:56:25 2013 (r317033) @@ -1830,6 +1830,7 @@ SUBDIR += squid SUBDIR += squid31 SUBDIR += squid32 + SUBDIR += squid33 SUBDIR += squid_radius_auth SUBDIR += squidclamav SUBDIR += squidguard Modified: head/www/squid33/Makefile ============================================================================== --- head/www/squid32/Makefile Wed May 1 15:55:52 2013 (r317029) +++ head/www/squid33/Makefile Wed May 1 16:56:25 2013 (r317033) @@ -35,9 +35,10 @@ # 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.2.${SQUID_STABLE_VER} +PORTVERSION= 3.3.${SQUID_STABLE_VER} CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ @@ -55,7 +56,7 @@ MASTER_SITES= ftp://ftp.squid-cache.org/ 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.2 +DIST_SUBDIR= squid3.3 PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www2.us.squid-cache.org/%SUBDIR%/ \ @@ -74,11 +75,11 @@ COMMENT= HTTP Caching Proxy LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LATEST_LINK= squid32 +LATEST_LINK= squid33 -SQUID_STABLE_VER= 9 +SQUID_STABLE_VER= 4 -CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[!2].* cacheboy-[0-9]* lusca-head-[0-9]* +CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[!3].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes USE_BZIP2= yes USE_PERL5= yes @@ -95,17 +96,22 @@ PORTEXAMPLES= * SUB_FILES+= pkg-install pkg-message OPTIONS_DEFINE= ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \ + AUTH_SQL \ 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 DOCS EXAMPLES +# TODO: +# add an option for external_acl/session (requires some kind of external +# Berkeley DB support, unsure which one) 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) +AUTH_SQL_DESC= Install SQL based auth (uses MySQL) CACHE_DIGESTS_DESC= Use cache digests DEBUG_DESC= Build with extended debugging support DELAY_POOLS_DESC= Enable delay pools (bandwidth limiting) @@ -119,7 +125,6 @@ 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 @@ -134,7 +139,7 @@ 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 \ +OPTIONS_DEFAULT= AUTH_KERB AUTH_NIS FS_AUFS HTCP IDENT KQUEUE \ SNMP WCCP WCCPV2 etc_files= squid/cachemgr.conf.default \ @@ -247,7 +252,7 @@ CXXFLAGS+= -Wno-unused-private-field basic_auth= DB MSNT MSNT-multi-domain NCSA PAM POP3 RADIUS \ fake getpwnam digest_auth= file -external_acl= file_userip unix_group +external_acl= file_userip time_quota unix_group ntlm_auth= fake smb_lm libexec+= basic_db_auth \ basic_fake_auth \ @@ -260,13 +265,15 @@ libexec+= basic_db_auth \ basic_radius_auth \ digest_file_auth \ ext_file_userip_acl \ + ext_time_quota_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 + ext_file_userip_acl.8 ext_time_quota_acl.8 \ + ext_unix_group_acl.8 .if ${PORT_OPTIONS:MAUTH_LDAP} USE_OPENLDAP= yes CFLAGS+= -I${LOCALBASE}/include @@ -294,6 +301,13 @@ libexec+= basic_smb_auth basic_smb_auth. ext_wbinfo_group_acl MAN8+= ext_wbinfo_group_acl.8 .endif +.if ${PORT_OPTIONS:MAUTH_SQL} +USE_MYSQL= yes +RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql +external_acl+= SQL_session +libexec+= ext_sql_session_acl +MAN8+= ext_sql_session_acl.8 +.endif # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too: .if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS) basic_auth+= NIS @@ -310,8 +324,9 @@ MAN8+= negotiate_kerberos_auth.8 external_acl+= kerberos_ldap_group libexec+= ext_kerberos_ldap_group_acl \ cert_tool +# TODO # XXX: this manpage is present in Squid's source but is not being -# built/installed yet (Squid 3.2.3 as at 11/2012). +# built/installed yet (Squid 3.3.3 as at 04/2013). #MAN8+= ext_kerberos_ldap_group_acl.8 .endif .else @@ -331,11 +346,6 @@ diskio_modules= AIO Blocking DiskDaemon .if ${PORT_OPTIONS:MFS_AUFS} storage_schemes+= aufs diskio_modules+= DiskThreads -# Only document switching from libpthread to libthr using libmap.conf -# 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 LDFLAGS+= -pthread @@ -364,6 +374,7 @@ libexec+= url_fake_rewrite url_fake_rewr .if empty(PORT_OPTIONS:MIPV6) || defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --disable-ipv6 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-cf.data.pre.noipv6 .endif .if ${PORT_OPTIONS:MDELAY_POOLS} CONFIGURE_ARGS+= --enable-delay-pools @@ -474,13 +485,10 @@ LDFLAGS+= -L${LOCALBASE}/lib .else CONFIGURE_ARGS+= --disable-esi .endif -.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: -CONFIGURE_ARGS+= --disable-kqueue -.else +.if ${PORT_OPTIONS:MKQUEUE} CONFIGURE_ARGS+= --enable-kqueue +.else +CONFIGURE_ARGS+= --disable-kqueue .endif .if ${PORT_OPTIONS:MLARGEFILE} CONFIGURE_ARGS+= --with-large-files Modified: head/www/squid33/distinfo ============================================================================== --- head/www/squid32/distinfo Wed May 1 15:55:52 2013 (r317029) +++ head/www/squid33/distinfo Wed May 1 16:56:25 2013 (r317033) @@ -1,2 +1,2 @@ -SHA256 (squid3.2/squid-3.2.9.tar.bz2) = 82d3d4cecfa4379b5197026198e34870a26977e6f6b175f5257241a3075767e6 -SIZE (squid3.2/squid-3.2.9.tar.bz2) = 2897511 +SHA256 (squid3.3/squid-3.3.4.tar.bz2) = e962c27a294f6dd57a32fdc493e32c16d24687035f03f1140c491fb8c12ce170 +SIZE (squid3.3/squid-3.3.4.tar.bz2) = 2987756 Added: head/www/squid33/files/extra-patch-src-cf.data.pre.noipv6 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid33/files/extra-patch-src-cf.data.pre.noipv6 Wed May 1 16:56:25 2013 (r317033) @@ -0,0 +1,13 @@ +--- src/cf.data.pre.orig 2013-04-27 05:34:48.000000000 +0200 ++++ src/cf.data.pre 2013-04-28 21:34:17.000000000 +0200 +@@ -740,8 +740,8 @@ + ENDIF + DEFAULT: all src all + DEFAULT: manager url_regex -i ^cache_object:// +i ^https?://[^/]+/squid-internal-mgr/ +-DEFAULT: localhost src 127.0.0.1/32 ::1 +-DEFAULT: to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1 ++DEFAULT: localhost src 127.0.0.1/32 ++DEFAULT: to_localhost dst 127.0.0.0/8 0.0.0.0/32 + DEFAULT_DOC: ACLs all, manager, localhost, and to_localhost are predefined. + DOC_START + Defining an Access List Modified: head/www/squid33/files/patch-configure ============================================================================== --- head/www/squid32/files/patch-configure Wed May 1 15:55:52 2013 (r317029) +++ head/www/squid33/files/patch-configure Wed May 1 16:56:25 2013 (r317033) @@ -1,6 +1,6 @@ ---- configure.orig 2012-10-21 18:10:03.000000000 +0200 -+++ configure 2012-10-21 18:27:39.000000000 +0200 -@@ -22154,7 +22154,7 @@ +--- configure.orig 2013-03-12 11:18:22.000000000 +0100 ++++ configure 2013-04-09 11:43:01.000000000 +0200 +@@ -22437,7 +22437,7 @@ done @@ -9,7 +9,7 @@ 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 @@ +@@ -22634,7 +22634,7 @@ ac_com_error_message=no @@ -18,7 +18,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <com_err.h> -@@ -22363,7 +22363,7 @@ +@@ -22646,7 +22646,7 @@ fi rm -f conftest* @@ -27,7 +27,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <et/com_err.h> -@@ -22424,7 +22424,7 @@ +@@ -22707,7 +22707,7 @@ fi @@ -36,7 +36,7 @@ { $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 @@ +@@ -22750,7 +22750,7 @@ fi Modified: head/www/squid33/files/patch-src-cf.data.pre ============================================================================== --- head/www/squid32/files/patch-src-cf.data.pre Wed May 1 15:55:52 2013 (r317029) +++ head/www/squid33/files/patch-src-cf.data.pre Wed May 1 16:56:25 2013 (r317033) @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/cf.data.pre.orig 2013-03-12 11:17:07.000000000 +0100 ++++ src/cf.data.pre 2013-04-09 11:43:01.000000000 +0200 +@@ -3849,6 +3849,10 @@ LOC: Config.pidFilename DOC_START A filename to write the process-id to. To disable, enter "none". Modified: head/www/squid33/files/squid.in ============================================================================== --- head/www/squid32/files/squid.in Wed May 1 15:55:52 2013 (r317029) +++ head/www/squid33/files/squid.in Wed May 1 16:56:25 2013 (r317033) @@ -54,6 +54,11 @@ load_rc_config ${name} : ${squid_user:=squid} command=%%PREFIX%%/sbin/squid + +# Make sure that we invoke squid with "-f ${squid_conf}"; define this +# variable early so reload_cmd and stop_precmd pick it up: + +command_args="-f ${squid_conf}" extra_commands=reload reload_cmd="${command} ${command_args} ${squid_flags} -k reconfigure" start_precmd=squid_setfib @@ -70,10 +75,6 @@ required_dirs=${squid_chdir} required_files=${squid_conf} -# Now make sure that we invoke squid with "-f ${squid_conf}": - -command_args="-f ${squid_conf}" - squid_setfib() { if command -v check_namevarlist > /dev/null 2>&1; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305011656.r41GuQWs024951>