[arch-commits] Commit in logwatch/repos/community-any (4 files)

Sergej Pupykin spupykin at archlinux.org
Mon Nov 24 10:49:01 UTC 2014


    Date: Monday, November 24, 2014 @ 11:49:01
  Author: spupykin
Revision: 123052

archrelease: copy trunk to community-any

Added:
  logwatch/repos/community-any/PKGBUILD
    (from rev 123051, logwatch/trunk/PKGBUILD)
  logwatch/repos/community-any/rsyslog-messages.patch
    (from rev 123051, logwatch/trunk/rsyslog-messages.patch)
Deleted:
  logwatch/repos/community-any/PKGBUILD
  logwatch/repos/community-any/rsyslog-messages.patch

------------------------+
 PKGBUILD               |  165 +++++++++++++++++++++++------------------------
 rsyslog-messages.patch |   52 +++++++-------
 2 files changed, 110 insertions(+), 107 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-24 10:48:52 UTC (rev 123051)
+++ PKGBUILD	2014-11-24 10:49:01 UTC (rev 123052)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=logwatch
-pkgver=7.4.0
-pkgrel=3
-arch=('any')
-pkgdesc="Logwatch is a customizable log analysis system."
-url="http://www.logwatch.org/"
-depends=('perl' 'cron')
-optdepends=('perl-date-manip: human readable dates')
-license=('custom')
-backup=(etc/logwatch/conf/logwatch.conf
-	etc/logwatch/conf/ignore.conf
-	etc/logwatch/conf/override.conf)
-source=(http://downloads.sourceforge.net/project/logwatch/logwatch-$pkgver/logwatch-$pkgver.tar.gz
-	rsyslog-messages.patch)
-md5sums=('b776466fb0633b486a41cf5aafcd9d12'
-         'e7f543259ae4f9bb0f4f1ce0638f5800')
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-
-	(cd scripts/shared/ && patch -p6 applystddate <$srcdir/rsyslog-messages.patch)
-
-	install -m 0755 -d $pkgdir/usr/share/logwatch
-	install -m 0755 -d $pkgdir/usr/share/logwatch/dist.conf
-	install -m 0755 -d $pkgdir/usr/share/logwatch/dist.conf/logfiles
-	install -m 0755 -d $pkgdir/usr/share/logwatch/dist.conf/services
-	install -m 0755 -d $pkgdir/usr/share/logwatch/default.conf
-	install -m 0755 -d $pkgdir/usr/share/logwatch/default.conf/logfiles
-	install -m 0755 -d $pkgdir/usr/share/logwatch/default.conf/services
-	install -m 0755 -d $pkgdir/usr/share/logwatch/default.conf/html
-	install -m 0755 -d $pkgdir/usr/share/logwatch/scripts
-	install -m 0755 -d $pkgdir/usr/share/logwatch/scripts/logfiles
-	install -m 0755 -d $pkgdir/usr/share/logwatch/scripts/services
-	install -m 0755 -d $pkgdir/usr/share/logwatch/scripts/shared
-	install -m 0755 -d $pkgdir/usr/share/logwatch/lib
-
-	install -m 0644 README $pkgdir/usr/share/logwatch/README
-	install -m 0644 HOWTO-Customize-LogWatch $pkgdir/usr/share/logwatch/HOWTO-Customize-LogWatch
-	install -m 0644 conf/*.conf $pkgdir/usr/share/logwatch/default.conf
-	install -m 0644 conf/logfiles/* $pkgdir/usr/share/logwatch/default.conf/logfiles
-	install -m 0644 conf/services/* $pkgdir/usr/share/logwatch/default.conf/services
-	install -m 0644 conf/html/* $pkgdir/usr/share/logwatch/default.conf/html
-	install -m 0755 scripts/logwatch.pl $pkgdir/usr/share/logwatch/scripts/logwatch.pl
-	for i in scripts/logfiles/* ; do
-		if [ `ls $i | grep -v CVS | wc -l` -ne 0 ] ; then
-		install -m 0755 -d $pkgdir/usr/share/logwatch/$i
-		install -m 0644 $i/* $pkgdir/usr/share/logwatch/$i
-		fi
-	done
-	install -m 0644 scripts/shared/* $pkgdir/usr/share/logwatch/scripts/shared
-	install -m 0644 scripts/services/* $pkgdir/usr/share/logwatch/scripts/services
-	install -m 0644 lib/* $pkgdir/usr/share/logwatch/lib
-
-	install -m 0755 -d $pkgdir/etc/logwatch
-	install -m 0755 -d $pkgdir/etc/logwatch/scripts
-	install -m 0755 -d $pkgdir/etc/logwatch/conf
-	install -m 0755 -d $pkgdir/etc/logwatch/conf/logfiles
-	install -m 0755 -d $pkgdir/etc/logwatch/conf/services
-	install -m 0755 -d $pkgdir/etc/logwatch/conf/html
-
-	touch $pkgdir/etc/logwatch/conf/logwatch.conf
-	touch $pkgdir/etc/logwatch/conf/ignore.conf
-	touch $pkgdir/etc/logwatch/conf/override.conf
-
-	install -m 0755 -d $pkgdir/usr/share/man/man8/
-	install -m 0644 logwatch.8 $pkgdir/usr/share/man/man8/
-
-	install -m 0755 -d $pkgdir/etc/cron.daily/
-	install -m 0755 -d $pkgdir/usr/bin/
-	ln -s /usr/share/logwatch/scripts/logwatch.pl $pkgdir/usr/bin/logwatch
-	ln -s /usr/share/logwatch/scripts/logwatch.pl $pkgdir/etc/cron.daily/0logwatch
-
-	install -m 0755 -d $pkgdir/var/cache/logwatch
-
-	install -m 0755 -d $pkgdir/usr/share/licenses/$pkgname/
-	install -m 0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/
-}

Copied: logwatch/repos/community-any/PKGBUILD (from rev 123051, logwatch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-11-24 10:49:01 UTC (rev 123052)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=logwatch
+pkgver=7.4.1
+pkgrel=1
+arch=('any')
+pkgdesc="Logwatch is a customizable log analysis system."
+url="http://www.logwatch.org/"
+depends=('perl' 'cron')
+optdepends=('perl-date-manip: human readable dates')
+license=('custom')
+backup=(etc/logwatch/conf/logwatch.conf
+	etc/logwatch/conf/ignore.conf
+	etc/logwatch/conf/override.conf)
+source=(http://downloads.sourceforge.net/project/logwatch/logwatch-$pkgver/logwatch-$pkgver.tar.gz
+	rsyslog-messages.patch)
+md5sums=('a0c3d8721f877bdcd4a9089eb1b4691b'
+         'e7f543259ae4f9bb0f4f1ce0638f5800')
+
+prepare() {
+	cd $srcdir/$pkgname-$pkgver/scripts/shared
+	patch -F100 -p6 applystddate <$srcdir/rsyslog-messages.patch
+}
+
+package() {
+	cd $srcdir/$pkgname-$pkgver
+
+	install -m 0755 -d $pkgdir/usr/share/logwatch
+	install -m 0755 -d $pkgdir/usr/share/logwatch/dist.conf
+	install -m 0755 -d $pkgdir/usr/share/logwatch/dist.conf/logfiles
+	install -m 0755 -d $pkgdir/usr/share/logwatch/dist.conf/services
+	install -m 0755 -d $pkgdir/usr/share/logwatch/default.conf
+	install -m 0755 -d $pkgdir/usr/share/logwatch/default.conf/logfiles
+	install -m 0755 -d $pkgdir/usr/share/logwatch/default.conf/services
+	install -m 0755 -d $pkgdir/usr/share/logwatch/default.conf/html
+	install -m 0755 -d $pkgdir/usr/share/logwatch/scripts
+	install -m 0755 -d $pkgdir/usr/share/logwatch/scripts/logfiles
+	install -m 0755 -d $pkgdir/usr/share/logwatch/scripts/services
+	install -m 0755 -d $pkgdir/usr/share/logwatch/scripts/shared
+	install -m 0755 -d $pkgdir/usr/share/logwatch/lib
+
+	install -m 0644 README $pkgdir/usr/share/logwatch/README
+	install -m 0644 HOWTO-Customize-LogWatch $pkgdir/usr/share/logwatch/HOWTO-Customize-LogWatch
+	install -m 0644 conf/*.conf $pkgdir/usr/share/logwatch/default.conf
+	install -m 0644 conf/logfiles/* $pkgdir/usr/share/logwatch/default.conf/logfiles
+	install -m 0644 conf/services/* $pkgdir/usr/share/logwatch/default.conf/services
+	install -m 0644 conf/html/* $pkgdir/usr/share/logwatch/default.conf/html
+	install -m 0755 scripts/logwatch.pl $pkgdir/usr/share/logwatch/scripts/logwatch.pl
+	for i in scripts/logfiles/* ; do
+		if [ `ls $i | grep -v CVS | wc -l` -ne 0 ] ; then
+		install -m 0755 -d $pkgdir/usr/share/logwatch/$i
+		install -m 0644 $i/* $pkgdir/usr/share/logwatch/$i
+		fi
+	done
+	install -m 0644 scripts/shared/* $pkgdir/usr/share/logwatch/scripts/shared
+	install -m 0644 scripts/services/* $pkgdir/usr/share/logwatch/scripts/services
+	install -m 0644 lib/* $pkgdir/usr/share/logwatch/lib
+
+	install -m 0755 -d $pkgdir/etc/logwatch
+	install -m 0755 -d $pkgdir/etc/logwatch/scripts
+	install -m 0755 -d $pkgdir/etc/logwatch/conf
+	install -m 0755 -d $pkgdir/etc/logwatch/conf/logfiles
+	install -m 0755 -d $pkgdir/etc/logwatch/conf/services
+	install -m 0755 -d $pkgdir/etc/logwatch/conf/html
+
+	touch $pkgdir/etc/logwatch/conf/logwatch.conf
+	touch $pkgdir/etc/logwatch/conf/ignore.conf
+	touch $pkgdir/etc/logwatch/conf/override.conf
+
+	install -m 0755 -d $pkgdir/usr/share/man/man8/
+	install -m 0644 logwatch.8 $pkgdir/usr/share/man/man8/
+
+	install -m 0755 -d $pkgdir/etc/cron.daily/
+	install -m 0755 -d $pkgdir/usr/bin/
+	ln -s /usr/share/logwatch/scripts/logwatch.pl $pkgdir/usr/bin/logwatch
+	ln -s /usr/share/logwatch/scripts/logwatch.pl $pkgdir/etc/cron.daily/0logwatch
+
+	install -m 0755 -d $pkgdir/var/cache/logwatch
+
+	install -m 0755 -d $pkgdir/usr/share/licenses/$pkgname/
+	install -m 0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/
+}

Deleted: rsyslog-messages.patch
===================================================================
--- rsyslog-messages.patch	2014-11-24 10:48:52 UTC (rev 123051)
+++ rsyslog-messages.patch	2014-11-24 10:49:01 UTC (rev 123052)
@@ -1,26 +0,0 @@
---- /usr/share/logwatch/scripts/shared/applystddate.orig	2009-12-15 14:36:04.000000000 +0000
-+++ /usr/share/logwatch/scripts/shared/applystddate.orig	2010-04-19 14:25:55.000000000 +0000
-@@ -15,6 +15,7 @@ 
- my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0;
- 
- $SearchDate = TimeFilter('%b %e %H:%M:%S');
-+$SearchDateRsyslog = TimeFilter('%Y-%m-%dT%H:%M:%S\.[0-9]+[+-][0-9]{2}:[0-9]{2}');
- 
- # The date might be "Dec 09", but it needs to be "Dec  9"...
- #$SearchDate =~ s/ 0/  /;
-@@ -22,11 +23,15 @@ 
- if ( $Debug > 5 ) {
-    print STDERR "DEBUG: Inside ApplyStdDate...\n";
-    print STDERR "DEBUG: Looking For: " . $SearchDate . "\n";
-+   print STDERR "DEBUG: Looking For: " . $SearchDateRsyslog . "\n";
- }
- 
- while (defined($ThisLine = <STDIN>)) {
-    if ($ThisLine =~ m/^$SearchDate /o) {
-       print $ThisLine;
-+   } elsif ($ThisLine =~ /^$SearchDateRsyslog /o) {
-+      $ThisLine =~ s/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})\.[0-9]+[+-][0-9]{2}:[0-9]{2} //o;
-+      print POSIX::strftime("%b %e %H:%M:%S", $6, $5, $4, $3+1, $2-1, $1 - 1900) . " " . $ThisLine;
-    } elsif ($ThisLine =~ m/(Mon|Tue|Wed|Thu|Fri|Sat|Sun) $SearchDate \d{4}/o) {
-       print $ThisLine;
-    }

Copied: logwatch/repos/community-any/rsyslog-messages.patch (from rev 123051, logwatch/trunk/rsyslog-messages.patch)
===================================================================
--- rsyslog-messages.patch	                        (rev 0)
+++ rsyslog-messages.patch	2014-11-24 10:49:01 UTC (rev 123052)
@@ -0,0 +1,26 @@
+--- /usr/share/logwatch/scripts/shared/applystddate.orig	2009-12-15 14:36:04.000000000 +0000
++++ /usr/share/logwatch/scripts/shared/applystddate.orig	2010-04-19 14:25:55.000000000 +0000
+@@ -15,6 +15,7 @@ 
+ my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0;
+ 
+ $SearchDate = TimeFilter('%b %e %H:%M:%S');
++$SearchDateRsyslog = TimeFilter('%Y-%m-%dT%H:%M:%S\.[0-9]+[+-][0-9]{2}:[0-9]{2}');
+ 
+ # The date might be "Dec 09", but it needs to be "Dec  9"...
+ #$SearchDate =~ s/ 0/  /;
+@@ -22,11 +23,15 @@ 
+ if ( $Debug > 5 ) {
+    print STDERR "DEBUG: Inside ApplyStdDate...\n";
+    print STDERR "DEBUG: Looking For: " . $SearchDate . "\n";
++   print STDERR "DEBUG: Looking For: " . $SearchDateRsyslog . "\n";
+ }
+ 
+ while (defined($ThisLine = <STDIN>)) {
+    if ($ThisLine =~ m/^$SearchDate /o) {
+       print $ThisLine;
++   } elsif ($ThisLine =~ /^$SearchDateRsyslog /o) {
++      $ThisLine =~ s/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})\.[0-9]+[+-][0-9]{2}:[0-9]{2} //o;
++      print POSIX::strftime("%b %e %H:%M:%S", $6, $5, $4, $3+1, $2-1, $1 - 1900) . " " . $ThisLine;
+    } elsif ($ThisLine =~ m/(Mon|Tue|Wed|Thu|Fri|Sat|Sun) $SearchDate \d{4}/o) {
+       print $ThisLine;
+    }


More information about the arch-commits mailing list