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

Sergej Pupykin spupykin at archlinux.org
Wed Jan 9 18:42:44 UTC 2019


    Date: Wednesday, January 9, 2019 @ 18:42:43
  Author: spupykin
Revision: 421298

archrelease: copy trunk to community-any

Added:
  logwatch/repos/community-any/PKGBUILD
    (from rev 421297, logwatch/trunk/PKGBUILD)
  logwatch/repos/community-any/cron.conf
    (from rev 421297, logwatch/trunk/cron.conf)
  logwatch/repos/community-any/logwatch-xz-support.patch
    (from rev 421297, logwatch/trunk/logwatch-xz-support.patch)
  logwatch/repos/community-any/maillog.conf
    (from rev 421297, logwatch/trunk/maillog.conf)
  logwatch/repos/community-any/messages.conf
    (from rev 421297, logwatch/trunk/messages.conf)
  logwatch/repos/community-any/secure.conf
    (from rev 421297, logwatch/trunk/secure.conf)
Deleted:
  logwatch/repos/community-any/PKGBUILD
  logwatch/repos/community-any/logwatch-xz-support.patch

---------------------------+
 PKGBUILD                  |  181 ++++++++++++++++++++++----------------------
 cron.conf                 |   10 ++
 logwatch-xz-support.patch |   42 +++++-----
 maillog.conf              |   11 ++
 messages.conf             |   13 +++
 secure.conf               |   11 ++
 6 files changed, 158 insertions(+), 110 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-09 18:42:26 UTC (rev 421297)
+++ PKGBUILD	2019-01-09 18:42:43 UTC (rev 421298)
@@ -1,89 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=logwatch
-pkgver=7.4.3
-pkgrel=4
-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/
-}

Copied: logwatch/repos/community-any/PKGBUILD (from rev 421297, logwatch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-01-09 18:42:43 UTC (rev 421298)
@@ -0,0 +1,92 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=logwatch
+pkgver=7.5.0
+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
+	cron.conf
+	maillog.conf
+	messages.conf
+	secure.conf)
+sha256sums=('fe63181473979b36657d2a9395e7fbd694ff450be41b49a447a852c334ae580e'
+            '51eb6b6f71fe65f35cc74b49db55e64790c50558309313adbab4945a23bf3d97'
+            'b1f273b094914702c790301eb045161229d0c2c6c74053dece832d6eeaaaf800'
+            'ed6b9bdf5be279f5301373b339025cdfc0efe7519936072a0e594c314226b24f'
+            '90ad32fce13269690731ceafd0ed4bb45512740fa97fc7cf66fcb9a3263219b5')
+
+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
+
+	# https://bbs.archlinux.org/viewtopic.php?id=227516
+	install -dm0755 "$pkgdir"/var/log
+	touch "$pkgdir"/var/log/emptylog
+	install -Dm0644 "$srcdir"/cron.conf "$pkgdir"/usr/share/logwatch/dist.conf/logfiles/cron.conf
+	install -Dm0644 "$srcdir"/maillog.conf "$pkgdir"/usr/share/logwatch/dist.conf/logfiles/maillog.conf
+	install -Dm0644 "$srcdir"/messages.conf "$pkgdir"/usr/share/logwatch/dist.conf/logfiles/messages.conf
+	install -Dm0644 "$srcdir"/secure.conf "$pkgdir"/usr/share/logwatch/dist.conf/logfiles/secure.conf
+
+	install -m 0755 -d "$pkgdir"/usr/share/licenses/$pkgname/
+	install -m 0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/
+}

Copied: logwatch/repos/community-any/cron.conf (from rev 421297, logwatch/trunk/cron.conf)
===================================================================
--- cron.conf	                        (rev 0)
+++ cron.conf	2019-01-09 18:42:43 UTC (rev 421298)
@@ -0,0 +1,10 @@
+Archive =
+LogFile =
+LogFile = emptylog
+
+# Facilities from /usr/include/sys/syslog.h
+# default syslog directive for cron is: cron.*
+*JournalCtl = "-q --no-pager -o short SYSLOG_FACILITY=9"
+
+# copied from existing cron.conf under default.conf/logfiles directory
+*RemoveService = anacron

Deleted: logwatch-xz-support.patch
===================================================================
--- logwatch-xz-support.patch	2019-01-09 18:42:26 UTC (rev 421297)
+++ logwatch-xz-support.patch	2019-01-09 18:42:43 UTC (rev 421298)
@@ -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 421297, logwatch/trunk/logwatch-xz-support.patch)
===================================================================
--- logwatch-xz-support.patch	                        (rev 0)
+++ logwatch-xz-support.patch	2019-01-09 18:42:43 UTC (rev 421298)
@@ -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

Copied: logwatch/repos/community-any/maillog.conf (from rev 421297, logwatch/trunk/maillog.conf)
===================================================================
--- maillog.conf	                        (rev 0)
+++ maillog.conf	2019-01-09 18:42:43 UTC (rev 421298)
@@ -0,0 +1,11 @@
+Archive =
+LogFile =
+LogFile = emptylog
+
+# Facilities from /usr/include/sys/syslog.h
+# default syslog directive for maillog is: mail.*
+*JournalCtl = "-q --no-pager -o short SYSLOG_FACILITY=2"
+
+# copied from existing maillog.conf under default.conf/logfiles directory
+*ExpandRepeats
+*ApplyStdDate = "%b %d %H:%M:%S "

Copied: logwatch/repos/community-any/messages.conf (from rev 421297, logwatch/trunk/messages.conf)
===================================================================
--- messages.conf	                        (rev 0)
+++ messages.conf	2019-01-09 18:42:43 UTC (rev 421298)
@@ -0,0 +1,13 @@
+Archive =
+LogFile =
+LogFile = emptylog
+
+# Facilities from /usr/include/sys/syslog.h
+# default syslog directive for messages is: *.info;mail.none;authpriv.none;cron.none
+# list all facilities except mail, authpriv and cron
+*JournalCtl = "-q --no-pager -o short -p info SYSLOG_FACILITY=0 SYSLOG_FACILITY=1 SYSLOG_FACILITY=3 SYSLOG_FACILITY=4 SYSLOG_FACILITY=5 SYSLOG_FACILITY=6 SYSLOG_FACILITY=7 SYSLOG_FACILITY=8 SYSLOG_FACILITY=11 SYSLOG_FACILITY=16 SYSLOG_FACILITY=17 SYSLOG_FACILITY=18 SYSLOG_FACILITY=19 SYSLOG_FACILITY=20 SYSLOG_FACILITY=21 SYSLOG_FACILITY=22 SYSLOG_FACILITY=23"
+
+# copied from existing message.conf under default.conf/logfiles directory
+*ExpandRepeats
+*RemoveService = talkd,telnetd,inetd,nfsd,/sbin/mingetty,netscreen,NetScreen
+*ApplyStdDate = "%b %d %H:%M:%S "

Copied: logwatch/repos/community-any/secure.conf (from rev 421297, logwatch/trunk/secure.conf)
===================================================================
--- secure.conf	                        (rev 0)
+++ secure.conf	2019-01-09 18:42:43 UTC (rev 421298)
@@ -0,0 +1,11 @@
+Archive =
+LogFile =
+LogFile = emptylog
+
+# Facilities from /usr/include/sys/syslog.h
+# default syslog directive for secure is: authpriv.*
+*JournalCtl = "-q --no-pager -o short SYSLOG_FACILITY=10"
+
+# copied from existing secure.conf under default.conf/logfiles directory
+*ExpandRepeats
+*ApplyStdDate = "%b %d %H:%M:%S "



More information about the arch-commits mailing list