* 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.
This commit is contained in:
naddy 2002-01-20 23:26:07 +00:00
parent a344c0259b
commit 8e816f0352
4 changed files with 7 additions and 23 deletions

View File

@ -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" COMMENT= "banner-ad blocking proxy server"
PKGNAME= junkbuster-2.0.2 PKGNAME= junkbuster-2.0.2p1
DISTNAME= ijb20 DISTNAME= ijb20
CATEGORIES= www CATEGORIES= www
NEED_VERSION= 1.364 NEED_VERSION= 1.490
MASTER_SITES= http://internet.junkbuster.com/
HOMEPAGE= http://internet.junkbuster.com/ HOMEPAGE= http://internet.junkbuster.com/
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
@ -15,7 +13,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tar.Z EXTRACT_SUFX= .tar.Z
ALL_TARGET= ALL_TARGET=
do-install: do-install:

View File

@ -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.orig Fri Oct 30 22:58:47 1998
+++ encode.c Fri Jun 8 22:23:38 2001 +++ encode.c Fri Jun 8 22:23:38 2001
@@ -24,6 +24,7 @@ url_encode(char **code_map, unsigned cha @@ -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 */ /* each input char can expand to at most 6 chars */
- buf = zalloc((strlen((char *) s) + 1) * 6); - buf = zalloc((strlen((char *) s) + 1) * 6);
+ len = strlen((char *) s + 1) * 6; + len = (strlen((char *) s) + 1) * 6;
+ if ((buf = zalloc(len)) == NULL) { + if ((buf = zalloc(len)) == NULL) {
+ fprintf(stderr, "%s:%d malloc failed\n", __FILE__, __LINE__); + fprintf(stderr, "%s:%d malloc failed\n", __FILE__, __LINE__);
+ exit(-1); + exit(-1);

View File

@ -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.