Attachment 146241 Details for Bug 192983 – update to 3.3.12

[patch] update to 3.3.12

squid33-3.3.12.patch (text/plain), 5.30 KB, created by Pavel Timofeev on 2014-08-25 07:26:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2014-08-25 07:26:17 UTC

Size: 5.30 KB

patch

obsolete

>--- Makefile.orig	2014-08-24 00:59:41.000000000 +0400
>+++ Makefile	2014-08-25 10:56:11.000000000 +0400
>@@ -3,7 +3,6 @@
> 
> 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}/ \
>@@ -21,7 +20,8 @@
> 		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
>+PATCHFILES=	FreeBSD_silence_nosuid_mk1.patch:nosid \
>+		${PORTNAME}-${PORTVERSION:R}-12679.patch
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	HTTP Caching Proxy
>@@ -29,7 +29,7 @@
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-SQUID_STABLE_VER=	11
>+SQUID_STABLE_VER=	12
> 
> CONFLICTS_INSTALL=	squid-2.[0-9].* squid32-* cacheboy-[0-9]* lusca-head-[0-9]*
> USES=		perl5 tar:bzip2 shebangfix
>@@ -68,11 +68,11 @@
> 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
>+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)
>+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
>@@ -238,6 +238,7 @@
> 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}"\
>@@ -270,6 +271,9 @@
> 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
>--- distinfo.orig	2014-08-24 00:59:37.000000000 +0400
>+++ distinfo	2014-08-24 01:00:04.000000000 +0400
>@@ -1,4 +1,6 @@
>-SHA256 (squid3.3/squid-3.3.11.tar.bz2) = 6b314cd706693522f01d5ab1930f3aa7a9b03a913bc0e699def16cca8d15ea54
>-SIZE (squid3.3/squid-3.3.11.tar.bz2) = 2989941
>+SHA256 (squid3.3/squid-3.3.12.tar.bz2) = 18781e700b950f58a1b669a8be4c60d5ca218131f6a2fc1263c2a453befa05a0
>+SIZE (squid3.3/squid-3.3.12.tar.bz2) = 2990435
> SHA256 (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 6fd9e55812e18463e92c83d1376e65ca54b2857606f59f4aa1b7d2716af2b72c
> SIZE (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 1295
>+SHA256 (squid3.3/squid-3.3-12679.patch) = 3e8d3bca71646cb592e0762ec0502ef3cd3ce7476d1c349f3b16492c75dbfa83
>+SIZE (squid3.3/squid-3.3-12679.patch) = 2461
>--- files/patch-configure.orig	2014-08-24 00:59:48.000000000 +0400
>+++ files/patch-configure	2014-08-25 11:22:57.000000000 +0400
>@@ -1,5 +1,95 @@
>---- configure.orig	2013-11-30 07:56:05.000000000 -0600
>-+++ configure	2014-02-12 10:53:47.000000000 -0600
>+--- configure.orig	2014-03-09 09:25:22.000000000 +0400
>++++ configure	2014-08-25 11:21:37.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="-Werror -Qunused-arguments"
>++   squid_cv_cxx_option_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

Actions: View | Diff

Attachments on bug 192983: 146240 | 146241 | 146275 | 146382