rpms/logrotate/F-7 logrotate-3.7.5-cfengine.patch, NONE, 1.1 logrotate-3.7.5-logfn.patch, NONE, 1.1 logrotate.spec, 1.61, 1.62

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/logrotate/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13609

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-3.7.5-cfengine.patch logrotate-3.7.5-logfn.patch 
Log Message:
fix ignoring pre/post scripts args, ignore .cfsaved files

logrotate-3.7.5-cfengine.patch:

--- NEW FILE logrotate-3.7.5-cfengine.patch ---
--- logrotate-3.7.5/config.c.cfengine	2007-05-14 14:18:44.000000000 +0200
+++ logrotate-3.7.5/config.c	2007-05-14 14:19:06.000000000 +0200
@@ -31,7 +31,7 @@
 #endif
 
 static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v",
-    ".rpmnew", ".swp"
+    ".rpmnew", ".swp", ".cfsaved"
 };
 static int defTabooCount = sizeof(defTabooExts) / sizeof(char *);
 

logrotate-3.7.5-logfn.patch:

--- NEW FILE logrotate-3.7.5-logfn.patch ---
--- logrotate-3.7.5/logrotate.c.logfn	2007-05-31 10:57:48.000000000 +0200
+++ logrotate-3.7.5/logrotate.c	2007-05-31 10:58:01.000000000 +0200
@@ -149,7 +149,7 @@
     }
 
     if (!fork()) {
-	execl("/bin/sh", "sh", "-c", script, NULL);
+	execl("/bin/sh", "sh", "-c", script, script, logfn, NULL);
 	exit(1);
     }
 


Index: logrotate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logrotate/F-7/logrotate.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- logrotate.spec	31 Mar 2007 10:56:49 -0000	1.61
+++ logrotate.spec	31 May 2007 10:52:51 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.5
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 License: GPL
 Group: System Environment/Base
 # The source for this package was pulled from cvs.
@@ -13,6 +13,8 @@
 #  make create-archive
 Source: logrotate-%{version}.tar.gz
 Patch1: logrotate-3.7.5-errorHandling.patch
+Patch2: logrotate-3.7.5-cfengine.patch
+Patch3: logrotate-3.7.5-logfn.patch
 BuildRequires: libselinux-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +32,8 @@
 %prep
 %setup -q
 %patch1 -p1 -b .errorHandling
+%patch2 -p1 -b .cfengine
+%patch3 -p1 -b .logfn
 
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes
@@ -59,6 +63,10 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Thu May 31 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.5-3.1
+- fix ignoring pre/postrotate arguments (related #241766)
+- ignore *.cfsaved files by default (#223476)
+
 * Sat Mar 31 2007 Peter Vrabec <pvrabec at redhat.com> 3.7.5-3
 - add error checking before running prerotate and postrotate scripts