main/rsyslog: upgrade to 8.9.0

2 files changed, 49 insertions, 8 deletions

diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index 2eb382976b8..e55a21d0fcb 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 # Contributor: cbanta@gmail.com
 pkgname=rsyslog
-pkgver=8.7.0
+pkgver=8.9.0
 pkgrel=0
 pkgdesc="Enhanced multi-threaded syslogd with database support and more."
 url="http://www.rsyslog.com/"
@@ -18,7 +18,9 @@ source="http://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz
 	$pkgname.confd
 	$pkgname.logrotate
 	$pkgname.conf
-	musl-fix.patch"
+	musl-fix.patch
+	gnutls-3.4.0.patch
+	"
 
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -94,21 +96,24 @@ snmp() {
 	mv "$pkgdir"/usr/lib/rsyslog/omsnmp.so "$subpkgdir"/usr/lib/rsyslog/
 }
 
-md5sums="f0706b07444b2d5e238486e10ec1a821  rsyslog-8.7.0.tar.gz
+md5sums="b9e10a3ea9d52b4fa9bbbf540d313970  rsyslog-8.9.0.tar.gz
 6b63d774eb718bc1ab91f3fb5471ade3  rsyslog.initd
 0a0aef98f677364e6178c34274df7723  rsyslog.confd
 bc43debc9ffdf66bc1409025fd3d1176  rsyslog.logrotate
 65fbf5a7a81a53a70974e3085e96cb41  rsyslog.conf
-05a0995f5cbe241720aaf6b149860286  musl-fix.patch"
-sha256sums="c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c  rsyslog-8.7.0.tar.gz
+05a0995f5cbe241720aaf6b149860286  musl-fix.patch
+aafafdf4502f5e4de5fcfebd21499700  gnutls-3.4.0.patch"
+sha256sums="eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc  rsyslog-8.9.0.tar.gz
 dfe1c50766df7bf862507f8f0819e01f78c3054e57e8c4db1f16b3874a04094c  rsyslog.initd
 c476c2180fcceaf581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56  rsyslog.confd
 f0effc19bd1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5  rsyslog.logrotate
 559a8221d2ef9376a77e08de05206f3d2214a81fa88649f5bca2a1207f8918c5  rsyslog.conf
-feda2d9ca6c788e375116b6c43b6c4ac5debe83dab0efcfc9a47216c9af36599  musl-fix.patch"
-sha512sums="53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0  rsyslog-8.7.0.tar.gz
+feda2d9ca6c788e375116b6c43b6c4ac5debe83dab0efcfc9a47216c9af36599  musl-fix.patch
+540530796fd535889ef1a1741ad06e3a0ab4441247396f89ebb06010ce9c102e  gnutls-3.4.0.patch"
+sha512sums="942cccc2cbe147572cc2d346ac330d80c86915757b2b7a380829f0b40294d7e4afd4887d5066821af1e059cd78cdb38520fc9d28b55daa7afcd0e5b2e6bd9a5d  rsyslog-8.9.0.tar.gz
 e35f07e9ce499b874bcc441cb3fa1f7a1c545bc72fec24f96debfbe00dff4d0a27d987c7cc70fd160c718bd25d9a0d291c241fc527aeef897842b7c8a48b35d3  rsyslog.initd
 c216674e6867d655c2c09b6205071591ae2b1611ad5dd0346e682733abafa8a1be261fdd9bb985bb5d05d5bfa708a68262b1a94e654a2c18d352fd02d6f950a3  rsyslog.confd
 d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f  rsyslog.logrotate
 032ccce1850bc89fb37b4b23f1607ce73086ff2b057838a1b83e36751ee0412c537fc0c9cbc2c6e8098311e6a04569c7fc7f7dea80111e8c8623b3b0cc3cccd1  rsyslog.conf
-d5f16d624b40fcd68f689bb65cfad8f537b35f3d7f9c4453c472b21437964442baf0846b3658a6cdd2e0d44b60085140deffc68cf9e3c460bcc5db40cf142ee1  musl-fix.patch"
+d5f16d624b40fcd68f689bb65cfad8f537b35f3d7f9c4453c472b21437964442baf0846b3658a6cdd2e0d44b60085140deffc68cf9e3c460bcc5db40cf142ee1  musl-fix.patch
+b0e2fc464c840211acef0da481fed5eb594d5bee62672fbccf379efcf3f88c3acee5efd8c51671508feaf2edacd05426766577c94e733479a90a58f68f4fc8a4  gnutls-3.4.0.patch"
diff --git a/main/rsyslog/gnutls-3.4.0.patch b/main/rsyslog/gnutls-3.4.0.patch
new file mode 100644
index 00000000000..fcf199b4a7b
--- /dev/null
+++ b/main/rsyslog/gnutls-3.4.0.patch
@@ -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));