[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.08.3-1-2-gba54da8
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Mar 21 11:20:33 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=4fc6b4d
The following commit has been merged in the master branch:
commit 4fc6b4dbc51ee75878ed68535d8b1fbc25b68491
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Mon Mar 20 17:09:30 2017 +0100
Add new patch: Make-sure-people-are-not-trying-to-sneak-invisible-charac.patch
This is a backport of the CVE-2016-7787 fix from kde-cli-tools [1].
[1]: https://github.com/KDE/kde-cli-tools/commit/5eda179a099ba68a20dc21dc0da63e85a565a171#diff-281a78cc7558547bc7507f1cabd3cfc9
Closes: 842498
Thanks: Moritz Mühlenhoff for the follow ups to the kde-cli-tools' bug
---
...-are-not-trying-to-sneak-invisible-charac.patch | 40 ++++++++++++++++++++++
debian/patches/add_glib_for_nm | 2 +-
debian/patches/disable_flacky_tests | 2 +-
debian/patches/disable_kwalletd_autotests | 2 +-
debian/patches/disable_usr_lib_install_rpath.diff | 2 +-
debian/patches/hurd.diff | 2 +-
debian/patches/kubuntu_nodisplay_knetattach.diff | 2 +-
debian/patches/kubuntu_shutup_shutup_shutup.diff | 2 +-
debian/patches/series | 1 +
.../patches/use_always_present_path_to_test.patch | 8 ++---
debian/patches/use_the_correct_locale.patch | 8 ++---
11 files changed, 52 insertions(+), 19 deletions(-)
diff --git a/debian/patches/Make-sure-people-are-not-trying-to-sneak-invisible-charac.patch b/debian/patches/Make-sure-people-are-not-trying-to-sneak-invisible-charac.patch
new file mode 100644
index 0000000..9637ce9
--- /dev/null
+++ b/debian/patches/Make-sure-people-are-not-trying-to-sneak-invisible-charac.patch
@@ -0,0 +1,40 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Mon, 20 Mar 2017 16:54:06 +0100
+Subject: Make sure people are not trying to sneak invisible characters on the
+ kdesu label
+
+This is a backport of
+5eda179a099ba68a20dc21dc0da63e85a565a171#diff-281a78cc7558547bc7507f1cabd3cfc9
+from kde-cli-tools to kde-runtime in order to close CVE-2016-7787.
+---
+ kdesu/kdesu/kdesu.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp
+index e3fe99c690..c03a3b2745 100644
+--- a/kdesu/kdesu/kdesu.cpp
++++ b/kdesu/kdesu/kdesu.cpp
+@@ -141,6 +141,10 @@ int main(int argc, char *argv[])
+ {
+ KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command)));
+ }
++ if (result == -2)
++ {
++ KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command)));
++ }
+
+ return result;
+ }
+@@ -367,6 +371,12 @@ static int startApp()
+ kDebug() << "Don't need password!!
";
+ }
+
++ for (const QChar character : QString::fromLocal8Bit(command)) {
++ if (!character.isPrint() && character.category() != QChar::Other_Surrogate) {
++ return -2;
++ }
++ }
++
+ // Start the dialog
+ QString password;
+ if (needpw)
diff --git a/debian/patches/add_glib_for_nm b/debian/patches/add_glib_for_nm
index e554be7..91773ac 100644
--- a/debian/patches/add_glib_for_nm
+++ b/debian/patches/add_glib_for_nm
@@ -7,7 +7,7 @@ Subject: add_glib_for_nm
1 file changed, 6 insertions(+)
diff --git a/solid-networkstatus/kded/CMakeLists.txt b/solid-networkstatus/kded/CMakeLists.txt
-index 633c7f1..5dfcbf4 100644
+index 633c7f1394..5dfcbf4f8d 100644
--- a/solid-networkstatus/kded/CMakeLists.txt
+++ b/solid-networkstatus/kded/CMakeLists.txt
@@ -16,6 +16,12 @@ set_package_properties(NetworkManager PROPERTIES DESCRIPTION "The NetworkManager
diff --git a/debian/patches/disable_flacky_tests b/debian/patches/disable_flacky_tests
index 50279e1..2ec3f23 100644
--- a/debian/patches/disable_flacky_tests
+++ b/debian/patches/disable_flacky_tests
@@ -7,7 +7,7 @@ Subject: disable_flacky_tests
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/kurifilter-plugins/tests/kurifiltertest.cpp b/kurifilter-plugins/tests/kurifiltertest.cpp
-index 32f968c..13c8e36 100644
+index 32f968c278..13c8e3696f 100644
--- a/kurifilter-plugins/tests/kurifiltertest.cpp
+++ b/kurifilter-plugins/tests/kurifiltertest.cpp
@@ -256,7 +256,7 @@ void KUriFilterTest::shortUris()
diff --git a/debian/patches/disable_kwalletd_autotests b/debian/patches/disable_kwalletd_autotests
index ddb5b16..277bf6b 100644
--- a/debian/patches/disable_kwalletd_autotests
+++ b/debian/patches/disable_kwalletd_autotests
@@ -7,7 +7,7 @@ Subject: disable_kwalletd_autotests
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/kwalletd/autotests/CMakeLists.txt b/kwalletd/autotests/CMakeLists.txt
-index c9af385..cd5f59e 100644
+index c9af3854e2..cd5f59ebc8 100644
--- a/kwalletd/autotests/CMakeLists.txt
+++ b/kwalletd/autotests/CMakeLists.txt
@@ -1,11 +1,11 @@
diff --git a/debian/patches/disable_usr_lib_install_rpath.diff b/debian/patches/disable_usr_lib_install_rpath.diff
index e532218..de1465f 100644
--- a/debian/patches/disable_usr_lib_install_rpath.diff
+++ b/debian/patches/disable_usr_lib_install_rpath.diff
@@ -12,7 +12,7 @@ Forwarded: not-needed
1 file changed, 2 deletions(-)
diff --git a/phonon/platform_kde/CMakeLists.txt b/phonon/platform_kde/CMakeLists.txt
-index f41a4dc..3d3df10 100644
+index f41a4dc58b..3d3df10e96 100644
--- a/phonon/platform_kde/CMakeLists.txt
+++ b/phonon/platform_kde/CMakeLists.txt
@@ -19,10 +19,8 @@ endif(ALSA_FOUND)
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
index c9e898d..d732de9 100644
--- a/debian/patches/hurd.diff
+++ b/debian/patches/hurd.diff
@@ -13,7 +13,7 @@ Last-Update: 2016-06-18
1 file changed, 3 insertions(+)
diff --git a/kioslave/nfs/nfsv3.cpp b/kioslave/nfs/nfsv3.cpp
-index 0640212..2240e7e 100644
+index 06402120f9..2240e7ed38 100644
--- a/kioslave/nfs/nfsv3.cpp
+++ b/kioslave/nfs/nfsv3.cpp
@@ -59,6 +59,9 @@
diff --git a/debian/patches/kubuntu_nodisplay_knetattach.diff b/debian/patches/kubuntu_nodisplay_knetattach.diff
index eace41d..bdda6ba 100644
--- a/debian/patches/kubuntu_nodisplay_knetattach.diff
+++ b/debian/patches/kubuntu_nodisplay_knetattach.diff
@@ -7,7 +7,7 @@ Subject: kubuntu_nodisplay_knetattach
1 file changed, 1 insertion(+)
diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop
-index 88b5585..f61827f 100755
+index 88b5585c1c..f61827f58d 100755
--- a/knetattach/knetattach.desktop
+++ b/knetattach/knetattach.desktop
@@ -186,3 +186,4 @@ X-KDE-StartupNotify=true
diff --git a/debian/patches/kubuntu_shutup_shutup_shutup.diff b/debian/patches/kubuntu_shutup_shutup_shutup.diff
index c9d22d8..ec4838c 100644
--- a/debian/patches/kubuntu_shutup_shutup_shutup.diff
+++ b/debian/patches/kubuntu_shutup_shutup_shutup.diff
@@ -7,7 +7,7 @@ Subject: kubuntu_shutup_shutup_shutup
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/attica/kdeplugin/kdeplatformdependent.cpp b/attica/kdeplugin/kdeplatformdependent.cpp
-index d0041b8..fde029c 100644
+index d0041b8a0e..fde029c654 100644
--- a/attica/kdeplugin/kdeplatformdependent.cpp
+++ b/attica/kdeplugin/kdeplatformdependent.cpp
@@ -221,7 +221,7 @@ QList<QUrl> KdePlatformDependent::getDefaultProviderFiles() const
diff --git a/debian/patches/series b/debian/patches/series
index dcd44fd..9d7e46c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ kubuntu_nodisplay_knetattach.diff
kubuntu_shutup_shutup_shutup.diff
add_glib_for_nm
hurd.diff
+Make-sure-people-are-not-trying-to-sneak-invisible-charac.patch
diff --git a/debian/patches/use_always_present_path_to_test.patch b/debian/patches/use_always_present_path_to_test.patch
index bd18543..9e601be 100644
--- a/debian/patches/use_always_present_path_to_test.patch
+++ b/debian/patches/use_always_present_path_to_test.patch
@@ -1,10 +1,6 @@
-From: =?utf-8?q?Lisandro_Dami=C3=A1n_Nicanor_P=C3=A9rez_Meyer?=
- <lisandro at debian.org>
+From: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
Date: Wed, 13 Apr 2016 13:53:28 +0200
Subject: use_always_present_path_to_test
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
Description: use a path that's always there
Or at least in Debian ;)
@@ -20,7 +16,7 @@ Last-Update: 2014-01-17
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kioslave/trash/tests/testtrash.cpp b/kioslave/trash/tests/testtrash.cpp
-index f99f0f0..bb4e87f 100644
+index f99f0f02e8..bb4e87f081 100644
--- a/kioslave/trash/tests/testtrash.cpp
+++ b/kioslave/trash/tests/testtrash.cpp
@@ -894,8 +894,8 @@ void TestTrash::moveDirectoryFromTrash()
diff --git a/debian/patches/use_the_correct_locale.patch b/debian/patches/use_the_correct_locale.patch
index 4f31520..2036bdb 100644
--- a/debian/patches/use_the_correct_locale.patch
+++ b/debian/patches/use_the_correct_locale.patch
@@ -1,10 +1,6 @@
-From: =?utf-8?q?Lisandro_Dami=C3=A1n_Nicanor_P=C3=A9rez_Meyer?=
- <lisandro at debian.org>
+From: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
Date: Wed, 13 Apr 2016 13:53:28 +0200
Subject: use_the_correct_locale
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
Description: Use the correct locale.
The test was expecting a specific locale. Everything seems to indicate
@@ -18,7 +14,7 @@ Last-Update: 2014-01-14
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kioslave/trash/tests/testtrash.cpp b/kioslave/trash/tests/testtrash.cpp
-index bccb0e5..f99f0f0 100644
+index bccb0e5a57..f99f0f02e8 100644
--- a/kioslave/trash/tests/testtrash.cpp
+++ b/kioslave/trash/tests/testtrash.cpp
@@ -58,7 +58,7 @@ int initLocale()
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list