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

[Robert Millan]

Author: rmh
Date: 2011-08-20 17:26:40 +0000 (Sat, 20 Aug 2011)
New Revision: 3688

Removed:
   trunk/kfreebsd-9/debian/patches/101_pfsync_ftbfs.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff
   trunk/kfreebsd-9/debian/patches/series
Log:
New upstream snapshot.

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-08-20 15:52:44 UTC (rev 3687)
+++ trunk/kfreebsd-9/debian/changelog	2011-08-20 17:26:40 UTC (rev 3688)
@@ -1,3 +1,10 @@
+kfreebsd-9 (9.0~svn225037-1) experimental; urgency=low
+
+  * New upstream snapshot.
+    - 101_pfsync_ftbfs.diff: Remove (merged).
+
+ -- Robert Millan <rmh at debian.org>  Sat, 20 Aug 2011 17:13:08 +0200
+
 kfreebsd-9 (9.0~svn224698-1) experimental; urgency=low
 
   * New upstream snapshot.

Deleted: trunk/kfreebsd-9/debian/patches/101_pfsync_ftbfs.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/101_pfsync_ftbfs.diff	2011-08-20 15:52:44 UTC (rev 3687)
+++ trunk/kfreebsd-9/debian/patches/101_pfsync_ftbfs.diff	2011-08-20 17:26:40 UTC (rev 3688)
@@ -1,17 +0,0 @@
-
-Reported to:
-
-http://www.freebsd.org/cgi/query-pr.cgi?pr=158636
-
---- a/sys/contrib/pf/net/if_pfsync.c
-+++ b/sys/contrib/pf/net/if_pfsync.c
-@@ -2126,8 +2126,8 @@
- #else
- 	struct ifnet *ifp = &sc->sc_if;
- #endif
--	struct mbuf *m;
- #endif
-+	struct mbuf *m;
- 	struct ip *ip;
- 	struct pfsync_header *ph;
- 	struct pfsync_subheader *subh;

Modified: trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff	2011-08-20 15:52:44 UTC (rev 3687)
+++ trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff	2011-08-20 17:26:40 UTC (rev 3688)
@@ -1,6 +1,6 @@
 --- a/sys/kern/sys_pipe.c
 +++ b/sys/kern/sys_pipe.c
-@@ -1384,6 +1384,8 @@
+@@ -1386,6 +1386,8 @@
  	struct thread *td;
  {
  	struct pipe *pipe = fp->f_data;
@@ -9,7 +9,7 @@
  #ifdef MAC
  	int error;
  
-@@ -1410,6 +1412,8 @@
+@@ -1412,6 +1414,8 @@
  	 * Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
  	 * XXX (st_dev, st_ino) should be unique.
  	 */

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-08-20 15:52:44 UTC (rev 3687)
+++ trunk/kfreebsd-9/debian/patches/series	2011-08-20 17:26:40 UTC (rev 3688)
@@ -7,7 +7,6 @@
 #007_clone_signals.diff
 #009_disable_duped_modules.diff
 020_linker.diff 
-101_pfsync_ftbfs.diff
 103_stat_pipe.diff
 #107_mount_update.diff
 108_teken_utf8_table.diff