Date: Thursday, April 16, 2015 @ 15:59:22
Author: spupykin
Revision: 131483
archrelease: copy trunk to community-staging-x86_64
Added:
rsyslog/repos/community-staging-x86_64/PKGBUILD
(from rev 131482, rsyslog/trunk/PKGBUILD)
rsyslog/repos/community-staging-x86_64/gnutls.patch
(from rev 131482, rsyslog/trunk/gnutls.patch)
rsyslog/repos/community-staging-x86_64/rsyslog.conf
(from rev 131482, rsyslog/trunk/rsyslog.conf)
rsyslog/repos/community-staging-x86_64/rsyslog.logrotate
(from rev 131482, rsyslog/trunk/rsyslog.logrotate)
Deleted:
rsyslog/repos/community-staging-x86_64/PKGBUILD
rsyslog/repos/community-staging-x86_64/gnutls.patch
rsyslog/repos/community-staging-x86_64/rsyslog.conf
rsyslog/repos/community-staging-x86_64/rsyslog.logrotate
-------------------+
PKGBUILD | 122 ++++++++++++++++++++++++++--------------------------
gnutls.patch | 72 +++++++++++++++---------------
rsyslog.conf | 88 ++++++++++++++++++-------------------
rsyslog.logrotate | 14 ++---
4 files changed, 148 insertions(+), 148 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-04-16 13:58:46 UTC (rev 131482)
+++ PKGBUILD 2015-04-16 13:59:22 UTC (rev 131483)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-
-pkgname=rsyslog
-pkgver=8.9.0
-pkgrel=2
-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' 'librelp')
-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'
- 'gnutls.patch')
-md5sums=('b9e10a3ea9d52b4fa9bbbf540d313970'
- '0d990373f5c70ddee989296007b4df5b'
- 'd61dd424e660eb16401121eed20d98bc'
- 'b190e0d348a33d8190569e6fcbff12ab')
-
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p1 <$srcdir/gnutls.patch
- sed -i rsyslog.service.in \
- -e 's|rsyslogd -n|rsyslogd -n -i /run/rsyslogd.pid|' \
- -e '/ExecStart=.*$/iPIDFile=/run/rsyslogd.pid'
-}
-
-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 \
- --enable-relp \
- --with-systemdsystemunitdir=/usr/lib/systemd/system
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make install DESTDIR=${pkgdir}
- install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
- install -D -m644 $srcdir/${pkgname}.logrotate
${pkgdir}/etc/logrotate.d/${pkgname}
-}
Copied: rsyslog/repos/community-staging-x86_64/PKGBUILD (from rev 131482,
rsyslog/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-04-16 13:59:22 UTC (rev 131483)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+
+pkgname=rsyslog
+pkgver=8.9.0
+pkgrel=3
+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' 'librelp')
+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'
+ 'gnutls.patch')
+md5sums=('b9e10a3ea9d52b4fa9bbbf540d313970'
+ '0d990373f5c70ddee989296007b4df5b'
+ 'd61dd424e660eb16401121eed20d98bc'
+ 'aafafdf4502f5e4de5fcfebd21499700')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p1 <$srcdir/gnutls.patch
+ sed -i rsyslog.service.in \
+ -e 's|rsyslogd -n|rsyslogd -n -i /run/rsyslogd.pid|' \
+ -e '/ExecStart=.*$/iPIDFile=/run/rsyslogd.pid'
+}
+
+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 \
+ --enable-relp \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make install DESTDIR=${pkgdir}
+ install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
+ install -D -m644 $srcdir/${pkgname}.logrotate
${pkgdir}/etc/logrotate.d/${pkgname}
+}
Deleted: gnutls.patch
===================================================================
--- gnutls.patch 2015-04-16 13:58:46 UTC (rev 131482)
+++ gnutls.patch 2015-04-16 13:59:22 UTC (rev 131483)
@@ -1,36 +0,0 @@
-diff -wbBur rsyslog-8.9.0.org/runtime/nsd_gtls.c
rsyslog-8.9.0/runtime/nsd_gtls.c
---- rsyslog-8.9.0.org/runtime/nsd_gtls.c 2015-03-29 16:00:04.000000000
+0300
-+++ rsyslog-8.9.0/runtime/nsd_gtls.c 2015-04-16 15:42:44.701275194 +0300
-@@ -231,13 +231,13 @@
- gtlsClientCertCallback(gnutls_session_t session,
- __attribute__((unused)) const gnutls_datum_t* req_ca_rdn, int
__attribute__((unused)) nreqs,
- __attribute__((unused)) const gnutls_pk_algorithm_t*
sign_algos, int __attribute__((unused)) sign_algos_length,
-- gnutls_retr_st *st)
-+ gnutls_retr2_st *st)
- {
- nsd_gtls_t *pThis;
-
- pThis = (nsd_gtls_t*) gnutls_session_get_ptr(session);
-
-- st->type = GNUTLS_CRT_X509;
-+ st->cert_type = GNUTLS_CRT_X509;
- st->ncerts = 1;
- st->cert.x509 = &pThis->ourCert;
- st->key.x509 = pThis->ourKey;
-@@ -1673,14 +1673,14 @@
- gnutls_session_set_ptr(pThis->sess, (void*)pThis);
- iRet = gtlsLoadOurCertKey(pThis); /* first load .pem files */
- if(iRet == RS_RET_OK) {
-- gnutls_certificate_client_set_retrieve_function(xcred,
gtlsClientCertCallback);
-+ gnutls_certificate_set_retrieve_function(xcred,
gtlsClientCertCallback);
- } else if(iRet != RS_RET_CERTLESS) {
- FINALIZE; /* we have an error case! */
- }
-
- /* Use default priorities */
- CHKgnutls(gnutls_set_default_priority(pThis->sess));
-- CHKgnutls(gnutls_certificate_type_set_priority(pThis->sess,
cert_type_priority));
-+ CHKgnutls(gnutls_priority_set_direct(pThis->sess, cert_type_priority,
NULL));
-
- /* put the x509 credentials to the current session */
- CHKgnutls(gnutls_credentials_set(pThis->sess, GNUTLS_CRD_CERTIFICATE,
xcred));
Copied: rsyslog/repos/community-staging-x86_64/gnutls.patch (from rev 131482,
rsyslog/trunk/gnutls.patch)
===================================================================
--- gnutls.patch (rev 0)
+++ gnutls.patch 2015-04-16 13:59:22 UTC (rev 131483)
@@ -0,0 +1,36 @@
+diff -wbBur rsyslog-8.9.0.org/runtime/nsd_gtls.c
rsyslog-8.9.0/runtime/nsd_gtls.c
+--- rsyslog-8.9.0.org/runtime/nsd_gtls.c 2015-03-29 16:00:04.000000000
+0300
++++ rsyslog-8.9.0/runtime/nsd_gtls.c 2015-04-16 15:42:44.701275194 +0300
+@@ -231,13 +231,13 @@
+ gtlsClientCertCallback(gnutls_session_t session,
+ __attribute__((unused)) const gnutls_datum_t* req_ca_rdn, int
__attribute__((unused)) nreqs,
+ __attribute__((unused)) const gnutls_pk_algorithm_t*
sign_algos, int __attribute__((unused)) sign_algos_length,
+- gnutls_retr_st *st)
++ gnutls_retr2_st *st)
+ {
+ nsd_gtls_t *pThis;
+
+ pThis = (nsd_gtls_t*) gnutls_session_get_ptr(session);
+
+- st->type = GNUTLS_CRT_X509;
++ st->cert_type = GNUTLS_CRT_X509;
+ st->ncerts = 1;
+ st->cert.x509 = &pThis->ourCert;
+ st->key.x509 = pThis->ourKey;
+@@ -1673,14 +1673,14 @@
+ gnutls_session_set_ptr(pThis->sess, (void*)pThis);
+ iRet = gtlsLoadOurCertKey(pThis); /* first load .pem files */
+ if(iRet == RS_RET_OK) {
+- gnutls_certificate_client_set_retrieve_function(xcred,
gtlsClientCertCallback);
++ gnutls_certificate_set_retrieve_function(xcred,
gtlsClientCertCallback);
+ } else if(iRet != RS_RET_CERTLESS) {
+ FINALIZE; /* we have an error case! */
+ }
+
+ /* Use default priorities */
+ CHKgnutls(gnutls_set_default_priority(pThis->sess));
+- CHKgnutls(gnutls_certificate_type_set_priority(pThis->sess,
cert_type_priority));
++ CHKgnutls(gnutls_set_default_priority(pThis->sess));
+
+ /* put the x509 credentials to the current session */
+ CHKgnutls(gnutls_credentials_set(pThis->sess, GNUTLS_CRD_CERTIFICATE,
xcred));
Deleted: rsyslog.conf
===================================================================
--- rsyslog.conf 2015-04-16 13:58:46 UTC (rev 131482)
+++ rsyslog.conf 2015-04-16 13:59:22 UTC (rev 131483)
@@ -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-staging-x86_64/rsyslog.conf (from rev 131482,
rsyslog/trunk/rsyslog.conf)
===================================================================
--- rsyslog.conf (rev 0)
+++ rsyslog.conf 2015-04-16 13:59:22 UTC (rev 131483)
@@ -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: rsyslog.logrotate
===================================================================
--- rsyslog.logrotate 2015-04-16 13:58:46 UTC (rev 131482)
+++ rsyslog.logrotate 2015-04-16 13:59:22 UTC (rev 131483)
@@ -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-staging-x86_64/rsyslog.logrotate (from rev
131482, rsyslog/trunk/rsyslog.logrotate)
===================================================================
--- rsyslog.logrotate (rev 0)
+++ rsyslog.logrotate 2015-04-16 13:59:22 UTC (rev 131483)
@@ -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
+}
