[webalizer] update to 2.23_05
jorton
jorton at fedoraproject.org
Thu Jul 14 08:36:22 UTC 2011
commit 4e103968dbd4292ac474adac356c52eaebbfdbbe
Author: Joe Orton <jorton at redhat.com>
Date: Thu Jul 14 09:36:00 2011 +0100
update to 2.23_05
.gitignore | 1 +
sources | 2 +-
webalizer-2.01-10-ipv6.patch | 241 --------------------
...fuser.patch => webalizer-2.23-05-confuser.patch | 9 -
...sit.patch => webalizer-2.23-05-groupvisit.patch | 29 ++--
webalizer.spec | 19 +-
6 files changed, 27 insertions(+), 274 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19066dc..8c6a2ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
x86_64
webalizer-2.20-01-src.tgz
webalizer-2.21-02-src.tar.bz2
+/webalizer-2.23-05-src.tgz
diff --git a/sources b/sources
index fe83ed0..20adb96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29af2558a5564493df654b6310b152e7 webalizer-2.21-02-src.tar.bz2
+304338cf3b1e9389123380d5f7d88d58 webalizer-2.23-05-src.tgz
diff --git a/webalizer-2.01_10-confuser.patch b/webalizer-2.23-05-confuser.patch
similarity index 90%
rename from webalizer-2.01_10-confuser.patch
rename to webalizer-2.23-05-confuser.patch
index ed0dae3..d8981e0 100644
--- a/webalizer-2.01_10-confuser.patch
+++ b/webalizer-2.23-05-confuser.patch
@@ -3,15 +3,6 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158174
--- webalizer-2.01-10/webalizer.c.confuser 2005-09-21 13:32:40.000000000 +0100
+++ webalizer-2.01-10/webalizer.c 2005-09-21 13:33:43.000000000 +0100
-@@ -50,6 +50,8 @@
- #include <sys/types.h>
- #endif
-
-+#include <sys/stat.h>
-+
- /* some systems need this */
- #ifdef HAVE_MATH_H
- #include <math.h>
@@ -252,6 +254,8 @@
int max_ctry; /* max countries defined */
diff --git a/webalizer-2.01-10-groupvisit.patch b/webalizer-2.23-05-groupvisit.patch
similarity index 77%
rename from webalizer-2.01-10-groupvisit.patch
rename to webalizer-2.23-05-groupvisit.patch
index fe8dbf7..56fd74b 100644
--- a/webalizer-2.01-10-groupvisit.patch
+++ b/webalizer-2.23-05-groupvisit.patch
@@ -1,15 +1,16 @@
---- webalizer-2.01-10/hashtab.c.groupvisit 2001-06-15 11:34:24.000000000 +0300
-+++ webalizer-2.01-10/hashtab.c 2006-03-30 12:52:30.000000000 +0300
-@@ -94,6 +94,8 @@
+diff -uap webalizer-2.23-05/hashtab.c.groupvisit webalizer-2.23-05/hashtab.c
+--- webalizer-2.23-05/hashtab.c.groupvisit 2011-01-10 01:47:49.000000000 +0000
++++ webalizer-2.23-05/hashtab.c 2011-07-14 09:26:11.645377843 +0100
+@@ -88,6 +88,8 @@ INODEPTR im_htab[MAXHASH];
DNODEPTR host_table[MAXHASH]; /* DNS hash table */
#endif /* USE_DNS */
+u_long pre_tstamp = 0; /* prev. real record tstamp */
+
-
- /*********************************************/
- /* DEL_HTABS - clear out our hash tables */
-@@ -184,6 +186,7 @@
+ /* Last node pointers */
+ HNODEPTR lm_hnode=NULL;
+ HNODEPTR ld_hnode=NULL;
+@@ -186,6 +188,7 @@ int put_hnode( char *str, /* Hostn
nptr->visit=(visit-1);
nptr->lasturl=find_url(lasturl);
nptr->tstamp=tstamp;
@@ -17,7 +18,7 @@
return 0;
}
else
-@@ -193,6 +196,7 @@
+@@ -195,6 +198,7 @@ int put_hnode( char *str, /* Hostn
if (htab==sm_htab) update_entry(log_rec.url);
nptr->lasturl=find_url(log_rec.url);
nptr->tstamp=tstamp;
@@ -25,7 +26,7 @@
nptr->visit=1;
}
}
-@@ -214,7 +218,8 @@
+@@ -225,7 +229,8 @@ int put_hnode( char *str, /* Hostn
if (ispage(log_rec.url))
{
@@ -35,7 +36,7 @@
{
cptr->visit++;
if (htab==sm_htab)
-@@ -247,6 +252,7 @@
+@@ -262,6 +267,7 @@ int put_hnode( char *str, /* Hostn
nptr->visit = (visit-1);
nptr->lasturl=find_url(lasturl);
nptr->tstamp= tstamp;
@@ -43,7 +44,7 @@
return 0;
}
else
-@@ -256,6 +262,7 @@
+@@ -271,6 +277,7 @@ int put_hnode( char *str, /* Hostn
if (htab==sm_htab) update_entry(log_rec.url);
nptr->lasturl=find_url(log_rec.url);
nptr->tstamp= tstamp;
@@ -51,7 +52,7 @@
nptr->visit=1;
}
}
-@@ -840,11 +847,16 @@
+@@ -875,11 +882,16 @@ int put_inode( char *str, /* ident
{
nptr->visit=(visit-1);
nptr->tstamp=tstamp;
@@ -69,7 +70,7 @@
}
}
}
-@@ -864,7 +876,8 @@
+@@ -899,7 +911,8 @@ int put_inode( char *str, /* ident
if (ispage(log_rec.url))
{
@@ -79,7 +80,7 @@
cptr->visit++;
cptr->tstamp=tstamp;
}
-@@ -888,11 +901,16 @@
+@@ -923,11 +936,16 @@ int put_inode( char *str, /* ident
{
nptr->visit = (visit-1);
nptr->tstamp= tstamp;
diff --git a/webalizer.spec b/webalizer.spec
index 2a77f18..1644af7 100644
--- a/webalizer.spec
+++ b/webalizer.spec
@@ -1,23 +1,21 @@
-%define ver 2.21
-%define patchlevel 02
-
-%define _default_patch_fuzz 2
+%define ver 2.23
+%define patchlevel 05
Name: webalizer
Summary: A flexible Web server log file analysis program
Group: Applications/Internet
-Version: 2.21_02
-Release: 5
+Version: 2.23_05
+Release: 1
URL: http://www.mrunix.net/webalizer/
License: GPLv2+
-Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tar.bz2
+Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz
Source1: webalizer.conf
Source2: webalizer.cron
Source3: webalizer-httpd.conf
Source4: webalizer.sysconfig
Patch4: webalizer-2.21-02-underrun.patch
-Patch6: webalizer-2.01_10-confuser.patch
-Patch9: webalizer-2.01-10-groupvisit.patch
+Patch6: webalizer-2.23-05-confuser.patch
+Patch9: webalizer-2.23-05-groupvisit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gd-devel, db4-devel, bzip2-devel
Requires(pre): /usr/sbin/useradd
@@ -87,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png
%changelog
+* Thu Jul 14 2011 Joe Orton <jorton at redhat.com> - 2.23_05-1
+- update to 2.23_05
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.21_02-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list