[SCM] kio packaging branch, master, updated. debian/5.28.0-1-14-g6a34213

Maximiliano Curia maxy at moszumanska.debian.org
Wed Apr 5 08:43:39 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=035b643

The following commit has been merged in the master branch:
commit 035b6436c4dc6da843988092964a8e3990c67edb
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Apr 4 17:22:58 2017 +0200

    Add new upstream patch: kssl-Ensure-user-certificate-directory-has-been-created-b.patch
---
 ...-certificate-directory-has-been-created-b.patch | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/kssl-Ensure-user-certificate-directory-has-been-created-b.patch b/debian/patches/kssl-Ensure-user-certificate-directory-has-been-created-b.patch
new file mode 100644
index 0000000..5e8ca9a
--- /dev/null
+++ b/debian/patches/kssl-Ensure-user-certificate-directory-has-been-created-b.patch
@@ -0,0 +1,32 @@
+From: Michael Pyne <mpyne at kde.org>
+Date: Tue, 10 Jan 2017 21:05:48 -0500
+Subject: kssl: Ensure user certificate directory has been created before use.
+
+The KSSL KCM (in kdelibs4support) fails to save imported certificates to
+the user certificate store, unless the user store directory is manually
+created by the user first.  Fix by ensuring the directory is created
+before trying to save user certs.
+
+Differential Revision: https://phabricator.kde.org/D4060
+BUG: 342958
+FIXED-IN: 5.31
+---
+ src/core/ksslcertificatemanager.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/ksslcertificatemanager.cpp b/src/core/ksslcertificatemanager.cpp
+index 2c51cf7c..2e57e32f 100644
+--- a/src/core/ksslcertificatemanager.cpp
++++ b/src/core/ksslcertificatemanager.cpp
+@@ -247,9 +247,9 @@ bool KSslCertificateManagerPrivate::addCertificate(const KSslCaCertificate &in)
+     }
+ 
+     QString certFilename = userCertDir + QString::fromLatin1(in.certHash);
+-    //qDebug() << certFilename;
++
+     QFile certFile(certFilename);
+-    if (certFile.open(QIODevice::ReadOnly)) {
++    if (!QDir().mkpath(userCertDir) || certFile.open(QIODevice::ReadOnly)) {
+         return false;
+     }
+     if (!certFile.open(QIODevice::WriteOnly)) {
diff --git a/debian/patches/series b/debian/patches/series
index 6022d76..88da383 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ Also-change-the-resize-mode-the-other-way.patch
 Allow-uppercase-checksums-matching-in-Checksums-tab.patch
 ForwardingSlaveBase-fix-passing-of-Overwrite-flag-to-kio_.patch
 Fix-another-clear-porting-bug-in-ForwardingSlaveBase.patch
+kssl-Ensure-user-certificate-directory-has-been-created-b.patch

-- 
kio packaging



More information about the pkg-kde-commits mailing list