diff --git a/debian/changelog b/debian/changelog index 11c2fc8a..d9a9e176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +syncevolution (1.5.3-2) unstable; urgency=medium + + * Remove libgconf2-dev build-dep (Closes: #897258) + + -- Tino Mettler Thu, 21 Jun 2018 21:19:04 +0200 + syncevolution (1.5.3-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 991f5912..613f7c34 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 11), libedataserver1.2-dev, libsynthesis-dev (>=3.4.0.47.5), libtool, automake, intltool, pkg-config, libglib2.0-dev, libgladeui-dev, libdbus-glib-1-dev, libgtk-3-dev, - libgconf2-dev, libsecret-1-dev, xsltproc, libopenobex2-dev [linux-any], libnotify-dev, diff --git a/debian/patches/0002-Disable-the-usage-of-CA-certificates-if-the-user-dis.patch b/debian/patches/0002-Disable-the-usage-of-CA-certificates-if-the-user-dis.patch deleted file mode 100644 index 8ceb6191..00000000 --- a/debian/patches/0002-Disable-the-usage-of-CA-certificates-if-the-user-dis.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 96ff80271fce975c9f73972d2d413da08f7de82e Mon Sep 17 00:00:00 2001 -From: Tino Mettler -Date: Mon, 22 Jan 2018 19:42:29 +0100 -Subject: [PATCH] Disable the usage of CA certificates if the user disables - SSLVerifyServer and SSLVerifyHost - ---- - src/syncevo/SoupTransportAgent.cpp | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/syncevo/SoupTransportAgent.cpp b/src/syncevo/SoupTransportAgent.cpp -index 9dd7f581..ed24a4b4 100644 ---- a/src/syncevo/SoupTransportAgent.cpp -+++ b/src/syncevo/SoupTransportAgent.cpp -@@ -130,9 +130,14 @@ void SoupTransportAgent::send(const char *data, size_t len) - // use CA certificates if available and needed, - // otherwise let soup use system default certificates - if (m_verifySSL) { -- if (!m_cacerts.empty()) { -- g_object_set(m_session.get(), SOUP_SESSION_SSL_CA_FILE, m_cacerts.c_str(), NULL); -- } -+ if (!m_cacerts.empty()) { -+ g_object_set(m_session.get(), SOUP_SESSION_SSL_CA_FILE, -+ m_cacerts.c_str(), NULL); -+ } -+ } else { -+ // Checking enabled by default, disable it. -+ g_object_set(m_session.get(), SOUP_SESSION_SSL_STRICT, false, -+ NULL); - } - - soup_message_set_request(message.get(), m_contentType.c_str(), diff --git a/debian/patches/series b/debian/patches/series index 0df709c4..0dce5ab6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ # debian/source/git-patches exported from git by quilt-patches-deb-export-hook 0001-Fix-FTBFS-on-kfreebsd-due-to-missing-SOCK_CLOEXEC.patch -0002-Disable-the-usage-of-CA-certificates-if-the-user-dis.patch