Attachment #133774 for bug #178304

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

Lines 228-237 Link Here

(-)b/www/squid33/Makefile (-1 / +2 lines)
228	--sbindir=${PREFIX}/sbin \	228	--sbindir=${PREFIX}/sbin \
229	--datadir=${ETCDIR} \	229	--datadir=${ETCDIR} \
230	--libexecdir=${PREFIX}/libexec/squid \	230	--libexecdir=${PREFIX}/libexec/squid \
231	--localstatedir=/var/squid \	231	--localstatedir=/var \
232	--sysconfdir=${ETCDIR} \	232	--sysconfdir=${ETCDIR} \
233	--with-logdir=/var/log/squid \	233	--with-logdir=/var/log/squid \
234	--with-pidfile=/var/run/squid/squid.pid \	234	--with-pidfile=/var/run/squid/squid.pid \
		235	--with-swapdir=/var/squid/cache \
235	--enable-auth \	236	--enable-auth \
236	--enable-build-info \	237	--enable-build-info \
237	--enable-loadable-modules \	238	--enable-loadable-modules \





PATH=/bin:/usr/bin:/usr/sbin
pkgname=$1
squid_homedir="/var/squid"
squid_cachedir="${squid_base}/cache"
squid_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/squid"
squid_logdir="/var/log/squid"
squid_rundir="/var/run/squid"
squid_cachedir="${squid_homedir}/cache"
# these are hardcoded, see /usr/ports/UIDs and /usr/ports/GIDs:
squid_user=squid
squid_group=squid

	;;
POST-INSTALL)
	# Since we usually start the Squid master process as ${squid_user}
	# instead of root make sure that ${squid_homedir} is writable for it.
	if [ ! -d ${squid_homedir} ]; then
		echo "Creating ${squid_homedir}..."
		install -d -o root -g ${squid_group} \
		    -m 0775 ${squid_homedir}
	else
		chgrp ${squid_group} ${squid_homedir}
		chmod g+w ${squid_homedir}
	fi
	if [ ! -d ${squid_cachedir} ]; then
		echo "Creating ${squid_cachedir} ..."

Lines 1-7 Link Here

(-)b/www/squid33/files/pkg-message.in (-1 / +1 lines)
1	o You can find the configuration files for this package in the	1	o You can find the configuration files for this package in the
2	directory %%PREFIX%%/etc/squid.	2	directory %%PREFIX%%/etc/squid.
3		3
4	o The default cache directory is /var/squid/.	4	o The default cache directory is /var/squid/cache/.
5	The default log directory is /var/log/squid/.	5	The default log directory is /var/log/squid/.
6		6
7	Note:	7	Note:





PATH=/bin:/usr/bin:/usr/sbin
squid_homedir="/var/squid"
squid_cache_basedir="${squid_homedir}/cache"
squid_state_basedir="${squid_homedir}/run"
squid_confdir=${PKG_PREFIX}/etc/squid
squid_logdir="/var/log/squid"
squid_rundir="/var/run/squid"
squid_cachedir="${squid_homedir}/cache"

case $2 in
DEINSTALL)

		cmp -s -z ${f} ${f}.default && rm ${f}
	done
	# try to cleanup directories in /var:
	for d in ${squid_logdir} ${squid_rundir} ${squid_cachedir} ${squid_homedir}; do
		rmdir ${d} 2>/dev/null
	done
	;;

	echo "     created by a default installation of this package, run"
	echo ""
	echo "     pw userdel -n squid -u 100"
	if  [ -d ${squid_confdir} -o -d ${squid_logdir} -o -d ${squid_rundir} -o -d ${squid_homedir} ] ; then
		echo ""
		echo "     In order to ease updates the cache and log directories"
		echo "     and all configuration files modified by you were preserved."

Return to bug 178304

Lines 5-15 Link Here

(-)b/www/squid33/files/pkg-install.in (-8 / +8 lines)
5		5
6	PATH=/bin:/usr/bin:/usr/sbin	6	PATH=/bin:/usr/bin:/usr/sbin
7	pkgname=$1	7	pkgname=$1
8	squid_base="/var/squid"	8	squid_homedir="/var/squid"
9	squid_cachedir="${squid_base}/cache"
10	squid_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/squid"	9	squid_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/squid"
11	squid_logdir="/var/log/squid"	10	squid_logdir="/var/log/squid"
12	squid_rundir="/var/run/squid"	11	squid_rundir="/var/run/squid"
		12	squid_cachedir="${squid_homedir}/cache"
13	# these are hardcoded, see /usr/ports/UIDs and /usr/ports/GIDs:	13	# these are hardcoded, see /usr/ports/UIDs and /usr/ports/GIDs:
14	squid_user=squid	14	squid_user=squid
15	squid_group=squid	15	squid_group=squid
Lines 21-34 Link Here
21	;;	21	;;
22	POST-INSTALL)	22	POST-INSTALL)
23	# Since we usually start the Squid master process as ${squid_user}	23	# Since we usually start the Squid master process as ${squid_user}
24	# instead of root make sure that ${squid_base} is writable for it.	24	# instead of root make sure that ${squid_homedir} is writable for it.
25	if [ ! -d ${squid_base} ]; then	25	if [ ! -d ${squid_homedir} ]; then
26	echo "Creating ${squid_base}..."	26	echo "Creating ${squid_homedir}..."
27	install -d -o root -g ${squid_group} \	27	install -d -o root -g ${squid_group} \
28	-m 0775 ${squid_base}	28	-m 0775 ${squid_homedir}
29	else	29	else
30	chgrp ${squid_group} ${squid_base}	30	chgrp ${squid_group} ${squid_homedir}
31	chmod g+w ${squid_base}	31	chmod g+w ${squid_homedir}
32	fi	32	fi
33	if [ ! -d ${squid_cachedir} ]; then	33	if [ ! -d ${squid_cachedir} ]; then
34	echo "Creating ${squid_cachedir} ..."	34	echo "Creating ${squid_cachedir} ..."

Lines 5-15 Link Here

(-)b/www/squid33/pkg-deinstall (-4 / +3 lines)
5		5
6	PATH=/bin:/usr/bin:/usr/sbin	6	PATH=/bin:/usr/bin:/usr/sbin
7	squid_homedir="/var/squid"	7	squid_homedir="/var/squid"
8	squid_cache_basedir="${squid_homedir}/cache"
9	squid_state_basedir="${squid_homedir}/run"
10	squid_confdir=${PKG_PREFIX}/etc/squid	8	squid_confdir=${PKG_PREFIX}/etc/squid
11	squid_logdir="/var/log/squid"	9	squid_logdir="/var/log/squid"
12	squid_rundir="/var/run/squid"	10	squid_rundir="/var/run/squid"
		11	squid_cachedir="${squid_homedir}/cache"
13		12
14	case $2 in	13	case $2 in
15	DEINSTALL)	14	DEINSTALL)
Lines 18-24 Link Here
18	cmp -s -z ${f} ${f}.default && rm ${f}	17	cmp -s -z ${f} ${f}.default && rm ${f}
19	done	18	done
20	# try to cleanup directories in /var:	19	# try to cleanup directories in /var:
21	for d in ${squid_cache_basedir}/squid ${squid_cache_basedir} ${squid_state_basedir}/squid ${squid_state_basedir} ${squid_homedir} ${squid_logdir} ${squid_rundir}; do	20	for d in ${squid_logdir} ${squid_rundir} ${squid_cachedir} ${squid_homedir}; do
22	rmdir ${d} 2>/dev/null	21	rmdir ${d} 2>/dev/null
23	done	22	done
24	;;	23	;;
Lines 32-38 Link Here
32	echo " created by a default installation of this package, run"	31	echo " created by a default installation of this package, run"
33	echo ""	32	echo ""
34	echo " pw userdel -n squid -u 100"	33	echo " pw userdel -n squid -u 100"
35	if [ -d ${squid_homedir} -o -d ${squid_confdir} -o -d ${squid_logdir} -o -d ${squid_rundir} ] ; then	34	if [ -d ${squid_confdir} -o -d ${squid_logdir} -o -d ${squid_rundir} -o -d ${squid_homedir} ] ; then
36	echo ""	35	echo ""
37	echo " In order to ease updates the cache and log directories"	36	echo " In order to ease updates the cache and log directories"
38	echo " and all configuration files modified by you were preserved."	37	echo " and all configuration files modified by you were preserved."