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

[Sergej Pupykin]

    Date: Thursday, April 16, 2015 @ 14:51:17
  Author: spupykin
Revision: 131469

upgpkg: rsyslog 8.9.0-2

upd

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

--------------+
 PKGBUILD     |    9 ++++++---
 gnutls.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-16 12:07:16 UTC (rev 131468)
+++ PKGBUILD	2015-04-16 12:51:17 UTC (rev 131469)
@@ -3,7 +3,7 @@
 
 pkgname=rsyslog
 pkgver=8.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64')
@@ -20,13 +20,16 @@
 options=('strip' 'zipman')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog.logrotate'
-	'rsyslog.conf')
+	'rsyslog.conf'
+	'gnutls.patch')
 md5sums=('b9e10a3ea9d52b4fa9bbbf540d313970'
          '0d990373f5c70ddee989296007b4df5b'
-         'd61dd424e660eb16401121eed20d98bc')
+         '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'

Added: gnutls.patch
===================================================================
--- gnutls.patch	                        (rev 0)
+++ gnutls.patch	2015-04-16 12:51:17 UTC (rev 131469)
@@ -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_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));