Attachment 168622 Details for Bug 208290 – port patch

[patch] port patch

squid3.new.patch (text/plain), 5.37 KB, created by Pavel Timofeev on 2016-03-25 15:48:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2016-03-25 15:48:56 UTC

Size: 5.37 KB

patch

obsolete

>diff -ruN /home/timp/squid.orig/Makefile squid/Makefile
>--- /home/timp/squid.orig/Makefile	2016-03-25 09:04:29.184360000 +0300
>+++ squid/Makefile	2016-03-25 15:53:47.577973000 +0300
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	squid
> PORTVERSION=	3.5.15
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www ipv6
> MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
> 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
>@@ -45,8 +45,11 @@
> SUB_FILES+=	pkg-install pkg-message
> 
> OPTIONS_SUB=	yes
>-OPTIONS_DEFINE=	ARP_ACL AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \
>-		AUTH_SQL CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \
>+OPTIONS_MULTI=	AUTH
>+OPTIONS_RADIO=	SMB
>+OPTIONS_MULTI_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_MYSQL AUTH_PGSQL AUTH_SQLITE
>+OPTIONS_RADIO_SMB=AUTH_SMB3 AUTH_SMB4
>+OPTIONS_DEFINE=	ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \
> 		FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
> 		KQUEUE LARGEFILE NETTLE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
> 		TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES
>@@ -54,8 +57,10 @@
> OPTIONS_SINGLE=	GSSAPI
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
> 
>-OPTIONS_DEFAULT=GSSAPI_BASE AUTH_NIS FS_AUFS FS_DISKD HTCP IDENT KQUEUE SNMP \
>-		WCCP WCCPV2
>+OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS DOCS EXAMPLES FOLLOW_XFF \
>+		FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE \
>+		LAX_HTTP SNMP SSL SSL_CRTD TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 \
>+		GSSAPI_BASE
> 
> ARP_ACL_CONFIGURE_ENABLE=	eui
> AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include
>@@ -65,10 +70,14 @@
> AUTH_SASL_CPPFLAGS=		-I${LOCALBASE}/include
> AUTH_SASL_LDFLAGS=		-L${LOCALBASE}/lib
> AUTH_SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
>-AUTH_SMB_BUILD_DEPENDS=		smbclient:${PORTSDIR}/net/samba36
>-AUTH_SMB_RUN_DEPENDS=		smbclient:${PORTSDIR}/net/samba36
>-AUTH_SQL_RUN_DEPENDS=		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
>-AUTH_SQL_USE=			MYSQL=yes
>+AUTH_SMB3_RUN_DEPENDS=		smbclient:${PORTSDIR}/net/samba36
>+AUTH_SMB4_RUN_DEPENDS=		smbclient:${PORTSDIR}/net/samba42
>+AUTH_MYSQL_RUN_DEPENDS=		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
>+AUTH_MYSQL_USE=			MYSQL=yes
>+AUTH_PGSQL_RUN_DEPENDS=		p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
>+AUTH_PGSQL_USES=		pgsql
>+AUTH_SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
>+AUTH_SQLITE_USES=		sqlite
> CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
> DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
> ECAP_CFLAGS=			-I${LOCALBASE}/include
>@@ -123,6 +132,7 @@
> # add an option for external_acl/session (requires some kind of external
> # Berkeley DB support, unsure which one)
> ARP_ACL_DESC=		ARP/MAC/EUI based authentification
>+AUTH_DESC=		Authentication helpers
> GSSAPI_DESC=		Install Kerberos authentication helpers
> GSSAPI_NONE_DESC=	Build without Kerberos support
> GSSAPI_BASE_DESC=	Build with Kerberos support from base
>@@ -131,8 +141,11 @@
> 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)
>+AUTH_SMB3_DESC=		Install SMB3 auth. helpers (req. net/samba36)
>+AUTH_SMB4_DESC=		Install SMB4 auth. helpers (req. net/samba42)
>+AUTH_MYSQL_DESC=	Install SQL based auth (uses MySQL)
>+AUTH_PGSQL_DESC=	Install SQL based auth (uses PgSQL)
>+AUTH_SQLITE_DESC=	Install SQL based auth (uses SQLite)
> CACHE_DIGESTS_DESC=	Use cache digests
> DEBUG_DESC=		Build with extended debugging support
> DELAY_POOLS_DESC=	Delay pools (bandwidth limiting)
>@@ -149,6 +162,7 @@
> KQUEUE_DESC=		Kqueue(2) support
> LARGEFILE_DESC=		Support large (>2GB) cache and log files
> NETTLE_DESC=		Nettle MD5 algorithm support
>+SMB_DESC=		Samba authentication helpers
> SNMP_DESC=		SNMP support
> SSL_CRTD_DESC=		Use ssl_crtd to handle SSL cert requests
> SSL_DESC=		SSL gatewaying support
>@@ -221,13 +235,19 @@
> basic_auth+=	SASL
> .endif
> 
>-.if ${PORT_OPTIONS:MAUTH_SMB}
>+.if ${PORT_OPTIONS:MAUTH_SMB3} || ${PORT_OPTIONS:MAUTH_SMB4}
>+PLIST_SUB+=	AUTH_SMB=""
> basic_auth+=	SMB
> external_acl+=	wbinfo_group
>+.else
>+PLIST_SUB+=	AUTH_SMB="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MAUTH_SQL}
>+.if ${PORT_OPTIONS:MAUTH_MYSQL} || ${PORT_OPTIONS:MAUTH_PGSQL} || ${PORT_OPTIONS:MAUTH_SQLITE}
>+PLIST_SUB+=	AUTH_SQL=""
> external_acl+=	SQL_session
>+.else
>+PLIST_SUB+=	AUTH_SQL="@comment "
> .endif
> 
> # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
>@@ -312,6 +332,10 @@
> LDFLAGS+=		-L${OPENSSLLIB}
> .endif
> 
>+.if ${PORT_OPTIONS:MSSL_CRTD} && !${PORT_OPTIONS:MSSL}
>+IGNORE=SSL_CRTD option can be used only if SSL option is enabled
>+.endif
>+
> .if ${PORT_OPTIONS:MSTACKTRACES}
> CFLAGS+=	-g
> LDFLAGS+=	-lunwind -L${LOCALBASE}/lib
>diff -ruN /home/timp/squid.orig/files/squid.in squid/files/squid.in
>--- /home/timp/squid.orig/files/squid.in	2016-03-25 09:04:29.188656000 +0300
>+++ squid/files/squid.in	2016-03-25 10:07:48.724402000 +0300
>@@ -108,13 +108,11 @@
> 
> squid_reload()
> {
>-
> 	$command $required_args $squid_flags -k reconfigure
> }
> 
> squid_configtest()
> {
>-
> 	echo "Performing sanity check on ${name} configuration."
> 	if $command $required_args $squid_flags -k check; then
> 		echo "Configuration for ${name} passes."
>@@ -142,7 +140,7 @@
> squid_prestop()
> {
> 	command_args="$command_args -k shutdown"
>-	$command $required_args $squid_flags -k check 2>/dev/null
>+	squid_configtest
> }
> 
> load_rc_config $name

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 208290: 168622 | 168778 | 168779