Date: Mon, 15 Jan 2007 20:23:03 +0100 (CET) From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: secteam@FreeBSD.org Subject: ports/107961: [Maintainer] www/squid: patch for Squid bug #1857; fix macro definition for SSL libs Message-ID: <200701151923.l0FJN3KS063914@hardy.tmseck.homedns.org> Resent-Message-ID: <200701151930.l0FJULaW073232@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 107961 >Category: ports >Synopsis: [Maintainer] www/squid: patch for Squid bug #1857; fix macro definition for SSL libs >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: Mon Jan 15 19:30:20 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of January 15, 2007. >Description: - Add a patch for Squid bug #1857 (segfault on certain FTP URLs). secteam CCed because I am unsure about the security implications of this. If there is a CVE number for this issue, feel free to VuXML it; Secunia e.g. did not pick it up yet. Squid 2.6.STABLE7 will include the same diff; the squid26 port will be updated as soon as S7 is officially announced and the tarball hits the FTP mirrors. - Use OPENSSLLIB instead of LOCALBASE/lib when specifying the path to the OpenSSL libs (thanks to Angelo Turetta for supplying the patch) - Bump PORTREVISION added files: files/patch-src-ftp.c >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid) (revision 1073) +++ Makefile (.../local/squid) (revision 1073) @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www2.us.squid-cache.org/%SUBDIR%/ \ @@ -252,7 +252,7 @@ CONFIGURE_ARGS+= --enable-ssl \ --with-openssl="${OPENSSLBASE}" CFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS+= -L${OPENSSLLIB} .endif .if defined(WITH_SQUID_PINGER) CONFIGURE_ARGS+= --enable-icmp Index: files/patch-src-ftp.c =================================================================== --- files/patch-src-ftp.c (.../www/squid) (revision 0) +++ files/patch-src-ftp.c (.../local/squid) (revision 1073) @@ -0,0 +1,24 @@ +Patch for Squid bug #1857, obtained from Squid bugzilla 2007-01-15. + +--- src/ftp.c.orig Sun Feb 26 00:34:13 2006 ++++ src/ftp.c Mon Jan 15 19:46:29 2007 +@@ -441,7 +441,7 @@ + ftpState->flags.dir_slash ? rfc1738_escape_part(ftpState->old_filepath) : "."); + } else if (ftpState->typecode == 'D') { + const char *path = ftpState->flags.dir_slash ? ftpState->filepath : "."; +- storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", html_quote(path)); ++ storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", rfc1738_escape_part(path)); + } + storeAppendPrintf(e, "<HR noshade size=\"1px\">\n"); + storeAppendPrintf(e, "<ADDRESS>\n"); +@@ -689,8 +689,8 @@ + snprintf(html, 8192, "%s\n", line); + return html; + } +- if (ftpState->flags.dir_slash) +- snprintf(prefix, sizeof(prefix), "%s/", rfc1738_escape_part(ftpState->dirpath)); ++ if (ftpState->flags.dir_slash && ftpState->dirpath && ftpState->typecode != 'D' ) ++ snprintf(prefix, 2048, "%s/", rfc1738_escape_part(ftpState->dirpath)); + else + prefix[0] = '\0'; + /* Handle builtin <dirup> */ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701151923.l0FJN3KS063914>