diff options
| -rw-r--r-- | www-proxy/junkbuster/ChangeLog | 9 | ||||
| -rw-r--r-- | www-proxy/junkbuster/Manifest | 15 | ||||
| -rw-r--r-- | www-proxy/junkbuster/files/digest-junkbuster-2.0.2-r2 (renamed from www-proxy/junkbuster/files/digest-junkbuster-2.0.2-r1) | 0 | ||||
| -rw-r--r-- | www-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch | 45 | ||||
| -rw-r--r-- | www-proxy/junkbuster/junkbuster-2.0.2-r2.ebuild (renamed from www-proxy/junkbuster/junkbuster-2.0.2-r1.ebuild) | 6 |
5 files changed, 61 insertions, 14 deletions
diff --git a/www-proxy/junkbuster/ChangeLog b/www-proxy/junkbuster/ChangeLog index cf9a4df8216a..476b70fa33a6 100644 --- a/www-proxy/junkbuster/ChangeLog +++ b/www-proxy/junkbuster/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-proxy/junkbuster # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-proxy/junkbuster/ChangeLog,v 1.4 2005/02/23 21:05:31 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-proxy/junkbuster/ChangeLog,v 1.5 2005/03/08 17:39:51 mrness Exp $ + +*junkbuster-2.0.2-r2 (08 Mar 2005) + + 08 Mar 2005; Alin Nastac <mrness@gentoo.org> + +files/junkbuster-2.0.2-fixups.patch, + -junkbuster-2.0.2-r1.ebuild, +junkbuster-2.0.2-r2.ebuild: + Various fixes, thanks to James Ranson <euclid80@users.sf.net>. *junkbuster-2.0.2-r1 (23 Feb 2005) diff --git a/www-proxy/junkbuster/Manifest b/www-proxy/junkbuster/Manifest index 77dfad5412c6..6d3fc53192aa 100644 --- a/www-proxy/junkbuster/Manifest +++ b/www-proxy/junkbuster/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 43e935c57bed48c818bacb8d10ee5c21 junkbuster-2.0.2-r1.ebuild 933 MD5 2654d7eb6a67bf445fa05dbb58f8b6bf ChangeLog 1500 MD5 fc31adb42c0ec77e8f6be26b67ce7ffd metadata.xml 218 -MD5 144473c056c1fe200cf39e691a8417ba files/digest-junkbuster-2.0.2-r1 70 +MD5 017be7280433e9c42d877d93e3c3664a junkbuster-2.0.2-r2.ebuild 996 +MD5 144473c056c1fe200cf39e691a8417ba files/digest-junkbuster-2.0.2-r2 70 +MD5 00550b1ad1399d06d361a47a44cb34bb files/junkbuster-2.0.2-string-format-cleanup.patch 1266 MD5 6c8d7b83685f02017218f73763bd8b71 files/junkbuster.rc6 583 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFCHPAljiC39V7gKu0RAgTWAKCjG7BCaL41xgJfJ5OTpBygf/XivwCdEyPD -L7n3E9eARdDLjqmNb8IPPy0= -=FgRD ------END PGP SIGNATURE----- diff --git a/www-proxy/junkbuster/files/digest-junkbuster-2.0.2-r1 b/www-proxy/junkbuster/files/digest-junkbuster-2.0.2-r2 index b8d73f6b66ec..b8d73f6b66ec 100644 --- a/www-proxy/junkbuster/files/digest-junkbuster-2.0.2-r1 +++ b/www-proxy/junkbuster/files/digest-junkbuster-2.0.2-r2 diff --git a/www-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch b/www-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch new file mode 100644 index 000000000000..72316161b683 --- /dev/null +++ b/www-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch @@ -0,0 +1,45 @@ +diff -Nru ijb20.orig/filters.c ijb20/filters.c +--- ijb20.orig/filters.c 2000-03-29 16:05:42.000000000 +0300 ++++ ijb20/filters.c 2005-03-08 19:25:54.105567248 +0200 +@@ -773,7 +773,7 @@ + + sprintf(out_str, + "%d requests received, %d filtered " +- "(%6.2f \%).\0", ++ "(%6.2f %%).", + urls_read, urls_rejected+1, perc_rej); + + s = strsav(s,out_str); +diff -Nru ijb20.orig/socks4.c ijb20/socks4.c +--- ijb20.orig/socks4.c 1998-10-30 23:58:48.000000000 +0200 ++++ ijb20/socks4.c 2005-03-08 19:25:54.105567248 +0200 +@@ -9,6 +9,7 @@ + #include <stdio.h> + #include <sys/types.h> + #include <errno.h> ++#include <string.h> + + #ifdef _WIN32 + #include <io.h> +@@ -56,7 +57,7 @@ + unsigned char sbuf[BUFSIZ]; + struct socks_op *c = (struct socks_op *)cbuf; + struct socks_reply *s = (struct socks_reply *)sbuf; +- int web_server_addr; ++ int web_server_addr = 0; + int n, csiz, sfd, target_port; + int err = 0; + char *errstr, *target_host; +diff -Nru ijb20.orig/ssplit.c ijb20/ssplit.c +--- ijb20.orig/ssplit.c 1998-10-30 23:58:48.000000000 +0200 ++++ ijb20/ssplit.c 2005-03-08 19:25:54.106567096 +0200 +@@ -19,6 +19,9 @@ + */ + + #include <string.h> ++#include <stdlib.h> ++ ++extern void *zalloc(int); + + int ssplit(char *s, char *c, char *v[], int n, int m, int l) + { diff --git a/www-proxy/junkbuster/junkbuster-2.0.2-r1.ebuild b/www-proxy/junkbuster/junkbuster-2.0.2-r2.ebuild index 57393694714b..4bed0d2c4b4f 100644 --- a/www-proxy/junkbuster/junkbuster-2.0.2-r1.ebuild +++ b/www-proxy/junkbuster/junkbuster-2.0.2-r2.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-proxy/junkbuster/junkbuster-2.0.2-r1.ebuild,v 1.1 2005/02/23 21:05:31 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-proxy/junkbuster/junkbuster-2.0.2-r2.ebuild,v 1.1 2005/03/08 17:39:51 mrness Exp $ +inherit eutils DESCRIPTION="Filtering HTTP proxy" HOMEPAGE="http://internet.junkbuster.com" @@ -18,6 +19,9 @@ S=${WORKDIR}/ijb20 src_unpack() { unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-fixups.patch + sed -i -e 's:^CFLAGS *=:CFLAGS +=:' ${S}/Makefile } |