[Glibc-bsd-commits] r5381 - in trunk/kfreebsd-10/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-24 21:32:48 +0000 (Fri, 24 Jan 2014)
New Revision: 5381

Added:
   trunk/kfreebsd-10/debian/patches/accept_O_CLOEXEC_in_shm_open.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
Log:
Accept O_CLOEXEC in shm_open().

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2014-01-24 21:29:20 UTC (rev 5380)
+++ trunk/kfreebsd-10/debian/changelog	2014-01-24 21:32:48 UTC (rev 5381)
@@ -1,3 +1,9 @@
+kfreebsd-10 (10.0-2) UNRELEASED; urgency=low
+
+  * Accept O_CLOEXEC in shm_open().
+
+ -- Robert Millan <rmh at debian.org>  Fri, 24 Jan 2014 22:32:32 +0100
+
 kfreebsd-10 (10.0-1) unstable; urgency=high
 
   * New upstream release.

Added: trunk/kfreebsd-10/debian/patches/accept_O_CLOEXEC_in_shm_open.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/accept_O_CLOEXEC_in_shm_open.diff	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/accept_O_CLOEXEC_in_shm_open.diff	2014-01-24 21:32:48 UTC (rev 5381)
@@ -0,0 +1,14 @@
+
+Cherry-pick from HEAD (rev 261138)
+
+--- a/sys/kern/uipc_shm.c
++++ b/sys/kern/uipc_shm.c
+@@ -704,7 +704,7 @@
+ 	    (uap->flags & O_ACCMODE) != O_RDWR)
+ 		return (EINVAL);
+ 
+-	if ((uap->flags & ~(O_ACCMODE | O_CREAT | O_EXCL | O_TRUNC)) != 0)
++	if ((uap->flags & ~(O_ACCMODE | O_CREAT | O_EXCL | O_TRUNC | O_CLOEXEC)) != 0)
+ 		return (EINVAL);
+ 
+ 	fdp = td->td_proc->p_fd;

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2014-01-24 21:29:20 UTC (rev 5380)
+++ trunk/kfreebsd-10/debian/patches/series	2014-01-24 21:32:48 UTC (rev 5381)
@@ -1,5 +1,6 @@
 # Patches from (or merged in) upstream
 si_status_wait6.diff
+accept_O_CLOEXEC_in_shm_open.diff
 
 # Patches that are in good shape for merging upstream
 mount_remount.diff