[logwatch] Update to revision 127 and drop ustreamed patches

jsynacek jsynacek at fedoraproject.org
Wed Jan 9 09:03:16 UTC 2013


commit 3a1d92e79ef52ce844d723423c04dbddf83b8d4e
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Wed Jan 9 09:25:31 2013 +0100

    Update to revision 127 and drop ustreamed patches

 .gitignore                  |    1 +
 logwatch-applystddate.patch |   30 ------------------
 logwatch-http.patch         |   16 ----------
 logwatch-manpage.patch      |   38 -----------------------
 logwatch-pam_unix.patch     |   29 -----------------
 logwatch-pluto.patch        |   71 -------------------------------------------
 logwatch-secure.patch       |   53 --------------------------------
 logwatch-sshd.patch         |   12 -------
 logwatch-xvc.patch          |   27 ----------------
 logwatch.spec               |   37 +++++++----------------
 sources                     |    2 +-
 11 files changed, 13 insertions(+), 303 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 916afa3..3842ed6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ logwatch-7.3.6.tar.gz
 /logwatch-svn85.tar.xz
 /logwatch-svn100.tar.xz
 /logwatch-svn110.tar.xz
+/logwatch-svn127.tar.xz
diff --git a/logwatch.spec b/logwatch.spec
index da15611..c40e4a9 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,15 +1,15 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.4.0
-Release: 20.20120619svn110%{?dist}
+Release: 21.20130102svn127%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 110 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-svn110
-#  tar cJvf logwatch-svn110.tar.xz logwatch-svn110
-Source0: logwatch-svn110.tar.xz
+#  svn export -r 127 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-svn127
+#  tar cJvf logwatch-svn127.tar.xz logwatch-svn127
+Source0: logwatch-svn127.tar.xz
 #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Needs proper fix. Not applied by the upstream.
 Patch0: logwatch-vsftpd.patch
@@ -17,23 +17,14 @@ Patch0: logwatch-vsftpd.patch
 Patch1: logwatch-oldfiles.patch
 # Fixes not yet in upstream for DNSSEC messages in named service (rhbz#666394)
 Patch3: logwatch-named-dnssec.patch
-# Manpage typo + obsolete option
-Patch4: logwatch-manpage.patch
 Patch5: logwatch-xntpd.patch
 Patch6: logwatch-smartd.patch
 Patch7: logwatch-dovecot.patch
-Patch8: logwatch-sshd.patch
 # Rootkit Hunter patch - not applied by upstream
 Patch9: logwatch-rkhunter.patch
-# Patches 10-15 not yet in upstream
-Patch10: logwatch-applystddate.patch
-Patch11: logwatch-http.patch
-Patch12: logwatch-pluto.patch
-Patch13: logwatch-xvc.patch
-Patch14: logwatch-secure.patch
-Patch15: logwatch-pam_unix.patch
+# Not yet upstreamed
 Patch16: logwatch-secure-userhelper.patch
-# Not upstreamed
+# Modified version pending upstream acceptance
 Patch17: logwatch-http-error.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -48,22 +39,13 @@ that you wish with the detail that you wish.  Easy to use - works right out
 of the package on many systems.
 
 %prep
-%setup -q -n logwatch-svn110
+%setup -q -n logwatch-svn127
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p0
-%patch6 -p1
-%patch7 -p0
-%patch8 -p1
+%patch7 -p1
 %patch9 -p0
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
 %patch16 -p1
 %patch17 -p1
 rm -f scripts/services/*.orig
@@ -156,6 +138,9 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jan 09 2013 Jan Synáček <jsynacek at redhat.com> - 7.4.0-21.20130102svn127
+- Update to revision 127 and drop ustreamed patches
+
 * Mon Dec 10 2012 Jan Synáček <jsynacek at redhat.com> - 7.4.0-20.20120619svn110
 - Comment patches
 
diff --git a/sources b/sources
index ce46e0f..f738a89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95ca4f693329dedcfce499440169aacc  logwatch-svn110.tar.xz
+43b30cb2c17a50df5a10067b85a5a2f1  logwatch-svn127.tar.xz


More information about the scm-commits mailing list