Attachment #146240 for bug #192983





PORTNAME=	squid
PORTVERSION=	3.3.${SQUID_STABLE_VER}
PORTREVISION=	6
CATEGORIES=	www ipv6
MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \

		http://www1.jp.squid-cache.org/%SUBDIR%/ \
		http://master.squid-cache.org/~amosjeffries/patches/:nosid
PATCH_SITE_SUBDIR=	Versions/v3/${PORTVERSION:R}/changesets
PATCHFILES=	FreeBSD_silence_nosuid_mk1.patch:nosid \
		${PORTNAME}-${PORTVERSION:R}-12679.patch

MAINTAINER=	ports@FreeBSD.org
COMMENT=	HTTP Caching Proxy

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

SQUID_STABLE_VER=	12

CONFLICTS_INSTALL=	squid-2.[0-9].* squid32-* cacheboy-[0-9]* lusca-head-[0-9]*
USES=		perl5 tar:bzip2 shebangfix

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 (broken on FreeBSD 10+)
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 and broken)
HTCP_DESC=	Enable HTCP support
ICAP_DESC=	Enable the ICAP client
ICMP_DESC=	Enable ICMP pinging and network measurement

CONFIGURE_ARGS+=	--without-pthreads
.endif
.if ${PORT_OPTIONS:MFS_COSS}
BROKEN=			FS_COSS does not compile
storage_schemes+=	coss
.endif
CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"\

CONFIGURE_ARGS+=	--disable-internal-dns
.endif
.if ${PORT_OPTIONS:MECAP}
.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
BROKEN=		ECAP and clang are not friendly
.endif
LIB_DEPENDS+=	libecap.so:${PORTSDIR}/www/libecap
CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

Lines 1-4 Link Here

(-)distinfo (-2 / +4 lines)
1	SHA256 (squid3.3/squid-3.3.11.tar.bz2) = 6b314cd706693522f01d5ab1930f3aa7a9b03a913bc0e699def16cca8d15ea54	1	SHA256 (squid3.3/squid-3.3.12.tar.bz2) = 18781e700b950f58a1b669a8be4c60d5ca218131f6a2fc1263c2a453befa05a0
2	SIZE (squid3.3/squid-3.3.11.tar.bz2) = 2989941	2	SIZE (squid3.3/squid-3.3.12.tar.bz2) = 2990435
3	SHA256 (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 6fd9e55812e18463e92c83d1376e65ca54b2857606f59f4aa1b7d2716af2b72c	3	SHA256 (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 6fd9e55812e18463e92c83d1376e65ca54b2857606f59f4aa1b7d2716af2b72c
4	SIZE (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 1295	4	SIZE (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 1295
		5	SHA256 (squid3.3/squid-3.3-12679.patch) = 3e8d3bca71646cb592e0762ec0502ef3cd3ce7476d1c349f3b16492c75dbfa83
		6	SIZE (squid3.3/squid-3.3-12679.patch) = 2461




--- configure	2014-08-25 10:59:51.000000000 +0400
+++ configure.orig	2014-03-09 09:25:22.000000000 +0400
@@ -11856,7 +11856,7 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1.*)
+    freebsd1*)
       ld_shlibs=no
       ;;
 
@@ -11872,7 +11872,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
+    freebsd2*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -12778,7 +12778,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1.*)
+freebsd1*)
   dynamic_linker=no
   ;;
 
@@ -12789,7 +12789,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123].*) objformat=aout ;;
+    freebsd[123]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -12807,7 +12807,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -14673,7 +14673,7 @@
         esac
         ;;
 
-      freebsd[12].*)
+      freebsd[12]*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -16441,7 +16441,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1.*)
+freebsd1*)
   dynamic_linker=no
   ;;
 
@@ -16452,7 +16452,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123].*) objformat=aout ;;
+    freebsd[123]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -16470,7 +16470,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -18550,7 +18550,7 @@
    squid_cv_cc_arg_pipe=""
    ;;
   clang)
-   squid_cv_cxx_option_werror="-Qunused-arguments"
+   squid_cv_cxx_option_werror="-Werror -Qunused-arguments"
    squid_cv_cc_option_werror="$squid_cv_cxx_option_werror"
    squid_cv_cc_option_wall="-Wall"
    squid_cv_cc_option_optimize="-O2"
@@ -22964,7 +22964,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"

 
 
   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>

 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>

 
   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 :

 
 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 :
@@ -24870,7 +24870,6 @@
   cassert \
   crypt.h \
   cstdarg \
-  cstdio \
   cstdlib \
   cstring \
   list \
@@ -25179,12 +25178,12 @@
 #if HAVE_NETINET_IP_H
 #include <netinet/ip.h>
 #endif
-#if HAVE_NET_IF_H
-#include <net/if.h>
-#endif
 #if HAVE_NETINET_IP_COMPAT_H
 #include <netinet/ip_compat.h>
 #endif
+#if HAVE_NET_IF_H
+#include <net/if.h>
+#endif
 #if HAVE_NETINET_IP_FIL_H
 #include <netinet/ip_fil.h>

Return to bug 192983

Lines 3-9 Link Here

(-)Makefile (-5 / +9 lines)
3		3
4	PORTNAME= squid	4	PORTNAME= squid
5	PORTVERSION= 3.3.${SQUID_STABLE_VER}	5	PORTVERSION= 3.3.${SQUID_STABLE_VER}
6	PORTREVISION= 6
7	CATEGORIES= www ipv6	6	CATEGORIES= www ipv6
8	MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	7	MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
9	http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	8	http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
Lines 21-27 Link Here
21	http://www1.jp.squid-cache.org/%SUBDIR%/ \	20	http://www1.jp.squid-cache.org/%SUBDIR%/ \
22	http://master.squid-cache.org/~amosjeffries/patches/:nosid	21	http://master.squid-cache.org/~amosjeffries/patches/:nosid
23	PATCH_SITE_SUBDIR= Versions/v3/${PORTVERSION:R}/changesets	22	PATCH_SITE_SUBDIR= Versions/v3/${PORTVERSION:R}/changesets
24	PATCHFILES= FreeBSD_silence_nosuid_mk1.patch:nosid	23	PATCHFILES= FreeBSD_silence_nosuid_mk1.patch:nosid \
		24	${PORTNAME}-${PORTVERSION:R}-12679.patch
25		25
26	MAINTAINER= ports@FreeBSD.org	26	MAINTAINER= ports@FreeBSD.org
27	COMMENT= HTTP Caching Proxy	27	COMMENT= HTTP Caching Proxy
Lines 29-35 Link Here
29	LICENSE= GPLv2	29	LICENSE= GPLv2
30	LICENSE_FILE= ${WRKSRC}/COPYING	30	LICENSE_FILE= ${WRKSRC}/COPYING
31		31
32	SQUID_STABLE_VER= 11	32	SQUID_STABLE_VER= 12
33		33
34	CONFLICTS_INSTALL= squid-2.[0-9].* squid32-* cacheboy-[0-9]* lusca-head-[0-9]*	34	CONFLICTS_INSTALL= squid-2.[0-9].* squid32-* cacheboy-[0-9]* lusca-head-[0-9]*
35	USES= perl5 tar:bzip2 shebangfix	35	USES= perl5 tar:bzip2 shebangfix
Lines 68-78 Link Here
68	DEBUG_DESC= Build with extended debugging support	68	DEBUG_DESC= Build with extended debugging support
69	DELAY_POOLS_DESC= Enable delay pools (bandwidth limiting)	69	DELAY_POOLS_DESC= Enable delay pools (bandwidth limiting)
70	DNS_HELPER_DESC= Use external dnsserver processes for DNS	70	DNS_HELPER_DESC= Use external dnsserver processes for DNS
71	ECAP_DESC= Enable loadable content adaptation modules	71	ECAP_DESC= Enable loadable content adaptation modules (broken on FreeBSD 10+)
72	ESI_DESC= Enable support for ESI	72	ESI_DESC= Enable support for ESI
73	FOLLOW_XFF_DESC= Enable support for the X-Following-For header	73	FOLLOW_XFF_DESC= Enable support for the X-Following-For header
74	FS_AUFS_DESC= Enable AUFS (async-io) support	74	FS_AUFS_DESC= Enable AUFS (async-io) support
75	FS_COSS_DESC= Enable COSS (not stable yet)	75	FS_COSS_DESC= Enable COSS (not stable yet and broken)
76	HTCP_DESC= Enable HTCP support	76	HTCP_DESC= Enable HTCP support
77	ICAP_DESC= Enable the ICAP client	77	ICAP_DESC= Enable the ICAP client
78	ICMP_DESC= Enable ICMP pinging and network measurement	78	ICMP_DESC= Enable ICMP pinging and network measurement
Lines 238-243 Link Here
238	CONFIGURE_ARGS+= --without-pthreads	238	CONFIGURE_ARGS+= --without-pthreads
239	.endif	239	.endif
240	.if ${PORT_OPTIONS:MFS_COSS}	240	.if ${PORT_OPTIONS:MFS_COSS}
		241	BROKEN= FS_COSS does not compile
241	storage_schemes+= coss	242	storage_schemes+= coss
242	.endif	243	.endif
243	CONFIGURE_ARGS+= --enable-storeio="${storage_schemes}"\	244	CONFIGURE_ARGS+= --enable-storeio="${storage_schemes}"\
Lines 270-275 Link Here
270	CONFIGURE_ARGS+= --disable-internal-dns	271	CONFIGURE_ARGS+= --disable-internal-dns
271	.endif	272	.endif
272	.if ${PORT_OPTIONS:MECAP}	273	.if ${PORT_OPTIONS:MECAP}
		274	.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
		275	BROKEN= ECAP and clang are not friendly
		276	.endif
273	LIB_DEPENDS+= libecap.so:${PORTSDIR}/www/libecap	277	LIB_DEPENDS+= libecap.so:${PORTSDIR}/www/libecap
274	CFLAGS+= -I${LOCALBASE}/include	278	CFLAGS+= -I${LOCALBASE}/include
275	LDFLAGS+= -L${LOCALBASE}/lib	279	LDFLAGS+= -L${LOCALBASE}/lib

Lines 1-11 Link Here

(-)files/patch-configure (-21 / +111 lines)
1	--- configure.orig 2013-11-30 07:56:05.000000000 -0600	1	--- configure 2014-08-25 10:59:51.000000000 +0400
2	+++ configure 2014-02-12 10:53:47.000000000 -0600	2	+++ configure.orig 2014-03-09 09:25:22.000000000 +0400
		3	@@ -11856,7 +11856,7 @@
		4	hardcode_shlibpath_var=no
		5	;;
		6
		7	- freebsd1.*)
		8	+ freebsd1*)
		9	ld_shlibs=no
		10	;;
		11
		12	@@ -11872,7 +11872,7 @@
		13	;;
		14
		15	# Unfortunately, older versions of FreeBSD 2 do not have this feature.
		16	- freebsd2.*)
		17	+ freebsd2*)
		18	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
		19	hardcode_direct=yes
		20	hardcode_minus_L=yes
		21	@@ -12778,7 +12778,7 @@
		22	shlibpath_var=LD_LIBRARY_PATH
		23	;;
		24
		25	-freebsd1.*)
		26	+freebsd1*)
		27	dynamic_linker=no
		28	;;
		29
		30	@@ -12789,7 +12789,7 @@
		31	objformat=`/usr/bin/objformat`
		32	else
		33	case $host_os in
		34	- freebsd[123].*) objformat=aout ;;
		35	+ freebsd[123]*) objformat=aout ;;
		36	*) objformat=elf ;;
		37	esac
		38	fi
		39	@@ -12807,7 +12807,7 @@
		40	esac
		41	shlibpath_var=LD_LIBRARY_PATH
		42	case $host_os in
		43	- freebsd2.*)
		44	+ freebsd2*)
		45	shlibpath_overrides_runpath=yes
		46	;;
		47	freebsd3.[01]* \| freebsdelf3.[01]*)
		48	@@ -14673,7 +14673,7 @@
		49	esac
		50	;;
		51
		52	- freebsd[12].*)
		53	+ freebsd[12]*)
		54	# C++ shared libraries reported to be fairly broken before
		55	# switch to ELF
		56	ld_shlibs_CXX=no
		57	@@ -16441,7 +16441,7 @@
		58	shlibpath_var=LD_LIBRARY_PATH
		59	;;
		60
		61	-freebsd1.*)
		62	+freebsd1*)
		63	dynamic_linker=no
		64	;;
		65
		66	@@ -16452,7 +16452,7 @@
67	objformat=`/usr/bin/objformat`
68	else
69	case $host_os in
70	- freebsd[123].*) objformat=aout ;;
71	+ freebsd[123]*) objformat=aout ;;
72	*) objformat=elf ;;
73	esac
74	fi
75	@@ -16470,7 +16470,7 @@
76	esac
77	shlibpath_var=LD_LIBRARY_PATH
78	case $host_os in
79	- freebsd2.*)
80	+ freebsd2*)
81	shlibpath_overrides_runpath=yes
82	;;
83	freebsd3.[01]* \| freebsdelf3.[01]*)
84	@@ -18550,7 +18550,7 @@
85	squid_cv_cc_arg_pipe=""
86	;;
87	clang)
88	- squid_cv_cxx_option_werror="-Qunused-arguments"
89	+ squid_cv_cxx_option_werror="-Werror -Qunused-arguments"
90	squid_cv_cc_option_werror="$squid_cv_cxx_option_werror"
91	squid_cv_cc_option_wall="-Wall"
92	squid_cv_cc_option_optimize="-O2"
3	@@ -22964,7 +22964,7 @@	93	@@ -22964,7 +22964,7 @@
4		94
5	done	95	done
6		96
7	- if test "x$ac_heimdal" == "x" ; then	97	- if test "x$ac_heimdal" = "x" ; then
8	+ if test "x$ac_heimdal" = "x" ; then	98	+ if test "x$ac_heimdal" == "x" ; then
9	for ac_header in gssapi/gssapi_generic.h	99	for ac_header in gssapi/gssapi_generic.h
10	do :	100	do :
11	ac_fn_cxx_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default"	101	ac_fn_cxx_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default"
Lines 13-20 Link Here
13		103
14		104
15	ac_com_error_message=no	105	ac_com_error_message=no
16	- if test "x$ac_cv_header_com_err_h" == "xyes" ; then	106	- if test "x$ac_cv_header_com_err_h" = "xyes" ; then
17	+ if test "x$ac_cv_header_com_err_h" = "xyes" ; then	107	+ if test "x$ac_cv_header_com_err_h" == "xyes" ; then
18	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	108	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19	/* end confdefs.h. */	109	/* end confdefs.h. */
20	#include <com_err.h>	110	#include <com_err.h>
Lines 22-29 Link Here
22	fi	112	fi
23	rm -f conftest*	113	rm -f conftest*
24		114
25	- elif test "x$ac_cv_header_et_com_err_h" == "xyes" ; then	115	- elif test "x$ac_cv_header_et_com_err_h" = "xyes" ; then
26	+ elif test "x$ac_cv_header_et_com_err_h" = "xyes" ; then	116	+ elif test "x$ac_cv_header_et_com_err_h" == "xyes" ; then
27	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	117	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
28	/* end confdefs.h. */	118	/* end confdefs.h. */
29	#include <et/com_err.h>	119	#include <et/com_err.h>
Lines 31-38 Link Here
31		121
32	fi	122	fi
33		123
34	- if test `echo $KRB5LIBS \| grep -c com_err` -ne 0 -a "x$ac_com_error_message" == "xyes" ; then	124	- if test `echo $KRB5LIBS \| grep -c com_err` -ne 0 -a "x$ac_com_error_message" = "xyes" ; then
35	+ if test `echo $KRB5LIBS \| grep -c com_err` -ne 0 -a "x$ac_com_error_message" = "xyes" ; then	125	+ if test `echo $KRB5LIBS \| grep -c com_err` -ne 0 -a "x$ac_com_error_message" == "xyes" ; then
36	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lcom_err" >&5	126	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lcom_err" >&5
37	$as_echo_n "checking for error_message in -lcom_err... " >&6; }	127	$as_echo_n "checking for error_message in -lcom_err... " >&6; }
38	if ${ac_cv_lib_com_err_error_message+:} false; then :	128	if ${ac_cv_lib_com_err_error_message+:} false; then :
Lines 40-70 Link Here
40		130
41	fi	131	fi
42		132
43	- elif test "x$ac_com_error_message" == "xyes" ; then	133	- elif test "x$ac_com_error_message" = "xyes" ; then
44	+ elif test "x$ac_com_error_message" = "xyes" ; then	134	+ elif test "x$ac_com_error_message" == "xyes" ; then
45	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lkrb5" >&5	135	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lkrb5" >&5
46	$as_echo_n "checking for error_message in -lkrb5... " >&6; }	136	$as_echo_n "checking for error_message in -lkrb5... " >&6; }
47	if ${ac_cv_lib_krb5_error_message+:} false; then :	137	if ${ac_cv_lib_krb5_error_message+:} false; then :
48	@@ -24870,6 +24870,7 @@	138	@@ -24870,7 +24870,6 @@
49	cassert \	139	cassert \
50	crypt.h \	140	crypt.h \
51	cstdarg \	141	cstdarg \
52	+ cstdio \	142	- cstdio \
53	cstdlib \	143	cstdlib \
54	cstring \	144	cstring \
55	list \	145	list \
56	@@ -25178,12 +25179,12 @@	146	@@ -25179,12 +25178,12 @@
57	#if HAVE_NETINET_IP_H	147	#if HAVE_NETINET_IP_H
58	#include <netinet/ip.h>	148	#include <netinet/ip.h>
59	#endif	149	#endif
60	-#if HAVE_NETINET_IP_COMPAT_H	150	-#if HAVE_NET_IF_H
61	-#include <netinet/ip_compat.h>	151	-#include <net/if.h>
62	-#endif	152	-#endif
63	#if HAVE_NET_IF_H	153	#if HAVE_NETINET_IP_COMPAT_H
64	#include <net/if.h>	154	#include <netinet/ip_compat.h>
65	#endif	155	#endif
66	+#if HAVE_NETINET_IP_COMPAT_H	156	+#if HAVE_NET_IF_H
67	+#include <netinet/ip_compat.h>	157	+#include <net/if.h>
68	+#endif	158	+#endif
69	#if HAVE_NETINET_IP_FIL_H	159	#if HAVE_NETINET_IP_FIL_H
70	#include <netinet/ip_fil.h>	160	#include <netinet/ip_fil.h>