Package: gloox Version: 1.0.10-3 Severity: normal Dear maintainer,
find atached the nmudiff for gloox 1.0.10-3.1. Regards. -- `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 gloox-1.0.10/debian/changelog gloox-1.0.10/debian/changelog
--- gloox-1.0.10/debian/changelog 2014-06-09 08:26:35.000000000 +0200
+++ gloox-1.0.10/debian/changelog 2014-09-13 11:49:09.000000000 +0200
@@ -1,3 +1,15 @@
+gloox (1.0.10-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Pull 0001-disable-compilation-of-the-jinglecontent-test-for-no.patch
+ and 0002-don-t-create-jinglecontent-Makefile.patch from upstream SVN to
+ fix FTBFS. Closes: #758899
+ * 0010_nogcryptthreadhandler.diff Drop unnecessary gcrypt usage.
+ * 0020_rely_on_pkg-config.diff Drop unnecessary gcrypt linkage.
+ * Build against GnuTLS 3. Closes: #745942
+
+ -- Andreas Metzler <ametz...@debian.org> Sat, 13 Sep 2014 11:48:49 +0200
+
gloox (1.0.10-3) unstable; urgency=medium
* Add debian/patches/fix_gcc4.9_ftbfs.patch to fix FTBFS with gcc 4.9.
diff -Nru gloox-1.0.10/debian/control gloox-1.0.10/debian/control
--- gloox-1.0.10/debian/control 2014-05-18 10:51:21.000000000 +0200
+++ gloox-1.0.10/debian/control 2014-09-13 09:10:40.000000000 +0200
@@ -8,7 +8,7 @@
doxygen,
graphviz,
gsfonts,
- libgnutls-dev (>= 1.2.8),
+ libgnutls28-dev,
libidn11-dev,
zlib1g-dev
Standards-Version: 3.9.5
@@ -22,7 +22,7 @@
Multi-Arch: same
Depends:
libgloox12 (= ${binary:Version}),
- libgnutls-dev,
+ libgnutls28-dev,
libidn11-dev,
${misc:Depends}
Description: C++ jabber/xmpp library (devel)
diff -Nru gloox-1.0.10/debian/patches/0001-disable-compilation-of-the-jinglecontent-test-for-no.patch gloox-1.0.10/debian/patches/0001-disable-compilation-of-the-jinglecontent-test-for-no.patch
--- gloox-1.0.10/debian/patches/0001-disable-compilation-of-the-jinglecontent-test-for-no.patch 1970-01-01 01:00:00.000000000 +0100
+++ gloox-1.0.10/debian/patches/0001-disable-compilation-of-the-jinglecontent-test-for-no.patch 2014-09-13 08:45:54.000000000 +0200
@@ -0,0 +1,27 @@
+From c8db7a7ed4b48014014ec7f7fb34e9e743ac8e4a Mon Sep 17 00:00:00 2001
+From: js <js@bb60cc1b-8fe5-0310-9879-aca5d778a633>
+Date: Fri, 12 Sep 2014 21:27:20 +0000
+Subject: [PATCH 1/2] * disable compilation of the jinglecontent test for now
+ (https://bugs.debian.org/758899)
+
+git-svn-id: svn://svn.camaya.net/gloox/branches/1.0@4545 bb60cc1b-8fe5-0310-9879-aca5d778a633
+---
+ src/tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
+index 4d530e9..87b3828 100644
+--- a/src/tests/Makefile.am
++++ b/src/tests/Makefile.am
+@@ -10,7 +10,7 @@ SUBDIRS = adhoc adhoccommand adhoccommandnote amprule amp base64 \
+ featureneg flexoffline flexofflineoffline forward \
+ gpgencrypted gpgsigned \
+ inbandbytestreamibb inbandbytestream iq \
+- jid jinglecontent jingleiceudp jinglesession jinglesessionjingle jinglesessionmanager \
++ jid jingleiceudp jinglesession jinglesessionjingle jinglesessionmanager \
+ lastactivity lastactivityquery \
+ md5 message messageeventfilter \
+ mucroommuc mucroommucadmin mucroommucowner mucroommucuser \
+--
+2.1.0
+
diff -Nru gloox-1.0.10/debian/patches/0002-don-t-create-jinglecontent-Makefile.patch gloox-1.0.10/debian/patches/0002-don-t-create-jinglecontent-Makefile.patch
--- gloox-1.0.10/debian/patches/0002-don-t-create-jinglecontent-Makefile.patch 1970-01-01 01:00:00.000000000 +0100
+++ gloox-1.0.10/debian/patches/0002-don-t-create-jinglecontent-Makefile.patch 2014-09-13 08:45:54.000000000 +0200
@@ -0,0 +1,25 @@
+From 3dbe2e3d4d55cb8eb7be58ed56fe76a631d65b97 Mon Sep 17 00:00:00 2001
+From: js <js@bb60cc1b-8fe5-0310-9879-aca5d778a633>
+Date: Fri, 12 Sep 2014 21:30:52 +0000
+Subject: [PATCH 2/2] * don't create jinglecontent/Makefile
+
+git-svn-id: svn://svn.camaya.net/gloox/branches/1.0@4546 bb60cc1b-8fe5-0310-9879-aca5d778a633
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 185d4f9..dde010a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -424,7 +424,6 @@ src/tests/inbandbytestreamibb/Makefile
+ src/tests/inbandbytestream/Makefile
+ src/tests/iq/Makefile
+ src/tests/jid/Makefile
+-src/tests/jinglecontent/Makefile
+ src/tests/jingleiceudp/Makefile
+ src/tests/jinglesession/Makefile
+ src/tests/jinglesessionjingle/Makefile
+--
+2.1.0
+
diff -Nru gloox-1.0.10/debian/patches/0010_nogcryptthreadhandler.diff gloox-1.0.10/debian/patches/0010_nogcryptthreadhandler.diff
--- gloox-1.0.10/debian/patches/0010_nogcryptthreadhandler.diff 1970-01-01 01:00:00.000000000 +0100
+++ gloox-1.0.10/debian/patches/0010_nogcryptthreadhandler.diff 2014-09-13 11:41:07.000000000 +0200
@@ -0,0 +1,42 @@
+Description: Drop superfluous (with GnuTLS >= 2.12) gcrypt usage.
+Author: Andreas Metzler <ametz...@debian.org>
+Bug-Debian: https://bugs.debian.org/745942
+Origin: vendor
+Bug: http://bugs.camaya.net/ticket/?id=231
+Forwarded: http://bugs.camaya.net/ticket/attachments.php?id=231
+Last-Update: 2014-09-13
+
+--- gloox-1.0.10.orig/src/tlsgnutlsclient.cpp
++++ gloox-1.0.10/src/tlsgnutlsclient.cpp
+@@ -18,12 +18,6 @@
+
+ #include <errno.h>
+
+-#ifdef HAVE_PTHREAD
+-extern "C" {
+-GCRY_THREAD_OPTION_PTHREAD_IMPL;
+-}
+-#endif
+-
+ namespace gloox
+ {
+
+@@ -48,8 +42,6 @@ namespace gloox
+ const std::string& /*clientCerts*/,
+ const StringList& /*cacerts*/ )
+ {
+- gcry_control( GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread );
+-
+ const int protocolPriority[] = {
+ #ifdef GNUTLS_TLS1_2
+ GNUTLS_TLS1_2,
+--- gloox-1.0.10.orig/src/tlsgnutlsclient.h
++++ gloox-1.0.10/src/tlsgnutlsclient.h
+@@ -23,7 +23,6 @@
+
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+-#include <gcrypt.h>
+
+ namespace gloox
+ {
diff -Nru gloox-1.0.10/debian/patches/0020_rely_on_pkg-config.diff gloox-1.0.10/debian/patches/0020_rely_on_pkg-config.diff
--- gloox-1.0.10/debian/patches/0020_rely_on_pkg-config.diff 1970-01-01 01:00:00.000000000 +0100
+++ gloox-1.0.10/debian/patches/0020_rely_on_pkg-config.diff 2014-09-13 11:41:50.000000000 +0200
@@ -0,0 +1,51 @@
+Description: Fix unnecessary linkage against gcrypt.
+Author: Andreas Metzler <ametz...@debian.org>
+Bug-Debian: https://bugs.debian.org/745942
+Origin: vendor
+Bug: http://bugs.camaya.net/ticket/?id=231
+Forwarded: http://bugs.camaya.net/ticket/attachments.php?id=231
+Last-Update: 2014-09-13
+
+--- gloox-1.0.10.orig/configure.ac
++++ gloox-1.0.10/configure.ac
+@@ -124,30 +124,21 @@ fi
+
+ dnl GnuTLS
+ if test "$ssl" = "no"; then
+- AC_ARG_WITH(gnutls, AC_HELP_STRING([--with-gnutls=[DIR]],
++ AC_ARG_WITH(gnutls, AC_HELP_STRING([--with-gnutls=[yes/no]],
+ [Support Stream Encryption (needs GnuTLS)]),
+ gnutls=$withval, gnutls=yes)
++ AC_MSG_CHECKING([if GnuTLS should be used])
+ if test "$gnutls" != "no"; then
+- if test "$gnutls" != "yes"; then
+- LDFLAGS="${LDFLAGS} `pkg-config gnutls --libs-only-L`"
+- CPPFLAGS="${CPPFLAGS} `pkg-config gnutls --cflags`"
++ PKG_CHECK_MODULES([GNUTLS], [gnutls >= 2.12], [gnutls=yes], [gnutls=no])
++ if test "$gnutls" = "yes" ; then
++ LIBS="${LIBS} ${GNUTLS_LIBS}"
++ CPPFLAGS="${CPPFLAGS} ${GNUTLS_CFLAGS}"
++ AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if you want TLS support (GnuTLS). Undefine HAVE_OPENSSL.])
++ ssl=yes
++ else
++ AC_MSG_WARN([GnuTLS not found])
+ fi
+- AC_CHECK_HEADER(gnutls/gnutls.h,
+- AC_CHECK_LIB(gnutls, gnutls_check_version,
+- [gnutls=yes LIBS="${LIBS} `pkg-config gnutls --libs` -lgcrypt"], gnutls=no),
+- gnutls=no)
+- fi
+- if test "$gnutls" != "no" ; then
+- AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if you want TLS support (GnuTLS). Undefine HAVE_OPENSSL.])
+- ssl=yes
+- AC_CHECK_LIB(gnutls, gnutls_session_channel_binding,
+- [AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_GNUTLS_SESSION_CHANNEL_BINDING, 1, [Define to 1 if you have GnuTLS 2.12.0 or above.] )], [AC_MSG_RESULT(no)])
+- else
+- AC_MSG_WARN([GnuTLS not found])
+ fi
+- AC_MSG_CHECKING([if GnuTLS should be used])
+- AC_MSG_RESULT($gnutls)
+ fi
+
+ dnl OpenSSL
diff -Nru gloox-1.0.10/debian/patches/series gloox-1.0.10/debian/patches/series
--- gloox-1.0.10/debian/patches/series 2014-06-09 08:53:23.000000000 +0200
+++ gloox-1.0.10/debian/patches/series 2014-09-13 08:59:40.000000000 +0200
@@ -1 +1,5 @@
fix_gcc4.9_ftbfs.patch
+0001-disable-compilation-of-the-jinglecontent-test-for-no.patch
+0002-don-t-create-jinglecontent-Makefile.patch
+0010_nogcryptthreadhandler.diff
+0020_rely_on_pkg-config.diff
signature.asc
Description: Digital signature
