diff options
Diffstat (limited to 'abs')
| -rw-r--r-- | abs/core/rsyslog/PKGBUILD | 29 | ||||
| -rw-r--r-- | abs/core/rsyslog/gnutls.patch | 36 |
2 files changed, 14 insertions, 51 deletions
diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD index 641af25..1e6ef5d 100644 --- a/abs/core/rsyslog/PKGBUILD +++ b/abs/core/rsyslog/PKGBUILD @@ -2,13 +2,13 @@ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=8.11.0 +pkgver=8.24.0 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' 'librelp') +depends=('zlib' 'libestr' 'libee' 'json-c' 'libsystemd' 'liblogging' 'librelp' 'libfastjson') makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' 'python2-docutils') optdepends=('postgresql-libs: PostgreSQL Database Support' @@ -20,19 +20,17 @@ options=('strip' 'zipman') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.conf.linhes' 'mythtv.conf' - 'log_care.sh' - 'gnutls.patch') + 'log_care.sh') prepare() { - cd ${srcdir}/${pkgname}-${pkgver} -# patch -p1 <$srcdir/gnutls.patch + cd "$srcdir"/${pkgname}-${pkgver} 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} + cd "$srcdir"/${pkgname}-${pkgver} ./configure --prefix=/usr \ --sbindir=/usr/bin \ --enable-mysql \ @@ -46,19 +44,20 @@ build() { --enable-omjournal \ --enable-relp \ --enable-impstats \ + --enable-imptcp \ + --enable-omprog \ --with-systemdsystemunitdir=/usr/lib/systemd/system make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} - install -D -m644 $srcdir/${pkgname}.conf.linhes ${pkgdir}/etc/${pkgname}.conf - install -D -m644 $srcdir/mythtv.conf ${pkgdir}/etc/rsyslog.d/mythtv.conf - install -D -m755 $srcdir/log_care.sh ${pkgdir}/etc/cron.daily/log_care + cd "$srcdir"/${pkgname}-${pkgver} + make install DESTDIR="$pkgdir" + install -D -m644 "$srcdir"/${pkgname}.conf.linhes "$pkgdir"/etc/${pkgname}.conf + install -D -m644 "$srcdir"/mythtv.conf "$pkgdir"/etc/rsyslog.d/mythtv.conf + install -D -m755 "$srcdir"/log_care.sh "$pkgdir"/etc/cron.daily/log_care } -md5sums=('35f0b7024ae7b5677e49f14f36304d77' +md5sums=('789be3f43edae1b20d92c620b04c19de' '61750ec989c319470b466946f6404931' 'd99814eeea48b370b3e0fe2899792fdb' - 'cd39e6edc1fcbbae2093c40c880e0079' - 'aafafdf4502f5e4de5fcfebd21499700') + 'cd39e6edc1fcbbae2093c40c880e0079') diff --git a/abs/core/rsyslog/gnutls.patch b/abs/core/rsyslog/gnutls.patch deleted file mode 100644 index fcf199b..0000000 --- a/abs/core/rsyslog/gnutls.patch +++ /dev/null @@ -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_set_default_priority(pThis->sess)); - - /* put the x509 credentials to the current session */ - CHKgnutls(gnutls_credentials_set(pThis->sess, GNUTLS_CRD_CERTIFICATE, xcred)); |