Date: 1 Nov 2005 13:01:03 -0000 From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/88327: [Maintainer] www/squid: update to 2.5.STABLE12 Message-ID: <20051101130103.12404.qmail@laurel.tmseck.homedns.org> Resent-Message-ID: <200511011310.jA1DALIv073762@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88327
>Category: ports
>Synopsis: [Maintainer] www/squid: update to 2.5.STABLE12
>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: Tue Nov 01 13:10:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 4.11-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of November 1, 2005.
>Description:
- Update squid to 2.5.STABLE12
- Apply some minor brushups:
+ remove the !defined NOPORTDOCS wrapper around the PORTDOCS definition
because bsd.port.mk takes care of this nowadays
+ pass SCRIPTS_ENV to pkg-install, too
+ point to 'make config' in pkg-descr
+ show the user how to remove the default squid user and group in the
post-deinstallation phase
+ rephrase post-deinstallatin information about the data left in the system
>How-To-Repeat:
>Fix:
Apply this patch:
Index: distinfo
===================================================================
--- distinfo (.../www/squid) (revision 610)
+++ distinfo (.../local/squid) (revision 610)
@@ -1,24 +1,2 @@
-MD5 (squid2.5/squid-2.5.STABLE11.tar.bz2) = 5e7f13ad95b64b60ddd6cdc2ab800d67
-SIZE (squid2.5/squid-2.5.STABLE11.tar.bz2) = 1075431
-MD5 (squid2.5/squid-2.5.STABLE11-delaypools_truncated.patch) = 73bd15ae4853d9b0f45ac4277b35ed15
-SIZE (squid2.5/squid-2.5.STABLE11-delaypools_truncated.patch) = 588
-MD5 (squid2.5/squid-2.5.STABLE11-tcp_outgoing_xxx.patch) = 18846f871032c4d7c496373c24b9f4d9
-SIZE (squid2.5/squid-2.5.STABLE11-tcp_outgoing_xxx.patch) = 1140
-MD5 (squid2.5/squid-2.5.STABLE11-ldap_auth.patch) = a22867a5be67b3ff2dd35ab338b05d9e
-SIZE (squid2.5/squid-2.5.STABLE11-ldap_auth.patch) = 4857
-MD5 (squid2.5/squid-2.5.STABLE11.accel_single_host_pconn.patch) = f6ad18183bb3df2da1c5e6287b7162ea
-SIZE (squid2.5/squid-2.5.STABLE11.accel_single_host_pconn.patch) = 944
-MD5 (squid2.5/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch) = a43d8d7bed00dc0caebec7b440625a11
-SIZE (squid2.5/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch) = 4010
-MD5 (squid2.5/squid-2.5.STABLE11-CNAME.patch) = 263c1a76d470ad4553e05e686e422de2
-SIZE (squid2.5/squid-2.5.STABLE11-CNAME.patch) = 3825
-MD5 (squid2.5/squid-2.5.STABLE11-httpd_accel-internal.patch) = fe88ab718a58e484bbf8ce6ce6111dd3
-SIZE (squid2.5/squid-2.5.STABLE11-httpd_accel-internal.patch) = 1736
-MD5 (squid2.5/squid-2.5.STABLE11-IMS-HEAD.patch) = 1e8ddcd080f431c8f3c059366e159765
-SIZE (squid2.5/squid-2.5.STABLE11-IMS-HEAD.patch) = 834
-MD5 (squid2.5/squid-2.5.STABLE11-redirect-CONNECT.patch) = 16e8a386cae25b5b0493adb66d89416f
-SIZE (squid2.5/squid-2.5.STABLE11-redirect-CONNECT.patch) = 1282
-MD5 (squid2.5/squid-2.5.STABLE11-setcookie.patch) = 0d1acad61df0ffb5224cb3910f25fb29
-SIZE (squid2.5/squid-2.5.STABLE11-setcookie.patch) = 531
-MD5 (squid2.5/squid-2.5.STABLE11-rfc1738_do_escape.patch) = 43094437e3d66aa1cb141ea4c776df19
-SIZE (squid2.5/squid-2.5.STABLE11-rfc1738_do_escape.patch) = 3302
+MD5 (squid2.5/squid-2.5.STABLE12.tar.bz2) = 7354255015b3772a1e024dfac173e48c
+SIZE (squid2.5/squid-2.5.STABLE12.tar.bz2) = 1075111
Index: pkg-descr
===================================================================
--- pkg-descr (.../www/squid) (revision 610)
+++ pkg-descr (.../local/squid) (revision 610)
@@ -9,7 +9,7 @@
ARPA funding for the Harvest project has ended, the squid project has
continued development of the cache where Harvest finished.
-Please see this port's Makefile for a list of compilation options.
+This port provides many configuration options, most of which are
+available via 'make config'.
-You can find further information on the project's website at
WWW: http://www.squid-cache.org/
Index: pkg-install
===================================================================
--- pkg-install (.../www/squid) (revision 610)
+++ pkg-install (.../local/squid) (revision 610)
@@ -156,7 +156,7 @@
echo " See ${PKG_PREFIX}/etc/rc.d/squid.sh for more"
echo " configuration options."
echo ""
- echo " If you want to install an old style rc script, run"
+ echo " If you want the port to install an old style rc script, run"
echo " 'make config' and deselect the option to install an"
echo " rcNG script."
echo ""
Index: Makefile
===================================================================
--- Makefile (.../www/squid) (revision 610)
+++ Makefile (.../local/squid) (revision 610)
@@ -69,8 +69,7 @@
#
PORTNAME= squid
-PORTVERSION= 2.5.11
-PORTREVISION= 3
+PORTVERSION= 2.5.12
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -79,21 +78,10 @@
ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
MASTER_SITE_SUBDIR= squid-2/STABLE
-DISTNAME= squid-2.5.STABLE11
+DISTNAME= squid-2.5.STABLE12
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES= squid-2.5.STABLE11-delaypools_truncated.patch \
- squid-2.5.STABLE11-tcp_outgoing_xxx.patch \
- squid-2.5.STABLE11-ldap_auth.patch \
- squid-2.5.STABLE11.accel_single_host_pconn.patch \
- squid-2.5.STABLE11-CACHE_HTTP_PORT.patch \
- squid-2.5.STABLE11-CNAME.patch \
- squid-2.5.STABLE11-httpd_accel-internal.patch \
- squid-2.5.STABLE11-IMS-HEAD.patch \
- squid-2.5.STABLE11-redirect-CONNECT.patch \
- squid-2.5.STABLE11-setcookie.patch \
- squid-2.5.STABLE11-rfc1738_do_escape.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
@@ -110,9 +98,7 @@
MAN8= cachemgr.cgi.8 squid.8
docs= QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
-.if !defined(NOPORTDOCS)
PORTDOCS= ${docs:T}
-.endif
OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
SQUID_DELAY_POOLS "Enable delay pools" off \
@@ -375,8 +361,9 @@
>${WRKDIR}/squid.sh
pre-su-install:
- @${SETENV} squid_user=${SQUID_UID} squid_group=${SQUID_GID} \
- PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+ @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
+ squid_user=${SQUID_UID} squid_group=${SQUID_GID} \
+ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
# Create cachemgr.conf.default manually since squid's install routine
Index: pkg-deinstall
===================================================================
--- pkg-deinstall (.../www/squid) (revision 610)
+++ pkg-deinstall (.../local/squid) (revision 610)
@@ -15,17 +15,21 @@
POST-DEINSTALL)
echo "===> post-deinstallation information for $1"
echo ""
- echo " Please note that squid was not completely removed"
- echo " from this system:"
+ echo " Note:"
+ echo " squid related user accounts and groups were not removed."
echo ""
- echo " Any squid related user accounts were kept."
+ echo " To remove the 'squid' user and the 'squid' group which were"
+ echo " created by a default installation of this package, run"
+ echo ""
+ echo " pw userdel -r -n squid -u 100"
+ echo ""
if [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then
echo ""
- echo " Additionally, cache and log directories as well as"
- echo " configuration files modified by you were preserved"
- echo " too, in case you want to install an updated version"
- echo " of squid. You need to remove them manually if you do"
- echo " not want to use it any longer."
+ echo " To ease updates, the cache and log directories and"
+ echo " all configuration files modified by you were preserved."
+ echo ""
+ echo " Please remove them manually if you do not want to use"
+ echo " squid any longer."
fi
echo ""
;;
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051101130103.12404.qmail>