From f51825299db96aa1fe69b1cbc374f0b071df343a Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 18 Apr 2002 04:23:54 +0000
Subject: [PATCH] - Update to 2.1.10, - fixes buffer-overflow repoted on
 BUGTRAQ - part of patch is now in the distribution

---
 www/webalizer/Makefile       |  8 ++++----
 www/webalizer/distinfo       |  2 +-
 www/webalizer/files/patch-ac | 18 ------------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 03184ffc85b9..c4a4b399a5e4 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	webalizer
-PORTVERSION=	2.1.9
-PORTREVISION=	1
+PORTVERSION=	2.1.10
 CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
-DISTNAME=	${PORTNAME}-2.01-09-src
+DISTNAME=	${PORTNAME}-2.01-10-src
 
 MAINTAINER=	dinoex@FreeBSD.org
 
@@ -19,7 +18,8 @@ MAINTAINER=	dinoex@FreeBSD.org
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 .endif
 
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
+EXTRACT_SUFX=	.tgz
 GNU_CONFIGURE=	yes
 DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/webalizer/distinfo b/www/webalizer/distinfo
index 0aa1adb34219..36cdcd5d5b8b 100644
--- a/www/webalizer/distinfo
+++ b/www/webalizer/distinfo
@@ -1 +1 @@
-MD5 (webalizer-2.01-09-src.tar.bz2) = 22d5305fc176b43b7ede54f8a401df20
+MD5 (webalizer-2.01-10-src.tgz) = 57aa2fa931ef38f4e472d600afde32d8
diff --git a/www/webalizer/files/patch-ac b/www/webalizer/files/patch-ac
index 8cac1f7ea721..2723bff29eb1 100644
--- a/www/webalizer/files/patch-ac
+++ b/www/webalizer/files/patch-ac
@@ -27,15 +27,6 @@
                 {
                    *cp1='\0';
                    if (log_rec.url[0]=='\0')
-@@ -735,7 +735,7 @@
-             while ( *cp1 != '\0' )
-             {
-                cp3=cp2;
--               if (*cp1<32 || *cp1>=127 || *cp1=='<') *cp1=0;
-+	       if (*cp1<32 || *cp1==127 || *cp1=='<') *cp1=0;
-                else *cp2++=*cp1++;
-             }
-             *cp3 = '\0';
 @@ -1466,19 +1466,19 @@
     while ( (fgets(buffer,BUFSIZE,fp)) != NULL)
     {
@@ -60,15 +51,6 @@
  
        /* check if blank keyword/value */
        if ( (keyword[0]=='\0') || (value[0]=='\0') ) continue;
-@@ -1727,7 +1727,7 @@
- 
- int isurlchar(char ch)
- {
--   if (isalnum((int)ch)) return 1;           /* allow letters, numbers...    */
-+   if (isalnum((unsigned char)ch)) return 1;           /* allow letters, numbers...    */
-    return (strchr(":/\\.,' *-+_@~()[]",ch)!=NULL); /* and a few special ones */
- }
- 
 @@ -1820,7 +1820,7 @@
           if (*cp1=='+') *cp1=' ';                      /* change + to space  */
           if (sp_flg && *cp1==' ') { cp1++; continue; } /* compress spaces    */