Commit da939b6e authored by Dmitry Smirnov's avatar Dmitry Smirnov

fix gnutls-related FTBFS (Closes: #754554)

parent 3a444a0c
abiword (3.0.0-5) unstable; urgency=medium
* Build-Depends: +libgcrypt20-dev.
* New patch to fix gnutls-related FTBFS (Closes: #754554);
Thanks, Andreas Metzler.
-- Dmitry Smirnov <onlyjob@debian.org> Thu, 24 Jul 2014 03:13:18 +1000
abiword (3.0.0-4) unstable; urgency=medium
* New patch to fix FTBFS with libboost1.54 (Closes: #737551).
......
......@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, quilt, imagemagick
,libecal1.2-dev (>= 3.8.5)
,libenchant-dev
,libfribidi-dev
,libgcrypt20-dev
,libgoffice-0.10-dev
,libgtk2.0-dev
,libglib2.0-dev
......
Last-Update: 2014-07-24
Forwarded: not-needed
Origin: http://bugzilla.abisource.com/attachment.cgi?id=5720
Bug-Debian: http://bugs.debian.org/754554
Bug-Abiword: http://bugzilla.abisource.com/13657
Description: fix FTBFS with gnutls3
--- a/plugins/collab/backends/service/xp/tls_tunnel.cpp
+++ b/plugins/collab/backends/service/xp/tls_tunnel.cpp
@@ -48,91 +48,9 @@
typedef boost::shared_ptr<asio::ip::tcp::socket> socket_ptr_t;
typedef boost::shared_ptr<gnutls_session_t> session_ptr_t;
typedef boost::shared_ptr< std::vector<char> > buffer_ptr_t;
-class mutex {
-public:
- mutex() {
-#ifdef WIN32
- repr = CreateMutex(0, FALSE, 0);
-#else
- pthread_mutex_init(&repr, NULL);
-#endif
- }
-
- void lock() {
-#ifdef WIN32
- WaitForSingleObject(repr, INFINITE);
-#else
- pthread_mutex_lock(&repr);
-#endif
- }
-
- void unlock() {
-#ifdef WIN32
- ReleaseMutex(repr);
-#else
- pthread_mutex_unlock(&repr);
-#endif
- }
-
- ~mutex()
- {
-#ifdef WIN32
- CloseHandle(repr);
-#else
- pthread_mutex_destroy(&repr);
-#endif
- }
-
-private:
- mutex( const mutex& );
- const mutex& operator=( const mutex& );
-
-#ifdef WIN32
- HANDLE repr;
-#else
- pthread_mutex_t repr;
-#endif
-};
-
-static int gcry_tunnel_mutex_init(void **priv)
-{
- if (!priv)
- return -1;
- *priv = new mutex();
- return 0;
-}
-
-static int gcry_tunnel_mutex_destroy(void **priv)
-{
- if (!priv || !*priv)
- return -1;
- delete reinterpret_cast<mutex*>(*priv);
- return 0;
-}
-
-static int gcry_tunnel_mutex_lock(void **priv)
-{
- reinterpret_cast<mutex*>(*priv)->lock();
- return 0;
-}
-
-static int gcry_tunnel_mutex_unlock(void **priv)
-{
- reinterpret_cast<mutex*>(*priv)->unlock();
- return 0;
-}
-
-static struct gcry_thread_cbs gcry_threads_tunnel =
-{ GCRY_THREAD_OPTION_USER, NULL,
- gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy,
- gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
-
bool Proxy::tls_tunnel_init() {
- if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0)
- return false;
if (gnutls_global_init() != 0)
return false;
return true;
}
--- a/plugins/collab/backends/service/xp/tls_tunnel.h
+++ b/plugins/collab/backends/service/xp/tls_tunnel.h
@@ -39,9 +39,8 @@
#ifdef _MSC_VER
typedef long ssize_t;
typedef int pid_t;
#endif
-#include <gcrypt.h>
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
namespace tls_tunnel {
evolution-data-server3.8.patch
gnutls-no-libgcrypt.patch
boost54.patch
itex2MML.y.patch
624095-disable_smooth_scrolling.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment