rpms/proftpd/devel proftpd.logrotate, 1.4, 1.5 proftpd.spec, 1.31, 1.32

Matthias Saou (thias) fedora-extras-commits at redhat.com
Sun Aug 12 14:04:24 UTC 2007


Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13563/devel

Modified Files:
	proftpd.logrotate proftpd.spec 
Log Message:
Fix logrotate file (#246392) and sync F-7, EL-4 and EL-5 to devel.



Index: proftpd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.logrotate,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- proftpd.logrotate	16 Nov 2004 18:34:32 -0000	1.4
+++ proftpd.logrotate	12 Aug 2007 14:03:51 -0000	1.5
@@ -1,16 +1,10 @@
-/var/log/xferlog {
+/var/log/proftpd/*.log /var/log/xferlog {
     compress
     missingok
+    notifempty
+    sharedscripts
     postrotate
-        test -f /var/lock/subsys/proftpd && /usr/bin/killall -HUP proftpd
-    endscript
-}
-
-/var/log/proftpd/*.log {
-    compress
-    missingok
-    postrotate
-        test -f /var/lock/subsys/proftpd && /usr/bin/killall -HUP proftpd
+        test -f /var/lock/subsys/proftpd && /usr/bin/killall -HUP proftpd || :
     endscript
 }
 


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- proftpd.spec	8 Aug 2007 17:38:54 -0000	1.31
+++ proftpd.spec	12 Aug 2007 14:03:51 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0a
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -196,6 +196,9 @@
 
 
 %changelog
+* Sun Aug 12 2007 Matthias Saou <http://freshrpms.net/> 1.3.0a-8
+- Fix logrotate entry to silence error when proftpd isn't running (#246392).
+
 * Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 1.3.0a-7
 - Include patch to fix "open" calls with recent glibc.
 




More information about the fedora-extras-commits mailing list