[Glibc-bsd-commits] r3581 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-13 13:35:45 +0000 (Wed, 13 Jul 2011)
New Revision: 3581

Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/007_clone_signals.diff
   trunk/kfreebsd-9/debian/patches/020_linker.diff
   trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff
   trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
Log:
  * New upstream snapshot.
    - Refresh all patches.
    - Includes support for RFTSIGZMB flag in rfork().

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-07-12 20:47:52 UTC (rev 3580)
+++ trunk/kfreebsd-9/debian/changelog	2011-07-13 13:35:45 UTC (rev 3581)
@@ -1,5 +1,10 @@
-kfreebsd-9 (9.0~svn223870-2) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn223966-1) UNRELEASED; urgency=low
 
+  * New upstream snapshot.
+    - Refresh all patches.
+    - Includes support for RFTSIGZMB flag in rfork().
+
+  [ Robert Millan ]
   * Require freebsd-buildutils (>= 8.2-7).
   * Replace sed kludge with a small patch.
   * Remove 013_ip_packed.diff (remnant from kfreebsd-6 transition in
@@ -7,7 +12,7 @@
   * Remove 200_xen.diff workaround (no longer needed after sed kludge
     was removed in r3577).
 
- -- Robert Millan <rmh at debian.org>  Tue, 12 Jul 2011 22:35:06 +0200
+ -- Robert Millan <rmh at debian.org>  Wed, 13 Jul 2011 15:34:27 +0200
 
 kfreebsd-9 (9.0~svn223870-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-9/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/007_clone_signals.diff	2011-07-12 20:47:52 UTC (rev 3580)
+++ trunk/kfreebsd-9/debian/patches/007_clone_signals.diff	2011-07-13 13:35:45 UTC (rev 3581)
@@ -1,13 +1,19 @@
+
+Starting with r223966 in 9-CURRENT, a new interface is available
+(RFTSIGZMB).  At the time of writing glibc isn't using it.  Even
+when it does, we need to keep this patch for backward
+compatibility untill old versions of glibc are flushed out.
+
 --- a/sys/kern/kern_fork.c
 +++ b/sys/kern/kern_fork.c
-@@ -477,7 +477,13 @@
- 		p2->p_sigacts = newsigacts;
- 	}
- 	if (flags & RFLINUXTHPN) 
+@@ -480,7 +480,13 @@
+ 	if (flags & RFTSIGZMB)
+ 	        p2->p_sigparent = RFTSIGNUM(flags);
+ 	else if (flags & RFLINUXTHPN)
 -	        p2->p_sigparent = SIGUSR1;
 +	{
 +		int sig;
-+		sig = RFTHPNSIGNUM(flags);
++		sig = (flags >> 24) & 0x7F;
 +	        if (sig == 0) sig = SIGUSR1;
 +	        if (sig == SIGCHLD) sig = 0;
 +	        p2->p_sigparent = sig;
@@ -15,16 +21,3 @@
  	else
  	        p2->p_sigparent = SIGCHLD;
  
---- a/sys/sys/unistd.h
-+++ b/sys/sys/unistd.h
-@@ -182,6 +182,10 @@
- #define	RFHIGHPID	(1<<18)	/* use a pid higher than 10 (idleproc) */
- #define	RFPPWAIT	(1<<31)	/* parent sleeps until child exits (vfork) */
- #define	RFKERNELONLY	(RFSTOPPED | RFHIGHPID | RFPPWAIT)
-+#define RFTHPNSHIFT	24	/* reserve bits 24-30 */
-+#define RFTHPNMASK	0x7F    /* for compatibility with linuxthreads/clone()   */
-+				/* allow to specify  "clone exit parent notification" signal */
-+#define RFTHPNSIGNUM(flags)	(((flags) >> RFTHPNSHIFT) & RFTHPNMASK)
- 
- #endif /* __BSD_VISIBLE */
- 

Modified: trunk/kfreebsd-9/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/020_linker.diff	2011-07-12 20:47:52 UTC (rev 3580)
+++ trunk/kfreebsd-9/debian/patches/020_linker.diff	2011-07-13 13:35:45 UTC (rev 3581)
@@ -19,7 +19,7 @@
  	${OBJCOPY} --strip-debug ${.TARGET}
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -189,7 +189,9 @@
+@@ -197,7 +197,9 @@
  
  .if ${__KLD_SHARED} == yes
  ${FULLPROG}: ${KMOD}.kld

Modified: trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff	2011-07-12 20:47:52 UTC (rev 3580)
+++ trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff	2011-07-13 13:35:45 UTC (rev 3581)
@@ -1,6 +1,6 @@
 --- a/sys/netinet6/in6_proto.c
 +++ b/sys/netinet6/in6_proto.c
-@@ -408,7 +408,7 @@
+@@ -396,7 +396,7 @@
  VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
  VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
  VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
@@ -9,7 +9,7 @@
  VNET_DEFINE(int, ip6_no_radr) = 0;
  VNET_DEFINE(int, ip6_norbit_raif) = 0;
  VNET_DEFINE(int, ip6_maxfragpackets);	/* initialized in frag6.c:frag6_init() */
-@@ -423,7 +423,7 @@
+@@ -411,7 +411,7 @@
  VNET_DEFINE(int, ip6_rr_prune) = 5;	/* router renumbering prefix
  					 * walk list every 5 sec. */
  VNET_DEFINE(int, ip6_mcast_pmtu) = 0;	/* enable pMTU discovery for multicast? */

Modified: trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff	2011-07-12 20:47:52 UTC (rev 3580)
+++ trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff	2011-07-13 13:35:45 UTC (rev 3581)
@@ -19,7 +19,7 @@
  CFLAGS+=	-fstack-protector
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -141,6 +141,9 @@
+@@ -149,6 +149,9 @@
  CTFFLAGS+=	-g
  .endif