Control: tags -1 pending patch
Control: severity -1 important

On 2015-04-18 Andreas Metzler <ametz...@bebt.de> wrote:
> retitle 624077 nufw: Uses deprecated _set_priority GnuTLS functions, FTBFS 
> against gnutls 3.4.0
[...]

Hello,

I have just uploaded a NMU with these changes to delayed/15:

* 16_gnutls34.diff: Drop call of deprecated
  gnutls_certificate_type_set_priority() function, CTYPE-X.509 is the
  default value. Closes: #624077

Please tell me if I should delay further.

Thanks, cu Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru nufw-2.4.3/debian/changelog nufw-2.4.3/debian/changelog
--- nufw-2.4.3/debian/changelog	2014-08-31 14:32:08.000000000 +0200
+++ nufw-2.4.3/debian/changelog	2015-07-25 15:08:43.000000000 +0200
@@ -1,3 +1,12 @@
+nufw (2.4.3-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * 16_gnutls34.diff: Drop call of deprecated
+    gnutls_certificate_type_set_priority() function, CTYPE-X.509 is the
+    default value. Closes: #624077
+
+ -- Andreas Metzler <ametz...@debian.org>  Sat, 25 Jul 2015 15:08:38 +0200
+
 nufw (2.4.3-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru nufw-2.4.3/debian/patches/16_gnutls34.diff nufw-2.4.3/debian/patches/16_gnutls34.diff
--- nufw-2.4.3/debian/patches/16_gnutls34.diff	1970-01-01 01:00:00.000000000 +0100
+++ nufw-2.4.3/debian/patches/16_gnutls34.diff	2015-07-25 15:12:33.000000000 +0200
@@ -0,0 +1,29 @@
+Description: gnutls 3.4 compat.
+ Drop call of deprecated gnutls_certificate_type_set_priority() function,
+ CTYPE-X.509 is the default value.
+Author: Andreas Metzler <ametz...@debian.org>
+Bug-Debian: https://bugs.debian.org/624077
+Origin: vendor
+Forwarded: no
+Last-Update: 2015-07-25
+
+--- nufw-2.4.3.orig/src/libs/nussl/nussl_socket.c
++++ nufw-2.4.3/src/libs/nussl/nussl_socket.c
+@@ -675,8 +675,6 @@ static const struct iofns iofns_ssl = {
+ };
+ 
+ #elif defined(HAVE_GNUTLS)
+-static const int cert_type_priority[3] = { GNUTLS_CRT_X509, 0 };
+-
+ /* Return zero if an alert value can be ignored. */
+ static int check_alert(nussl_socket * sock, ssize_t ret)
+ {
+@@ -1708,8 +1706,6 @@ int nussl_sock_connect_ssl(nussl_socket
+ 	 * */
+ 	gnutls_init(&sock->ssl, GNUTLS_CLIENT);
+ 	gnutls_set_default_priority(sock->ssl);
+-	gnutls_certificate_type_set_priority(sock->ssl,
+-					     cert_type_priority);
+ 	gnutls_session_set_ptr(sock->ssl, userdata);
+ 	gnutls_credentials_set(sock->ssl, GNUTLS_CRD_CERTIFICATE,
+ 			       ctx->cred);
diff -Nru nufw-2.4.3/debian/patches/series nufw-2.4.3/debian/patches/series
--- nufw-2.4.3/debian/patches/series	2014-08-31 14:27:29.000000000 +0200
+++ nufw-2.4.3/debian/patches/series	2015-07-25 15:06:15.000000000 +0200
@@ -1,3 +1,4 @@
 10-fix-format-strings.patch
 11-fix-ftbfs-pthread_cancel.patch
 15_gnutls_renamedtypes.diff
+16_gnutls34.diff

Attachment: signature.asc
Description: Digital signature

Reply via email to