Hello community, here is the log from the commit of package webalizer for openSUSE:Factory checked in at 2020-06-09 00:06:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webalizer (Old) and /work/SRC/openSUSE:Factory/.webalizer.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webalizer" Tue Jun 9 00:06:08 2020 rev:33 rq:812472 version:2.23 Changes: -------- --- /work/SRC/openSUSE:Factory/webalizer/webalizer.changes 2019-11-08 15:27:26.203105147 +0100 +++ /work/SRC/openSUSE:Factory/.webalizer.new.3606/webalizer.changes 2020-06-09 00:08:15.974057399 +0200 @@ -1,0 +2,8 @@ +Mon Jun 8 08:39:47 UTC 2020 - [email protected] + +- fix build +- added patches + fix static variables + + webalizer-static.patch + +------------------------------------------------------------------- New: ---- webalizer-static.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webalizer.spec ++++++ --- /var/tmp/diff_new_pack.WhqoNe/_old 2020-06-09 00:08:17.614063217 +0200 +++ /var/tmp/diff_new_pack.WhqoNe/_new 2020-06-09 00:08:17.618063232 +0200 @@ -1,7 +1,7 @@ # # spec file for package webalizer # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Group: Productivity/Networking/Web/Utilities Version: 2.23 Release: 0 -Url: http://www.mrunix.net/webalizer/ +URL: http://www.mrunix.net/webalizer/ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{version}-%{editlvl}-src.tar.bz2 Source1: flags.tar.bz2 Source2: flags.license.html @@ -42,6 +42,8 @@ # FIX-DATADIR - fix for datadir and mandir Patch6: %{name}-2.23-04-Makefile.patch Patch7: webalizer-overlinking.patch +# static variables +Patch8: webalizer-static.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: apache2-devel BuildRequires: autoconf @@ -72,7 +74,7 @@ Summary: Flags of the World License: CC-BY-SA-3.0 Group: Productivity/Networking/Web/Utilities -Url: http://flags.blogpotato.de/ +URL: http://flags.blogpotato.de/ BuildArch: noarch %description flags @@ -91,6 +93,7 @@ %patch5 %patch6 %patch7 +%patch8 -p1 %{__cp} -a %{S:2} . %build ++++++ webalizer-static.patch ++++++ Index: webalizer-2.23-08/dns_resolv.c =================================================================== --- webalizer-2.23-08.orig/dns_resolv.c 2013-02-26 06:37:27.000000000 +0100 +++ webalizer-2.23-08/dns_resolv.c 2020-06-08 10:37:00.206448803 +0200 @@ -80,9 +80,7 @@ struct dns_child child[MAXCHILD]; DNODEPTR host_table[MAXHASH]; /* hostname/ip hash table */ -char buffer[BUFSIZE]; /* log file record buffer */ -char tmp_buf[BUFSIZE]; /* used to temp save above */ -struct utsname system_info; /* system info structure */ +static char buffer[BUFSIZE]; /* log file record buffer */ int raiseSigChild = 1; @@ -244,7 +242,6 @@ int dns_resolver(void *log_fp) continue; /* go get next record if any */ } - strcpy(tmp_buf, buffer); /* save buffer in case of error */ if(parse_record(buffer)) /* parse the record */ { struct addrinfo hints, *ares; Index: webalizer-2.23-08/webalizer.c =================================================================== --- webalizer-2.23-08.orig/webalizer.c 2013-08-26 06:52:15.000000000 +0200 +++ webalizer-2.23-08/webalizer.c 2020-06-08 10:34:04.845481306 +0200 @@ -246,7 +246,7 @@ struct log_struct log_rec; void *zlog_fp; /* compressed logfile ptr */ FILE *log_fp; /* regular logfile pointer */ -char buffer[BUFSIZE]; /* log file record buffer */ +static char buffer[BUFSIZE]; /* log file record buffer */ char tmp_buf[BUFSIZE]; /* used to temp save above */ CLISTPTR *top_ctrys = NULL; /* Top countries table */ Index: webalizer-2.23-08/hashtab.c =================================================================== --- webalizer-2.23-08.orig/hashtab.c 2013-08-26 06:45:28.000000000 +0200 +++ webalizer-2.23-08/hashtab.c 2020-06-08 10:27:37.043341687 +0200 @@ -84,9 +84,6 @@ RNODEPTR rm_htab[MAXHASH]; ANODEPTR am_htab[MAXHASH]; SNODEPTR sr_htab[MAXHASH]; /* search string table */ INODEPTR im_htab[MAXHASH]; /* ident table (username) */ -#ifdef USE_DNS -DNODEPTR host_table[MAXHASH]; /* DNS hash table */ -#endif /* USE_DNS */ /*********************************************/ /* DEL_HTABS - clear out our hash tables */ @@ -101,9 +98,6 @@ void del_htabs() del_alist(am_htab); del_slist(sr_htab); del_ilist(im_htab); -#ifdef USE_DNS -/* del_dlist(host_table); */ /* delete DNS hash table */ -#endif /* USE_DNS */ } /*********************************************/ Index: webalizer-2.23-08/hashtab.h =================================================================== --- webalizer-2.23-08.orig/hashtab.h 2008-05-22 10:14:30.000000000 +0200 +++ webalizer-2.23-08/hashtab.h 2020-06-08 10:27:58.507460109 +0200 @@ -73,9 +73,6 @@ extern RNODEPTR rm_htab[MAXHASH]; extern ANODEPTR am_htab[MAXHASH]; extern SNODEPTR sr_htab[MAXHASH]; /* search string table */ extern INODEPTR im_htab[MAXHASH]; /* ident table (username) */ -#ifdef USE_DNS -extern DNODEPTR host_table[MAXHASH]; /* DNS resolver table */ -#endif extern int put_hnode(char *, int, u_int64_t, u_int64_t, double, u_int64_t *, u_int64_t, u_int64_t, char *, HNODEPTR *);
