rpms/logrotate/devel logrotate-3.7.5-cfengine.patch, NONE, 1.1 logrotate.spec, 1.62, 1.63

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon May 14 12:42:07 UTC 2007


Author: tsmetana

Update of /cvs/dist/rpms/logrotate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv785

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-3.7.5-cfengine.patch 
Log Message:
ignore .cfsaved files

logrotate-3.7.5-cfengine.patch:
 config.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- 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 *);
 


Index: logrotate.spec
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- logrotate.spec	14 May 2007 10:38:35 -0000	1.62
+++ logrotate.spec	14 May 2007 12:42:05 -0000	1.63
@@ -14,6 +14,7 @@
 Source: logrotate-%{version}.tar.gz
 Patch1: logrotate-3.7.5-errorHandling.patch
 Patch2: logrotate-3.7.5-shred.patch
+Patch3: logrotate-3.7.5-cfengine.patch
 Requires: coreutils >= 5.92
 BuildRequires: libselinux-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +34,7 @@
 %setup -q
 %patch1 -p1 -b .errorHandling
 %patch2 -p1 -b .shred
+%patch3 -p1 -b .cfengine
 
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes
@@ -65,6 +67,7 @@
 * Mon May 14 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.5-4
 - add options to use shred for deleting files -- adapt patch sent by
   Peter Eckersley <pde at eff.org> (#239934)
+- 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




More information about the fedora-cvs-commits mailing list