diff options
Diffstat (limited to 'abs')
-rw-r--r-- | abs/core/eventlog/PKGBUILD | 29 | ||||
-rw-r--r-- | abs/core/syslog-ng/PKGBUILD | 70 | ||||
-rwxr-xr-x | abs/core/syslog-ng/syslog-ng | 39 | ||||
-rw-r--r-- | abs/core/syslog-ng/syslog-ng.conf | 86 | ||||
-rw-r--r-- | abs/core/syslog-ng/syslog-ng.logrotate | 4 |
5 files changed, 111 insertions, 117 deletions
diff --git a/abs/core/eventlog/PKGBUILD b/abs/core/eventlog/PKGBUILD index 476dbad..36f657b 100644 --- a/abs/core/eventlog/PKGBUILD +++ b/abs/core/eventlog/PKGBUILD @@ -1,20 +1,29 @@ - +# $Id: PKGBUILD 85218 2010-07-10 21:39:54Z dan $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + pkgname=eventlog -pkgver=0.2.5 -pkgrel=2 +pkgver=0.2.12 +pkgrel=1 pkgdesc="A new API to format and send structured log messages" arch=('i686' 'x86_64') url="http://www.balabit.com/support/community/products/" license=('BSD') depends=('glibc') options=('!libtool') -source=(http://www.balabit.com/downloads/files/eventlog/0.2/eventlog-$pkgver.tar.gz) -md5sums=('a6bdba91f88540cc69b398fd138d86cd') +changelog=ChangeLog +source=(http://www.balabit.com/downloads/files/eventlog/${pkgver%.*}/eventlog_${pkgver}.tar.gz) +md5sums=('3d6ebda8a161d36cb40d09328f78786b') +sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d') build() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE -}
\ No newline at end of file + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/abs/core/syslog-ng/PKGBUILD b/abs/core/syslog-ng/PKGBUILD index 2602964..dc66813 100644 --- a/abs/core/syslog-ng/PKGBUILD +++ b/abs/core/syslog-ng/PKGBUILD @@ -1,34 +1,56 @@ -# $Id: PKGBUILD 2319 2008-05-31 21:01:41Z eric $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 87478 2010-08-14 05:35:10Z allan $ +# Maintainer: Aaron Griffin <aaron@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + pkgname=syslog-ng -_pkgver=2.0.10 -pkgver=2.0.9.10 -pkgrel=11 +pkgver=3.1.2 +pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" -arch=(i686 x86_64) -license=('GPL') +arch=('i686' 'x86_64') +license=('GPL2') groups=('base') url="http://www.balabit.com/network-security/syslog-ng/" -depends=('logrotate' 'glibc') -makedepends=('flex' 'glib2' 'eventlog' 'pkgconfig' 'tcp_wrappers') +depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl') +makedepends=('flex' 'pkgconfig') +optdepends=('logrotate') provides=('logger') backup=('etc/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') -source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${_pkgver}/source/${pkgname}_${_pkgver}.tar.gz \ - syslog-ng.conf syslog-ng.logrotate syslog-ng) -md5sums=('e5ca55796c11899739affa417ff8a71e' - 'ee95af3a4f969f3759e477289305c8c6' - '65d52180f1762e3985168fffa1faf0a8' +source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/$pkgname\_$pkgver.tar.gz + syslog-ng.conf + syslog-ng.logrotate + syslog-ng.rc) +install=syslog-ng.install +md5sums=('b9f45d9783a4ebeb84ec5acd158502fb' + 'e02be6637d0c3b5484d4597ce049ae39' + '735636090be4582885974542d2a75855' '9bd98250cfa49e13fa3fa731b6040549') build() { - cd $startdir/src/$pkgname-${_pkgver} - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var/lib/syslog-ng --enable-tcp-wrapper \ - --disable-spoof-source - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - install -d $startdir/pkg/var/lib/syslog-ng - install -D -m644 ../syslog-ng.conf $startdir/pkg/etc/syslog-ng.conf - install -D -m644 ../syslog-ng.logrotate $startdir/pkg/etc/logrotate.d/syslog-ng - install -D -m755 ../syslog-ng $startdir/pkg/etc/rc.d/syslog-ng + cd $srcdir/$pkgname-$pkgver + + # NOTE - re-assess this with later releases + # FS#15787: syslog-ng does not write to files not owned by root + # Upstream: https://bugzilla.balabit.com/show_bug.cgi?id=52 + # Solution: --disable-linux-caps + + LDFLAGS="$LDFLAGS -Wl,--no-undefined" ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var/lib/syslog-ng \ + --enable-tcp-wrapper \ + --with-pidfile-dir=/var/run \ + --disable-spoof-source \ + --disable-linux-caps + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + install -dm755 $pkgdir/var/lib/syslog-ng + install -Dm644 $srcdir/syslog-ng.conf $pkgdir/etc/syslog-ng.conf + install -Dm644 $srcdir/syslog-ng.logrotate $pkgdir/etc/logrotate.d/syslog-ng + install -Dm755 $srcdir/syslog-ng.rc $pkgdir/etc/rc.d/syslog-ng + # remove libexec + rm -rf $pkgdir/usr/libexec } diff --git a/abs/core/syslog-ng/syslog-ng b/abs/core/syslog-ng/syslog-ng deleted file mode 100755 index f9d14c7..0000000 --- a/abs/core/syslog-ng/syslog-ng +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/syslog-ng` -case "$1" in - start) - stat_busy "Starting Syslog-NG" - [ -z "$PID" ] && /usr/sbin/syslog-ng - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon syslog-ng - stat_done - fi - ;; - stop) - stat_busy "Stopping Syslog-NG" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/syslog-ng.pid -# Removing stale syslog-ng.persist file. It's new location, as of 2.0.6-1, is /var/lib/syslog-ng/ - rm -f /var/syslog-ng.persist - rm_daemon syslog-ng - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core/syslog-ng/syslog-ng.conf b/abs/core/syslog-ng/syslog-ng.conf index d941b6a..adee0cd 100644 --- a/abs/core/syslog-ng/syslog-ng.conf +++ b/abs/core/syslog-ng/syslog-ng.conf @@ -1,9 +1,11 @@ +@version: 3.0 # # /etc/syslog-ng.conf # options { - sync (0); + stats_freq (0); + flush_lines (0); time_reopen (10); log_fifo_size (1000); long_hostnames(off); @@ -21,27 +23,27 @@ source src { file("/proc/kmsg"); }; -destination authlog { file("/var/log/auth.log"); }; -destination syslog { file("/var/log/syslog.log"); }; -destination cron { file("/var/log/crond.log"); }; -destination daemon { file("/var/log/daemon.log"); }; -destination kernel { file("/var/log/kernel.log"); }; -destination lpr { file("/var/log/lpr.log"); }; -destination user { file("/var/log/user.log"); }; -destination uucp { file("/var/log/uucp.log"); }; -destination mail { file("/var/log/mail.log"); }; -destination news { file("/var/log/news.log"); }; -destination ppp { file("/var/log/ppp.log"); }; -destination debug { file("/var/log/debug.log"); }; -destination messages { file("/var/log/messages.log"); }; -destination errors { file("/var/log/errors.log"); }; -destination everything { file("/var/log/everything.log"); }; -destination iptables { file("/var/log/iptables.log"); }; -destination acpid { file("/var/log/acpid.log"); }; -destination console { usertty("root"); }; +destination d_authlog { file("/var/log/auth.log"); }; +destination d_syslog { file("/var/log/syslog.log"); }; +destination d_cron { file("/var/log/crond.log"); }; +destination d_daemon { file("/var/log/daemon.log"); }; +destination d_kernel { file("/var/log/kernel.log"); }; +destination d_lpr { file("/var/log/lpr.log"); }; +destination d_user { file("/var/log/user.log"); }; +destination d_uucp { file("/var/log/uucp.log"); }; +destination d_mail { file("/var/log/mail.log"); }; +destination d_news { file("/var/log/news.log"); }; +destination d_ppp { file("/var/log/ppp.log"); }; +destination d_debug { file("/var/log/debug.log"); }; +destination d_messages { file("/var/log/messages.log"); }; +destination d_errors { file("/var/log/errors.log"); }; +destination d_everything { file("/var/log/everything.log"); }; +destination d_iptables { file("/var/log/iptables.log"); }; +destination d_acpid { file("/var/log/acpid.log"); }; +destination d_console { usertty("root"); }; -# Log everything to vc12 -destination console_all { file("/dev/vc/12"); }; +# Log everything to tty12 +destination console_all { file("/dev/tty12"); }; filter f_auth { facility(auth); }; filter f_authpriv { facility(auth, authpriv); }; @@ -65,27 +67,27 @@ filter f_notice { level(notice); }; filter f_warn { level(warn); }; filter f_crit { level(crit); }; filter f_err { level(err); }; -filter f_iptables { match("IN=.*OUT="); }; -filter f_acpid { match("acpid"); }; +filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; +filter f_acpid { program("acpid"); }; -log { source(src); filter(f_acpid); destination(acpid); flags(final); }; -log { source(src); filter(f_authpriv); destination(authlog); }; -log { source(src); filter(f_syslog); destination(syslog); }; -log { source(src); filter(f_cron); destination(cron); }; -log { source(src); filter(f_daemon); destination(daemon); }; -log { source(src); filter(f_kernel); destination(kernel); }; -log { source(src); filter(f_lpr); destination(lpr); }; -log { source(src); filter(f_mail); destination(mail); }; -log { source(src); filter(f_news); destination(news); }; -log { source(src); filter(f_ppp); destination(ppp); }; -log { source(src); filter(f_user); destination(user); }; -log { source(src); filter(f_uucp); destination(uucp); }; -#log { source(src); filter(f_debug); destination(debug); }; -log { source(src); filter(f_messages); destination(messages); }; -log { source(src); filter(f_err); destination(errors); }; -log { source(src); filter(f_emergency); destination(console); }; -log { source(src); filter(f_everything); destination(everything); }; -log { source(src); filter(f_iptables); destination(iptables); }; +log { source(src); filter(f_acpid); destination(d_acpid); }; +log { source(src); filter(f_authpriv); destination(d_authlog); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_cron); destination(d_cron); }; +log { source(src); filter(f_daemon); destination(d_daemon); }; +log { source(src); filter(f_kernel); destination(d_kernel); }; +log { source(src); filter(f_lpr); destination(d_lpr); }; +log { source(src); filter(f_mail); destination(d_mail); }; +log { source(src); filter(f_news); destination(d_news); }; +log { source(src); filter(f_ppp); destination(d_ppp); }; +log { source(src); filter(f_user); destination(d_user); }; +log { source(src); filter(f_uucp); destination(d_uucp); }; +#log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); filter(f_messages); destination(d_messages); }; +log { source(src); filter(f_err); destination(d_errors); }; +log { source(src); filter(f_emergency); destination(d_console); }; +log { source(src); filter(f_everything); destination(d_everything); }; +log { source(src); filter(f_iptables); destination(d_iptables); }; -# Log everything to vc12 +# Log everything to tty12 #log { source(src); destination(console_all); }; diff --git a/abs/core/syslog-ng/syslog-ng.logrotate b/abs/core/syslog-ng/syslog-ng.logrotate index b26dfb4..e0e6929 100644 --- a/abs/core/syslog-ng/syslog-ng.logrotate +++ b/abs/core/syslog-ng/syslog-ng.logrotate @@ -1,7 +1,7 @@ -/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log { +/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { missingok sharedscripts postrotate - /usr/bin/killall -HUP -q syslog-ng + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true endscript } |