[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.7-1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=a1b7e22

The following commit has been merged in the master branch:
commit a1b7e22165bbe41f0377c67fcf829ad0053b1a1f
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Mar 2 16:24:58 2014 +0100

    New patch: unlink_testsock
---
 debian/changelog               |  1 +
 debian/patches/series          |  1 +
 debian/patches/unlink_testsock | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7aadd5f..9ced3d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kde-workspace (4:4.11.7-1~) UNRELEASED; urgency=medium
   * New upstream release.
   * New patch: effect_gles_link_against_gles
   * Remove upstream patch: upstream_explicitly_request_a_window-drawable
+  * New patch: unlink_testsock
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 02 Mar 2014 11:23:35 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 4d9e8fa..9785d78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ krunner_iceweasel_bookmarks.patch
 kubuntu_kcm_display_add_kscreen.diff
 kubuntu_no_krandr.diff
 effect_gles_link_against_gles
+unlink_testsock
diff --git a/debian/patches/unlink_testsock b/debian/patches/unlink_testsock
new file mode 100644
index 0000000..4634e40
--- /dev/null
+++ b/debian/patches/unlink_testsock
@@ -0,0 +1,29 @@
+Index: kde-workspace/kdm/ConfigureChecks.cmake
+===================================================================
+--- kde-workspace.orig/kdm/ConfigureChecks.cmake	2014-03-02 11:19:54.378463363 +0100
++++ kde-workspace/kdm/ConfigureChecks.cmake	2014-03-02 16:24:05.240895816 +0100
+@@ -97,6 +97,7 @@
+ int main()
+ {
+     int fd, fd2;
++    int ret;
+     struct sockaddr_un sa;
+ 
+     if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+@@ -108,10 +109,14 @@
+         return 2;
+     chmod(sa.sun_path, 0);
+     setuid(getuid() + 1000);
+-    if ((fd2 = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
++    if ((fd2 = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
++        unlink(sa.sun_path);
+         return 2;
++    }
+     connect(fd2, (struct sockaddr *)&sa, sizeof(sa));
+-    return errno != EACCES;
++    ret = errno != EACCES;
++    unlink(sa.sun_path);
++    return ret;
+ }
+ " HONORS_SOCKET_PERMS)
+ macro_pop_required_vars()

-- 
KDE Base Workspace module packaging