[Glibc-bsd-commits] r2648 - in trunk/kfreebsd-8/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2009-07-19 16:08:20 +0000 (Sun, 19 Jul 2009)
New Revision: 2648

Added:
   trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
Log:
* merge from kfreebsd-7


Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2009-07-19 15:19:47 UTC (rev 2647)
+++ trunk/kfreebsd-8/debian/changelog	2009-07-19 16:08:20 UTC (rev 2648)
@@ -1,4 +1,4 @@
-kfreebsd-8 (8.0~cvs20090715-1) experimental; urgency=low
+kfreebsd-8 (8.0~cvs20090719-1) EXPERIMENTAL; urgency=low
 
   [ Luca Favatella ]
   * New upstream snapshot of HEAD
@@ -11,10 +11,17 @@
   * Alter Build-depends as freebsd-buildutils 7.0 is still sufficent
   * Update of some patches
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 19 Jul 2009 17:18:23 +0200
+
+kfreebsd-7 (7.2-3) unstable; urgency=low
+
+  [ Petr Salinger ]
+  * 103_stat_pipe.diff: return distinct inode for distinct pipes. See #537555.
+
   [ Aurelien Jarno ]
   * debian/control.in: bump Standards-Version to 3.8.2 (no changes).
 
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 17 Jul 2009 08:19:57 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 19 Jul 2009 17:18:23 +0200
 
 kfreebsd-7 (7.2-2) unstable; urgency=low
 

Copied: trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff (from rev 2647, trunk/kfreebsd-7/debian/patches/103_stat_pipe.diff)
===================================================================
--- trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff	2009-07-19 16:08:20 UTC (rev 2648)
@@ -0,0 +1,20 @@
+--- src.orig/sys/kern/sys_pipe.c
++++ src/sys/kern/sys_pipe.c
+@@ -1384,6 +1384,8 @@
+ 	struct thread *td;
+ {
+ 	struct pipe *pipe = fp->f_data;
++	unsigned long hash;
++	
+ #ifdef MAC
+ 	int error;
+ 
+@@ -1410,6 +1412,8 @@
+ 	 * Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
+ 	 * XXX (st_dev, st_ino) should be unique.
+ 	 */
++	hash = (unsigned long) (pipe->pipe_pair);
++	ub->st_ino = (((hash >> 31) ^ hash) & 0x7FFFFFFF); 
+ 	return (0);
+ }
+ 

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2009-07-19 15:19:47 UTC (rev 2647)
+++ trunk/kfreebsd-8/debian/patches/series	2009-07-19 16:08:20 UTC (rev 2648)
@@ -10,6 +10,7 @@
 020_linker.diff 
 101_subsecond_timestamp.diff
 102_POLL_HUP.diff
+103_stat_pipe.diff
 902_version.diff
 903_disable_non-free_drivers.diff 
 904_dev_full.diff