Date: Wed, 12 Mar 2008 21:06:35 +0100 (CET) From: Thomas-Martin Seck <tmseck@web.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/121649: [Maintainer] www/squid30: update to 3.0.STABLE2 Message-ID: <200803122006.m2CK6Z6E013024@hardy.tmseck.homedns.org> Resent-Message-ID: <200803122010.m2CKA1vU083724@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121649 >Category: ports >Synopsis: [Maintainer] www/squid30: update to 3.0.STABLE2 >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: Wed Mar 12 20:10:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 7.0-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of March 12, 2008. >Description: - Update to 3.0.STABLE2 - Add a patch for Squid bug #2203: compilation of authentication helper applications that required additional libraries from $LOCALBASE broke when --with-maxfd=N was set via SQUID_CONFIGURE_ARGS Added file: files/patch-configure >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid30) (revision 1318) +++ Makefile (.../local/squid30) (revision 1318) @@ -62,7 +62,7 @@ # requests. PORTNAME= squid -PORTVERSION= 3.0.1 +PORTVERSION= 3.0.2 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ @@ -81,7 +81,7 @@ http://www1.jp.squid-cache.org/Versions/v3/3.0/ \ http://www2.tw.squid-cache.org/Versions/v3/3.0/ MASTER_SITE_SUBDIR= squid-3/STABLE -DISTNAME= squid-3.0.STABLE1 +DISTNAME= squid-3.0.STABLE2 DIST_SUBDIR= squid3.0 PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ @@ -378,7 +378,8 @@ Hebrew Hungarian Italian Japanese Korean Lithuanian \ Polish Portuguese Romanian Russian-1251 Russian-koi8-r \ Serbian Simplify_Chinese Slovak Spanish Swedish \ - Traditional_Chinese Turkish + Traditional_Chinese Turkish Ukrainian-1251 \ + Ukrainian-koi8-u Ukrainian-utf8 SQUID_DEFAULT_LANG?= English CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \ --enable-default-err-language=${SQUID_DEFAULT_LANG} @@ -411,6 +412,13 @@ # Prevent installation of .orig files by deleting them. @${FIND} ${WRKSRC} -name '*.bak' -delete @${FIND} ${WRKSRC} -name '*.orig' -delete +# XXX: +# Remove error pages that were prematurely integrated into 3.0.STABLE2. +# This is done to keep the package list manageable by installing the same +# set of error files for every language: + @for d in Ukrainian-1251 Ukrainian-koi8-u Ukrainian-utf8; \ + do ${RM} -f ${WRKSRC}/errors/$${d}/ERR_SECURE_CONNECT_FAIL; \ + done pre-su-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ Index: distinfo =================================================================== --- distinfo (.../www/squid30) (revision 1318) +++ distinfo (.../local/squid30) (revision 1318) @@ -1,3 +1,3 @@ -MD5 (squid3.0/squid-3.0.STABLE1.tar.bz2) = ec7458b00a68341854d91e7f6ece56ba -SHA256 (squid3.0/squid-3.0.STABLE1.tar.bz2) = 3ebf3e22998b608afcfc10f29991722b5df5636217df6498902302dd05f4ab6c -SIZE (squid3.0/squid-3.0.STABLE1.tar.bz2) = 1816804 +MD5 (squid3.0/squid-3.0.STABLE2.tar.bz2) = 33c89b22aaf27d12b818b5f120aa0322 +SHA256 (squid3.0/squid-3.0.STABLE2.tar.bz2) = eabace0fd4f61a49389d1dffb20705b4a22ba8d65e281e6c5fff47c1aeef2ed1 +SIZE (squid3.0/squid-3.0.STABLE2.tar.bz2) = 1822143 Index: files/patch-configure =================================================================== --- files/patch-configure (.../www/squid30) (revision 0) +++ files/patch-configure (.../local/squid30) (revision 1318) @@ -0,0 +1,23 @@ +Patch for Squid bug #2203: + +LDFLAGS gets unset when --with-filedescriptors=n is added to +SQUID_CONFIGURE_ARGS. + +--- configure.orig Fri Dec 14 01:25:27 2007 ++++ configure Thu Jan 24 19:56:32 2008 +@@ -43934,6 +43934,7 @@ + esac + { echo "$as_me:$LINENO: result: $SQUID_MAXFD" >&5 + echo "${ECHO_T}$SQUID_MAXFD" >&6; } ++ LDFLAGS="$TLDFLAGS" + fi + + cat >>confdefs.h <<_ACEOF +@@ -43947,7 +43948,6 @@ + echo " on how to increase your filedescriptor limit" + sleep 10 + fi +-LDFLAGS="$TLDFLAGS" + + if test `expr $SQUID_MAXFD % 64` != 0; then + echo "WARNING: $SQUID_MAXFD is not an multiple of 64. This may cause issues" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803122006.m2CK6Z6E013024>