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

(-)distinfo (-50 / +2 lines)
Lines 1-50 Link Here
1
MD5 (squid2.5/squid-2.5.STABLE6.tar.bz2) = 7fd964ac27b43b613d6b981cc702a29e
1
MD5 (squid2.5/squid-2.5.STABLE7.tar.bz2) = bf63e34906c68d716896eec0351108dc
2
SIZE (squid2.5/squid-2.5.STABLE6.tar.bz2) = 1047199
2
SIZE (squid2.5/squid-2.5.STABLE7.tar.bz2) = 1051830
3
MD5 (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
4
SIZE (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566
5
MD5 (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = fb7684fa6c797404f46c8ef86122848a
6
SIZE (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 25444
7
MD5 (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = b485488ef0031f26902bb94f55a3a2ed
8
SIZE (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6461
9
MD5 (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 1900043f6b73aa8a3cbd5004633a6c5c
10
SIZE (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 765
11
MD5 (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 9ce8322cf6c48dc02a7a51d039489143
12
SIZE (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747
13
MD5 (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 929fe3d48046a7d17c0aa314befd8f7c
14
SIZE (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 895
15
MD5 (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 63b5693268cbba233a442b345e5769bb
16
SIZE (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 847
17
MD5 (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = eb6f28d6d572c8cf996619aea925a1b6
18
SIZE (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337
19
MD5 (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = f465bdbbadd83dee417aafeb974a9248
20
SIZE (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500
21
MD5 (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 772a2ed149b89a1addf70cd1dd5def3c
22
SIZE (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 3828
23
MD5 (squid2.5/squid-2.5.STABLE6-ntlmtruncated.patch) = c77b3c10fc5d5c9d34ccf41f7623a0fe
24
SIZE (squid2.5/squid-2.5.STABLE6-ntlmtruncated.patch) = 4383
25
MD5 (squid2.5/squid-2.5.STABLE6-grammar.patch) = 963208de03349b6fa143bc099524699c
26
SIZE (squid2.5/squid-2.5.STABLE6-grammar.patch) = 50267
27
MD5 (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = b9f329cdf98c7c5a048cdadc32d6874d
28
SIZE (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = 377
29
MD5 (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = c82d9f3972419833b757c0c116c216f8
30
SIZE (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = 867
31
MD5 (squid2.5/squid-2.5.STABLE6-initgroups.patch) = 5cd7eb8451754166f543d84c7a9ba6dc
32
SIZE (squid2.5/squid-2.5.STABLE6-initgroups.patch) = 11060
33
MD5 (squid2.5/squid-2.5.STABLE6-external_acl_newlines.patch) = 0e01c58db5545e1b7273d2d244171642
34
SIZE (squid2.5/squid-2.5.STABLE6-external_acl_newlines.patch) = 4965
35
MD5 (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = dbf1826522c14dc64c0c37430bb27b2e
36
SIZE (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606
37
MD5 (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 6053338662140e9514afd4c3d158590d
38
SIZE (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646
39
MD5 (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = d6bdb1500f947b5aa67c23561f941ddf
40
SIZE (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 13473
41
MD5 (squid2.5/squid-2.5.STABLE6-rotate_error.patch) = e842e11bd987d56e49df020a17fb1ad9
42
SIZE (squid2.5/squid-2.5.STABLE6-rotate_error.patch) = 2238
43
MD5 (squid2.5/squid-2.5.STABLE6-digest_crash.patch) = b0e5a15164ac7f14682bc200f2efd6c9
44
SIZE (squid2.5/squid-2.5.STABLE6-digest_crash.patch) = 1250
45
MD5 (squid2.5/squid-2.5.STABLE6-acl_times.patch) = 91c69f9a5cebd5d84a4eee63ea10be99
46
SIZE (squid2.5/squid-2.5.STABLE6-acl_times.patch) = 3047
47
MD5 (squid2.5/squid-2.5.STABLE6-http_header_range.patch) = 83b25961601597375682afde86ce23a8
48
SIZE (squid2.5/squid-2.5.STABLE6-http_header_range.patch) = 616
49
MD5 (squid2.5/squid-2.5.STABLE6-Content-Disposition.patch) = c11ca0bcf406b4240a745fc52b063495
50
SIZE (squid2.5/squid-2.5.STABLE6-Content-Disposition.patch) = 1815
(-)files/squid.sh (-10 / +14 lines)
Lines 22-41 Link Here
22
# --begin rcng
22
# --begin rcng
23
extra_commands=reload
23
extra_commands=reload
24
reload_cmd="${command} -k reconfigure"
24
reload_cmd="${command} -k reconfigure"
25
restart_cmd=squid_restart
26
# --end rcng
25
# --end rcng
27
stop_cmd="${command} -k shutdown"
26
stop_cmd="squid_stop"
28
squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
27
squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
29
squid_enable=${squid_enable:-"NO"}
28
squid_enable=${squid_enable:-"NO"}
30
squid_flags=${squid_flags-"-D"}
29
squid_flags=${squid_flags-"-D"}
31
squid_user=${squid_user:-%%SQUID_UID%%}
30
squid_user=${squid_user:-%%SQUID_UID%%}
32
default_config=%%PREFIX%%/etc/squid/squid.conf
31
default_config=%%PREFIX%%/etc/squid/squid.conf
33
32
33
# --begin rcold
34
squid_stop() {
35
	echo -n " ${name}"
36
	${command} -k shutdown
37
	while ps -xcU ${squid_user} | grep -q squid; do
38
		sleep 2
39
	done
40
}
41
42
# --end rcold
34
# --begin rcng
43
# --begin rcng
35
squid_restart() {
44
squid_stop() {
36
	run_rc_command stop
45
	${command} -k shutdown
37
	run_rc_command poll
46
	run_rc_command poll
38
	run_rc_command start
39
}
47
}
40
48
41
. %%RC_SUBR%%
49
. %%RC_SUBR%%
Lines 66-79 Link Here
66
	;;
74
	;;
67
stop)
75
stop)
68
	if [ -x "${command}" ]; then
76
	if [ -x "${command}" ]; then
69
		echo -n " ${name}"
70
		${stop_cmd}
77
		${stop_cmd}
71
		while ps -xcU ${squid_user} | grep -q squid; do
72
			sleep 2
73
		done
74
	fi
78
	fi
75
	;;
79
	;;
76
	*)
80
*)
77
	echo "usage: ${0##*/} {start|stop}" >&2
81
	echo "usage: ${0##*/} {start|stop}" >&2
78
	exit 64
82
	exit 64
79
	;;
83
	;;
(-)files/patch-configure (-11 lines)
Lines 1-11 Link Here
1
--- configure.orig	Tue Mar  2 11:29:57 2004
2
+++ configure	Tue Mar  2 11:30:34 2004
3
@@ -2236,6 +2236,8 @@
4
 	    ;;
5
 	*-solaris-*)
6
 	    ;;
7
+	*-freebsd*)
8
+	    ;;
9
 	*)
10
 	    echo "WARNING: ARP ACL support probably won't work on $host."
11
 	    sleep 10
(-)pkg-install (-4 / +7 lines)
Lines 146-161 Link Here
146
	echo "       initialize the cache directory by running \"squid -z\""
146
	echo "       initialize the cache directory by running \"squid -z\""
147
	echo "       as 'root' or '${squid_user}' before starting squid."
147
	echo "       as 'root' or '${squid_user}' before starting squid."
148
	echo ""
148
	echo ""
149
	echo "     Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh"
149
	echo "     Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh is now"
150
	echo "     will not start squid automatically anymore unless you"
150
	echo "     an rcNG script by default. This means that squid will not"
151
	echo "     explicitly configured the port not to install an rcNG"
151
	echo "     start automatically at boot time."
152
	echo "     style startup script via 'make config'."
153
	echo ""
152
	echo ""
154
	echo "     To enable squid, set squid_enable=yes in either"
153
	echo "     To enable squid, set squid_enable=yes in either"
155
	echo "     /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid"
154
	echo "     /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid"
156
	echo "     See ${PKG_PREFIX}/etc/rc.d/squid.sh for more"
155
	echo "     See ${PKG_PREFIX}/etc/rc.d/squid.sh for more"
157
	echo "     configuration options."
156
	echo "     configuration options."
158
	echo ""
157
	echo ""
158
	echo "     If you want to install an old style rc script, run"
159
	echo "     'make config' and deselect the option to install an"
160
	echo "     rcNG script."
161
	echo ""
159
	;;
162
	;;
160
*)
163
*)
161
	exit 64
164
	exit 64
(-)Makefile (-28 / +3 lines)
Lines 73-80 Link Here
73
#     about how to do transparent proxying with ipfw)
73
#     about how to do transparent proxying with ipfw)
74
74
75
PORTNAME=	squid
75
PORTNAME=	squid
76
PORTVERSION=	2.5.6
76
PORTVERSION=	2.5.7
77
PORTREVISION=	12
78
CATEGORIES=	www
77
CATEGORIES=	www
79
MASTER_SITES=	\
78
MASTER_SITES=	\
80
		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
79
		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
Lines 83-117 Link Here
83
		ftp://ftp.leo.org/pub/comp/general/infosys/www/servers/squid/%SUBDIR%/ \
82
		ftp://ftp.leo.org/pub/comp/general/infosys/www/servers/squid/%SUBDIR%/ \
84
		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
83
		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
85
MASTER_SITE_SUBDIR=	squid-2/STABLE
84
MASTER_SITE_SUBDIR=	squid-2/STABLE
86
DISTNAME=	squid-2.5.STABLE6
85
DISTNAME=	squid-2.5.STABLE7
87
DIST_SUBDIR=	squid2.5
86
DIST_SUBDIR=	squid2.5
88
87
89
PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
88
PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
90
PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
91
		squid-2.5.STABLE6-ldap_helpers.patch \
92
		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
93
		squid-2.5.STABLE6-request_header_max_size.patch \
94
		squid-2.5.STABLE6-partial_hit_is_miss.patch \
95
		squid-2.5.STABLE6-HEAD.patch \
96
		squid-2.5.STABLE6-ufs_create_error.patch \
97
		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
98
		squid-2.5.STABLE6-active_requests_delaypool.patch \
99
		squid-2.5.STABLE6-client_db_gc.patch \
100
		squid-2.5.STABLE6-ntlmtruncated.patch \
101
		squid-2.5.STABLE6-grammar.patch \
102
		squid-2.5.STABLE6-errorpage_quote.patch \
103
		squid-2.5.STABLE6-heap_segfault.patch \
104
		squid-2.5.STABLE6-initgroups.patch \
105
		squid-2.5.STABLE6-external_acl_newlines.patch \
106
		squid-2.5.STABLE6-ntlm_fetch_string.patch \
107
		squid-2.5.STABLE6-ntlm_noreuse_leak.patch \
108
		squid-2.5.STABLE6-ntlm_challengereuse_leak.patch \
109
		squid-2.5.STABLE6-rotate_error.patch \
110
		squid-2.5.STABLE6-digest_crash.patch \
111
		squid-2.5.STABLE6-acl_times.patch \
112
		squid-2.5.STABLE6-http_header_range.patch \
113
		squid-2.5.STABLE6-Content-Disposition.patch
114
PATCH_DIST_STRIP=	-p1
115
89
116
MAINTAINER=	tmseck@netcologne.de
90
MAINTAINER=	tmseck@netcologne.de
117
COMMENT=	The successful WWW proxy cache and accelerator
91
COMMENT=	The successful WWW proxy cache and accelerator
Lines 302-307 Link Here
302
.endif
276
.endif
303
.if defined(WITH_SQUID_STACKTRACES)
277
.if defined(WITH_SQUID_STACKTRACES)
304
CONFIGURE_ARGS+=	--enable-stacktraces
278
CONFIGURE_ARGS+=	--enable-stacktraces
279
STRIP=			""
305
.endif
280
.endif
306
.if !defined(WITHOUT_SQUID_RCNG)
281
.if !defined(WITHOUT_SQUID_RCNG)
307
USE_RC_SUBR=	yes
282
USE_RC_SUBR=	yes

Return to bug 72581