- Apply a patch, bump PORTREVISION

The problem is that webalizer strips down all national characters from
query strings making impossible to use its Search String report for
non-English sites.

Submitted by:	ache

2 files changed, 34 insertions, 6 deletions

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 3016e04511d1..03184ffc85b9 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	webalizer
 PORTVERSION=	2.1.9
+PORTREVISION=	1
 CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
diff --git a/www/webalizer/files/patch-ac b/www/webalizer/files/patch-ac
index 9f298fd50741..8cac1f7ea721 100644
--- a/www/webalizer/files/patch-ac
+++ b/www/webalizer/files/patch-ac
@@ -1,5 +1,14 @@
---- webalizer.c.orig	Mon Oct 16 23:15:53 2000
-+++ webalizer.c	Thu Jun 28 12:52:50 2001
+--- webalizer.c.orig	Wed Oct 24 10:24:51 2001
++++ webalizer.c	Tue Feb 12 05:29:59 2002
+@@ -231,7 +231,7 @@
+ int main(int argc, char *argv[])
+ {
+    int      i;                           /* generic counter             */
+-   char     *cp1, *cp2, *cp3, *str;      /* generic char pointers       */
++   unsigned char *cp1, *cp2, *cp3, *str;      /* generic char pointers       */
+    NLISTPTR lptr;                        /* generic list pointer        */
+ 
+    extern char *optarg;                  /* used for command line       */
 @@ -569,7 +569,7 @@
  
           /* convert month name to lowercase */
@@ -9,7 +18,25 @@
  
           /* get year/month/day/hour/min/sec values    */
           for (i=0;i<12;i++)
-@@ -1460,19 +1460,19 @@
+@@ -713,7 +713,7 @@
+          {
+             if ((cp1=strstr(log_rec.url,lptr->string))!=NULL)
+             {
+-               if ((cp1==log_rec.url)||(*(cp1-1)=='/'))
++	       if ((cp1==(unsigned char *)log_rec.url)||(*(cp1-1)=='/'))
+                {
+                   *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)
     {
        /* skip comments and blank lines */
@@ -33,7 +60,7 @@
  
        /* check if blank keyword/value */
        if ( (keyword[0]=='\0') || (value[0]=='\0') ) continue;
-@@ -1721,7 +1721,7 @@
+@@ -1727,7 +1727,7 @@
  
  int isurlchar(char ch)
  {
@@ -42,7 +69,7 @@
     return (strchr(":/\\.,' *-+_@~()[]",ch)!=NULL); /* and a few special ones */
  }
  
-@@ -1814,7 +1814,7 @@
+@@ -1820,7 +1820,7 @@
           if (*cp1=='+') *cp1=' ';                      /* change + to space  */
           if (sp_flg && *cp1==' ') { cp1++; continue; } /* compress spaces    */
           if (*cp1==' ') sp_flg=1; else sp_flg=0;       /* (flag spaces here) */
@@ -51,7 +78,7 @@
           cp1++;
        }
     }
-@@ -1849,7 +1849,7 @@
+@@ -1855,7 +1855,7 @@
     int  i=group_domains+1;
  
     cp = str+strlen(str)-1;