6 files changed, 58 insertions, 27 deletions

diff --git a/www/webalizer/files/linklist.geo.patch b/www/webalizer/files/linklist.geo.patch
new file mode 100644
index 000000000000..16d5a66e2a1d
--- /dev/null
+++ b/www/webalizer/files/linklist.geo.patch
@@ -0,0 +1,18 @@
+--- linklist.c.orig	Sun Sep  4 07:40:09 2005
++++ linklist.c	Sun Sep  4 07:42:19 2005
+@@ -190,12 +190,12 @@
+ int add_glist(char *str, GLISTPTR *list)
+ {
+    GLISTPTR newptr,cptr,pptr;
+-   char temp_buf[256];
++   char temp_buf[LINKLIST_MAX_STRING];
+    char *name=temp_buf;
+ 
+    /* make local copy of string */
+-   strncpy(temp_buf,str,255);
+-   temp_buf[255]=0;
++   strncpy(temp_buf,str,LINKLIST_MAX_STRING - 1);
++   temp_buf[LINKLIST_MAX_STRING - 1]=0;
+ 
+    while (!isspace((int)*name)&&*name!=0) name++;
+    if (*name==0) name=temp_buf;
diff --git a/www/webalizer/files/linklist.patch b/www/webalizer/files/linklist.patch
new file mode 100644
index 000000000000..f901a290ff43
--- /dev/null
+++ b/www/webalizer/files/linklist.patch
@@ -0,0 +1,18 @@
+--- linklist.c.orig	Sat Jun 23 11:12:40 2001
++++ linklist.c	Sat Jun 23 11:19:54 2001
+@@ -190,12 +190,12 @@
+ int add_glist(char *str, GLISTPTR *list)
+ {
+    GLISTPTR newptr,cptr,pptr;
+-   char temp_buf[80];
++   char temp_buf[LINKLIST_MAX_STRING];
+    char *name=temp_buf;
+ 
+    /* make local copy of string */
+-   strncpy(temp_buf,str,79);
+-   temp_buf[79]=0;
++   strncpy(temp_buf,str,LINKLIST_MAX_STRING - 1);
++   temp_buf[LINKLIST_MAX_STRING - 1]=0;
+ 
+    while (!isspace((unsigned char)*name)&&*name!=0) name++;
+    if (*name==0) name=temp_buf;
diff --git a/www/webalizer/files/output.geo.patch b/www/webalizer/files/output.geo.patch
new file mode 100644
index 000000000000..6d2ba5edbaae
--- /dev/null
+++ b/www/webalizer/files/output.geo.patch
@@ -0,0 +1,11 @@
+--- output.c.orig	Sun Sep  4 07:40:09 2005
++++ output.c	Sun Sep  4 07:47:06 2005
+@@ -2037,7 +2044,7 @@
+             while ( (*domain!='.')&&(domain!=hptr->string)) domain--;
+             if (domain==hptr->string)
+ 	       country=NULL;
+-            else if (isdigit((int)*++domain))
++            else if (isdigit((unsigned char)*++domain))
+             {
+ #ifdef USE_GEOIP
+                if (use_geoip)
diff --git a/www/webalizer/files/output.patch b/www/webalizer/files/output.patch
new file mode 100644
index 000000000000..c964ada0a0bc
--- /dev/null
+++ b/www/webalizer/files/output.patch
@@ -0,0 +1,11 @@
+--- output.c.orig	Fri Sep 29 07:51:42 2000
++++ output.c	Sat Oct 14 17:18:55 2000
+@@ -1932,7 +1939,7 @@
+          {
+             domain = hptr->string+strlen(hptr->string)-1;
+             while ( (*domain!='.')&&(domain!=hptr->string)) domain--;
+-            if ((domain==hptr->string)||(isdigit((int)*++domain)))
++	    if ((domain==hptr->string)||(isdigit((unsigned char)*++domain)))
+             {
+                ctry[0].count+=hptr->count;
+                ctry[0].files+=hptr->files;
diff --git a/www/webalizer/files/patch-ad b/www/webalizer/files/patch-ad
index 4ef6e9feebda..8656c8b3df11 100644
--- a/www/webalizer/files/patch-ad
+++ b/www/webalizer/files/patch-ad
@@ -22,12 +22,3 @@
           r_reg--;
        }
     }
-@@ -1932,7 +1939,7 @@
-          {
-             domain = hptr->string+strlen(hptr->string)-1;
-             while ( (*domain!='.')&&(domain!=hptr->string)) domain--;
--            if ((domain==hptr->string)||(isdigit((int)*++domain)))
-+	    if ((domain==hptr->string)||(isdigit((unsigned char)*++domain)))
-             {
-                ctry[0].count+=hptr->count;
-                ctry[0].files+=hptr->files;
diff --git a/www/webalizer/files/patch-linklist b/www/webalizer/files/patch-linklist
index 7320ad7233a5..7e2ca025bae9 100644
--- a/www/webalizer/files/patch-linklist
+++ b/www/webalizer/files/patch-linklist
@@ -1,21 +1,3 @@
---- linklist.c.orig	Sat Jun 23 11:12:40 2001
-+++ linklist.c	Sat Jun 23 11:19:54 2001
-@@ -190,12 +190,12 @@
- int add_glist(char *str, GLISTPTR *list)
- {
-    GLISTPTR newptr,cptr,pptr;
--   char temp_buf[80];
-+   char temp_buf[LINKLIST_MAX_STRING];
-    char *name=temp_buf;
- 
-    /* make local copy of string */
--   strncpy(temp_buf,str,79);
--   temp_buf[79]=0;
-+   strncpy(temp_buf,str,LINKLIST_MAX_STRING - 1);
-+   temp_buf[LINKLIST_MAX_STRING - 1]=0;
- 
-    while (!isspace((unsigned char)*name)&&*name!=0) name++;
-    if (*name==0) name=temp_buf;
 --- linklist.h.orig	Fri Sep 29 05:50:30 2000
 +++ linklist.h	Sat Jun 23 11:15:57 2001
 @@ -1,12 +1,18 @@