ports/116165: [Maintainer] www/squid: update to 2.6.STABLE16

Thu Sep 6 19:50:03 UTC 2007

>Number:         116165
>Category:       ports
>Synopsis:       [Maintainer] www/squid: update to 2.6.STABLE16
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 06 19:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of September 6, 2007.

	
>Description:
Update to 2.6.STABLE16.
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: Makefile
===================================================================

--- Makefile	(.../www/squid)	(revision 1241)
+++ Makefile	(.../local/squid)	(revision 1241)
@@ -75,7 +75,7 @@
 #     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	squid
-PORTVERSION=	2.6.15
+PORTVERSION=	2.6.16
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
@@ -94,7 +94,7 @@
 		http://www1.jp.squid-cache.org/Versions/v2/2.6/ \
 		http://www2.tw.squid-cache.org/Versions/v2/2.6/
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.6.STABLE15
+DISTNAME=	squid-2.6.STABLE16
 DIST_SUBDIR=	squid2.6
 
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
@@ -106,7 +106,7 @@
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www2.tw.squid-cache.org/%SUBDIR%/
 PATCH_SITE_SUBDIR=	Versions/v2/2.6/changesets
-PATCHFILES=	11624.patch 11629.patch 11631.patch 11635.patch
+PATCHFILES=
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck at netcologne.de
@@ -407,7 +407,6 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-	    -e 's|VERSION=.*2\.6\.STABLE15|&+PatchSets-20070903|' \
 	    ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
 	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' \
Index: distinfo
===================================================================
--- distinfo	(.../www/squid)	(revision 1241)
+++ distinfo	(.../local/squid)	(revision 1241)
@@ -1,15 +1,3 @@
-MD5 (squid2.6/squid-2.6.STABLE15.tar.bz2) = 2a21d5c64af8bc164b8d8be980aede6a
-SHA256 (squid2.6/squid-2.6.STABLE15.tar.bz2) = ccd306b5ef56afeefbaa96db006f051fd966f610524a530596668a95d1c0b0bc
-SIZE (squid2.6/squid-2.6.STABLE15.tar.bz2) = 1292222
-MD5 (squid2.6/11624.patch) = af5e027668cf87a9e6528b7b879cf85f
-SHA256 (squid2.6/11624.patch) = 18e441a06d6face56d74321683bfa982c043ea1272cc1ce2fc8af74d714206bd
-SIZE (squid2.6/11624.patch) = 1457
-MD5 (squid2.6/11629.patch) = 2c24e03a5a66993cd3b26d8925baae84
-SHA256 (squid2.6/11629.patch) = c8357fac5c09221afbc12208eb194ca1abea86e566a54cec926a5cccd62305e6
-SIZE (squid2.6/11629.patch) = 2459
-MD5 (squid2.6/11631.patch) = 4d4482db46b942cbf84c254f3dc43a53
-SHA256 (squid2.6/11631.patch) = 089ea0d4f04bfcceb79d9742f75dc2a728b2c7312732a4dc9a9363bfa5d5bedf
-SIZE (squid2.6/11631.patch) = 1134
-MD5 (squid2.6/11635.patch) = d6fc4153e67f6e5a4a16eaa41ca21292
-SHA256 (squid2.6/11635.patch) = 26d5684182359ca7ef097a464947c019512ecbb15d90d00dbe8afc8302b4604d
-SIZE (squid2.6/11635.patch) = 1918
+MD5 (squid2.6/squid-2.6.STABLE16.tar.bz2) = 849bee6f269e6c773f215fd4b41de0e3
+SHA256 (squid2.6/squid-2.6.STABLE16.tar.bz2) = 9e306c885c4a37b1a57e2e8c0cdac5c90e4cffa2801e30f3c78b1cca880a62c7
+SIZE (squid2.6/squid-2.6.STABLE16.tar.bz2) = 1293078
Index: files/icap-2.6-bootstrap.patch
===================================================================
--- files/icap-2.6-bootstrap.patch	(.../www/squid)	(revision 1241)
+++ files/icap-2.6-bootstrap.patch	(.../local/squid)	(revision 1241)
@@ -7,10 +7,10 @@
 
 Please see icap-2.6-core.patch for further information.
 
-Patch last updated: 2007-09-01
+Patch last updated: 2007-09-06
 
---- configure.orig	Fri Aug 31 16:55:13 2007
-+++ configure	Sat Sep  1 16:56:36 2007
+--- configure.orig	Thu Sep  6 00:25:42 2007
++++ configure	Thu Sep  6 21:22:04 2007
 @@ -728,6 +728,8 @@
  ENABLE_PINGER_FALSE
  USE_DELAY_POOLS_TRUE
@@ -43,8 +43,8 @@
  
  # Define the identity of the package.
   PACKAGE='squid'
-- VERSION='2.6.STABLE15'
-+ VERSION='2.6.STABLE15+ICAP'
+- VERSION='2.6.STABLE16'
++ VERSION='2.6.STABLE16+ICAP'
  
  
  cat >>confdefs.h <<_ACEOF
@@ -89,7 +89,7 @@
  # Check whether --enable-useragent-log was given.
  if test "${enable_useragent_log+set}" = set; then
    enableval=$enable_useragent_log;  if test "$enableval" = "yes" ; then
-@@ -24504,6 +24545,8 @@
+@@ -24506,6 +24547,8 @@
  	srand48 \
  	srandom \
  	statfs \
@@ -98,7 +98,7 @@
  	strsep \
  	strtoll \
  	sysconf \
-@@ -25209,6 +25252,52 @@
+@@ -25211,6 +25254,52 @@
  
  
  if false; then
@@ -151,7 +151,7 @@
    NEED_OWN_STRSEP_TRUE=
    NEED_OWN_STRSEP_FALSE='#'
  else
-@@ -26799,6 +26888,20 @@
+@@ -26801,6 +26890,20 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -172,7 +172,7 @@
  if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -26960,6 +27063,34 @@
+@@ -26962,6 +27065,34 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -207,7 +207,7 @@
  if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -27705,6 +27836,8 @@
+@@ -27707,6 +27838,8 @@
  ENABLE_PINGER_FALSE!$ENABLE_PINGER_FALSE$ac_delim
  USE_DELAY_POOLS_TRUE!$USE_DELAY_POOLS_TRUE$ac_delim
  USE_DELAY_POOLS_FALSE!$USE_DELAY_POOLS_FALSE$ac_delim
@@ -216,7 +216,7 @@
  USE_SNMP_TRUE!$USE_SNMP_TRUE$ac_delim
  USE_SNMP_FALSE!$USE_SNMP_FALSE$ac_delim
  SNMPLIB!$SNMPLIB$ac_delim
-@@ -27771,6 +27904,10 @@
+@@ -27773,6 +27906,10 @@
  USE_DEVPOLL_FALSE!$USE_DEVPOLL_FALSE$ac_delim
  NEED_OWN_SNPRINTF_TRUE!$NEED_OWN_SNPRINTF_TRUE$ac_delim
  NEED_OWN_SNPRINTF_FALSE!$NEED_OWN_SNPRINTF_FALSE$ac_delim
@@ -227,7 +227,7 @@
  NEED_OWN_STRSEP_TRUE!$NEED_OWN_STRSEP_TRUE$ac_delim
  NEED_OWN_STRSEP_FALSE!$NEED_OWN_STRSEP_FALSE$ac_delim
  REGEXLIB!$REGEXLIB$ac_delim
-@@ -27781,7 +27918,7 @@
+@@ -27783,7 +27920,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
	


>Release-Note:
>Audit-Trail:
>Unformatted:

