pull in upstream rev.475 to fix format string problem in the "proxy" debug tool, bump PKGREVdiff -r1.14 -r1.15 pkgsrc/www/libproxy/Makefile
(drochner)
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.14 2012/11/23 16:40:41 drochner Exp $ | 1 | # $NetBSD: Makefile,v 1.15 2012/11/27 11:26:23 drochner Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= libproxy-0.3.1 | 4 | DISTNAME= libproxy-0.3.1 | |
5 | PKGREVISION= 1 | 5 | PKGREVISION= 2 | |
6 | CATEGORIES= www gnome | 6 | CATEGORIES= www gnome | |
7 | MASTER_SITES= http://libproxy.googlecode.com/files/ | 7 | MASTER_SITES= http://libproxy.googlecode.com/files/ | |
8 | EXTRACT_SUFX= .tar.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://code.google.com/p/libproxy/ | 11 | HOMEPAGE= http://code.google.com/p/libproxy/ | |
12 | COMMENT= Library that provides automatic proxy configuration management | 12 | COMMENT= Library that provides automatic proxy configuration management | |
13 | LICENSE= gnu-lgpl-v2.1 | 13 | LICENSE= gnu-lgpl-v2.1 | |
14 | 14 | |||
15 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
16 | CONFIGURE_ARGS+= --without-python | 16 | CONFIGURE_ARGS+= --without-python | |
17 | CONFIGURE_ENV+= PYTHON=${TRUE} | 17 | CONFIGURE_ENV+= PYTHON=${TRUE} | |
18 | USE_LIBTOOL= yes | 18 | USE_LIBTOOL= yes |
@@ -1,8 +1,9 @@ | @@ -1,8 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.8 2012/11/23 16:40:41 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.9 2012/11/27 11:26:23 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (libproxy-0.3.1.tar.bz2) = 71338ede69b4ed2b32541f7cf5285c8828ad3a8d | 3 | SHA1 (libproxy-0.3.1.tar.bz2) = 71338ede69b4ed2b32541f7cf5285c8828ad3a8d | |
4 | RMD160 (libproxy-0.3.1.tar.bz2) = 565deed81f13752f61bbff531085ef1b2c5e13d0 | 4 | RMD160 (libproxy-0.3.1.tar.bz2) = 565deed81f13752f61bbff531085ef1b2c5e13d0 | |
5 | Size (libproxy-0.3.1.tar.bz2) = 315526 bytes | 5 | Size (libproxy-0.3.1.tar.bz2) = 315526 bytes | |
6 | SHA1 (patch-CVE-2012-4505) = ad59e5196a334d909073170bf2e56f1feca3dccf | 6 | SHA1 (patch-CVE-2012-4505) = ad59e5196a334d909073170bf2e56f1feca3dccf | |
7 | SHA1 (patch-aa) = 08baf8aeab5a1060cc5a6fa0435199892c7a0ab6 | 7 | SHA1 (patch-aa) = 08baf8aeab5a1060cc5a6fa0435199892c7a0ab6 | |
8 | SHA1 (patch-ab) = b2bd350d3af3274fa028612dbe6e2cb8ddd3e8bd | 8 | SHA1 (patch-ab) = b2bd350d3af3274fa028612dbe6e2cb8ddd3e8bd | |
9 | SHA1 (patch-ac) = 6de9bf20c6a684e0ddc300bb94944c85f057aa55 |
$NetBSD: patch-ac,v 1.3 2012/11/27 11:26:23 drochner Exp $
see https://bugzilla.novell.com/show_bug.cgi?id=791086
--- src/bin/proxy.c.orig 2009-09-29 19:52:50.000000000 +0000
+++ src/bin/proxy.c
@@ -89,11 +89,7 @@ print_proxies(char **proxies)
{
for (int j = 0; proxies[j] ; j++)
{
- printf(proxies[j]);
- if (proxies[j+1])
- printf(" ");
- else
- printf("\n");
+ printf("%s%s", proxies[j], proxies[j+1] ? " " : "\n");
free(proxies[j]);
}
free(proxies);