debian/changelog |
13 +++-
debian/control |
2
debian/patches/0001-Set-the-close-on-exec-flag-for-listening-sockets.patch |
32 ++++++++++
debian/patches/series |
1
4 files changed, 45 insertions(+), 3 deletions(-)
New commits:
commit dd3ec436e48142d595c17a73be357ea6560b1495
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Oct 29 14:57:01 2010 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 8856a27..d771ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libice (2:1.0.6-2) UNRELEASED; urgency=low
+libice (2:1.0.6-2) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -13,7 +13,7 @@ libice (2:1.0.6-2) UNRELEASED; urgency=low
[From upstream 1967c04c0]
* Add myself to Uploaders.
- -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:43 +0000
+ -- Cyril Brulebois <k...@debian.org> Fri, 29 Oct 2010 14:56:48 +0200
libice (2:1.0.6-1) unstable; urgency=low
commit 2bd6e86e516c37eb31dc0c8bcf09ae156fd2bfb4
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Oct 29 14:56:44 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 29f4719..8856a27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libice (2:1.0.6-2) UNRELEASED; urgency=low
Stop leaking listening sockets by setting the close on exec flag on
them. Thanks to Kalle Olavi Niemitalo (Closes: #538248).
[From upstream 1967c04c0]
+ * Add myself to Uploaders.
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:43 +0000
diff --git a/debian/control b/debian/control
index 9079292..0901143 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libice
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
quilt,
commit bfe6cbacf83459fbfbd5b4e2171053f101759333
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Oct 29 14:56:02 2010 +0200
Stop leaking listening sockets by setting the close on exec flag on them.
Thanks to Kalle Olavi Niemitalo (Closes: #538248). From upstream 1967c04c0.
diff --git a/debian/changelog b/debian/changelog
index d388077..29f4719 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
libice (2:1.0.6-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ [ Cyril Brulebois ]
+ * Cherry-pick from upstream:
+ + 0001-Set-the-close-on-exec-flag-for-listening-sockets.patch:
+ Stop leaking listening sockets by setting the close on exec flag on
+ them. Thanks to Kalle Olavi Niemitalo (Closes: #538248).
+ [From upstream 1967c04c0]
+
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:43 +0000
libice (2:1.0.6-1) unstable; urgency=low
diff --git
a/debian/patches/0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
b/debian/patches/0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
new file mode 100644
index 0000000..eb8bf38
--- /dev/null
+++ b/debian/patches/0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
@@ -0,0 +1,32 @@
+From 1967c04c021a4cfd7b3cdd4efdc13610b4385a65 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcris...@debian.org>
+Date: Tue, 11 May 2010 16:36:20 +0200
+Subject: [PATCH] Set the close-on-exec flag for listening sockets
+
+This prevents xsm from leaking file descriptors to the processes it
+starts.
+
+X.Org bug#22932 <http://bugs.freedesktop.org/show_bug.cgi?id=22932>
+
+Reported-by: Kalle Olavi Niemitalo <k...@iki.fi>
+Signed-off-by: Julien Cristau <jcris...@debian.org>
+---
+ src/listen.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/listen.c b/src/listen.c
+index eb46f87..be28aef 100644
+--- a/src/listen.c
++++ b/src/listen.c
+@@ -76,6 +76,8 @@ IceListenForConnections (
+
+ for (i = 0; i < transCount; i++)
+ {
++ _IceTransSetOption(transConns[i], TRANS_CLOSEONEXEC, 1);
++
+ networkId = _IceTransGetMyNetworkId (transConns[i]);
+
+ if (networkId)
+--
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..1c91e89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pbogz-0006jm...@alioth.debian.org
