Skip to content
Snippets Groups Projects
Commit aa37aa80 authored by Sebastian Dröge's avatar Sebastian Dröge
Browse files

[svn-buildpackage] Tagging glib2.0 2.25.12-1

parent cc1f78f3
No related merge requests found
glib2.0 (2.25.11-4) UNRELEASED; urgency=low
glib2.0 (2.25.12-1) experimental; urgency=low
[ Josselin Mouette ]
* Don’t run the triggers when executed from a nonexistent directory.
Closes: #589693.
-- Josselin Mouette <joss@debian.org> Tue, 20 Jul 2010 15:41:37 +0200
[ Sebastian Dröge ]
* New upstream development release:
+ debian/rules,
debian/libglib2.0-0.symbols:
- Update for API changes.
+ debian/patches/99_gsocket-create-socket-cloexec.patch:
- Dropped, merged upstream.
-- Sebastian Dröge <slomo@debian.org> Fri, 30 Jul 2010 12:29:10 +0200
glib2.0 (2.25.11-3) experimental; urgency=low
......
......@@ -12,7 +12,7 @@ Build-Depends: debhelper (>> 5.0.22),
dpkg-dev (>= 1.14.13),
libpcre3-dev (>= 7.4-1~),
desktop-file-utils,
gtk-doc-tools,
gtk-doc-tools (>= 1.15),
libselinux1-dev [linux-any],
linux-libc-dev [linux-any],
libgamin-dev [!linux-any] | libfam-dev [!linux-any],
......
......@@ -12,7 +12,7 @@ Build-Depends: debhelper (>> 5.0.22),
dpkg-dev (>= 1.14.13),
libpcre3-dev (>= 7.4-1~),
desktop-file-utils,
gtk-doc-tools,
gtk-doc-tools (>= 1.15),
libselinux1-dev [linux-any],
linux-libc-dev [linux-any],
libgamin-dev [!linux-any] | libfam-dev [!linux-any],
......
This diff is collapsed.
rom 9a319e5d593fd09028b14901ba7a8110921d21a0 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Thu, 15 Jul 2010 15:26:02 +0100
Subject: [PATCH] gio: don't assume that SOCK_CLOEXEC is supported whenever it's defined
Just because SOCK_CLOEXEC was defined at build time doesn't mean the
kernel we're running on supports it. So if socket() fails with EINVAL,
try again without the flag.
Signed-off-by: Julien Cristau <jcristau@debian.org>
---
gio/gsocket.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/gio/gsocket.c b/gio/gsocket.c
index e2ba788..3879202 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -455,9 +455,12 @@ g_socket_create_socket (GSocketFamily family,
}
#ifdef SOCK_CLOEXEC
- native_type |= SOCK_CLOEXEC;
+ fd = socket (family, native_type | SOCK_CLOEXEC, protocol);
+ if (fd < 0 && errno == EINVAL)
#endif
- fd = socket (family, native_type, protocol);
+ {
+ fd = socket (family, native_type, protocol);
+ }
if (fd < 0)
{
--
1.7.1
......@@ -4,4 +4,3 @@
04_homedir_env.patch
60_wait-longer-for-threads-to-die.patch
61_glib-compile-schemas-path.patch
99_gsocket-create-socket-cloexec.patch
......@@ -43,7 +43,7 @@ LDFLAGS += -Wl,-O1
APIVER := 2.0
SONAME := 0
SHVER := 2.25.11
SHVER := 2.25.12
# package names
SHARED_PKG := libglib$(APIVER)-$(SONAME)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment