From 8e816f0352e9d75abf1ad19f0be56ab299032053 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sun, 20 Jan 2002 23:26:07 +0000
Subject: [PATCH] * Fix a typo that causes crashes during config file parsing. 
  From Kenneth J. Hendrickson <Kenneth.Hendrickson@Home.com>, PR #2285. * md5
 -> distinfo * Remove a SECURITY file that doesn't document any security
 issues.

---
 www/junkbuster/Makefile                | 10 +++++-----
 www/junkbuster/{files/md5 => distinfo} |  0
 www/junkbuster/patches/patch-encode_c  |  4 ++--
 www/junkbuster/pkg/SECURITY            | 16 ----------------
 4 files changed, 7 insertions(+), 23 deletions(-)
 rename www/junkbuster/{files/md5 => distinfo} (100%)
 delete mode 100644 www/junkbuster/pkg/SECURITY

diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index 07eab963b04..a97f52963be 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2001/10/28 13:05:50 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2002/01/20 23:26:07 naddy Exp $
 
 COMMENT=	"banner-ad blocking proxy server"
 
-PKGNAME=	junkbuster-2.0.2
+PKGNAME=	junkbuster-2.0.2p1
 DISTNAME=	ijb20
 CATEGORIES=	www
-NEED_VERSION=	1.364
-
-MASTER_SITES=	http://internet.junkbuster.com/
+NEED_VERSION=	1.490
 HOMEPAGE=	http://internet.junkbuster.com/
 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -15,7 +13,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.Z
+
 ALL_TARGET=	
 
 do-install:
diff --git a/www/junkbuster/files/md5 b/www/junkbuster/distinfo
similarity index 100%
rename from www/junkbuster/files/md5
rename to www/junkbuster/distinfo
diff --git a/www/junkbuster/patches/patch-encode_c b/www/junkbuster/patches/patch-encode_c
index b6392e0d34f..fb472f190a1 100644
--- a/www/junkbuster/patches/patch-encode_c
+++ b/www/junkbuster/patches/patch-encode_c
@@ -1,4 +1,4 @@
-$OpenBSD: patch-encode_c,v 1.2 2001/06/09 02:36:48 angelos Exp $
+$OpenBSD: patch-encode_c,v 1.3 2002/01/20 23:26:07 naddy Exp $
 --- encode.c.orig	Fri Oct 30 22:58:47 1998
 +++ encode.c	Fri Jun  8 22:23:38 2001
 @@ -24,6 +24,7 @@ url_encode(char **code_map, unsigned cha
@@ -35,7 +35,7 @@ $OpenBSD: patch-encode_c,v 1.2 2001/06/09 02:36:48 angelos Exp $
  
  	/* each input char can expand to at most 6 chars */
 -	buf = zalloc((strlen((char *) s) + 1) * 6);
-+	len = strlen((char *) s + 1) * 6;
++	len = (strlen((char *) s) + 1) * 6;
 +	if ((buf = zalloc(len)) == NULL) {
 +	   fprintf(stderr, "%s:%d malloc failed\n", __FILE__, __LINE__);
 +	   exit(-1);
diff --git a/www/junkbuster/pkg/SECURITY b/www/junkbuster/pkg/SECURITY
deleted file mode 100644
index c67a036227d..00000000000
--- a/www/junkbuster/pkg/SECURITY
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: SECURITY,v 1.1.1.1 2001/04/19 15:46:34 lebel Exp $
-
-These patches change numerous uses of the str(cmp, cat, cpy)
-operations and changes them to their length limited strn counterparts.
-All instances of sprintf have also been changed to snprintf.
-
-Several cases where malloc is used without checking its return value
-have also had some rudimentary error checking added.
-
-Hopefully this results in a more stable and more secure version of
-junkbuster - suitable to run as a service for more than just personal
-use.
-
-These patches have been submitted to the junkbuster dev team and
-as soon as they incorporate them, we wont need to maintain our own
-patched version.