Attachment 229503 Details for Bug 243291 – Updated patch file

[patch] Updated patch file

www_squid.patch (text/plain), 3.41 KB, created by Yasuhiro Kimura on 2021-11-15 07:45:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2021-11-15 07:45:30 UTC

Size: 3.41 KB

patch

obsolete

>From 795935466db61fe540566a15bbb95dd8e82496c2 Mon Sep 17 00:00:00 2001
>From: Pavel Timofeev <timp87@gmail.com>
>Date: Tue, 22 Jun 2021 07:13:33 +0900
>Subject: [PATCH] www/squid www/squid-devel: Remove PCRE option
>
>This option was added about 3 years ago and worked as is expected at
>the time. But it doesn't work any more. So remove it from squid ports.
>
>PR:		243291
>Reported by:	OlivierW
>---
> www/squid-devel/Makefile | 7 ++-----
> www/squid/Makefile       | 7 ++-----
> 2 files changed, 4 insertions(+), 10 deletions(-)
>
>diff --git a/www/squid-devel/Makefile b/www/squid-devel/Makefile
>index 9903860e39e1..937f46ffbf10 100644
>--- a/www/squid-devel/Makefile
>+++ b/www/squid-devel/Makefile
>@@ -48,7 +48,7 @@ OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
> OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF
> OPTIONS_DEFINE=	ARP_ACL TDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \
> 		FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
>-		KQUEUE LARGEFILE LAX_HTTP NETTLE PCRE SNMP SSL SSL_CRTD \
>+		KQUEUE LARGEFILE LAX_HTTP NETTLE SNMP SSL SSL_CRTD \
> 		STACKTRACES VIA_DB WCCP WCCPV2
> 
> OPTIONS_SINGLE=	GSSAPI
>@@ -56,7 +56,7 @@ OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
> 
> OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
> 		FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
>-		LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
>+		LARGEFILE LAX_HTTP SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
> 		WCCPV2
> 
> ARP_ACL_CONFIGURE_ENABLE=	eui
>@@ -108,9 +108,6 @@ FS_DISKD_VARS=			STORAGE_SCHEMES+=diskd DISKIO_MODULES+=DiskDaemon
> FS_ROCK_VARS=			STORAGE_SCHEMES+=rock
> NETTLE_LIB_DEPENDS=		libnettle.so:security/nettle
> NETTLE_CONFIGURE_OFF=		--without-nettle
>-PCRE_LIB_DEPENDS=		libpcre.so:devel/pcre
>-PCRE_CPPFLAGS=			-I${LOCALBASE}/include
>-PCRE_LDFLAGS=			-L${LOCALBASE}/lib -lpcreposix -lpcre
> SNMP_CONFIGURE_ENABLE=		snmp
> SSL_CONFIGURE_ENABLE=		ssl
> SSL_CONFIGURE_ON=		--with-openssl=${OPENSSLBASE} \
>diff --git a/www/squid/Makefile b/www/squid/Makefile
>index 8e03dc0792eb..1c9c1c363817 100644
>--- a/www/squid/Makefile
>+++ b/www/squid/Makefile
>@@ -47,7 +47,7 @@ OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
> OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF
> OPTIONS_DEFINE=	ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \
> 		FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
>-		KQUEUE LARGEFILE LAX_HTTP NETTLE PCRE SNMP SSL SSL_CRTD \
>+		KQUEUE LARGEFILE LAX_HTTP NETTLE SNMP SSL SSL_CRTD \
> 		STACKTRACES VIA_DB WCCP WCCPV2
> 
> OPTIONS_SINGLE=	GSSAPI
>@@ -55,7 +55,7 @@ OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
> 
> OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
> 		FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
>-		LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
>+		LARGEFILE LAX_HTTP SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
> 		WCCPV2
> 
> ARP_ACL_CONFIGURE_ENABLE=	eui
>@@ -103,9 +103,6 @@ FS_DISKD_VARS=			STORAGE_SCHEMES+=diskd DISKIO_MODULES+=DiskDaemon
> FS_ROCK_VARS=			STORAGE_SCHEMES+=rock
> NETTLE_LIB_DEPENDS=		libnettle.so:security/nettle
> NETTLE_CONFIGURE_OFF=		--without-nettle
>-PCRE_LIB_DEPENDS=		libpcre.so:devel/pcre
>-PCRE_CPPFLAGS=			-I${LOCALBASE}/include
>-PCRE_LDFLAGS=			-L${LOCALBASE}/lib -lpcreposix -lpcre
> SNMP_CONFIGURE_ENABLE=		snmp
> SSL_CONFIGURE_ENABLE=		ssl
> SSL_CONFIGURE_ON=		--with-openssl=${OPENSSLBASE} \
>-- 
>2.33.1
>

Flags:

yasu: maintainer-approval? (timp87)

Actions: View | Diff

Attachments on bug 243291: 225982 | 229503