Date: Monday, September 23, 2019 @ 10:38:07 Author: spupykin Revision: 511571
archrelease: copy trunk to community-any Added: logwatch/repos/community-any/PKGBUILD (from rev 511570, logwatch/trunk/PKGBUILD) logwatch/repos/community-any/cron.conf (from rev 511570, logwatch/trunk/cron.conf) logwatch/repos/community-any/maillog.conf (from rev 511570, logwatch/trunk/maillog.conf) logwatch/repos/community-any/messages.conf (from rev 511570, logwatch/trunk/messages.conf) logwatch/repos/community-any/secure.conf (from rev 511570, logwatch/trunk/secure.conf) Deleted: logwatch/repos/community-any/PKGBUILD logwatch/repos/community-any/cron.conf logwatch/repos/community-any/logwatch-xz-support.patch logwatch/repos/community-any/maillog.conf logwatch/repos/community-any/messages.conf logwatch/repos/community-any/secure.conf ---------------------------+ PKGBUILD | 155 +++++++++++++++++--------------------------- cron.conf | 20 ++--- logwatch-xz-support.patch | 21 ----- maillog.conf | 22 +++--- messages.conf | 26 +++---- secure.conf | 22 +++--- 6 files changed, 108 insertions(+), 158 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-09-23 10:37:53 UTC (rev 511570) +++ PKGBUILD 2019-09-23 10:38:07 UTC (rev 511571) @@ -1,92 +0,0 @@ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgname=logwatch -pkgver=7.5.2 -pkgrel=4 -arch=('any') -pkgdesc="Logwatch is a customizable log analysis system." -url="http://www.logwatch.org/" -depends=('perl') -optdepends=('cron' - '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=(https://downloads.sourceforge.net/project/logwatch/logwatch-$pkgver/logwatch-$pkgver.tar.gz - cron.conf - maillog.conf - messages.conf - secure.conf) -sha256sums=('5d9c1a6eaf082b880c61895914824e347c6d63ad2a31cfc150f384a3e68ce5fb' - '41b9ec84fc825545f43080064ffaa9612cd037c10bb24c0810341e01d63f7a75' - '9a614822b5f25d9d473a00abdd2e93751d86685608bd6ca0770e2954c3c97f0e' - '59466406f306b4b377616943e8737f522cff713dd1fc968045cba57eeb0acbc2' - 'a4c78442968abf363729e96bfd9ed379eb0718967deb60950c201d40f8aaa461') - -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"/usr/bin/ - ln -s /usr/share/logwatch/scripts/logwatch.pl "$pkgdir"/usr/bin/logwatch - - install -m 0755 -d "$pkgdir"/var/cache/logwatch - - 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 - - # systemd - install -Dm0644 scheduler/logwatch.timer "$pkgdir"/usr/lib/systemd/system/logwatch.timer - install -Dm0644 scheduler/logwatch.service "$pkgdir"/usr/lib/systemd/system/logwatch.service - - 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 511570, logwatch/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-09-23 10:38:07 UTC (rev 511571) @@ -0,0 +1,63 @@ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgname=logwatch +pkgver=7.5.2 +pkgrel=5 +arch=('any') +pkgdesc="Logwatch is a customizable log analysis system." +url="http://www.logwatch.org/" +depends=('perl') +optdepends=('cron' + '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=(https://downloads.sourceforge.net/project/logwatch/logwatch-$pkgver/logwatch-$pkgver.tar.gz + cron.conf + maillog.conf + messages.conf + secure.conf) +sha256sums=('5d9c1a6eaf082b880c61895914824e347c6d63ad2a31cfc150f384a3e68ce5fb' + '41b9ec84fc825545f43080064ffaa9612cd037c10bb24c0810341e01d63f7a75' + '9a614822b5f25d9d473a00abdd2e93751d86685608bd6ca0770e2954c3c97f0e' + '59466406f306b4b377616943e8737f522cff713dd1fc968045cba57eeb0acbc2' + 'a4c78442968abf363729e96bfd9ed379eb0718967deb60950c201d40f8aaa461') + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + sed \ + -e '/BASEDIR=/d' \ + -e '/CONFIGDIR=/d' \ + -e '/TEMPDIR=/d' \ + -e '/PERLEXE=/d' \ + -e '/MANDIR=/d' \ + -e '/ln -f -s $BASEDIR/d' \ + -e "s|/lib/systemd/|$pkgdir/usr/lib/systemd/|g" \ + -e "s|/usr/sbin/logwatch|$pkgdir/usr/bin/logwatch/|g" \ + -i install_logwatch.sh +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + install -dm0755 "$pkgdir"/usr/{bin,lib/systemd/system} + + export BASEDIR="$pkgdir/usr/share/logwatch" + export CONFIGDIR="$pkgdir/etc/logwatch" + export TEMPDIR="$pkgdir/var/cache/logwatch" + export PERLEXE="$pkgdir/usr/bin/perl" + export MANDIR="$pkgdir/usr/share/man" + echo "$pkgdir/usr/share/logwatch" | sh install_logwatch.sh --systemd + ln -sf /usr/share/logwatch/scripts/logwatch.pl "$pkgdir"/usr/bin/logwatch + rm -rf "$pkgdir"/usr/lib/systemd/system/multi-user.target.wants + + 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/ +} Deleted: cron.conf =================================================================== --- cron.conf 2019-09-23 10:37:53 UTC (rev 511570) +++ cron.conf 2019-09-23 10:38:07 UTC (rev 511571) @@ -1,10 +0,0 @@ -Archive = -LogFile = -LogFile = /dev/null - -# 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 Copied: logwatch/repos/community-any/cron.conf (from rev 511570, logwatch/trunk/cron.conf) =================================================================== --- cron.conf (rev 0) +++ cron.conf 2019-09-23 10:38:07 UTC (rev 511571) @@ -0,0 +1,10 @@ +Archive = +LogFile = +LogFile = /dev/null + +# 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-09-23 10:37:53 UTC (rev 511570) +++ logwatch-xz-support.patch 2019-09-23 10:38:07 UTC (rev 511571) @@ -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 Deleted: maillog.conf =================================================================== --- maillog.conf 2019-09-23 10:37:53 UTC (rev 511570) +++ maillog.conf 2019-09-23 10:38:07 UTC (rev 511571) @@ -1,11 +0,0 @@ -Archive = -LogFile = -LogFile = /dev/null - -# 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/maillog.conf (from rev 511570, logwatch/trunk/maillog.conf) =================================================================== --- maillog.conf (rev 0) +++ maillog.conf 2019-09-23 10:38:07 UTC (rev 511571) @@ -0,0 +1,11 @@ +Archive = +LogFile = +LogFile = /dev/null + +# 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 " Deleted: messages.conf =================================================================== --- messages.conf 2019-09-23 10:37:53 UTC (rev 511570) +++ messages.conf 2019-09-23 10:38:07 UTC (rev 511571) @@ -1,13 +0,0 @@ -Archive = -LogFile = -LogFile = /dev/null - -# 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/messages.conf (from rev 511570, logwatch/trunk/messages.conf) =================================================================== --- messages.conf (rev 0) +++ messages.conf 2019-09-23 10:38:07 UTC (rev 511571) @@ -0,0 +1,13 @@ +Archive = +LogFile = +LogFile = /dev/null + +# 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 " Deleted: secure.conf =================================================================== --- secure.conf 2019-09-23 10:37:53 UTC (rev 511570) +++ secure.conf 2019-09-23 10:38:07 UTC (rev 511571) @@ -1,11 +0,0 @@ -Archive = -LogFile = -LogFile = /dev/null - -# 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 " Copied: logwatch/repos/community-any/secure.conf (from rev 511570, logwatch/trunk/secure.conf) =================================================================== --- secure.conf (rev 0) +++ secure.conf 2019-09-23 10:38:07 UTC (rev 511571) @@ -0,0 +1,11 @@ +Archive = +LogFile = +LogFile = /dev/null + +# 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 "