[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.19-1-2-gb0ceb7d

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  b0ceb7d7c2f1d002b809351e087d20eeaba250e3 (commit)
      from  e25ca9f796aa5337760828e6ac19cb344831bd7e (commit)


- Shortlog ------------------------------------------------------------
b0ceb7d added debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch

Summary of changes:
 debian/changelog                                   |    4 ++-
 ...round-some-platforms-not-having-O_CLOEXEC.patch |   26 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 30 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit b0ceb7d7c2f1d002b809351e087d20eeaba250e3
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Oct 25 12:40:54 2009 +0000

    added debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
    
    * debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch:
      + Added. Don't use O_CLOEXEC on platforms that support it.

diff --git a/debian/changelog b/debian/changelog
index ee1bfdd..5bbaca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 pulseaudio (0.9.19-2) UNRELEASED; urgency=low
 
   * Built with normal old-style hal support on kfreebsd and the hurd
+  * debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch:
+    + Added. Don't use O_CLOEXEC on platforms that support it.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 24 Oct 2009 17:19:01 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 25 Oct 2009 12:38:58 +0000
 
 pulseaudio (0.9.19-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch b/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
new file mode 100644
index 0000000..cd12707
--- /dev/null
+++ b/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
@@ -0,0 +1,26 @@
+From c6bb9dd1df10c49b11ac65db138fc3f34757bb41 Mon Sep 17 00:00:00 2001
+From: Clint Adams <schizo at debian.org>
+Date: Sun, 25 Oct 2009 12:35:14 +0000
+Subject: [PATCH] Work around some platforms not having O_CLOEXEC
+
+---
+ src/modules/module-cli.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/modules/module-cli.c b/src/modules/module-cli.c
+index 6bd0f4f..b1adb52 100644
+--- a/src/modules/module-cli.c
++++ b/src/modules/module-cli.c
+@@ -105,7 +105,12 @@ int pa__init(pa_module*m) {
+      * of log messages, particularly because if stdout and stderr are
+      * dup'ed they share the same O_NDELAY, too. */
+ 
++#ifdef O_CLOEXEC
+     if ((fd = open("/dev/tty", O_RDWR|O_CLOEXEC|O_NONBLOCK)) >= 0) {
++#else
++    if ((fd = open("/dev/tty", O_RDWR|O_NONBLOCK)) >= 0) {
++        pa_make_fd_cloexec(fd);
++#endif
+         io = pa_iochannel_new(m->core->mainloop, fd, fd);
+         pa_log_debug("Managed to open /dev/tty.");
+     } else {
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..9d0a131 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch

-- 
pulseaudio packaging