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

Sergej Pupykin spupykin at archlinux.org
Wed Jun 21 10:46:22 UTC 2017


    Date: Wednesday, June 21, 2017 @ 10:46:21
  Author: spupykin
Revision: 239232

archrelease: copy trunk to community-any

Added:
  logwatch/repos/community-any/PKGBUILD
    (from rev 239231, logwatch/trunk/PKGBUILD)
  logwatch/repos/community-any/logwatch-xz-support.patch
    (from rev 239231, logwatch/trunk/logwatch-xz-support.patch)
Deleted:
  logwatch/repos/community-any/PKGBUILD
  logwatch/repos/community-any/logwatch-xz-support.patch

---------------------------+
 PKGBUILD                  |  174 ++++++++++++++++++++++----------------------
 logwatch-xz-support.patch |   42 +++++-----
 2 files changed, 111 insertions(+), 105 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-21 10:46:04 UTC (rev 239231)
+++ PKGBUILD	2017-06-21 10:46:21 UTC (rev 239232)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=logwatch
-pkgver=7.4.3
-pkgrel=2
-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
-	logwatch-xz-support.patch)
-md5sums=('22bd22841caa45f12c605abc3e0c2b09'
-         '2bc1c11efd92c7859e378b5103497fd1')
-
-prepare() {
-	cd $srcdir/$pkgname-$pkgver
-	patch -p0 -i $srcdir/logwatch-xz-support.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/
-}

Copied: logwatch/repos/community-any/PKGBUILD (from rev 239231, logwatch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-06-21 10:46:21 UTC (rev 239232)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=logwatch
+pkgver=7.4.3
+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
+	https://src.fedoraproject.org/cgit/rpms/logwatch.git/plain/logwatch-journald-source.patch
+	https://src.fedoraproject.org/cgit/rpms/logwatch.git/plain/logwatch-journal.patch
+	logwatch-xz-support.patch)
+sha256sums=('1dbdc48d65e150f2dbb43f1e4f4700d94166e053b1c7bbbdedf4ad670283720e'
+            '12704561991f1775dcf7751628ef8c12f8b4e822f523c095f57a5bbb6d4217e9'
+            'bef20eb3b68ee665c4c2ef6e794f59c50049605ec055a07b75fda055c70e4356'
+            '3da549a147c16eae38ec19c221205dfdf3467ed9f17ad14767ebf292880c6e31')
+
+prepare() {
+	cd "$srcdir"/$pkgname-$pkgver
+	patch -p0 -i "$srcdir"/logwatch-xz-support.patch
+	patch -p1 -i "$srcdir"/logwatch-journal.patch
+	patch -p1 -i "$srcdir"/logwatch-journald-source.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: logwatch-xz-support.patch
===================================================================
--- logwatch-xz-support.patch	2017-06-21 10:46:04 UTC (rev 239231)
+++ logwatch-xz-support.patch	2017-06-21 10:46:21 UTC (rev 239232)
@@ -1,21 +0,0 @@
---- scripts/logwatch.pl	2016-04-27 23:14:37.000000000 +0300
-+++ scripts/logwatch.pl	2016-05-13 15:26:00.000000000 +0300
-@@ -87,6 +87,7 @@
- $Config{'pathtocat'} = "cat";
- $Config{'pathtozcat'} = "zcat";
- $Config{'pathtobzcat'} = "bzcat";
-+$Config{'pathtoxzcat'} = "xzcat";
- $Config{'output'} = "stdout"; #8.0
- $Config{'format'} = "text"; #8.0
- $Config{'encode'} = "none"; #8.0
-@@ -767,6 +768,10 @@
-             my $arguments = "'${Archive}' 2>/dev/null >> $DestFile";
-             system("$Config{'pathtobzcat'} $arguments") == 0
-                or die "system '$Config{'pathtobzcat'} $arguments' failed: $?"
-+         } elsif (($Archive =~ m/xz$/) && (-f "$Archive") && (-s "$Archive")) {
-+            my $arguments = "'${Archive}' 2>/dev/null >> $DestFile";
-+            system("$Config{'pathtoxzcat'} $arguments") == 0
-+               or die "system '$Config{'pathtoxzcat'} $arguments' failed: $?"
-          } elsif ((-f "$Archive") && (-s "$Archive")) {
-             my $arguments = "'${Archive}'  >> $DestFile";
-             system("$Config{'pathtocat'} $arguments") == 0

Copied: logwatch/repos/community-any/logwatch-xz-support.patch (from rev 239231, logwatch/trunk/logwatch-xz-support.patch)
===================================================================
--- logwatch-xz-support.patch	                        (rev 0)
+++ logwatch-xz-support.patch	2017-06-21 10:46:21 UTC (rev 239232)
@@ -0,0 +1,21 @@
+--- scripts/logwatch.pl	2016-04-27 23:14:37.000000000 +0300
++++ scripts/logwatch.pl	2016-05-13 15:26:00.000000000 +0300
+@@ -87,6 +87,7 @@
+ $Config{'pathtocat'} = "cat";
+ $Config{'pathtozcat'} = "zcat";
+ $Config{'pathtobzcat'} = "bzcat";
++$Config{'pathtoxzcat'} = "xzcat";
+ $Config{'output'} = "stdout"; #8.0
+ $Config{'format'} = "text"; #8.0
+ $Config{'encode'} = "none"; #8.0
+@@ -767,6 +768,10 @@
+             my $arguments = "'${Archive}' 2>/dev/null >> $DestFile";
+             system("$Config{'pathtobzcat'} $arguments") == 0
+                or die "system '$Config{'pathtobzcat'} $arguments' failed: $?"
++         } elsif (($Archive =~ m/xz$/) && (-f "$Archive") && (-s "$Archive")) {
++            my $arguments = "'${Archive}' 2>/dev/null >> $DestFile";
++            system("$Config{'pathtoxzcat'} $arguments") == 0
++               or die "system '$Config{'pathtoxzcat'} $arguments' failed: $?"
+          } elsif ((-f "$Archive") && (-s "$Archive")) {
+             my $arguments = "'${Archive}'  >> $DestFile";
+             system("$Config{'pathtocat'} $arguments") == 0



More information about the arch-commits mailing list