Author: lisu Date: Wed Sep 8 13:24:21 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- resurected
---- Files affected:
packages/webalizer:
webalizer-debian-23.patch (1.4 -> 1.5) , webalizer-debian_gcc2_fix.patch
(1.2 -> 1.3) , webalizer-largefile.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/webalizer/webalizer-debian-23.patch
diff -u /dev/null packages/webalizer/webalizer-debian-23.patch:1.5
--- /dev/null Wed Sep 8 15:24:21 2010
+++ packages/webalizer/webalizer-debian-23.patch Wed Sep 8 15:24:15 2010
@@ -0,0 +1,49733 @@
+--- webalizer-2.01.10.orig/dns_resolv.c
++++ webalizer-2.01.10/dns_resolv.c
+@@ -61,6 +61,9 @@
+ #include <sys/types.h>
+ #endif
+
++/* ensure getaddrinfo/getnameinfo */
++#include <netdb.h>
++
+ /* some systems need this */
+ #ifdef HAVE_MATH_H
+ #include <math.h>
+@@ -218,7 +221,7 @@
+ if(!(dns_db = dbopen(dns_cache, O_RDWR|O_CREAT, 0664, DB_HASH, NULL)))
+ {
+ /* Error: Unable to open DNS cache file <filename> */
+- if (verbose) fprintf(stderr,"%s %s\n",msg_dns_nodb,dns_cache);
++ if (verbose) fprintf(stderr,"%s %s\n",_("Error: Unable to open DNS
cache file"),dns_cache);
+ dns_cache=NULL;
+ dns_db=NULL;
+ return 0; /* disable cache */
+@@ -231,7 +234,7 @@
+ if (fcntl(dns_fd,F_SETLK,&tmp_flock) < 0) /* and barf if we cant lock */
+ {
+ /* Error: Unable to lock DNS cache file <filename> */
+- if (verbose) fprintf(stderr,"%s %s\n",msg_dns_nolk,dns_cache);
++ if (verbose) fprintf(stderr,"%s %s\n",_("Error: Unable to lock DNS
cache file"),dns_cache);
+ dns_db->close(dns_db);
+ dns_cache=NULL;
+ dns_db=NULL;
+@@ -266,9 +269,16 @@
+ strcpy(tmp_buf, buffer); /* save buffer in case of error */
+ if(parse_record(buffer)) /* parse the record */
+ {
+- if((log_rec.addr.s_addr = inet_addr(log_rec.hostname)) !=
INADDR_NONE)
++ struct addrinfo hints, *ares;
++ memset(&hints, 0, sizeof(hints));
++ hints.ai_family = AF_UNSPEC;
++ hints.ai_socktype = SOCK_STREAM;
++ hints.ai_flags = AI_NUMERICHOST;
++ if (0 == getaddrinfo(log_rec.hostname, "0", &hints, &ares))
+ {
+ DBT q, r;
++ memcpy(&log_rec.addr, ares->ai_addr, ares->ai_addrlen);
++ freeaddrinfo(ares);
+ q.data = log_rec.hostname;
+ q.size = strlen(log_rec.hostname);
+
+@@ -323,7 +333,7 @@
+ if(!l_list)
+ {
+ /* No valid addresses found... */
+- if (verbose>1) printf("%s\n",msg_dns_none);
++ if (verbose>1) printf("%s\n",_("None to process"));
+ tmp_flock.l_type=F_UNLCK;
+ fcntl(dns_fd, F_SETLK, &tmp_flock);
+ dns_db->close(dns_db);
+@@ -338,11 +348,11 @@
+ if (time_me || (verbose>1))
+ {
+ if (verbose<2 && time_me) printf("DNS: ");
+- printf("%lu %s ",listEntries, msg_addresses);
++ printf("%lu %s ",listEntries, _("addresses"));
+
+ /* get processing time (end-start) */
+ temp_time = (float)(end_time-start_time)/CLK_TCK;
+- printf("%s %.2f %s", msg_in, temp_time, msg_seconds);
++ printf("%s %.2f %s", _("in"), temp_time, _("seconds"));
+
+ /* calculate records per second */
+ if (temp_time)
+@@ -414,12 +424,10 @@
+ {
+ int size;
+
+- struct hostent *res_ent;
+-
+ close(child[i].inpipe[0]);
+ close(child[i].outpipe[1]);
+
+- /* get struct in_addr here */
++ /* get struct sockaddr_storage here */
+ while((size = read(child[i].outpipe[0], child_buf, MAXHOST)))
+ {
+ if(size < 0)
+@@ -429,37 +437,40 @@
+ }
+ else
+ {
+- if(debug_mode)
++ char hbuf[NI_MAXHOST];
++
++ if(debug_mode)
+ printf("Child got work: %lx(%d)\n",
+- *((unsigned long *)child_buf), size);
++ *(unsigned long *)((struct
sockaddr*)child_buf)->sa_data, size);
+
+- if((res_ent = gethostbyaddr(child_buf, size, AF_INET)))
++ if(0 == getnameinfo((struct sockaddr*)child_buf,
sizeof(struct sockaddr_storage),
++ hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD))
+ {
+ /* must be at least 4 chars */
+- if (strlen(res_ent->h_name)>3)
++ if (strlen(hbuf)>3)
+ {
+ if(debug_mode)
+- printf("Child got %s for %lx(%d), %d bytes\n",
+- res_ent->h_name,
+- *((unsigned long *)child_buf),
+- size,strlen(res_ent->h_name));
++ printf("Child got %s for %x(%d), %d bytes\n",
++ hbuf,
++ *(unsigned long *)((struct sockaddr
*)child_buf)->sa_data,
++ size,strlen(hbuf));
+
+ /* If long hostname, take max domain name part */
+- if ((size = strlen(res_ent->h_name)) > MAXHOST-2)
+-
strcpy(child_buf,(res_ent->h_name+(size-MAXHOST+1)));
+- else strcpy(child_buf, res_ent->h_name);
++ if ((size = strlen(hbuf)) > MAXHOST-2)
++ strcpy(child_buf,(hbuf+(size-MAXHOST+1)));
++ else strcpy(child_buf, hbuf);
+ size = strlen(child_buf);
+ }
+ else
+ {
+ if (debug_mode)
+- printf("gethostbyaddr returned bad h_name!\n");
++ printf("getnameinfor returned bad hbuf!\n");
+ }
+ }
+ else
+ {
+ if(debug_mode)
+- printf("gethostbyaddr returned NULL! (%d)\n",h_errno);
++ printf("getnameinfo didn't return any usable
information!\n");
+ }
+
+ if (write(child[i].inpipe[1], child_buf, size) == -1)
+@@ -538,8 +549,8 @@
+
+ if(trav) /* something to resolve */
+ {
+- if (write(child[i].outpipe[1], &(trav->addr.s_addr),
+- sizeof(trav->addr.s_addr)) != -1)
++ if (write(child[i].outpipe[1], &trav->addr,
++ sizeof(trav->addr)) != -1)
+ {
+ /* We will watch this child */
+ child[i].cur = trav;
+@@ -547,10 +558,9 @@
+ max_fd = MAX(max_fd, child[i].inpipe[0]);
+
+ if(debug_mode)
+- printf("Giving %s (%lx) to Child %d for resolving\n",
++ printf("Giving %s (%x) to Child %d for resolving\n",
+ child[i].cur->string,
+- (unsigned long)child[i].cur->addr.s_addr, i);
+-
++ *(unsigned long *)((struct sockaddr
*)&child[i].cur->addr)->sa_data, i);
+ trav = trav->llist;
+ }
+ else /* write error */
+@@ -640,8 +650,8 @@
+ default:
+ {
+ dns_buf[size] = '\0';
+- if(memcmp(dns_buf, &(child[i].cur->addr.s_addr),
+- sizeof(child[i].cur->addr.s_addr)))
++ if(memcmp(dns_buf, &(child[i].cur->addr),
++ sizeof(child[i].cur->addr)))
+ {
+ if(debug_mode)
+ printf("Got a result (%d): %s -> %s\n",
+@@ -793,7 +803,7 @@
+ if(!(dns_db = dbopen(dns_cache, O_RDONLY, 0664, DB_HASH, NULL)))
+ {
+ /* Error: Unable to open DNS cache file <filename> */
+- if (verbose) fprintf(stderr,"%s %s\n",msg_dns_nodb,dns_cache);
++ if (verbose) fprintf(stderr,"%s %s\n",_("Error: Unable to open DNS
cache file"),dns_cache);
+ return 0; /* disable cache */
+ }
+
+@@ -803,7 +813,7 @@
+ /* Get shared lock on cache file */
+ if (fcntl(dns_fd, F_SETLK, &tmp_flock) < 0)
+ {
+- if (verbose) fprintf(stderr,"%s %s\n",msg_dns_nolk,dns_cache);
++ if (verbose) fprintf(stderr,"%s %s\n",_("Error: Unable to lock DNS
cache file"),dns_cache);
+ dns_db->close(dns_db);
+ return 0;
+ }
+--- webalizer-2.01.10.orig/graphs.c
++++ webalizer-2.01.10/graphs.c
+@@ -128,8 +128,8 @@
+ s_mth = fmonth;
+ for (i=0;i<12;i++)
+ {
+- gdImageString(im,gdFontSmall,28+(i*23), /* use language */
+- 238,s_month[s_mth-1],black); /* specific array */
++ gdImageString(im,gdFontSmall,28+(i*23),238,_(s_month[s_mth-1]),black);
++
+ s_mth++;
+ if (s_mth > 12) s_mth = 1;
+ if (data1[i] > maxval) maxval = data1[i]; /* get max val */
+@@ -143,33 +143,33 @@
+ if (graph_legend) /* print color coded legends? */
+ {
+ /* Kbytes Legend */
+- i = (strlen(msg_h_xfer)*6);
+- gdImageString(im,gdFontSmall,491-i,239,msg_h_xfer,dkgrey);
+- gdImageString(im,gdFontSmall,490-i,238,msg_h_xfer,COLOR4);
++ i = (strlen(_("KBytes"))*6);
++ gdImageString(im,gdFontSmall,491-i,239,_("KBytes"),dkgrey);
++ gdImageString(im,gdFontSmall,490-i,238,_("KBytes"),COLOR4);
+
+ /* Sites/Visits Legend */
+- i = (strlen(msg_h_visits)*6);
+- j = (strlen(msg_h_sites)*6);
+- gdImageString(im,gdFontSmall,491-i-j-12,11,msg_h_visits,dkgrey);
+- gdImageString(im,gdFontSmall,490-i-j-12,10,msg_h_visits,COLOR6);
++ i = (strlen(_("Visits"))*6);
++ j = (strlen(_("Sites"))*6);
++ gdImageString(im,gdFontSmall,491-i-j-12,11,_("Visits"),dkgrey);
++ gdImageString(im,gdFontSmall,490-i-j-12,10,_("Visits"),COLOR6);
+ gdImageString(im,gdFontSmall,491-j-9,11,"/",dkgrey);
+ gdImageString(im,gdFontSmall,490-j-9,10,"/",black);
+- gdImageString(im,gdFontSmall,491-j,11,msg_h_sites,dkgrey);
+- gdImageString(im,gdFontSmall,490-j,10,msg_h_sites,COLOR3);
++ gdImageString(im,gdFontSmall,491-j,11,_("Sites"),dkgrey);
++ gdImageString(im,gdFontSmall,490-j,10,_("Sites"),COLOR3);
+
+ /* Hits/Files/Pages Legend */
+- i = (strlen(msg_h_pages)*6);
+- j = (strlen(msg_h_files)*6);
+- gdImageStringUp(im,gdFontSmall,8,231,msg_h_pages,dkgrey);
+- gdImageStringUp(im,gdFontSmall,7,230,msg_h_pages,COLOR5);
++ i = (strlen(_("Pages"))*6);
++ j = (strlen(_("Files"))*6);
++ gdImageStringUp(im,gdFontSmall,8,231,_("Pages"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,7,230,_("Pages"),COLOR5);
+ gdImageStringUp(im,gdFontSmall,8,231-i-3,"/",dkgrey);
+ gdImageStringUp(im,gdFontSmall,7,230-i-3,"/",black);
+- gdImageStringUp(im,gdFontSmall,8,231-i-12,msg_h_files,dkgrey);
+- gdImageStringUp(im,gdFontSmall,7,230-i-12,msg_h_files,COLOR2);
++ gdImageStringUp(im,gdFontSmall,8,231-i-12,_("Files"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,7,230-i-12,_("Files"),COLOR2);
+ gdImageStringUp(im,gdFontSmall,8,231-i-j-15,"/",dkgrey);
+ gdImageStringUp(im,gdFontSmall,7,230-i-j-15,"/",black);
+- gdImageStringUp(im,gdFontSmall,8,231-i-j-24,msg_h_hits,dkgrey);
+- gdImageStringUp(im,gdFontSmall,7,230-i-j-24,msg_h_hits,COLOR1);
++ gdImageStringUp(im,gdFontSmall,8,231-i-j-24,_("Hits"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,7,230-i-j-24,_("Hits"),COLOR1);
+ }
+
+ /* data1 */
+@@ -361,32 +361,32 @@
+ if (graph_legend) /* Print color coded legends?
*/
+ {
+ /* Kbytes Legend */
+- gdImageStringUp(im,gdFontSmall,494,376,msg_h_xfer,dkgrey);
+- gdImageStringUp(im,gdFontSmall,493,375,msg_h_xfer,COLOR4);
++ gdImageStringUp(im,gdFontSmall,494,376,_("KBytes"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,493,375,_("KBytes"),COLOR4);
+
+ /* Sites/Visits Legend */
+- i = (strlen(msg_h_sites)*6);
+- gdImageStringUp(im,gdFontSmall,494,276,msg_h_sites,dkgrey);
+- gdImageStringUp(im,gdFontSmall,493,275,msg_h_sites,COLOR3);
++ i = (strlen(_("Sites"))*6);
++ gdImageStringUp(im,gdFontSmall,494,276,_("Sites"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,493,275,_("Sites"),COLOR3);
+ gdImageStringUp(im,gdFontSmall,494,276-i-3,"/",dkgrey);
+ gdImageStringUp(im,gdFontSmall,493,275-i-3,"/",black);
+- gdImageStringUp(im,gdFontSmall,494,276-i-12,msg_h_visits,dkgrey);
+- gdImageStringUp(im,gdFontSmall,493,275-i-12,msg_h_visits,COLOR6);
++ gdImageStringUp(im,gdFontSmall,494,276-i-12,_("Visits"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,493,275-i-12,_("Visits"),COLOR6);
+
+ /* Pages/Files/Hits Legend */
+- s = ( i=(strlen(msg_h_pages)*6) )+
+- ( j=(strlen(msg_h_files)*6) )+
+- ( strlen(msg_h_hits)*6 )+ 52;
+- gdImageStringUp(im,gdFontSmall,494,s,msg_h_pages,dkgrey);
+- gdImageStringUp(im,gdFontSmall,493,s-1,msg_h_pages,COLOR5);
++ s = ( i=(strlen(_("Pages"))*6) )+
++ ( j=(strlen(_("Files"))*6) )+
++ ( strlen(_("Hits"))*6 )+ 52;
++ gdImageStringUp(im,gdFontSmall,494,s,_("Pages"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,493,s-1,_("Pages"),COLOR5);
+ gdImageStringUp(im,gdFontSmall,494,s-i-3,"/",dkgrey);
+ gdImageStringUp(im,gdFontSmall,493,s-i-4,"/",black);
+- gdImageStringUp(im,gdFontSmall,494,s-i-12,msg_h_files,dkgrey);
+- gdImageStringUp(im,gdFontSmall,493,s-i-13,msg_h_files,COLOR2);
++ gdImageStringUp(im,gdFontSmall,494,s-i-12,_("Files"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,493,s-i-13,_("Files"),COLOR2);
+ gdImageStringUp(im,gdFontSmall,494,s-i-j-15,"/",dkgrey);
+ gdImageStringUp(im,gdFontSmall,493,s-i-j-16,"/",black);
+- gdImageStringUp(im,gdFontSmall,494,s-i-j-24,msg_h_hits,dkgrey);
+- gdImageStringUp(im,gdFontSmall,493,s-i-j-25,msg_h_hits,COLOR1);
++ gdImageStringUp(im,gdFontSmall,494,s-i-j-24,_("Hits"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,493,s-i-j-25,_("Hits"),COLOR1);
+ }
+
+ /* data1 */
+@@ -538,19 +538,19 @@
+ if (graph_legend) /* print color coded legends? */
+ {
+ /* Pages/Files/Hits Legend */
+- s = ( i=(strlen(msg_h_pages)*6) )+
+- ( j=(strlen(msg_h_files)*6) )+
+- ( strlen(msg_h_hits)*6 )+ 52;
+- gdImageStringUp(im,gdFontSmall,494,s,msg_h_pages,dkgrey);
+- gdImageStringUp(im,gdFontSmall,493,s-1,msg_h_pages,COLOR5);
++ s = ( i=(strlen(_("Pages"))*6) )+
++ ( j=(strlen(_("Files"))*6) )+
++ ( strlen(_("Hits"))*6 )+ 52;
++ gdImageStringUp(im,gdFontSmall,494,s,_("Pages"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,493,s-1,_("Pages"),COLOR5);
+ gdImageStringUp(im,gdFontSmall,494,s-i-3,"/",dkgrey);
+ gdImageStringUp(im,gdFontSmall,493,s-i-4,"/",black);
+- gdImageStringUp(im,gdFontSmall,494,s-i-12,msg_h_files,dkgrey);
+- gdImageStringUp(im,gdFontSmall,493,s-i-13,msg_h_files,COLOR2);
++ gdImageStringUp(im,gdFontSmall,494,s-i-12,_("Files"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,493,s-i-13,_("Files"),COLOR2);
+ gdImageStringUp(im,gdFontSmall,494,s-i-j-15,"/",dkgrey);
+ gdImageStringUp(im,gdFontSmall,493,s-i-j-16,"/",black);
+- gdImageStringUp(im,gdFontSmall,494,s-i-j-24,msg_h_hits,dkgrey);
+- gdImageStringUp(im,gdFontSmall,493,s-i-j-25,msg_h_hits,COLOR1);
++ gdImageStringUp(im,gdFontSmall,494,s-i-j-24,_("Hits"),dkgrey);
++ gdImageStringUp(im,gdFontSmall,493,s-i-j-25,_("Hits"),COLOR1);
+ }
+
+ /* data1 */
+@@ -654,7 +654,7 @@
+ gdImageLine(im, CX, CY, gdata.x, gdata.y, black);
+ gdImageFill(im, gdata.mx, gdata.my, i+4);
+
+- sprintf(buffer,"%s (%d%%)",legend[i], percent);
++ snprintf(buffer,sizeof(buffer),"%s (%d%%)",legend[i], percent);
+ x=480-(strlen(buffer)*7);
+ gdImageString(im,gdFontMediumBold, x+1, y+1, buffer, black);
+ gdImageString(im,gdFontMediumBold, x, y, buffer, i+4);
+@@ -667,7 +667,8 @@
+ gdata=*calc_arc(s_arc,1.0);
+
+ gdImageFill(im, gdata.mx, gdata.my, white);
+- sprintf(buffer,"%s (%d%%)",msg_h_other,100-(int)(s_arc*100));
++ snprintf(buffer,sizeof(buffer),"%s (%d%%)",
++ _("Other") ,100-(int)(s_arc*100));
+ x=480-(strlen(buffer)*7);
+ gdImageString(im,gdFontMediumBold, x+1, y+1, buffer, black);
+ gdImageString(im,gdFontMediumBold, x, y, buffer, white);
+--- webalizer-2.01.10.orig/hashtab.c
++++ webalizer-2.01.10/hashtab.c
+@@ -126,7 +126,7 @@
+ {
+ if (verbose)
+ {
+- fprintf(stderr,"[new_hnode] %s (%d)",msg_big_one,strlen(str));
++ fprintf(stderr,"[new_hnode] %s (%d)",_("Warning: String exceeds
storage size"),strlen(str));
+ if (debug_mode)
+ fprintf(stderr,":\n--> %s",str);
+ fprintf(stderr,"\n");
+@@ -316,7 +316,7 @@
+ {
+ if (verbose)
+ {
+- fprintf(stderr,"[new_unode] %s (%d)",msg_big_one,strlen(str));
++ fprintf(stderr,"[new_unode] %s (%d)",_("Warning: String exceeds
storage size"),strlen(str));
+ if (debug_mode)
+ fprintf(stderr,":\n--> %s",str);
+ fprintf(stderr,"\n");
+@@ -443,7 +443,7 @@
+ {
+ if (verbose)
+ {
+- fprintf(stderr,"[new_rnode] %s (%d)",msg_big_one,strlen(str));
++ fprintf(stderr,"[new_rnode] %s (%d)",_("Warning: String exceeds
storage size"),strlen(str));
+ if (debug_mode)
+ fprintf(stderr,":\n--> %s",str);
+ fprintf(stderr,"\n");
+@@ -562,7 +562,7 @@
+ {
+ if (verbose)
+ {
+- fprintf(stderr,"[new_anode] %s (%d)",msg_big_one,strlen(str));
++ fprintf(stderr,"[new_anode] %s (%d)",_("Warning: String exceeds
storage size"),strlen(str));
+ if (debug_mode)
+ fprintf(stderr,":\n--> %s",str);
+ fprintf(stderr,"\n");
+@@ -678,7 +678,7 @@
+ {
+ if (verbose)
+ {
+- fprintf(stderr,"[new_snode] %s (%d)",msg_big_one,strlen(str));
++ fprintf(stderr,"[new_snode] %s (%d)",_("Warning: String exceeds
storage size"),strlen(str));
+ if (debug_mode)
+ fprintf(stderr,":\n--> %s",str);
+ fprintf(stderr,"\n");
+@@ -783,7 +783,7 @@
+ {
+ if (verbose)
+ {
+- fprintf(stderr,"[new_inode] %s (%d)",msg_big_one,strlen(str));
++ fprintf(stderr,"[new_inode] %s (%d)",_("Warning: String exceeds
storage size"),strlen(str));
+ if (debug_mode)
+ fprintf(stderr,":\n--> %s",str);
+ fprintf(stderr,"\n");
+@@ -953,7 +953,7 @@
+ {
+ if (verbose)
+ {
+- fprintf(stderr,"[new_dnode] %s (%d)",msg_big_one,strlen(str));
++ fprintf(stderr,"[new_dnode] %s (%d)",_("Warning: String exceeds
storage size"),strlen(str));
+ if (debug_mode)
+ fprintf(stderr,":\n--> %s",str);
+ fprintf(stderr,"\n");
+@@ -976,7 +976,7 @@
+ /* PUT_DNODE - insert/update dns host node */
+ /*********************************************/
+
+-int put_dnode(char *str, struct in_addr *addr, DNODEPTR *htab)
++int put_dnode(char *str, struct sockaddr_storage *addr, DNODEPTR *htab)
+ {
+ DNODEPTR cptr,nptr;
+
+@@ -988,8 +988,8 @@
+ /* not hashed */
+ if ( (nptr=new_dnode(str)) != NULL)
+ {
+- if (addr) memcpy(&nptr->addr, addr, sizeof(struct in_addr));
+- else memset(&nptr->addr, 0, sizeof(struct in_addr));
++ if (addr) memcpy(&nptr->addr, addr, sizeof(struct sockaddr_storage));
++ else memset(&nptr->addr, 0, sizeof(struct sockaddr_storage));
+ nptr->next = NULL;
+ htab[hash(str)] = nptr;
+ }
+@@ -1005,8 +1005,8 @@
+ /* not found... */
+ if ( (nptr = new_dnode(str)) != NULL)
+ {
+- if (addr) memcpy(&nptr->addr, addr, sizeof(struct in_addr));
+- else memset(&nptr->addr, 0, sizeof(struct in_addr));
++ if (addr) memcpy(&nptr->addr, addr, sizeof(struct sockaddr_storage));
++ else memset(&nptr->addr, 0, sizeof(struct sockaddr_storage));
+ nptr->next = htab[hash(str)];
+ htab[hash(str)]=nptr;
+ }
+--- webalizer-2.01.10.orig/hashtab.h
++++ webalizer-2.01.10/hashtab.h
+@@ -18,7 +18,7 @@
+
+ #ifdef USE_DNS
+ struct dnode { char *string; /* DNS node hash table struct */
+- struct in_addr addr;
++ struct sockaddr_storage addr;
+ struct dnode *llist;
+ struct dnode *next; };
+ #endif
+@@ -87,7 +87,7 @@
+ extern int put_snode(char *, u_long, SNODEPTR *);
+
+ #ifdef USE_DNS
+-extern int put_dnode(char *, struct in_addr *, DNODEPTR *);
++extern int put_dnode(char *, struct sockaddr_storage *, DNODEPTR *);
+ extern void del_dlist(DNODEPTR *);
+ #endif
+
+--- webalizer-2.01.10.orig/lang.h
++++ webalizer-2.01.10/lang.h
+@@ -1,174 +1,15 @@
+-#ifndef _LANG_H
+-#define _LANG_H
++#include <libintl.h>
++#include <locale.h>
+
+-extern char *language ;
++#define _(String) gettext (String)
++#define gettext_noop(String) String
++#define N_(String) gettext_noop (String)
+
+-extern char *msg_records ;
+-extern char *msg_addresses;
+-extern char *msg_ignored ;
+-extern char *msg_bad ;
+-extern char *msg_in ;
+-extern char *msg_seconds ;
+-
+-extern char *msg_log_err ;
+-extern char *msg_log_use ;
+-extern char *msg_dir_err ;
+-extern char *msg_dir_use ;
+-extern char *msg_cur_dir ;
+-extern char *msg_hostname;
+-extern char *msg_ign_hist;
+-extern char *msg_no_hist ;
+-extern char *msg_get_hist;
+-extern char *msg_put_hist;
+-extern char *msg_hist_err;
+-extern char *msg_bad_hist;
+-extern char *msg_bad_conf;
+-extern char *msg_bad_key ;
+-extern char *msg_bad_date;
+-extern char *msg_ign_nscp;
+-extern char *msg_bad_rec ;
+-extern char *msg_no_vrec ;
+-extern char *msg_gen_rpt ;
+-extern char *msg_gen_sum ;
+-extern char *msg_get_data;
+-extern char *msg_put_data;
+-extern char *msg_no_data ;
+-extern char *msg_bad_data;
+-extern char *msg_data_err;
+-extern char *msg_dup_data;
+-
+-extern char *msg_dns_nocf;
+-extern char *msg_dns_nodb;
+-extern char *msg_dns_nolk;
+-extern char *msg_dns_usec;
+-extern char *msg_dns_rslf;
+-extern char *msg_dns_none;
+-
+-extern char *msg_nomem_ts;
+-extern char *msg_nomem_tr;
+-extern char *msg_nomem_tu;
+-extern char *msg_nomem_tc;
+-extern char *msg_nomem_ta;
+-extern char *msg_nomem_tsr;
+-extern char *msg_nomem_ti;
+-extern char *msg_nomem_dh;
+-extern char *msg_nomem_mh;
+-extern char *msg_nomem_u ;
+-extern char *msg_nomem_a ;
+-extern char *msg_nomem_r ;
+-extern char *msg_nomem_sc;
+-extern char *msg_nomem_i ;
+-
+-extern char *msg_big_rec ;
+-extern char *msg_big_host;
+-extern char *msg_big_date;
+-extern char *msg_big_req ;
+-extern char *msg_big_ref ;
+-extern char *msg_big_user;
+-extern char *msg_big_one ;
+-
+-extern char *msg_no_open ;
+-
+-extern char *h_usage1 ;
+-extern char *h_usage2 ;
+ extern char *h_msg[];
+
+-/* HTML Strings */
+-
+-extern char *msg_hhdr_sp ;
+-extern char *msg_hhdr_gt ;
+-
+-extern char *msg_main_us ;
+-extern char *msg_main_per;
+-extern char *msg_main_sum;
+-extern char *msg_main_da ;
+-extern char *msg_main_mt ;
+-
+-extern char *msg_hmth_du ;
+-extern char *msg_hmth_hu ;
+-
+-extern char *msg_h_by ;
+-extern char *msg_h_avg ;
+-extern char *msg_h_max ;
+-extern char *msg_h_total ;
+-extern char *msg_h_totals;
+-extern char *msg_h_day ;
+-extern char *msg_h_mth ;
+-extern char *msg_h_hour ;
+-extern char *msg_h_hits ;
+-extern char *msg_h_pages ;
+-extern char *msg_h_visits;
+-extern char *msg_h_files ;
+-extern char *msg_h_sites ;
+-extern char *msg_h_xfer ;
+-extern char *msg_h_hname ;
+-extern char *msg_h_url ;
+-extern char *msg_h_agent ;
+-extern char *msg_h_ref ;
+-extern char *msg_h_ctry ;
+-extern char *msg_h_search;
+-extern char *msg_h_uname ;
+-
+-extern char *msg_hlnk_ds ;
+-extern char *msg_hlnk_hs ;
+-extern char *msg_hlnk_u ;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/webalizer/webalizer-debian-23.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/webalizer/webalizer-debian_gcc2_fix.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/webalizer/webalizer-largefile.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
