[arch-commits] Commit in logwatch/repos/community-any (3 files)
Sergej Pupykin
spupykin at archlinux.org
Thu May 12 16:03:59 UTC 2016
Date: Thursday, May 12, 2016 @ 18:03:59
Author: spupykin
Revision: 175054
archrelease: copy trunk to community-any
Added:
logwatch/repos/community-any/PKGBUILD
(from rev 175053, logwatch/trunk/PKGBUILD)
Deleted:
logwatch/repos/community-any/PKGBUILD
logwatch/repos/community-any/rsyslog-messages.patch
------------------------+
PKGBUILD | 154 +++++++++++++++++++++++------------------------
rsyslog-messages.patch | 26 -------
2 files changed, 77 insertions(+), 103 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-05-12 16:03:44 UTC (rev 175053)
+++ PKGBUILD 2016-05-12 16:03:59 UTC (rev 175054)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=logwatch
-pkgver=7.4.2
-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)
-md5sums=('6eef537d20a7ec3bd3c99109853e2a05')
-
-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/
-}
Copied: logwatch/repos/community-any/PKGBUILD (from rev 175053, logwatch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-05-12 16:03:59 UTC (rev 175054)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=logwatch
+pkgver=7.4.3
+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)
+md5sums=('22bd22841caa45f12c605abc3e0c2b09')
+
+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 2016-05-12 16:03:44 UTC (rev 175053)
+++ rsyslog-messages.patch 2016-05-12 16:03:59 UTC (rev 175054)
@@ -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;
- }
More information about the arch-commits
mailing list