Date: Friday, October 3, 2014 @ 12:46:08 Author: spupykin Revision: 120100
archrelease: copy trunk to community-i686, community-x86_64 Added: rsyslog/repos/community-i686/PKGBUILD (from rev 120099, rsyslog/trunk/PKGBUILD) rsyslog/repos/community-i686/rsyslog.conf (from rev 120099, rsyslog/trunk/rsyslog.conf) rsyslog/repos/community-i686/rsyslog.logrotate (from rev 120099, rsyslog/trunk/rsyslog.logrotate) rsyslog/repos/community-x86_64/PKGBUILD (from rev 120099, rsyslog/trunk/PKGBUILD) rsyslog/repos/community-x86_64/rsyslog.conf (from rev 120099, rsyslog/trunk/rsyslog.conf) rsyslog/repos/community-x86_64/rsyslog.logrotate (from rev 120099, rsyslog/trunk/rsyslog.logrotate) Deleted: rsyslog/repos/community-i686/PKGBUILD rsyslog/repos/community-i686/build-fix.patch rsyslog/repos/community-i686/rsyslog.conf rsyslog/repos/community-i686/rsyslog.logrotate rsyslog/repos/community-x86_64/PKGBUILD rsyslog/repos/community-x86_64/build-fix.patch rsyslog/repos/community-x86_64/rsyslog.conf rsyslog/repos/community-x86_64/rsyslog.logrotate ------------------------------------+ /PKGBUILD | 112 +++++++++++++++++++++++++++++++++++ /rsyslog.conf | 88 +++++++++++++++++++++++++++ /rsyslog.logrotate | 14 ++++ community-i686/PKGBUILD | 63 ------------------- community-i686/build-fix.patch | 15 ---- community-i686/rsyslog.conf | 44 ------------- community-i686/rsyslog.logrotate | 7 -- community-x86_64/PKGBUILD | 63 ------------------- community-x86_64/build-fix.patch | 15 ---- community-x86_64/rsyslog.conf | 44 ------------- community-x86_64/rsyslog.logrotate | 7 -- 11 files changed, 214 insertions(+), 258 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-10-03 10:45:49 UTC (rev 120099) +++ community-i686/PKGBUILD 2014-10-03 10:46:08 UTC (rev 120100) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> - -pkgname=rsyslog -pkgver=8.4.1 -pkgrel=1 -pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" -url="http://www.rsyslog.com/" -arch=('i686' 'x86_64') -license=('GPL3') -depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging') -makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' - 'python-docutils') -optdepends=('postgresql-libs: PostgreSQL Database Support' - 'libmariadbclient: MySQL Database Support' - 'net-snmp' - 'gnutls') -backup=('etc/rsyslog.conf' - 'etc/logrotate.d/rsyslog') -options=('strip' 'zipman') -source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" - 'rsyslog.logrotate' - 'rsyslog.conf' - 'build-fix.patch') -md5sums=('03a80c3390294205be2df1d3a9d24f8a' - '0d990373f5c70ddee989296007b4df5b' - 'd61dd424e660eb16401121eed20d98bc' - '1211cde1be4a2196c77d89e38c48c930') - -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} -# patch -p1 <$srcdir/build-fix.patch -} - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --enable-mysql \ - --enable-pgsql \ - --enable-mail \ - --enable-imfile \ - --enable-snmp \ - --enable-gnutls \ - --enable-inet \ - --enable-imjournal \ - --enable-omjournal \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} - # Install Daemons and Configuration Files - install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf - install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} - - # fix location of systemctl and remove start precondition - sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \ - -e 's@/bin/systemctl@/usr&@' \ - -e '/^ExecStartPre/d' -} Copied: rsyslog/repos/community-i686/PKGBUILD (from rev 120099, rsyslog/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-10-03 10:46:08 UTC (rev 120100) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=rsyslog +pkgver=8.4.2 +pkgrel=1 +pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" +url="http://www.rsyslog.com/" +arch=('i686' 'x86_64') +license=('GPL3') +depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging') +makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' + 'python-docutils') +optdepends=('postgresql-libs: PostgreSQL Database Support' + 'libmariadbclient: MySQL Database Support' + 'net-snmp' + 'gnutls') +backup=('etc/rsyslog.conf' + 'etc/logrotate.d/rsyslog') +options=('strip' 'zipman') +source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" + 'rsyslog.logrotate' + 'rsyslog.conf') +md5sums=('5d0f39d5a4fdd4b3b91d80450f17f22e' + '0d990373f5c70ddee989296007b4df5b' + 'd61dd424e660eb16401121eed20d98bc') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --enable-mysql \ + --enable-pgsql \ + --enable-mail \ + --enable-imfile \ + --enable-snmp \ + --enable-gnutls \ + --enable-inet \ + --enable-imjournal \ + --enable-omjournal \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} + # Install Daemons and Configuration Files + install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf + install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} + + # fix location of systemctl and remove start precondition + sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \ + -e 's@/bin/systemctl@/usr&@' \ + -e '/^ExecStartPre/d' +} Deleted: community-i686/build-fix.patch =================================================================== --- community-i686/build-fix.patch 2014-10-03 10:45:49 UTC (rev 120099) +++ community-i686/build-fix.patch 2014-10-03 10:46:08 UTC (rev 120100) @@ -1,15 +0,0 @@ -diff -wbBur rsyslog-8.4.0/runtime/msg.c rsyslog-8.4.0.my/runtime/msg.c ---- rsyslog-8.4.0/runtime/msg.c 2014-08-18 13:14:06.000000000 +0400 -+++ rsyslog-8.4.0.my/runtime/msg.c 2014-08-22 15:58:52.974045109 +0400 -@@ -4074,7 +4074,11 @@ - - err = tokener->err; - if(err != json_tokener_continue) -+# if HAVE_JSON_TOKENER_ERROR_DESC -+ errMsg = json_tokener_error_desc(err); -+# else - errMsg = json_tokener_errors[err]; -+# endif - else - errMsg = "Unterminated input"; - } else if(!json_object_is_type(json, json_type_object)) Deleted: community-i686/rsyslog.conf =================================================================== --- community-i686/rsyslog.conf 2014-10-03 10:45:49 UTC (rev 120099) +++ community-i686/rsyslog.conf 2014-10-03 10:46:08 UTC (rev 120100) @@ -1,44 +0,0 @@ -# Minimal config - -$ModLoad imuxsock # provides support for local system logging -$ModLoad imklog # provides kernel logging support -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat -$FileOwner root -$FileGroup root -$FileCreateMode 0640 -$DirCreateMode 0755 -$Umask 0022 -$WorkDirectory /var/spool/rsyslog -$IncludeConfig /etc/rsyslog.d/*.conf - -auth,authpriv.* /var/log/auth.log -*.*;auth,authpriv.none -/var/log/syslog -#cron.* /var/log/cron.log -daemon.* -/var/log/daemon.log -kern.* -/var/log/kern.log -lpr.* -/var/log/lpr.log -mail.* -/var/log/mail.log -user.* -/var/log/user.log - -mail.info -/var/log/mail.info -mail.warn -/var/log/mail.warn -mail.err /var/log/mail.err - -news.crit /var/log/news/news.crit -news.err /var/log/news/news.err -news.notice -/var/log/news/news.notice - -*.=debug;\ - auth,authpriv.none;\ - news.none;mail.none -/var/log/debug -*.=info;*.=notice;*.=warn;\ - auth,authpriv.none;\ - cron,daemon.none;\ - mail,news.none -/var/log/messages - -*.emerg :omusrmsg:* - -daemon.*;mail.*;\ - news.err;\ - *.=debug;*.=info;\ - *.=notice;*.=warn |/dev/xconsole Copied: rsyslog/repos/community-i686/rsyslog.conf (from rev 120099, rsyslog/trunk/rsyslog.conf) =================================================================== --- community-i686/rsyslog.conf (rev 0) +++ community-i686/rsyslog.conf 2014-10-03 10:46:08 UTC (rev 120100) @@ -0,0 +1,44 @@ +# Minimal config + +$ModLoad imuxsock # provides support for local system logging +$ModLoad imklog # provides kernel logging support +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +$FileOwner root +$FileGroup root +$FileCreateMode 0640 +$DirCreateMode 0755 +$Umask 0022 +$WorkDirectory /var/spool/rsyslog +$IncludeConfig /etc/rsyslog.d/*.conf + +auth,authpriv.* /var/log/auth.log +*.*;auth,authpriv.none -/var/log/syslog +#cron.* /var/log/cron.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +lpr.* -/var/log/lpr.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log + +mail.info -/var/log/mail.info +mail.warn -/var/log/mail.warn +mail.err /var/log/mail.err + +news.crit /var/log/news/news.crit +news.err /var/log/news/news.err +news.notice -/var/log/news/news.notice + +*.=debug;\ + auth,authpriv.none;\ + news.none;mail.none -/var/log/debug +*.=info;*.=notice;*.=warn;\ + auth,authpriv.none;\ + cron,daemon.none;\ + mail,news.none -/var/log/messages + +*.emerg :omusrmsg:* + +daemon.*;mail.*;\ + news.err;\ + *.=debug;*.=info;\ + *.=notice;*.=warn |/dev/xconsole Deleted: community-i686/rsyslog.logrotate =================================================================== --- community-i686/rsyslog.logrotate 2014-10-03 10:45:49 UTC (rev 120099) +++ community-i686/rsyslog.logrotate 2014-10-03 10:46:08 UTC (rev 120100) @@ -1,7 +0,0 @@ -/var/log/auth.log /var/log/cron.log /var/log/daemon.log /var/log/debug /var/log/kern.log /var/log/lpr.log /var/log/mail.err /var/log/mail.info /var/log/mail.log /var/log/mail.warn /var/log/messages /var/log/news /var/log/syslog /var/log/user.log { - missingok - sharedscripts - postrotate - /usr/bin/killall -HUP /usr/bin/rsyslogd - endscript -} Copied: rsyslog/repos/community-i686/rsyslog.logrotate (from rev 120099, rsyslog/trunk/rsyslog.logrotate) =================================================================== --- community-i686/rsyslog.logrotate (rev 0) +++ community-i686/rsyslog.logrotate 2014-10-03 10:46:08 UTC (rev 120100) @@ -0,0 +1,7 @@ +/var/log/auth.log /var/log/cron.log /var/log/daemon.log /var/log/debug /var/log/kern.log /var/log/lpr.log /var/log/mail.err /var/log/mail.info /var/log/mail.log /var/log/mail.warn /var/log/messages /var/log/news /var/log/syslog /var/log/user.log { + missingok + sharedscripts + postrotate + /usr/bin/killall -HUP /usr/bin/rsyslogd + endscript +} Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2014-10-03 10:45:49 UTC (rev 120099) +++ community-x86_64/PKGBUILD 2014-10-03 10:46:08 UTC (rev 120100) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> - -pkgname=rsyslog -pkgver=8.4.1 -pkgrel=1 -pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" -url="http://www.rsyslog.com/" -arch=('i686' 'x86_64') -license=('GPL3') -depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging') -makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' - 'python-docutils') -optdepends=('postgresql-libs: PostgreSQL Database Support' - 'libmariadbclient: MySQL Database Support' - 'net-snmp' - 'gnutls') -backup=('etc/rsyslog.conf' - 'etc/logrotate.d/rsyslog') -options=('strip' 'zipman') -source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" - 'rsyslog.logrotate' - 'rsyslog.conf' - 'build-fix.patch') -md5sums=('03a80c3390294205be2df1d3a9d24f8a' - '0d990373f5c70ddee989296007b4df5b' - 'd61dd424e660eb16401121eed20d98bc' - '1211cde1be4a2196c77d89e38c48c930') - -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} -# patch -p1 <$srcdir/build-fix.patch -} - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --enable-mysql \ - --enable-pgsql \ - --enable-mail \ - --enable-imfile \ - --enable-snmp \ - --enable-gnutls \ - --enable-inet \ - --enable-imjournal \ - --enable-omjournal \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} - # Install Daemons and Configuration Files - install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf - install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} - - # fix location of systemctl and remove start precondition - sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \ - -e 's@/bin/systemctl@/usr&@' \ - -e '/^ExecStartPre/d' -} Copied: rsyslog/repos/community-x86_64/PKGBUILD (from rev 120099, rsyslog/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-10-03 10:46:08 UTC (rev 120100) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=rsyslog +pkgver=8.4.2 +pkgrel=1 +pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" +url="http://www.rsyslog.com/" +arch=('i686' 'x86_64') +license=('GPL3') +depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging') +makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' + 'python-docutils') +optdepends=('postgresql-libs: PostgreSQL Database Support' + 'libmariadbclient: MySQL Database Support' + 'net-snmp' + 'gnutls') +backup=('etc/rsyslog.conf' + 'etc/logrotate.d/rsyslog') +options=('strip' 'zipman') +source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" + 'rsyslog.logrotate' + 'rsyslog.conf') +md5sums=('5d0f39d5a4fdd4b3b91d80450f17f22e' + '0d990373f5c70ddee989296007b4df5b' + 'd61dd424e660eb16401121eed20d98bc') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --enable-mysql \ + --enable-pgsql \ + --enable-mail \ + --enable-imfile \ + --enable-snmp \ + --enable-gnutls \ + --enable-inet \ + --enable-imjournal \ + --enable-omjournal \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} + # Install Daemons and Configuration Files + install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf + install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} + + # fix location of systemctl and remove start precondition + sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \ + -e 's@/bin/systemctl@/usr&@' \ + -e '/^ExecStartPre/d' +} Deleted: community-x86_64/build-fix.patch =================================================================== --- community-x86_64/build-fix.patch 2014-10-03 10:45:49 UTC (rev 120099) +++ community-x86_64/build-fix.patch 2014-10-03 10:46:08 UTC (rev 120100) @@ -1,15 +0,0 @@ -diff -wbBur rsyslog-8.4.0/runtime/msg.c rsyslog-8.4.0.my/runtime/msg.c ---- rsyslog-8.4.0/runtime/msg.c 2014-08-18 13:14:06.000000000 +0400 -+++ rsyslog-8.4.0.my/runtime/msg.c 2014-08-22 15:58:52.974045109 +0400 -@@ -4074,7 +4074,11 @@ - - err = tokener->err; - if(err != json_tokener_continue) -+# if HAVE_JSON_TOKENER_ERROR_DESC -+ errMsg = json_tokener_error_desc(err); -+# else - errMsg = json_tokener_errors[err]; -+# endif - else - errMsg = "Unterminated input"; - } else if(!json_object_is_type(json, json_type_object)) Deleted: community-x86_64/rsyslog.conf =================================================================== --- community-x86_64/rsyslog.conf 2014-10-03 10:45:49 UTC (rev 120099) +++ community-x86_64/rsyslog.conf 2014-10-03 10:46:08 UTC (rev 120100) @@ -1,44 +0,0 @@ -# Minimal config - -$ModLoad imuxsock # provides support for local system logging -$ModLoad imklog # provides kernel logging support -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat -$FileOwner root -$FileGroup root -$FileCreateMode 0640 -$DirCreateMode 0755 -$Umask 0022 -$WorkDirectory /var/spool/rsyslog -$IncludeConfig /etc/rsyslog.d/*.conf - -auth,authpriv.* /var/log/auth.log -*.*;auth,authpriv.none -/var/log/syslog -#cron.* /var/log/cron.log -daemon.* -/var/log/daemon.log -kern.* -/var/log/kern.log -lpr.* -/var/log/lpr.log -mail.* -/var/log/mail.log -user.* -/var/log/user.log - -mail.info -/var/log/mail.info -mail.warn -/var/log/mail.warn -mail.err /var/log/mail.err - -news.crit /var/log/news/news.crit -news.err /var/log/news/news.err -news.notice -/var/log/news/news.notice - -*.=debug;\ - auth,authpriv.none;\ - news.none;mail.none -/var/log/debug -*.=info;*.=notice;*.=warn;\ - auth,authpriv.none;\ - cron,daemon.none;\ - mail,news.none -/var/log/messages - -*.emerg :omusrmsg:* - -daemon.*;mail.*;\ - news.err;\ - *.=debug;*.=info;\ - *.=notice;*.=warn |/dev/xconsole Copied: rsyslog/repos/community-x86_64/rsyslog.conf (from rev 120099, rsyslog/trunk/rsyslog.conf) =================================================================== --- community-x86_64/rsyslog.conf (rev 0) +++ community-x86_64/rsyslog.conf 2014-10-03 10:46:08 UTC (rev 120100) @@ -0,0 +1,44 @@ +# Minimal config + +$ModLoad imuxsock # provides support for local system logging +$ModLoad imklog # provides kernel logging support +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +$FileOwner root +$FileGroup root +$FileCreateMode 0640 +$DirCreateMode 0755 +$Umask 0022 +$WorkDirectory /var/spool/rsyslog +$IncludeConfig /etc/rsyslog.d/*.conf + +auth,authpriv.* /var/log/auth.log +*.*;auth,authpriv.none -/var/log/syslog +#cron.* /var/log/cron.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +lpr.* -/var/log/lpr.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log + +mail.info -/var/log/mail.info +mail.warn -/var/log/mail.warn +mail.err /var/log/mail.err + +news.crit /var/log/news/news.crit +news.err /var/log/news/news.err +news.notice -/var/log/news/news.notice + +*.=debug;\ + auth,authpriv.none;\ + news.none;mail.none -/var/log/debug +*.=info;*.=notice;*.=warn;\ + auth,authpriv.none;\ + cron,daemon.none;\ + mail,news.none -/var/log/messages + +*.emerg :omusrmsg:* + +daemon.*;mail.*;\ + news.err;\ + *.=debug;*.=info;\ + *.=notice;*.=warn |/dev/xconsole Deleted: community-x86_64/rsyslog.logrotate =================================================================== --- community-x86_64/rsyslog.logrotate 2014-10-03 10:45:49 UTC (rev 120099) +++ community-x86_64/rsyslog.logrotate 2014-10-03 10:46:08 UTC (rev 120100) @@ -1,7 +0,0 @@ -/var/log/auth.log /var/log/cron.log /var/log/daemon.log /var/log/debug /var/log/kern.log /var/log/lpr.log /var/log/mail.err /var/log/mail.info /var/log/mail.log /var/log/mail.warn /var/log/messages /var/log/news /var/log/syslog /var/log/user.log { - missingok - sharedscripts - postrotate - /usr/bin/killall -HUP /usr/bin/rsyslogd - endscript -} Copied: rsyslog/repos/community-x86_64/rsyslog.logrotate (from rev 120099, rsyslog/trunk/rsyslog.logrotate) =================================================================== --- community-x86_64/rsyslog.logrotate (rev 0) +++ community-x86_64/rsyslog.logrotate 2014-10-03 10:46:08 UTC (rev 120100) @@ -0,0 +1,7 @@ +/var/log/auth.log /var/log/cron.log /var/log/daemon.log /var/log/debug /var/log/kern.log /var/log/lpr.log /var/log/mail.err /var/log/mail.info /var/log/mail.log /var/log/mail.warn /var/log/messages /var/log/news /var/log/syslog /var/log/user.log { + missingok + sharedscripts + postrotate + /usr/bin/killall -HUP /usr/bin/rsyslogd + endscript +}