Import Debian changes 1.5.3-2
syncevolution (1.5.3-2) unstable; urgency=medium . * Remove libgconf2-dev build-dep (Closes: #897258)
This commit is contained in:
parent
22449d72c0
commit
b9c153ddf3
|
@ -1,3 +1,9 @@
|
||||||
|
syncevolution (1.5.3-2) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Remove libgconf2-dev build-dep (Closes: #897258)
|
||||||
|
|
||||||
|
-- Tino Mettler <tino+debian@tikei.de> Thu, 21 Jun 2018 21:19:04 +0200
|
||||||
|
|
||||||
syncevolution (1.5.3-1) unstable; urgency=medium
|
syncevolution (1.5.3-1) unstable; urgency=medium
|
||||||
|
|
||||||
* New upstream release
|
* New upstream release
|
||||||
|
|
|
@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 11), libedataserver1.2-dev,
|
||||||
libsynthesis-dev (>=3.4.0.47.5),
|
libsynthesis-dev (>=3.4.0.47.5),
|
||||||
libtool, automake, intltool, pkg-config,
|
libtool, automake, intltool, pkg-config,
|
||||||
libglib2.0-dev, libgladeui-dev, libdbus-glib-1-dev, libgtk-3-dev,
|
libglib2.0-dev, libgladeui-dev, libdbus-glib-1-dev, libgtk-3-dev,
|
||||||
libgconf2-dev,
|
|
||||||
libsecret-1-dev,
|
libsecret-1-dev,
|
||||||
xsltproc,
|
xsltproc,
|
||||||
libopenobex2-dev [linux-any], libnotify-dev,
|
libopenobex2-dev [linux-any], libnotify-dev,
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
From 96ff80271fce975c9f73972d2d413da08f7de82e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tino Mettler <tino+debian@tikei.de>
|
|
||||||
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(),
|
|
|
@ -1,3 +1,2 @@
|
||||||
# debian/source/git-patches exported from git by quilt-patches-deb-export-hook
|
# debian/source/git-patches exported from git by quilt-patches-deb-export-hook
|
||||||
0001-Fix-FTBFS-on-kfreebsd-due-to-missing-SOCK_CLOEXEC.patch
|
0001-Fix-FTBFS-on-kfreebsd-due-to-missing-SOCK_CLOEXEC.patch
|
||||||
0002-Disable-the-usage-of-CA-certificates-if-the-user-dis.patch
|
|
||||||
|
|
Loading…
Reference in New Issue