[arch-commits] Commit in rsyslog/trunk (PKGBUILD gnutls.patch)

[Sergej Pupykin]

    Date: Tuesday, March 8, 2016 @ 20:32:55
  Author: spupykin
Revision: 165622

upgpkg: rsyslog 8.17.0-1

upd

Modified:
  rsyslog/trunk/PKGBUILD
Deleted:
  rsyslog/trunk/gnutls.patch

--------------+
 PKGBUILD     |   15 ++++++---------
 gnutls.patch |   36 ------------------------------------
 2 files changed, 6 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-08 19:28:36 UTC (rev 165621)
+++ PKGBUILD	2016-03-08 19:32:55 UTC (rev 165622)
@@ -2,13 +2,13 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=rsyslog
-pkgver=8.16.0
-pkgrel=2
+pkgver=8.17.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' 'systemd' 'liblogging' 'librelp' 'libfastjson')
 makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls'
 	     'python-docutils')
 optdepends=('postgresql-libs: PostgreSQL Database Support'
@@ -20,16 +20,13 @@
 options=('strip' 'zipman')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog.logrotate'
-	'rsyslog.conf'
-	'gnutls.patch')
-md5sums=('52916045c07ebbd3ee77c39e8465bc4d'
+	'rsyslog.conf')
+md5sums=('fadc26576a783afdf11f64beca278bc9'
          '0d990373f5c70ddee989296007b4df5b'
-         'd61dd424e660eb16401121eed20d98bc'
-         'aafafdf4502f5e4de5fcfebd21499700')
+         'd61dd424e660eb16401121eed20d98bc')
 
 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'

Deleted: gnutls.patch
===================================================================
--- gnutls.patch	2016-03-08 19:28:36 UTC (rev 165621)
+++ gnutls.patch	2016-03-08 19:32:55 UTC (rev 165622)
@@ -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));