packages: logwatch/logwatch-archives.patch, logwatch/logwatch.spec - up to ...

Thu Jun 16 01:30:37 CEST 2011

Author: zbyniu                       Date: Wed Jun 15 23:30:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 7.4.0 [fixes CVE-2011-1018]

---- Files affected:
packages/logwatch:
   logwatch-archives.patch (1.1 -> 1.2) , logwatch.spec (1.181 -> 1.182) 

---- Diffs:

================================================================
Index: packages/logwatch/logwatch-archives.patch
diff -u packages/logwatch/logwatch-archives.patch:1.1 packages/logwatch/logwatch-archives.patch:1.2

--- packages/logwatch/logwatch-archives.patch:1.1	Mon Oct  6 08:27:45 2008
+++ packages/logwatch/logwatch-archives.patch	Thu Jun 16 01:30:32 2011
@@ -1,29 +1,36 @@
---- logwatch-7.3.6/conf/logfiles/clam-update.conf	2005-10-31 18:21:20.000000000 +0200
-+++ logwatch-7.3.6-archives/conf/logfiles/clam-update.conf	2008-10-06 09:24:48.974677526 +0300
-@@ -51,7 +51,9 @@
+--- a/conf/logfiles/clam-update.conf~	2010-04-30 23:36:27.000000000 +0200
++++ b/conf/logfiles/clam-update.conf	2011-06-16 00:50:42.113853681 +0200
+@@ -51,12 +51,12 @@
  Archive = clam-update.*
  Archive = freshclam.log.*
  Archive = clamav/freshclam.log.*
 -Archive = archiv/clam-update.*
 -Archive = archiv/freshclam.log.*
 +Archive = archive/clam-update.*
-+Archive = archive/clam-update-*
 +Archive = archive/freshclam.log.*
+ Archive = clam-update-*
+ Archive = freshclam.log-*
+ Archive = clamav/freshclam.log-*
+-Archive = archiv/clam-update-*
+-Archive = archiv/freshclam.log-*
++Archive = archive/clam-update-*
 +Archive = archive/freshclam.log-*
  
  # vi: shiftwidth=3 tabstop=3 et
 --- logwatch-7.3.6/conf/logfiles/cron.conf	2005-02-24 19:05:18.000000000 +0200
 +++ logwatch-7.3.6-archives/conf/logfiles/cron.conf	2008-10-06 09:26:33.184698880 +0300
-@@ -18,7 +18,8 @@
+@@ -18,9 +18,9 @@
  # If the archives are searched, here is one or more line
  # (optionally containing wildcards) that tell where they are...
  Archive = cron.*
 -Archive = archiv/cron.*
 +Archive = archive/cron.*
+ Archive = cron-*
+-Archive = archiv/cron-*
 +Archive = archive/cron-*
  
- *OnlyHost
  *RemoveService = anacron
+ 
 --- logwatch-7.3.6/conf/logfiles/exim.conf	2006-03-21 03:47:28.000000000 +0200
 +++ logwatch-7.3.6-archives/conf/logfiles/exim.conf	2008-10-06 09:26:20.831985126 +0300
 @@ -17,7 +17,8 @@
@@ -64,60 +71,72 @@
  
 --- logwatch-7.3.6/conf/logfiles/messages.conf	2006-03-21 03:47:28.000000000 +0200
 +++ logwatch-7.3.6-archives/conf/logfiles/messages.conf	2008-10-06 09:26:45.961437136 +0300
-@@ -17,7 +17,8 @@
+@@ -17,9 +17,9 @@
  # (optionally containing wildcards) that tell where they are...
  #If you use a "-" in naming add that as well -mgt
  Archive = messages.*
 -Archive = archiv/messages.*
 +Archive = archive/messages.*
+ Archive = messages-*
+-Archive = archiv/messages-*
 +Archive = archive/messages-*
  
  # Expand the repeats (actually just removes them now)
  *ExpandRepeats
 --- logwatch-7.3.6/conf/logfiles/secure.conf	2006-03-21 03:47:28.000000000 +0200
 +++ logwatch-7.3.6-archives/conf/logfiles/secure.conf	2008-10-06 09:25:28.088937578 +0300
-@@ -20,7 +20,8 @@
+@@ -20,11 +20,11 @@
  # (optionally containing wildcards) that tell where they are...
  #If you use a "-" in naming add that as well -mgt
  Archive = secure.*
 -Archive = archiv/secure.*
 +Archive = archive/secure.*
-+Archive = archive/secure-*
  Archive = authlog.*
  Archive = auth.log.*.gz
+ Archive = secure-*
+-Archive = archiv/secure-*
++Archive = archive/secure-*
+ Archive = authlog-*
+ Archive = auth.log-*.gz
  
 --- logwatch-7.3.6/conf/logfiles/sonicwall.conf	2006-03-21 03:47:28.000000000 +0200
 +++ logwatch-7.3.6-archives/conf/logfiles/sonicwall.conf	2008-10-06 09:26:26.876334376 +0300
-@@ -19,7 +19,8 @@
+@@ -19,9 +19,9 @@
  # (optionally containing wildcards) that tell where they are...
  #If you use a "-" in naming add that as well -mgt
  Archive = sonicwall.log.*
 -Archive = archiv/sonicwall.log.*
 +Archive = archive/sonicwall.log.*
+ Archive = sonicwall.log-*
+-Archive = archiv/sonicwall.log-*
 +Archive = archive/sonicwall.log-*
  
  # Keep only the lines in the proper date range...
  *OnlyHost
 --- logwatch-7.3.6/conf/logfiles/vsftpd.conf	2006-03-21 03:47:28.000000000 +0200
 +++ logwatch-7.3.6-archives/conf/logfiles/vsftpd.conf	2008-10-06 09:26:08.739286395 +0300
-@@ -18,7 +18,8 @@
+@@ -18,9 +18,9 @@
  # (optionally containing wildcards) that tell where they are...
  #If you use a "-" in naming add that as well -mgt
  Archive = vsftpd.log.*
 -Archive = archiv/vsftpd.log.*
 +Archive = archive/vsftpd.log.*
+ Archive = vsftpd.log-*
+-Archive = archiv/vsftpd.log-*
 +Archive = archive/vsftpd.log-*
  
  *ApplyStdDate = 
  # vi: shiftwidth=3 tabstop=3 et
 --- logwatch-7.3.6/conf/logfiles/xferlog.conf	2006-03-21 03:47:28.000000000 +0200
 +++ logwatch-7.3.6-archives/conf/logfiles/xferlog.conf	2008-10-06 09:25:34.761323115 +0300
-@@ -17,6 +17,7 @@
+@@ -17,8 +17,8 @@
  # (optionally containing wildcards) that tell where they are...
  #If you use a "-" in naming add that as well -mgt
  Archive = xferlog.*
 -Archive = archiv/xferlog.*
 +Archive = archive/xferlog.*
+ Archive = xferlog-* 
+-Archive = archiv/xferlog-*
 +Archive = archive/xferlog-*
  
  # vi: shiftwidth=3 tabstop=3 et

================================================================
Index: packages/logwatch/logwatch.spec
diff -u packages/logwatch/logwatch.spec:1.181 packages/logwatch/logwatch.spec:1.182
--- packages/logwatch/logwatch.spec:1.181	Mon Nov  3 00:37:54 2008
+++ packages/logwatch/logwatch.spec	Thu Jun 16 01:30:32 2011
@@ -3,15 +3,12 @@
 Summary:	Analyzes system logs
 Summary(pl.UTF-8):	Logwatch - analizator logów systemowych
 Name:		logwatch
-Version:	7.3.6
-Release:	4
+Version:	7.4.0
+Release:	1
 License:	MIT
 Group:		Applications/System
-# Path for stable versions:
-Source0:	ftp://ftp.logwatch.org/pub/linux/%{name}-%{version}.tar.gz
-# Source0-md5:	937d982006b2a76a83edfcfd2e5a9d7d
-# Path for pre-versions:
-#Source0:	ftp://ftp.kaybee.org/pub/beta/linux/%{name}-pre%{version}.tar.gz
+Source0:	http://sourceforge.net/projects/logwatch/files/logwatch-7.4.0/logwatch-7.4.0.tar.gz/download
+# Source0-md5:	b776466fb0633b486a41cf5aafcd9d12
 # https://po2.uni-stuttgart.de/~rusjako/logwatch/default.html
 Source1:	https://po2.uni-stuttgart.de/~rusjako/logwatch/%{name}-syslog-ng.tar.gz
 # Source1-md5:	2f834407b85080e8e6556d6182d245aa
@@ -56,10 +53,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_logwatchconf}/{conf,scripts},/etc/{cron.d,sysconfig,tmpwatch}} \
-	$RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_logwatchdir}/{lib,default.conf},/var/cache/logwatch}
+	$RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},%{_logwatchdir}/{lib,default.conf},/var/cache/logwatch}
 
 install conf/logwatch.conf $RPM_BUILD_ROOT%{_logwatchconf}/conf
 install conf/logwatch.conf $RPM_BUILD_ROOT%{_logwatchdir}/default.conf
+install conf/ignore.conf $RPM_BUILD_ROOT%{_logwatchconf}/conf
+install conf/ignore.conf $RPM_BUILD_ROOT%{_logwatchdir}/default.conf
+touch $RPM_BUILD_ROOT%{_logwatchconf}/conf/override.conf
 # Where to put it The Right Way(TM)?
 install lib/Logwatch.pm $RPM_BUILD_ROOT%{_logwatchdir}/lib
 
@@ -82,6 +82,9 @@
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/logwatch
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/tmpwatch/%{name}.conf
 install logwatch.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install logwatch.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
+install override.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
+install ignore.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -105,11 +108,13 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README HOWTO-* project/{CHANGES,TODO}
+%doc README HOWTO-*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/tmpwatch/%{name}.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/logwatch
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_logwatchconf}/conf/ignore.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_logwatchconf}/conf/logwatch.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_logwatchconf}/conf/override.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_logwatchconf}/conf/html/*.html
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_logwatchconf}/conf/logfiles/*.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_logwatchconf}/conf/services/*.conf
@@ -119,11 +124,11 @@
 %attr(750,root,root) %dir %{_logwatchconf}/conf/logfiles
 %attr(750,root,root) %dir %{_logwatchconf}/conf/services
 %attr(750,root,root) %dir %{_logwatchconf}/scripts
-%attr(755,root,root) %{_logwatchdir}
+%{_logwatchdir}
 %attr(755,root,root) %{_sbindir}/logwatch
 %attr(755,root,root) %{_sbindir}/logwatch-cron
 %attr(750,root,root) %dir /var/cache/logwatch
-%{_mandir}/man8/*
+%{_mandir}/man[58]/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -131,6 +136,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.182  2011/06/15 23:30:32  zbyniu
+- up to 7.4.0 [fixes CVE-2011-1018]
+
 Revision 1.181  2008/11/02 23:37:54  glen
 - -syslog-ng.patch applied in new syslog-ng tarball (1.0-20081102)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/logwatch/logwatch-archives.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/logwatch/logwatch.spec?r1=1.181&r2=1.182&f=u

