[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/0.9.0-2
Diane Trout
diane-guest at moszumanska.debian.org
Wed Jun 10 04:22:56 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-accounts-kcm.git;a=commitdiff;h=d21a0dc
The following commit has been merged in the master branch:
commit d21a0dc6f2266839628528b413a62821a4f5c5b6
Author: Diane Trout <diane at ghic.org>
Date: Tue Jun 2 20:29:34 2015 -0700
Add ignore-ssl-error.patch to make it easier to deal with telepathy-rakia's ignoring standard places for SSL cetificate authorities.
---
debian/changelog | 5 ++++-
debian/patches/ignore-ssl-error.patch | 32 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f487858..022497a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
ktp-accounts-kcm (0.9.0-2) UNRELEASED; urgency=medium
* Apply KDE Homepage update patch from Matthew Cope.
+ * Add ignore-ssl-error.patch to make it easier to deal
+ with telepathy-rakia's ignoring standard places for
+ SSL cetificate authorities.
- -- Diane Trout <diane at ghic.org> Wed, 27 May 2015 22:52:14 -0700
+ -- Diane Trout <diane at ghic.org> Tue, 02 Jun 2015 20:26:26 -0700
ktp-accounts-kcm (0.9.0-1) unstable; urgency=medium
diff --git a/debian/patches/ignore-ssl-error.patch b/debian/patches/ignore-ssl-error.patch
new file mode 100644
index 0000000..c4e54dd
--- /dev/null
+++ b/debian/patches/ignore-ssl-error.patch
@@ -0,0 +1,32 @@
+Author: Diane Trout <diane at ghic.org>
+Description: Allow disabling SSL errors in rakia.
+Origin: https://git.reviewboard.kde.org/r/121877/
+--- a/plugins/rakia/rakia-advanced-options-widget.cpp
++++ b/plugins/rakia/rakia-advanced-options-widget.cpp
+@@ -47,6 +47,8 @@ RakiaAdvancedOptionsWidget::RakiaAdvancedOptionsWidget(ParameterEditModel* model
+ handleParameter(QLatin1String("transport"), QVariant::String,
+ m_ui->transportComboBox,
+ m_ui->transportLabel);
++ handleParameter(QLatin1String("ignore-tls-errors"), QVariant::Bool,
++ m_ui->ignoreTlsErrorsCheckBox, 0);
+
+ handleParameter(QLatin1String("stun-server"), QVariant::String,
+ m_ui->stunServerLineEdit,
+diff --git a/plugins/rakia/rakia-advanced-options-widget.ui b/plugins/rakia/rakia-advanced-options-widget.ui
+index 460d839..953419a 100644
+--- a/plugins/rakia/rakia-advanced-options-widget.ui
++++ b/plugins/rakia/rakia-advanced-options-widget.ui
+@@ -115,6 +115,13 @@
+ </property>
+ </widget>
+ </item>
++ <item row="4" column="1">
++ <widget class="QCheckBox" name="ignoreTlsErrorsCheckBox">
++ <property name="text">
++ <string>Ignore TLS Errors</string>
++ </property>
++ </widget>
++ </item>
+ </layout>
+ </widget>
+ </item>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..04874c3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ignore-ssl-error.patch
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list