Attachment #81099 for bug #116165

View | Details | Raw Unified | Return to bug 116165
Collapse All | Expand All




#     Enable experimental multicast notification of cachemisses.

PORTNAME=	squid
PORTVERSION=	2.6.16
CATEGORIES=	www
MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \

		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.STABLE16
DIST_SUBDIR=	squid2.6

PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \

		http://www1.jp.squid-cache.org/%SUBDIR%/ \
		http://www2.tw.squid-cache.org/%SUBDIR%/
PATCH_SITE_SUBDIR=	Versions/v2/2.6/changesets
PATCHFILES=
PATCH_DIST_STRIP=	-p1

MAINTAINER=	tmseck@netcologne.de


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' \




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
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





Please see icap-2.6-core.patch for further information.

Patch last updated: 2007-09-06

--- 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

 
 # Define the identity of the package.
  PACKAGE='squid'
- VERSION='2.6.STABLE16'
+ VERSION='2.6.STABLE16+ICAP'
 
 
 cat >>confdefs.h <<_ACEOF

 # Check whether --enable-useragent-log was given.
 if test "${enable_useragent_log+set}" = set; then
   enableval=$enable_useragent_log;  if test "$enableval" = "yes" ; then
@@ -24506,6 +24547,8 @@
 	srand48 \
 	srandom \
 	statfs \

 	strsep \
 	strtoll \
 	sysconf \
@@ -25211,6 +25254,52 @@
 
 
 if false; then

   NEED_OWN_STRSEP_TRUE=
   NEED_OWN_STRSEP_FALSE='#'
 else
@@ -26801,6 +26890,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi

 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
@@ -26962,6 +27065,34 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi

 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
@@ -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

 USE_SNMP_TRUE!$USE_SNMP_TRUE$ac_delim
 USE_SNMP_FALSE!$USE_SNMP_FALSE$ac_delim
 SNMPLIB!$SNMPLIB$ac_delim
@@ -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

 NEED_OWN_STRSEP_TRUE!$NEED_OWN_STRSEP_TRUE$ac_delim
 NEED_OWN_STRSEP_FALSE!$NEED_OWN_STRSEP_FALSE$ac_delim
 REGEXLIB!$REGEXLIB$ac_delim
@@ -27783,7 +27920,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF

Return to bug 116165

Lines 75-81 Link Here

(-)Makefile (-4 / +3 lines)
75	# Enable experimental multicast notification of cachemisses.	75	# Enable experimental multicast notification of cachemisses.
76		76
77	PORTNAME= squid	77	PORTNAME= squid
78	PORTVERSION= 2.6.15	78	PORTVERSION= 2.6.16
79	CATEGORIES= www	79	CATEGORIES= www
80	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	80	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
81	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \	81	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
Lines 94-100 Link Here
94	http://www1.jp.squid-cache.org/Versions/v2/2.6/ \	94	http://www1.jp.squid-cache.org/Versions/v2/2.6/ \
95	http://www2.tw.squid-cache.org/Versions/v2/2.6/	95	http://www2.tw.squid-cache.org/Versions/v2/2.6/
96	MASTER_SITE_SUBDIR= squid-2/STABLE	96	MASTER_SITE_SUBDIR= squid-2/STABLE
97	DISTNAME= squid-2.6.STABLE15	97	DISTNAME= squid-2.6.STABLE16
98	DIST_SUBDIR= squid2.6	98	DIST_SUBDIR= squid2.6
99		99
100	PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \	100	PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
Lines 106-112 Link Here
106	http://www1.jp.squid-cache.org/%SUBDIR%/ \	106	http://www1.jp.squid-cache.org/%SUBDIR%/ \
107	http://www2.tw.squid-cache.org/%SUBDIR%/	107	http://www2.tw.squid-cache.org/%SUBDIR%/
108	PATCH_SITE_SUBDIR= Versions/v2/2.6/changesets	108	PATCH_SITE_SUBDIR= Versions/v2/2.6/changesets
109	PATCHFILES= 11624.patch 11629.patch 11631.patch 11635.patch	109	PATCHFILES=
110	PATCH_DIST_STRIP= -p1	110	PATCH_DIST_STRIP= -p1
111		111
112	MAINTAINER= tmseck@netcologne.de	112	MAINTAINER= tmseck@netcologne.de
Lines 407-413 Link Here
407		407
408	post-patch:	408	post-patch:
409	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \	409	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \
410	-e 's\|VERSION=.*2\.6\.STABLE15\|&+PatchSets-20070903\|' \
411	${WRKSRC}/configure	410	${WRKSRC}/configure
412	@${REINPLACE_CMD} -e 's\|%%SQUID_UID%%\|${SQUID_UID}\|g' \	411	@${REINPLACE_CMD} -e 's\|%%SQUID_UID%%\|${SQUID_UID}\|g' \
413	-e 's\|%%SQUID_GID%%\|${SQUID_GID}\|g' \	412	-e 's\|%%SQUID_GID%%\|${SQUID_GID}\|g' \

Lines 1-15 Link Here

(-)distinfo (-15 / +3 lines)
1	MD5 (squid2.6/squid-2.6.STABLE15.tar.bz2) = 2a21d5c64af8bc164b8d8be980aede6a	1	MD5 (squid2.6/squid-2.6.STABLE16.tar.bz2) = 849bee6f269e6c773f215fd4b41de0e3
2	SHA256 (squid2.6/squid-2.6.STABLE15.tar.bz2) = ccd306b5ef56afeefbaa96db006f051fd966f610524a530596668a95d1c0b0bc	2	SHA256 (squid2.6/squid-2.6.STABLE16.tar.bz2) = 9e306c885c4a37b1a57e2e8c0cdac5c90e4cffa2801e30f3c78b1cca880a62c7
3	SIZE (squid2.6/squid-2.6.STABLE15.tar.bz2) = 1292222	3	SIZE (squid2.6/squid-2.6.STABLE16.tar.bz2) = 1293078
4	MD5 (squid2.6/11624.patch) = af5e027668cf87a9e6528b7b879cf85f
5	SHA256 (squid2.6/11624.patch) = 18e441a06d6face56d74321683bfa982c043ea1272cc1ce2fc8af74d714206bd
6	SIZE (squid2.6/11624.patch) = 1457
7	MD5 (squid2.6/11629.patch) = 2c24e03a5a66993cd3b26d8925baae84
8	SHA256 (squid2.6/11629.patch) = c8357fac5c09221afbc12208eb194ca1abea86e566a54cec926a5cccd62305e6
9	SIZE (squid2.6/11629.patch) = 2459
10	MD5 (squid2.6/11631.patch) = 4d4482db46b942cbf84c254f3dc43a53
11	SHA256 (squid2.6/11631.patch) = 089ea0d4f04bfcceb79d9742f75dc2a728b2c7312732a4dc9a9363bfa5d5bedf
12	SIZE (squid2.6/11631.patch) = 1134
13	MD5 (squid2.6/11635.patch) = d6fc4153e67f6e5a4a16eaa41ca21292
14	SHA256 (squid2.6/11635.patch) = 26d5684182359ca7ef097a464947c019512ecbb15d90d00dbe8afc8302b4604d
15	SIZE (squid2.6/11635.patch) = 1918

Lines 7-16 Link Here

(-)files/icap-2.6-bootstrap.patch (-12 / +12 lines)
7		7
8	Please see icap-2.6-core.patch for further information.	8	Please see icap-2.6-core.patch for further information.
9		9
10	Patch last updated: 2007-09-01	10	Patch last updated: 2007-09-06
11		11
12	--- configure.orig Fri Aug 31 16:55:13 2007	12	--- configure.orig Thu Sep 6 00:25:42 2007
13	+++ configure Sat Sep 1 16:56:36 2007	13	+++ configure Thu Sep 6 21:22:04 2007
14	@@ -728,6 +728,8 @@	14	@@ -728,6 +728,8 @@
15	ENABLE_PINGER_FALSE	15	ENABLE_PINGER_FALSE
16	USE_DELAY_POOLS_TRUE	16	USE_DELAY_POOLS_TRUE
Lines 43-50 Link Here
43		43
44	# Define the identity of the package.	44	# Define the identity of the package.
45	PACKAGE='squid'	45	PACKAGE='squid'
46	- VERSION='2.6.STABLE15'	46	- VERSION='2.6.STABLE16'
47	+ VERSION='2.6.STABLE15+ICAP'	47	+ VERSION='2.6.STABLE16+ICAP'
48		48
49		49
50	cat >>confdefs.h <<_ACEOF	50	cat >>confdefs.h <<_ACEOF
Lines 89-95 Link Here
89	# Check whether --enable-useragent-log was given.	89	# Check whether --enable-useragent-log was given.
90	if test "${enable_useragent_log+set}" = set; then	90	if test "${enable_useragent_log+set}" = set; then
91	enableval=$enable_useragent_log; if test "$enableval" = "yes" ; then	91	enableval=$enable_useragent_log; if test "$enableval" = "yes" ; then
92	@@ -24504,6 +24545,8 @@	92	@@ -24506,6 +24547,8 @@
93	srand48 \	93	srand48 \
94	srandom \	94	srandom \
95	statfs \	95	statfs \
Lines 98-104 Link Here
98	strsep \	98	strsep \
99	strtoll \	99	strtoll \
100	sysconf \	100	sysconf \
101	@@ -25209,6 +25252,52 @@	101	@@ -25211,6 +25254,52 @@
102		102
103		103
104	if false; then	104	if false; then
Lines 151-157 Link Here
151	NEED_OWN_STRSEP_TRUE=	151	NEED_OWN_STRSEP_TRUE=
152	NEED_OWN_STRSEP_FALSE='#'	152	NEED_OWN_STRSEP_FALSE='#'
153	else	153	else
154	@@ -26799,6 +26888,20 @@	154	@@ -26801,6 +26890,20 @@
155	Usually this means the macro was only invoked conditionally." >&2;}	155	Usually this means the macro was only invoked conditionally." >&2;}
156	{ (exit 1); exit 1; }; }	156	{ (exit 1); exit 1; }; }
157	fi	157	fi
Lines 172-178 Link Here
172	if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then	172	if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then
173	{ { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never defined.	173	{ { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never defined.
174	Usually this means the macro was only invoked conditionally." >&5	174	Usually this means the macro was only invoked conditionally." >&5
175	@@ -26960,6 +27063,34 @@	175	@@ -26962,6 +27065,34 @@
176	Usually this means the macro was only invoked conditionally." >&2;}	176	Usually this means the macro was only invoked conditionally." >&2;}
177	{ (exit 1); exit 1; }; }	177	{ (exit 1); exit 1; }; }
178	fi	178	fi
Lines 207-213 Link Here
207	if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then	207	if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then
208	{ { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.	208	{ { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.
209	Usually this means the macro was only invoked conditionally." >&5	209	Usually this means the macro was only invoked conditionally." >&5
210	@@ -27705,6 +27836,8 @@	210	@@ -27707,6 +27838,8 @@
211	ENABLE_PINGER_FALSE!$ENABLE_PINGER_FALSE$ac_delim	211	ENABLE_PINGER_FALSE!$ENABLE_PINGER_FALSE$ac_delim
212	USE_DELAY_POOLS_TRUE!$USE_DELAY_POOLS_TRUE$ac_delim	212	USE_DELAY_POOLS_TRUE!$USE_DELAY_POOLS_TRUE$ac_delim
213	USE_DELAY_POOLS_FALSE!$USE_DELAY_POOLS_FALSE$ac_delim	213	USE_DELAY_POOLS_FALSE!$USE_DELAY_POOLS_FALSE$ac_delim
Lines 216-222 Link Here
216	USE_SNMP_TRUE!$USE_SNMP_TRUE$ac_delim	216	USE_SNMP_TRUE!$USE_SNMP_TRUE$ac_delim
217	USE_SNMP_FALSE!$USE_SNMP_FALSE$ac_delim	217	USE_SNMP_FALSE!$USE_SNMP_FALSE$ac_delim
218	SNMPLIB!$SNMPLIB$ac_delim	218	SNMPLIB!$SNMPLIB$ac_delim
219	@@ -27771,6 +27904,10 @@	219	@@ -27773,6 +27906,10 @@
220	USE_DEVPOLL_FALSE!$USE_DEVPOLL_FALSE$ac_delim	220	USE_DEVPOLL_FALSE!$USE_DEVPOLL_FALSE$ac_delim
221	NEED_OWN_SNPRINTF_TRUE!$NEED_OWN_SNPRINTF_TRUE$ac_delim	221	NEED_OWN_SNPRINTF_TRUE!$NEED_OWN_SNPRINTF_TRUE$ac_delim
222	NEED_OWN_SNPRINTF_FALSE!$NEED_OWN_SNPRINTF_FALSE$ac_delim	222	NEED_OWN_SNPRINTF_FALSE!$NEED_OWN_SNPRINTF_FALSE$ac_delim
Lines 227-233 Link Here
227	NEED_OWN_STRSEP_TRUE!$NEED_OWN_STRSEP_TRUE$ac_delim	227	NEED_OWN_STRSEP_TRUE!$NEED_OWN_STRSEP_TRUE$ac_delim
228	NEED_OWN_STRSEP_FALSE!$NEED_OWN_STRSEP_FALSE$ac_delim	228	NEED_OWN_STRSEP_FALSE!$NEED_OWN_STRSEP_FALSE$ac_delim
229	REGEXLIB!$REGEXLIB$ac_delim	229	REGEXLIB!$REGEXLIB$ac_delim
230	@@ -27781,7 +27918,7 @@	230	@@ -27783,7 +27920,7 @@
231	LTLIBOBJS!$LTLIBOBJS$ac_delim	231	LTLIBOBJS!$LTLIBOBJS$ac_delim
232	_ACEOF	232	_ACEOF