Attachment #42128 for bug #65723

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

Lines 18-20 Link Here

(-)distinfo (+2 lines)
18	SIZE (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 900	18	SIZE (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 900
19	MD5 (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = e3640442452f77762df5b20380aeb334	19	MD5 (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = e3640442452f77762df5b20380aeb334
20	SIZE (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685	20	SIZE (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685
		21	MD5 (squid2.5/squid-2.5.STABLE5-digest_blank.patch) = 9eec94b95e52f26aece4568af4a2e5ae
		22	SIZE (squid2.5/squid-2.5.STABLE5-digest_blank.patch) = 4598

Lines 7-12 Link Here

(-)pkg-install (-3 / +10 lines)
7	pkgname=$1	7	pkgname=$1
8	squid_base=${PKG_PREFIX:-/usr/local}/squid	8	squid_base=${PKG_PREFIX:-/usr/local}/squid
9	squid_confdir=${PKG_PREFIX:-/usr/local}/etc/squid	9	squid_confdir=${PKG_PREFIX:-/usr/local}/etc/squid
		10	if [ -x /usr/sbin/nologin ]; then
		11	nologin=/usr/sbin/nologin
		12	else
		13	nologin=/sbin/nologin
		14	fi
10	: ${squid_user:=squid}	15	: ${squid_user:=squid}
11	: ${squid_group:=squid}	16	: ${squid_group:=squid}
12	squid_gid=100	17	squid_gid=100
Lines 42-50 Link Here
42		47
43	if ! pw usershow ${squid_user} -q >/dev/null ; then	48	if ! pw usershow ${squid_user} -q >/dev/null ; then
44	echo "There is no account '${squid_user}' on this system, so I will try to create it:"	49	echo "There is no account '${squid_user}' on this system, so I will try to create it:"
45	if ! pw useradd ${squid_user} -u ${squid_uid} -q \	50	if ! pw useradd -q -n ${squid_user} \
46	-c "squid caching-proxy pseudo user" -g ${squid_group} \	51	-u ${squid_uid} -g ${squid_group} \
47	-d "${squid_base}" -s "/sbin/nologin" -h - ; then	52	-c "squid caching-proxy pseudo user" \
		53	-d "${squid_base}" -s "${nologin}" \
		54	-h - ; then
48	echo "Failed to create user '${squid_user}'!" >&2	55	echo "Failed to create user '${squid_user}'!" >&2
49	echo "Please create it manually." >&2	56	echo "Please create it manually." >&2
50	exit 1	57	exit 1





PORTNAME=	squid
PORTVERSION=	2.5.5
PORTREVISION=	4
CATEGORIES=	www
MASTER_SITES=	\
		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \

		squid-2.5.STABLE5-CONNECT_timeout.patch \
		squid-2.5.STABLE5-cache_swap_log.patch \
		squid-2.5.STABLE5-ntlm_warning.patch \
		squid-2.5.STABLE5-rfc1035NameUnpack.patch \
		squid-2.5.STABLE5-digest_blank.patch
PATCH_DIST_STRIP=	-p1

MAINTAINER=	tmseck@netcologne.de

		SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \
		SQUID_PF "Enable transp. proxy support using PF" off \
		SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \
		SQUID_AUFS "Enable the aufs storage scheme" off \
		SQUID_COSS "Enable the COSS storage scheme" off \
		SQUID_STACKTRACES "Create backtraces on fatal errors" off

PLIST_FILES=	etc/rc.d/squid.sh etc/squid/mib.txt etc/squid/mime.conf.default \

			--enable-external-acl-helpers="${external_acl}" \
			--enable-ntlm-auth-helpers="SMB winbind"

# Selection of storage schemes:

storage_schemes=	ufs diskd null
.if defined(WITH_SQUID_AUFS)
storage_schemes+=	aufs
# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
CONFIGURE_ARGS+=	--enable-async-io \
			--with-pthreads
CFLAGS+=	${PTHREAD_CFLAGS}
.endif
.if defined(WITH_SQUID_COSS)
storage_schemes+=	coss
CONFIGURE_ARGS+=	--with-aio
.endif
CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"

# Other options set via 'make config':


# we need to .include bsd.openssl.mk manually here because USE_OPENSSL only
# works when it is defined before bsd.port{.pre}.mk is .included and this is
# not possible when using OPTIONS
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
CONFIGURE_ARGS+=	--enable-ssl \
			--with-openssl="${OPENSSLBASE}"
CFLAGS+=	-I${OPENSSLINC}

Return to bug 65723

Lines 29-35 Link Here

(-)Makefile (-10 / +11 lines)
29		29
30	PORTNAME= squid	30	PORTNAME= squid
31	PORTVERSION= 2.5.5	31	PORTVERSION= 2.5.5
32	PORTREVISION= 3	32	PORTREVISION= 4
33	CATEGORIES= www	33	CATEGORIES= www
34	MASTER_SITES= \	34	MASTER_SITES= \
35	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	35	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
Lines 50-56 Link Here
50	squid-2.5.STABLE5-CONNECT_timeout.patch \	50	squid-2.5.STABLE5-CONNECT_timeout.patch \
51	squid-2.5.STABLE5-cache_swap_log.patch \	51	squid-2.5.STABLE5-cache_swap_log.patch \
52	squid-2.5.STABLE5-ntlm_warning.patch \	52	squid-2.5.STABLE5-ntlm_warning.patch \
53	squid-2.5.STABLE5-rfc1035NameUnpack.patch	53	squid-2.5.STABLE5-rfc1035NameUnpack.patch \
		54	squid-2.5.STABLE5-digest_blank.patch
54	PATCH_DIST_STRIP= -p1	55	PATCH_DIST_STRIP= -p1
55		56
56	MAINTAINER= tmseck@netcologne.de	57	MAINTAINER= tmseck@netcologne.de
Lines 90-97 Link Here
90	SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \	91	SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \
91	SQUID_PF "Enable transp. proxy support using PF" off \	92	SQUID_PF "Enable transp. proxy support using PF" off \
92	SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \	93	SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \
93	SQUID_AUFS "Enable the aufs store type" off \	94	SQUID_AUFS "Enable the aufs storage scheme" off \
94	SQUID_COSS "Enable the COSS store type" off \	95	SQUID_COSS "Enable the COSS storage scheme" off \
95	SQUID_STACKTRACES "Create backtraces on fatal errors" off	96	SQUID_STACKTRACES "Create backtraces on fatal errors" off
96		97
97	PLIST_FILES= etc/rc.d/squid.sh etc/squid/mib.txt etc/squid/mime.conf.default \	98	PLIST_FILES= etc/rc.d/squid.sh etc/squid/mib.txt etc/squid/mime.conf.default \
Lines 125-145 Link Here
125	--enable-external-acl-helpers="${external_acl}" \	126	--enable-external-acl-helpers="${external_acl}" \
126	--enable-ntlm-auth-helpers="SMB winbind"	127	--enable-ntlm-auth-helpers="SMB winbind"
127		128
128	# Selection of store types:	129	# Selection of storage schemes:
129		130
130	store_types= ufs diskd null	131	storage_schemes= ufs diskd null
131	.if defined(WITH_SQUID_AUFS)	132	.if defined(WITH_SQUID_AUFS)
132	store_types+= aufs	133	storage_schemes+= aufs
133	# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS	134	# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
134	CONFIGURE_ARGS+= --enable-async-io \	135	CONFIGURE_ARGS+= --enable-async-io \
135	--with-pthreads	136	--with-pthreads
136	CFLAGS+= ${PTHREAD_CFLAGS}	137	CFLAGS+= ${PTHREAD_CFLAGS}
137	.endif	138	.endif
138	.if defined(WITH_SQUID_COSS)	139	.if defined(WITH_SQUID_COSS)
139	store_types+= coss	140	storage_schemes+= coss
140	CONFIGURE_ARGS+= --with-aio	141	CONFIGURE_ARGS+= --with-aio
141	.endif	142	.endif
142	CONFIGURE_ARGS+= --enable-storeio="${store_types}"	143	CONFIGURE_ARGS+= --enable-storeio="${storage_schemes}"
143		144
144	# Other options set via 'make config':	145	# Other options set via 'make config':
145		146
Lines 156-162 Link Here
156	# we need to .include bsd.openssl.mk manually here because USE_OPENSSL only	157	# we need to .include bsd.openssl.mk manually here because USE_OPENSSL only
157	# works when it is defined before bsd.port{.pre}.mk is .included and this is	158	# works when it is defined before bsd.port{.pre}.mk is .included and this is
158	# not possible when using OPTIONS	159	# not possible when using OPTIONS
159	.include "${PORTSDIR}/Mk/bsd.openssl.mk"	160	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
160	CONFIGURE_ARGS+= --enable-ssl \	161	CONFIGURE_ARGS+= --enable-ssl \
161	--with-openssl="${OPENSSLBASE}"	162	--with-openssl="${OPENSSLBASE}"
162	CFLAGS+= -I${OPENSSLINC}	163	CFLAGS+= -I${OPENSSLINC}