Control: tags 745957 + patch Control: tags 745957 + pending On 2014-08-31 Andreas Metzler <ametz...@bebt.de> wrote: [...] > this has now happened. I will probably upload a NMU to delayed later this > day.
Hello, upload is now in delayed/5-day. Please feel free to tell me if I should delay it longer. 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 2013-07-08 10:47:16.000000000 +0200
+++ nufw-2.4.3/debian/changelog 2014-08-31 14:32:08.000000000 +0200
@@ -1,3 +1,12 @@
+nufw (2.4.3-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Change b-d to libgnutls28-dev|libgnutls-dev, fixing a FTBFS caused by
+ conflicting b-d (libprelude-dev <-> libgnutls-dev). Closes: 745957
+ * 15_gnutls_renamedtype.diff: Stop using ancient types removed in GnuTLS 3.
+
+ -- Andreas Metzler <ametz...@debian.org> Sun, 31 Aug 2014 14:24:41 +0200
+
nufw (2.4.3-3) unstable; urgency=low
* Rewrite packaging files
diff -Nru nufw-2.4.3/debian/control nufw-2.4.3/debian/control
--- nufw-2.4.3/debian/control 2013-07-02 17:15:53.000000000 +0200
+++ nufw-2.4.3/debian/control 2014-08-31 08:10:35.000000000 +0200
@@ -10,7 +10,7 @@
libpq-dev,
iptables-dev,
libtool,
- libgnutls-dev, libsasl2-dev,
+ libgnutls28-dev | libgnutls-dev, libsasl2-dev,
libpam0g-dev,
libprelude-dev,
libnetfilter-conntrack-dev, libnetfilter-queue-dev, libnfnetlink-dev,
diff -Nru nufw-2.4.3/debian/patches/15_gnutls_renamedtypes.diff nufw-2.4.3/debian/patches/15_gnutls_renamedtypes.diff
--- nufw-2.4.3/debian/patches/15_gnutls_renamedtypes.diff 1970-01-01 01:00:00.000000000 +0100
+++ nufw-2.4.3/debian/patches/15_gnutls_renamedtypes.diff 2014-08-31 14:23:16.000000000 +0200
@@ -0,0 +1,54 @@
+Description: Fixup usage of long-deprecated (2004) and recently removed
+ (GnuTLS 3) types:
+ * gnutls_pkcs12 -> gnutls_pkcs12_t
+ * gnutls_pkcs12_bag -> gnutls_pkcs12_bag_t
+ * gnutls_pkcs12_bag_type -> gnutls_pkcs12_bag_type_t
+Author: Andreas Metzler <ametz...@debian.org>
+Origin: vendor
+Last-Update: 2014-08-31
+
+--- a/src/libs/nussl/nussl_gnutls.c
++++ b/src/libs/nussl/nussl_gnutls.c
+@@ -915,11 +915,11 @@ int read_to_datum(const char *filename,
+ /* Parses a PKCS#12 structure and loads the certificate, private key
+ * and friendly name if possible. Returns zero on success, non-zero
+ * on error. */
+-static int pkcs12_parse(gnutls_pkcs12 p12, gnutls_x509_privkey * pkey,
++static int pkcs12_parse(gnutls_pkcs12_t p12, gnutls_x509_privkey * pkey,
+ gnutls_x509_crt * x5, char **friendly_name,
+ const char *password)
+ {
+- gnutls_pkcs12_bag bag = NULL;
++ gnutls_pkcs12_bag_t bag = NULL;
+ int i, j, ret = 0;
+
+ for (i = 0; ret == 0; ++i) {
+@@ -939,7 +939,7 @@ static int pkcs12_parse(gnutls_pkcs12 p1
+ for (j = 0;
+ ret == 0 && j < gnutls_pkcs12_bag_get_count(bag);
+ ++j) {
+- gnutls_pkcs12_bag_type type;
++ gnutls_pkcs12_bag_type_t type;
+ gnutls_datum data;
+
+ if (friendly_name && *friendly_name == NULL) {
+@@ -1020,7 +1020,7 @@ nussl_ssl_client_cert *nussl_ssl_clicert
+ {
+ int ret;
+ gnutls_datum data;
+- gnutls_pkcs12 p12;
++ gnutls_pkcs12_t p12;
+ nussl_ssl_client_cert *cc;
+ char *friendly_name = NULL;
+ gnutls_x509_crt cert = NULL;
+--- a/src/libs/nussl/nussl_ssl_common.h
++++ b/src/libs/nussl/nussl_ssl_common.h
+@@ -57,7 +57,7 @@ struct nussl_ssl_certificate_s {
+ };
+
+ struct nussl_ssl_client_cert_s {
+- gnutls_pkcs12 p12;
++ gnutls_pkcs12_t p12;
+ int decrypted; /* non-zero if successfully decrypted. */
+ nussl_ssl_certificate cert;
+ gnutls_x509_privkey pkey;
diff -Nru nufw-2.4.3/debian/patches/series nufw-2.4.3/debian/patches/series
--- nufw-2.4.3/debian/patches/series 2013-07-02 16:08:18.000000000 +0200
+++ nufw-2.4.3/debian/patches/series 2014-08-31 14:27:29.000000000 +0200
@@ -1,2 +1,3 @@
10-fix-format-strings.patch
11-fix-ftbfs-pthread_cancel.patch
+15_gnutls_renamedtypes.diff
signature.asc
Description: Digital signature
