From 9263cf655b186c93744177e4308c34ef8ae0bb195d97dea68cd0ec73c2fdda3e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 31 Jan 2008 23:45:45 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/logrotate?expand=0&rev=4 --- logrotate-mess_err.dif | 11 ++++ logrotate.changes | 6 +++ logrotate.spec | 120 +++++++++++++++++++++-------------------- 3 files changed, 80 insertions(+), 57 deletions(-) create mode 100644 logrotate-mess_err.dif diff --git a/logrotate-mess_err.dif b/logrotate-mess_err.dif new file mode 100644 index 0000000..a143242 --- /dev/null +++ b/logrotate-mess_err.dif @@ -0,0 +1,11 @@ +--- logrotate.c ++++ logrotate.c +@@ -898,7 +898,7 @@ + now.tm_mon + 1, now.tm_mday, fileext); + sprintf(destFile, "%s%s", rotNames->finalName, compext); + if (!stat(destFile, &fst_buf)) { +- message(MESS_DEBUG, ++ message(MESS_ERROR, + "destination %s already exists, skipping rotation\n", + rotNames->firstRotated); + hasErrors = 1; diff --git a/logrotate.changes b/logrotate.changes index fe8812d..ae9aa03 100644 --- a/logrotate.changes +++ b/logrotate.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 31 14:08:47 CET 2008 - ro@suse.de + +- log error if target file already exists + (upgrade from MESS_DEBUG to MESS_ERROR) + ------------------------------------------------------------------- Wed Oct 31 18:01:58 CET 2007 - ro@suse.de diff --git a/logrotate.spec b/logrotate.spec index 0c3036e..49aacea 100644 --- a/logrotate.spec +++ b/logrotate.spec @@ -1,7 +1,7 @@ # # spec file for package logrotate (Version 3.7.5) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,7 +14,7 @@ Name: logrotate BuildRequires: popt-devel Summary: Rotate, Compress, Remove, and Mail System Log Files Version: 3.7.5 -Release: 12 +Release: 28 License: GPL v2 or later Group: System/Base Source: ftp://people.redhat.com/sopwith/logrotate-%{version}.tar.bz2 @@ -22,6 +22,7 @@ Patch: logrotate-suse.dif Patch1: logrotate-conf.dif Patch2: logrotate-autoext.dif Patch3: logrotate-addextension.dif +Patch4: logrotate-mess_err.dif Patch11: logrotate-3.7.5-errorHandling.patch Patch12: logrotate-3.7.5-shred.patch Patch13: logrotate-3.7.5-cfengine.patch @@ -53,6 +54,7 @@ Authors: %patch1 %patch2 %patch3 +%patch4 %patch11 -p1 %patch12 -p1 %patch13 -p1 @@ -89,142 +91,146 @@ rm -rf $RPM_BUILD_ROOT /etc/cron.daily/logrotate %config /etc/logrotate.conf %config(noreplace)/etc/logrotate.d/wtmp + %changelog -* Wed Oct 31 2007 - ro@suse.de +* Thu Jan 31 2008 ro@suse.de +- log error if target file already exists + (upgrade from MESS_DEBUG to MESS_ERROR) +* Wed Oct 31 2007 ro@suse.de - added bzip2 as dependency since it's used as default compressor (#334555) -* Thu Aug 16 2007 - ro@suse.de +* Thu Aug 16 2007 ro@suse.de - update to 3.7.5 with some bugfixes containing: - 251040 config option size not handled correctly - added the current fedora patchkit which adds shred support -* Mon Aug 07 2006 - ro@suse.de +* Mon Aug 07 2006 ro@suse.de - try adding new option "addextension" which provides what some users expected the old "extension" keyword to do -* Wed Jun 21 2006 - ro@suse.de +* Wed Jun 21 2006 ro@suse.de - update to 3.7.4 - adds the "minsize" option - clean up comments in sample logrotate.conf (#183440) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Jan 11 2006 - ro@suse.de +* Wed Jan 11 2006 ro@suse.de - fixed segfault in autoext patch (#142021) -* Fri Dec 09 2005 - ro@suse.de +* Fri Dec 09 2005 ro@suse.de - updated to 3.7.3 - removed upstreamed patches - added autoext patch for determining file extension from used compression program -* Tue Oct 18 2005 - ro@suse.de +* Tue Oct 18 2005 ro@suse.de - update to upstream patchkit -* Tue Oct 11 2005 - ro@suse.de +* Tue Oct 11 2005 ro@suse.de - update to 3.7.2 and some upstream patches -* Tue Oct 11 2005 - ro@suse.de +* Tue Oct 11 2005 ro@suse.de - fix else case in maxage patch (thanks to pvrabec) -* Tue Jul 26 2005 - ro@suse.de +* Tue Jul 26 2005 ro@suse.de - added noTMPDIR and selinux patches -* Fri May 20 2005 - ro@suse.de +* Fri May 20 2005 ro@suse.de - update to 3.7.1 -* Wed Apr 20 2005 - ro@suse.de +* Wed Apr 20 2005 ro@suse.de - cron-script: give some more details when things fail -* Mon Sep 06 2004 - ro@suse.de +* Mon Sep 06 2004 ro@suse.de - changed patch sequence, simple ones first - added one-liner fix from cvs - fix mail call - fix uninitialized variable when mailing out first rotation - fix number of logs kept with dateext -* Thu Mar 25 2004 - ro@suse.de +* Thu Mar 25 2004 ro@suse.de - adapted logger path (#36947) -* Mon Feb 23 2004 - ro@suse.de +* Mon Feb 23 2004 ro@suse.de - update to version 3.7 -* Fri Oct 17 2003 - ro@suse.de +* Fri Oct 17 2003 ro@suse.de - don't build as root - use defattr -* Mon Oct 13 2003 - ro@suse.de +* Mon Oct 13 2003 ro@suse.de - updated to 3.6.10 and ported patches -* Thu Jun 12 2003 - kukuk@suse.de +* Thu Jun 12 2003 kukuk@suse.de - /etc/logrotate.d is part of filesystem -* Thu Jan 23 2003 - ro@suse.de +* Thu Jan 23 2003 ro@suse.de - update to 3.6.6 (some tmpfile fixes, new options supported) - remove system-config /etc/logrotate.d/aaa_base and all code messing with it (all logrotate configs have been moved to their respective packages) - add /etc/logrotate.d/wtmp -* Thu Jan 23 2003 - ro@suse.de +* Thu Jan 23 2003 ro@suse.de - remove mgetty logfiles -* Mon Jan 20 2003 - ro@suse.de +* Mon Jan 20 2003 ro@suse.de - remove i4l logfiles -* Thu Jan 16 2003 - ro@suse.de +* Thu Jan 16 2003 ro@suse.de - removed xdm logfile from main config (in XFree86 now) -* Wed Jan 15 2003 - ro@suse.de +* Wed Jan 15 2003 ro@suse.de - removed more files from main config and moved to their packages -* Mon Nov 11 2002 - ro@suse.de +* Mon Nov 11 2002 ro@suse.de - fix deprecated multiline string literals -* Mon Oct 14 2002 - ro@suse.de +* Mon Oct 14 2002 ro@suse.de - remove postgresql logfile from config on update (#20860) -* Mon Oct 14 2002 - ro@suse.de +* Mon Oct 14 2002 ro@suse.de - moved syslog logrotation config to syslogd package -* Mon Sep 23 2002 - ro@suse.de +* Mon Sep 23 2002 ro@suse.de - mark logrotate.del as missingok -* Mon Sep 09 2002 - ro@suse.de +* Mon Sep 09 2002 ro@suse.de - remove handling of /var/account/pacct (moved to acct package) -* Fri Aug 16 2002 - ro@suse.de +* Fri Aug 16 2002 ro@suse.de - dropped insserv from prereq (not used) -* Mon Aug 05 2002 - kukuk@suse.de +* Mon Aug 05 2002 kukuk@suse.de - Add rm and mv to PreRequires -* Wed Jul 31 2002 - ro@suse.de +* Wed Jul 31 2002 ro@suse.de - fixed typo in specfile - added comment in config-file about bzip2 usage -* Mon Jul 29 2002 - ro@suse.de +* Mon Jul 29 2002 ro@suse.de - removed fetchmail logrotate entry (#17279) -* Mon Jul 29 2002 - ro@suse.de +* Mon Jul 29 2002 ro@suse.de - removed apache,smail,perforce,abuild components - remove old entries also from logrotate.d/aaa_base on update -* Mon Jul 29 2002 - ro@suse.de +* Mon Jul 29 2002 ro@suse.de - squid components removed (done in squid package now) (#17278) -* Fri Jul 19 2002 - gd@suse.de +* Fri Jul 19 2002 gd@suse.de - fixed samba log paths -* Fri Jul 12 2002 - kukuk@suse.de +* Fri Jul 12 2002 kukuk@suse.de - Fix post-install script for the case that there is no rc.config -* Mon Jun 24 2002 - ro@suse.de +* Mon Jun 24 2002 ro@suse.de - fixed squid log paths (#16557) -* Wed May 08 2002 - ro@suse.de +* Thu May 09 2002 ro@suse.de - uucp-logfiles are handled by own config -* Mon Mar 18 2002 - ro@suse.de +* Tue Mar 19 2002 ro@suse.de - don't rotate any file for /var/log/news.* -* Fri Mar 01 2002 - ro@suse.de +* Fri Mar 01 2002 ro@suse.de - don't overwrite logfiles with dateext if run more than once a day (partial solution for #13202) -* Mon Feb 25 2002 - ro@suse.de +* Mon Feb 25 2002 ro@suse.de - install etc_logfiles as 644 -* Tue Feb 19 2002 - ro@suse.de +* Tue Feb 19 2002 ro@suse.de - removed yast from logrotate.d -* Sat Feb 16 2002 - ro@suse.de +* Sat Feb 16 2002 ro@suse.de - removed postgresql logfile (handled by package) -* Mon Jan 07 2002 - ro@suse.de +* Mon Jan 07 2002 ro@suse.de - take wtmp out of default config -* Fri Dec 14 2001 - ro@suse.de +* Fri Dec 14 2001 ro@suse.de - really remove old variable from rc.config -* Wed Dec 12 2001 - ro@suse.de +* Wed Dec 12 2001 ro@suse.de - mark files in /etc/logrotate.d as noreplace -* Tue Dec 11 2001 - ro@suse.de +* Tue Dec 11 2001 ro@suse.de - implement maxage if dateext is not used - uncompress log for mail if maillast is used -* Mon Dec 10 2001 - ro@suse.de +* Mon Dec 10 2001 ro@suse.de - added etc_logfiles as reminder to sources - moved convert script into postinstall and try to find old etc/logfiles and use etc_logfiles as fallback - added yast and syslog to /etc/logrotate.d as config files -* Mon Dec 10 2001 - ro@suse.de +* Mon Dec 10 2001 ro@suse.de - added maxage extension -* Thu Dec 06 2001 - ro@suse.de +* Thu Dec 06 2001 ro@suse.de - split patches for purpose -* Tue Dec 04 2001 - ro@suse.de +* Tue Dec 04 2001 ro@suse.de - archiving option changed to "dateext" and works completely transparent otherwise -* Tue Nov 27 2001 - ro@suse.de +* Tue Nov 27 2001 ro@suse.de - added multiple rotation criteria can be selected at one time - added/completed implementation for days (max days) -* Mon Nov 26 2001 - ro@suse.de +* Mon Nov 26 2001 ro@suse.de - added archiving option - added script to convert /etc/logfiles -* Tue Nov 13 2001 - ro@suse.de +* Tue Nov 13 2001 ro@suse.de - initial package for SuSE Linux (version 3.5.9)