ports/64946: [Maintainer] www/squid: integrate vendor patches; misc fixes
Thomas-Martin Seck
tmseck at netcologne.de
Tue Mar 30 17:50:18 UTC 2004
>Number: 64946
>Category: ports
>Synopsis: [Maintainer] www/squid: integrate vendor patches; misc fixes
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 30 09:50:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 4.9-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports repository as of March 30, 2004.
>Description:
This PR supersedes ports/64668 which can be closed.
- Integrate four new vendor patches applicable to FreeBSD, see
http://www.squid-cache.org/Versions/v2/2.5/bugs/ for details
- Fix OPTIONS parser to handle a default-to-on option correctly
when either the portoptions file does not exist and/or is not read
(i.e. the PACKAGE_BUILDING and BATCH cases)
- use IGNORE instead of .error to abort
- use ${ID} consistently
- inform the user of squid.sh's rcNG-ness when /etc/rc.subr is present
at installation time
- bump PORTREVISION
>How-To-Repeat:
>Fix:
Apply this patch:
Index: projekte/FreeBSD/ports/www/squid/Makefile
diff -u projekte/FreeBSD/ports/www/squid/Makefile:1.12 projekte/FreeBSD/ports/www/squid/Makefile:1.5.2.36
--- projekte/FreeBSD/ports/www/squid/Makefile:1.12 Wed Mar 24 22:09:01 2004
+++ projekte/FreeBSD/ports/www/squid/Makefile Tue Mar 30 19:27:22 2004
@@ -29,6 +29,7 @@
PORTNAME= squid
PORTVERSION= 2.5.5
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -42,7 +43,11 @@
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES= squid-2.5.STABLE5-ntlm_assert.patch \
- squid-2.5.STABLE5-ldap.patch
+ squid-2.5.STABLE5-ldap.patch \
+ squid-2.5.STABLE5-helper_warning.patch \
+ squid-2.5.STABLE5-vary.patch \
+ squid-2.5.STABLE5-deny_info.patch \
+ squid-2.5.STABLE5-CONNECT_timeout.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck at netcologne.de
@@ -163,7 +168,7 @@
.if defined(WITHOUT_SQUID_WCCP)
CONFIGURE_ARGS+= --disable-wccp
.endif
-.if defined(WITH_SQUID_UNDERSCORES)
+.if !defined(WITHOUT_SQUID_UNDERSCORES)
CONFIGURE_ARGS+= --enable-underscores
.endif
.if defined(WITHOUT_SQUID_CHECK_HOSTNAME)
@@ -188,7 +193,7 @@
# on 5.[0-2] systems instead, go on, I will integrate your patch.
CONFIGURE_ARGS+= --enable-pf-transparent
.else
-.error WITH_SQUID_PF only works on systems where pf is part of the base system.
+IGNORE= WITH_SQUID_PF only works on systems where pf is part of the base system.
.endif
.endif
.if defined(WITH_SQUID_FOLLOW_XFF)
@@ -306,7 +311,7 @@
${ECHO_CMD} "this target!"
exit 1
.endif
- @if [ `id -u` -ne 0 ]; \
+ @if [ `${ID} -u` -ne 0 ]; \
then ${ECHO_CMD} "Sorry, you must be root to use this target."; exit 1; fi; \
current_uid=`id -u ${SQUID_UID}`; \
current_gid=`pw groupshow ${SQUID_GID}|cut -f 3 -d :`; \
Index: projekte/FreeBSD/ports/www/squid/distinfo
diff -u projekte/FreeBSD/ports/www/squid/distinfo:1.10 projekte/FreeBSD/ports/www/squid/distinfo:1.4.2.18
--- projekte/FreeBSD/ports/www/squid/distinfo:1.10 Wed Mar 24 22:09:01 2004
+++ projekte/FreeBSD/ports/www/squid/distinfo Tue Mar 30 19:20:47 2004
@@ -4,3 +4,11 @@
SIZE (squid2.5/squid-2.5.STABLE5-ntlm_assert.patch) = 545
MD5 (squid2.5/squid-2.5.STABLE5-ldap.patch) = 81bdcaf96390eab1655fd8d65cf607ed
SIZE (squid2.5/squid-2.5.STABLE5-ldap.patch) = 6245
+MD5 (squid2.5/squid-2.5.STABLE5-helper_warning.patch) = f384daa03a07a4c99e84c922d9860524
+SIZE (squid2.5/squid-2.5.STABLE5-helper_warning.patch) = 3302
+MD5 (squid2.5/squid-2.5.STABLE5-vary.patch) = fd5f98f7eb8673df7e496ee72a6474b8
+SIZE (squid2.5/squid-2.5.STABLE5-vary.patch) = 626
+MD5 (squid2.5/squid-2.5.STABLE5-deny_info.patch) = bf73b60d02964ad9e410565389e73b06
+SIZE (squid2.5/squid-2.5.STABLE5-deny_info.patch) = 1282
+MD5 (squid2.5/squid-2.5.STABLE5-CONNECT_timeout.patch) = b6aa700c75a061dc9658d8dc198a9183
+SIZE (squid2.5/squid-2.5.STABLE5-CONNECT_timeout.patch) = 2531
Index: projekte/FreeBSD/ports/www/squid/pkg-install
diff -u projekte/FreeBSD/ports/www/squid/pkg-install:1.5 projekte/FreeBSD/ports/www/squid/pkg-install:1.2.2.8
--- projekte/FreeBSD/ports/www/squid/pkg-install:1.5 Wed Mar 24 21:53:20 2004
+++ projekte/FreeBSD/ports/www/squid/pkg-install Wed Mar 24 22:18:35 2004
@@ -148,6 +148,15 @@
echo " Please check your squid.conf and update it if necessary."
tput me
echo ""
+ if [ -f /etc/rc.subr ]; then
+ echo " Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh"
+ echo " will not start squid automatically on this system."
+ echo " You need to set squid_enable=yes in either"
+ echo " /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid"
+ echo " See ${PKG_PREFIX}/etc/rc.d/squid.sh for more"
+ echo " configuration options."
+ echo ""
+ fi
;;
*)
exit 64
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list