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

Sergej Pupykin spupykin at archlinux.org
Fri May 13 12:33:32 UTC 2016


    Date: Friday, May 13, 2016 @ 14:33:32
  Author: spupykin
Revision: 175212

archrelease: copy trunk to community-any

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

---------------------------+
 PKGBUILD                  |  161 ++++++++++++++++++++++----------------------
 logwatch-xz-support.patch |   21 +++++
 2 files changed, 105 insertions(+), 77 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-13 12:31:55 UTC (rev 175211)
+++ PKGBUILD	2016-05-13 12:33:32 UTC (rev 175212)
@@ -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.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/
-}

Copied: logwatch/repos/community-any/PKGBUILD (from rev 175211, logwatch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2016-05-13 12:33:32 UTC (rev 175212)
@@ -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.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/logwatch-xz-support.patch (from rev 175211, logwatch/trunk/logwatch-xz-support.patch)
===================================================================
--- logwatch-xz-support.patch	                        (rev 0)
+++ logwatch-xz-support.patch	2016-05-13 12:33:32 UTC (rev 175212)
@@ -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