[Glibc-bsd-commits] r3522 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-03 11:41:47 +0000 (Sun, 03 Jul 2011)
New Revision: 3522

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/03_libsbuf.diff
   trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff
Log:
Remove hunk to include <sys/user.h> in subr_sbuf.c, as this breaks hurd-i386.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2011-07-03 09:22:33 UTC (rev 3521)
+++ trunk/freebsd-libs/debian/changelog	2011-07-03 11:41:47 UTC (rev 3522)
@@ -1,3 +1,10 @@
+freebsd-libs (8.2+ds1-3) UNRELEASED; urgency=low
+
+  * Remove hunk to include <sys/user.h> in subr_sbuf.c, as this breaks
+    hurd-i386.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 03 Jul 2011 13:41:34 +0200
+
 freebsd-libs (8.2+ds1-2) unstable; urgency=low
 
   * Replace use of __aligned() in libusb.h and libusb20_desc.h.

Modified: trunk/freebsd-libs/debian/patches/03_libsbuf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/03_libsbuf.diff	2011-07-03 09:22:33 UTC (rev 3521)
+++ trunk/freebsd-libs/debian/patches/03_libsbuf.diff	2011-07-03 11:41:47 UTC (rev 3522)
@@ -14,16 +14,6 @@
  
  .PATH:	${.CURDIR}/../../sys/kern
  
---- a/sys/kern/subr_sbuf.c
-+++ b/sys/kern/subr_sbuf.c
-@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/user.h> /* PAGE_SIZE */
- #endif /* _KERNEL */
- 
- #include <sys/sbuf.h>
 --- a/sys/sys/sbuf.h
 +++ b/sys/sys/sbuf.h
 @@ -31,7 +31,8 @@

Modified: trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff	2011-07-03 09:22:33 UTC (rev 3521)
+++ trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff	2011-07-03 11:41:47 UTC (rev 3522)
@@ -3,7 +3,7 @@
 
 --- a/sys/kern/subr_sbuf.c
 +++ b/sys/kern/subr_sbuf.c
-@@ -77,6 +77,11 @@
+@@ -76,6 +76,11 @@
  #define	SBUF_SETFLAG(s, f)	do { (s)->s_flags |= (f); } while (0)
  #define	SBUF_CLEARFLAG(s, f)	do { (s)->s_flags &= ~(f); } while (0)