diffstat of debian/ for zeromq_2.1.11-1 zeromq_2.1.11-1ubuntu1 changelog | 17 ++++++++++++ control | 3 +- patches/series | 1 patches/sock_cloexec-runtime-check.patch | 41 +++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) diff -Nru zeromq-2.1.11/debian/changelog zeromq-2.1.11/debian/changelog --- zeromq-2.1.11/debian/changelog 2012-01-23 10:17:40.000000000 +0000 +++ zeromq-2.1.11/debian/changelog 2012-02-19 14:46:14.000000000 +0000 @@ -1,3 +1,12 @@ +zeromq (2.1.11-1ubuntu1) precise; urgency=low + + * Merge with debian unstable (LP: #925649). Remaining changes + - sock_cloexec-runtime-check.patch: (LP: #910757) + check at runtime for SOCK_CLOEXEC support in kernel + allows using testsuite on builders running 2.6.24 + + -- Julian Taylor Sun, 19 Feb 2012 15:40:32 +0100 + zeromq (2.1.11-1) unstable; urgency=low * [4016b65] Imported Upstream version 2.1.11 @@ -7,6 +16,14 @@ -- Martin Lucina Mon, 23 Jan 2012 11:14:23 +0100 +zeromq (2.1.10-1ubuntu1) precise; urgency=low + + * sock_cloexec-runtime-check.patch: (LP: #910757) + check at runtime for SOCK_CLOEXEC support in kernel + allows using testsuite on builders running 2.6.24 + + -- Julian Taylor Thu, 19 Jan 2012 18:43:25 +0100 + zeromq (2.1.10-1) unstable; urgency=low * New upstream version. diff -Nru zeromq-2.1.11/debian/control zeromq-2.1.11/debian/control --- zeromq-2.1.11/debian/control 2012-01-23 10:17:40.000000000 +0000 +++ zeromq-2.1.11/debian/control 2012-02-19 14:27:45.000000000 +0000 @@ -1,7 +1,8 @@ Source: zeromq Section: libs Priority: optional -Maintainer: Martin Lucina +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Martin Lucina Build-Depends: debhelper (>= 7), uuid-dev, libpgm-dev, pkg-config Standards-Version: 3.9.2 Homepage: http://www.zeromq.org/ diff -Nru zeromq-2.1.11/debian/patches/series zeromq-2.1.11/debian/patches/series --- zeromq-2.1.11/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ zeromq-2.1.11/debian/patches/series 2012-02-19 14:26:24.000000000 +0000 @@ -0,0 +1 @@ +sock_cloexec-runtime-check.patch diff -Nru zeromq-2.1.11/debian/patches/sock_cloexec-runtime-check.patch zeromq-2.1.11/debian/patches/sock_cloexec-runtime-check.patch --- zeromq-2.1.11/debian/patches/sock_cloexec-runtime-check.patch 1970-01-01 00:00:00.000000000 +0000 +++ zeromq-2.1.11/debian/patches/sock_cloexec-runtime-check.patch 2012-02-19 14:36:56.000000000 +0000 @@ -0,0 +1,41 @@ +Description: runtime check for SOCK_CLOEXEC support + buildd's run kernel 2.6.24 which does not support SOCK_CLOEXEC. + check at runtime for the feature. +Bug: https://zeromq.jira.com/browse/LIBZMQ-273 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/910757 +Forwarded: yes +Author: Julian Taylor + +--- a/src/ip.cpp ++++ b/src/ip.cpp +@@ -188,20 +188,27 @@ + { + // Setting this option result in sane behaviour when exec() functions + // are used. Old sockets are closed and don't block TCP ports etc. +-#if defined HAVE_SOCK_CLOEXEC ++#if defined SOCK_CLOEXEC + type_ |= SOCK_CLOEXEC; + #endif + + int s = socket (domain_, type_, protocol_); ++#if defined SOCK_CLOEXEC ++ if (s == -1 && errno == EINVAL) { ++ s = socket (domain_, type_ & (~SOCK_CLOEXEC), protocol_); ++ } ++#endif ++ + if (s == -1) + return -1; + + // If there's no SOCK_CLOEXEC, let's try the second best option. Note that + // race condition can cause socket not to be closed (if fork happens + // between socket creation and this point). +-#if !defined HAVE_SOCK_CLOEXEC && defined FD_CLOEXEC ++#if !defined SOCK_CLOEXEC && defined FD_CLOEXEC + int rc = fcntl (s, F_SETFD, FD_CLOEXEC); +- errno_assert (rc != -1); ++ /* ignore to be able to run build testsuites on hardy builders ++ errno_assert (rc != -1); */ + #endif + + return s;