From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 5 11:40:20 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3998116A4CE for ; Mon, 5 Jan 2004 11:40:20 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DA4D43D31 for ; Mon, 5 Jan 2004 11:40:17 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i05JeGFR023347 for ; Mon, 5 Jan 2004 11:40:16 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i05JeGOX023346; Mon, 5 Jan 2004 11:40:16 -0800 (PST) (envelope-from gnats) Resent-Date: Mon, 5 Jan 2004 11:40:16 -0800 (PST) Resent-Message-Id: <200401051940.i05JeGOX023346@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thomas-Martin Seck Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9415516A4CE for ; Mon, 5 Jan 2004 11:34:52 -0800 (PST) Received: from smtp2.netcologne.de (smtp2.netcologne.de [194.8.194.218]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5AE643D39 for ; Mon, 5 Jan 2004 11:34:50 -0800 (PST) (envelope-from thomas@laurel.tmseck.homedns.org) Received: from laurel.tmseck.homedns.org (xdsl-213-196-194-122.netcologne.de [213.196.194.122]) by smtp2.netcologne.de (Postfix) with SMTP id A81DA3A0EE for ; Mon, 5 Jan 2004 20:34:48 +0100 (MET) Received: (qmail 38265 invoked by uid 1001); 5 Jan 2004 19:34:47 -0000 Message-Id: <20040105193447.38264.qmail@laurel.tmseck.homedns.org> Date: 5 Jan 2004 19:34:47 -0000 From: Thomas-Martin Seck To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/60950: [MAINTAINER UPDATE] www/squid: integrate yet another patch X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jan 2004 19:40:20 -0000 >Number: 60950 >Category: ports >Synopsis: [MAINTAINER UPDATE] www/squid: integrate yet another patch >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: Mon Jan 05 11:40:16 PST 2004 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 4.9-STABLE i386 >Organization: private site >Environment: FreeBSD ports repository as of 05 Jan 2004. >Description: Integrate a new patch issued by the squid development team to correct the behaviour of the LDAP authentication helper wrt TLS, see for details. Reinstate the "errorpages.patch" and work around its partial brokenness by installing some Lithuanian error pages manually. PORTREVISION bumped. >How-To-Repeat: >Fix: Here's the patch: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/squid/Makefile,v retrieving revision 1.108 diff -u -r1.108 Makefile --- Makefile 5 Jan 2004 09:54:35 -0000 1.108 +++ Makefile 5 Jan 2004 19:22:09 -0000 @@ -7,7 +7,7 @@ PORTNAME= squid PORTVERSION= 2.5.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -27,6 +27,7 @@ squid-2.5.STABLE4-fqdnnegcache.patch \ pam_auth-2.2.patch \ squid-2.5.STABLE4_auth_param_doc.patch \ + squid-2.5.STABLE4-errorpages.patch \ squid-2.5.STABLE4-error_load_text.patch \ squid-2.5.STABLE4-xpi_mime.patch \ squid-2.5.STABLE4-size_overflow.patch \ @@ -51,7 +52,8 @@ squid-2.5.STABLE4-russian.patch \ squid-2.5.STABLE4-redirlog.patch \ squid-2.5.STABLE4-pinger.patch \ - squid-2.5.STABLE4-partial_reload.patch + squid-2.5.STABLE4-partial_reload.patch \ + squid-2.5.STABLE4-ldap_tls.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de @@ -169,5 +171,10 @@ ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh; \ fi + +# Work around the fact that the errorpages.patch creates files in +# an "Attic" subdir: + @${FIND} ${WRKSRC}/errors/Lithuanian/Attic -type f \ + -exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \; .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/squid/distinfo,v retrieving revision 1.73 diff -u -r1.73 distinfo --- distinfo 2 Jan 2004 00:27:50 -0000 1.73 +++ distinfo 5 Jan 2004 18:19:37 -0000 @@ -5,6 +5,7 @@ MD5 (squid2.5/squid-2.5.STABLE4-fqdnnegcache.patch) = ae1b7cce41ca403ebd7115d4506b0c25 MD5 (squid2.5/pam_auth-2.2.patch) = 3037a67d8f4b85cd7d51cb2dd5b4e8b8 MD5 (squid2.5/squid-2.5.STABLE4_auth_param_doc.patch) = 3b35c424db58c71c541563cd5ae39d15 +MD5 (squid2.5/squid-2.5.STABLE4-errorpages.patch) = cd2afde3f233df8ab8015e045f304ee7 MD5 (squid2.5/squid-2.5.STABLE4-error_load_text.patch) = 3935a3005d125f55cd78b228eba20647 MD5 (squid2.5/squid-2.5.STABLE4-xpi_mime.patch) = 1143fb9244690a24450c3c9ce6105da4 MD5 (squid2.5/squid-2.5.STABLE4-size_overflow.patch) = 7cd2d6b1ebbd86aa143fa5a57156d6ce @@ -30,3 +31,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-redirlog.patch) = 8a2cc15f2bde6fa263a9e40aae807f82 MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34 +MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/squid/pkg-plist,v retrieving revision 1.20 diff -u -r1.20 pkg-plist --- pkg-plist 28 Dec 2003 09:46:13 -0000 1.20 +++ pkg-plist 5 Jan 2004 19:20:50 -0000 @@ -470,9 +470,12 @@ etc/squid/errors/Lithuanian/ERR_FORWARDING_DENIED etc/squid/errors/Lithuanian/ERR_FTP_DISABLED etc/squid/errors/Lithuanian/ERR_FTP_FAILURE +etc/squid/errors/Lithuanian/ERR_FTP_FORBIDDEN +etc/squid/errors/Lithuanian/ERR_FTP_NOT_FOUND etc/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED etc/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR etc/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED +etc/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE etc/squid/errors/Lithuanian/ERR_INVALID_REQ etc/squid/errors/Lithuanian/ERR_INVALID_URL etc/squid/errors/Lithuanian/ERR_LIFETIME_EXP @@ -480,7 +483,9 @@ etc/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS etc/squid/errors/Lithuanian/ERR_READ_ERROR etc/squid/errors/Lithuanian/ERR_READ_TIMEOUT +etc/squid/errors/Lithuanian/ERR_SHUTTING_DOWN etc/squid/errors/Lithuanian/ERR_SOCKET_FAILURE +etc/squid/errors/Lithuanian/ERR_TOO_BIG etc/squid/errors/Lithuanian/ERR_UNSUP_REQ etc/squid/errors/Lithuanian/ERR_URN_RESOLVE etc/squid/errors/Lithuanian/ERR_WRITE_ERROR >Release-Note: >Audit-Trail: >Unformatted: