Tue Apr 14 13:19:24 UTC 2009

Author: jorton

Update of /cvs/extras/rpms/webalizer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17816

Modified Files:
	webalizer.spec 
Added Files:
	webalizer-2.21-02-underrun.patch 
Removed Files:
	dns-db1.patch webalizer-2.01-06-rh.patch 
	webalizer-2.01-10-agent-apple.patch 
	webalizer-2.01-10-agent-compatible.patch 
	webalizer-2.01-10-agent-default.patch 
	webalizer-2.01-10-agent-gecko.patch 
	webalizer-2.01-10-agent-opera.patch 
	webalizer-2.01-10-countrycode.patch 
	webalizer-2.01-10-hostname.patch 
	webalizer-2.01-10-maxagent.patch 
	webalizer-2.01-10-overflow.patch 
	webalizer-2.01-10-underrun.patch webalizer-2.01_10-lfs.patch 
Log Message:
* Tue Apr 14 2009 Joe Orton <jorton at redhat.com> 2.21_02-2
- update to 2.21-02 (thanks to Robert Scheck)


webalizer-2.21-02-underrun.patch:

--- NEW FILE webalizer-2.21-02-underrun.patch ---
--- webalizer-2.21-02/webalizer.c		2009-01-13 06:35:54.000000000 +0100
+++ webalizer-2.21-02/webalizer.c.underrun	2009-03-29 14:16:21.000000000 +0200
@@ -737,10 +737,16 @@
          rec_sec =atoi(&log_rec.datetime[19]);   /* get second number       */
 
          /* Kludge for Netscape server time (0-24?) error                   */
-         if (rec_hour>23) rec_hour=0;
+         if (rec_hour > 23)
+         	rec_hour=0;
+         /* Handle leap seconds (AC 2004) */
+         if (rec_sec > 59 && rec_sec < 62)	/* 23:59:60/61 exist */
+         	rec_sec = 59;
 
          /* minimal sanity check on date */
-         if ((i>=12)||(rec_min>59)||(rec_sec>60)||(rec_year<1990))
+         if ( i >= 12 || rec_min < 0 || rec_min > 59 ||
+              rec_sec < 0 || rec_sec > 59 || rec_year<1990 ||
+         	rec_day < 0)
          {
             total_bad++;                /* if a bad date, bump counter      */
             if (verbose)


Index: webalizer.spec
===================================================================
RCS file: /cvs/extras/rpms/webalizer/devel/webalizer.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- webalizer.spec	25 Feb 2009 18:20:01 -0000	1.36
+++ webalizer.spec	14 Apr 2009 13:18:54 -0000	1.37
@@ -1,12 +1,12 @@
-%define ver 2.01
-%define patchlevel 10
+%define ver 2.21
+%define patchlevel 02
 
 %define _default_patch_fuzz 2
 
 Name: webalizer
 Summary: A flexible Web server log file analysis program
 Group: Applications/Internet
-Version: 2.20_01
+Version: 2.21_02
 Release: 2
 URL: http://www.mrunix.net/webalizer/
 License: GPLv2+
@@ -14,24 +14,12 @@
 Source1: webalizer.conf
 Source2: webalizer.cron
 Source3: webalizer-httpd.conf
-Patch0: webalizer-2.01-06-rh.patch
-Patch1: dns-db1.patch
-Patch2: webalizer-2.01_10-lfs.patch
-Patch3: webalizer-2.01-10-overflow.patch
-Patch4: webalizer-2.01-10-underrun.patch
+Patch4: webalizer-2.21-02-underrun.patch
 Patch5: webalizer-2.01-10-ipv6.patch
 Patch6: webalizer-2.01_10-confuser.patch
-Patch7: webalizer-2.01-10-hostname.patch
-Patch8: webalizer-2.01-10-maxagent.patch
 Patch9: webalizer-2.01-10-groupvisit.patch
-Patch10: webalizer-2.01-10-countrycode.patch
-Patch11: webalizer-2.01-10-agent-opera.patch
-Patch12: webalizer-2.01-10-agent-gecko.patch
-Patch13: webalizer-2.01-10-agent-apple.patch
-Patch14: webalizer-2.01-10-agent-compatible.patch
-Patch15: webalizer-2.01-10-agent-default.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gd-devel, db4-devel
+BuildRequires: gd-devel, db4-devel, bzip2-devel
 Requires(pre): /usr/sbin/useradd
 Requires: httpd, crontabs
 
@@ -44,41 +32,27 @@
 
 %prep
 %setup -q -n %{name}-%{ver}-%{patchlevel}
-%patch0 -p1 -b .rh
-%patch1 -p1 -b .db1
-%patch2 -p1 -b .lfs
-%patch3 -p1 -b .overflow
 %patch4 -p1 -b .underrun
-%patch5 -p1 -b .ipv6
 %patch6 -p1 -b .confuser
-%patch7 -p1 -b .hostname
-%patch8 -p1 -b .maxagent
 %patch9 -p1 -b .groupvisit
-%patch10 -p1 -b .countrycode
-%patch11 -p1 -b .agent-opera
-%patch12 -p1 -b .agent-gecko
-%patch13 -p1 -b .agent-apple
-%patch14 -p1 -b .agent-compatible
-%patch15 -p1 -b .agent-default
 
 %build
 CPPFLAGS="-I%{_includedir}/db4" ; export CPPFLAGS
-CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" ; export CFLAGS
-%configure --enable-dns --with-dblib=/lib
+CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -D_GNU_SOURCE" ; export CFLAGS
+%configure --enable-dns --with-dblib=/lib --enable-bz2
 
 make %{?_smp_mflags}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir} \
-         $RPM_BUILD_ROOT/%{_mandir}/man1 \
-         $RPM_BUILD_ROOT%{_localstatedir}/www/usage \
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/usage \
          $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/webalizer
 
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
+
 install -p -m 644 $RPM_SOURCE_DIR/webalizer.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 644 *.png $RPM_BUILD_ROOT%{_localstatedir}/www/usage
 install -p -m 755 $RPM_SOURCE_DIR/webalizer.cron \
@@ -99,7 +73,7 @@
 %files
 %defattr(-,root,root)
 %doc README
-%{_mandir}/man1/webalizer.1*
+%{_mandir}/man1/*.1*
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/webalizer.conf
 %{_sysconfdir}/cron.daily/00webalizer
@@ -109,6 +83,9 @@
 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png
 
 %changelog
+* Tue Apr 14 2009 Joe Orton <jorton at redhat.com> 2.21_02-2
+- update to 2.21-02 (thanks to Robert Scheck)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.20_01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- dns-db1.patch DELETED ---


--- webalizer-2.01-06-rh.patch DELETED ---


--- webalizer-2.01-10-agent-apple.patch DELETED ---


--- webalizer-2.01-10-agent-compatible.patch DELETED ---


--- webalizer-2.01-10-agent-default.patch DELETED ---


--- webalizer-2.01-10-agent-gecko.patch DELETED ---


--- webalizer-2.01-10-agent-opera.patch DELETED ---


--- webalizer-2.01-10-countrycode.patch DELETED ---


--- webalizer-2.01-10-hostname.patch DELETED ---


--- webalizer-2.01-10-maxagent.patch DELETED ---


--- webalizer-2.01-10-overflow.patch DELETED ---


--- webalizer-2.01-10-underrun.patch DELETED ---


--- webalizer-2.01_10-lfs.patch DELETED ---


