[arch-commits] Commit in logwatch/trunk (5 files)

[Sergej Pupykin]

    Date: Wednesday, January 9, 2019 @ 18:42:26
  Author: spupykin
Revision: 421297

upgpkg: logwatch 7.5.0-1

Added:
  logwatch/trunk/cron.conf
  logwatch/trunk/maillog.conf
  logwatch/trunk/messages.conf
  logwatch/trunk/secure.conf
Modified:
  logwatch/trunk/PKGBUILD

---------------+
 PKGBUILD      |   35 +++++++++++++++++++----------------
 cron.conf     |   10 ++++++++++
 maillog.conf  |   11 +++++++++++
 messages.conf |   13 +++++++++++++
 secure.conf   |   11 +++++++++++
 5 files changed, 64 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-09 18:41:54 UTC (rev 421296)
+++ PKGBUILD	2019-01-09 18:42:26 UTC (rev 421297)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=logwatch
-pkgver=7.4.3
-pkgrel=4
+pkgver=7.5.0
+pkgrel=1
 arch=('any')
 pkgdesc="Logwatch is a customizable log analysis system."
 url="http://www.logwatch.org/"
@@ -14,21 +14,16 @@
 	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')
+	cron.conf
+	maillog.conf
+	messages.conf
+	secure.conf)
+sha256sums=('fe63181473979b36657d2a9395e7fbd694ff450be41b49a447a852c334ae580e'
+            '51eb6b6f71fe65f35cc74b49db55e64790c50558309313adbab4945a23bf3d97'
+            'b1f273b094914702c790301eb045161229d0c2c6c74053dece832d6eeaaaf800'
+            'ed6b9bdf5be279f5301373b339025cdfc0efe7519936072a0e594c314226b24f'
+            '90ad32fce13269690731ceafd0ed4bb45512740fa97fc7cf66fcb9a3263219b5')
 
-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
 
@@ -84,6 +79,14 @@
 
 	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/
 }

Added: cron.conf
===================================================================
--- cron.conf	                        (rev 0)
+++ cron.conf	2019-01-09 18:42:26 UTC (rev 421297)
@@ -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

Added: maillog.conf
===================================================================
--- maillog.conf	                        (rev 0)
+++ maillog.conf	2019-01-09 18:42:26 UTC (rev 421297)
@@ -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 "

Added: messages.conf
===================================================================
--- messages.conf	                        (rev 0)
+++ messages.conf	2019-01-09 18:42:26 UTC (rev 421297)
@@ -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 "

Added: secure.conf
===================================================================
--- secure.conf	                        (rev 0)
+++ secure.conf	2019-01-09 18:42:26 UTC (rev 421297)
@@ -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 "