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

[Robert Millan]

Author: rmh
Date: 2011-07-03 14:21:41 +0000 (Sun, 03 Jul 2011)
New Revision: 3526

Added:
   trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff
Removed:
   trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/series
Log:
Replace 14_sbuf_page_size.diff with cherry-picked 00_sbuf_page_size.diff from HEAD, which fixes the same problem differently.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2011-07-03 13:33:31 UTC (rev 3525)
+++ trunk/freebsd-libs/debian/changelog	2011-07-03 14:21:41 UTC (rev 3526)
@@ -2,8 +2,11 @@
 
   * Remove hunk to include <sys/user.h> in subr_sbuf.c, as this breaks
     hurd-i386.
+  * Replace 14_sbuf_page_size.diff with cherry-picked
+    00_sbuf_page_size.diff from HEAD, which fixes the same problem
+    differently.
 
- -- Robert Millan <rmh at debian.org>  Sun, 03 Jul 2011 13:41:34 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 03 Jul 2011 16:21:31 +0200
 
 freebsd-libs (8.2+ds1-2) unstable; urgency=low
 

Added: trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff	2011-07-03 14:21:41 UTC (rev 3526)
@@ -0,0 +1,17 @@
+--- a/sys/kern/subr_sbuf.c
++++ b/sys/kern/subr_sbuf.c
+@@ -77,8 +77,14 @@
+ #define	SBUF_CLEARFLAG(s, f)	do { (s)->s_flags &= ~(f); } while (0)
+ 
+ #define	SBUF_MINEXTENDSIZE	16		/* Should be power of 2. */
++
++#ifdef PAGE_SIZE
+ #define	SBUF_MAXEXTENDSIZE	PAGE_SIZE
+ #define	SBUF_MAXEXTENDINCR	PAGE_SIZE
++#else
++#define	SBUF_MAXEXTENDSIZE	4096
++#define	SBUF_MAXEXTENDINCR	4096
++#endif
+ 
+ /*
+  * Debugging support

Deleted: trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff	2011-07-03 13:33:31 UTC (rev 3525)
+++ trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff	2011-07-03 14:21:41 UTC (rev 3526)
@@ -1,19 +0,0 @@
-
-Fixes FTBFS on armel, ia64, powerpc, sparc.
-
-Sent to freebsd-hackers (2011-07-03)
-
---- a/sys/kern/subr_sbuf.c
-+++ b/sys/kern/subr_sbuf.c
-@@ -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)
- 
-+#if !defined(PAGE_SIZE) && !defined(_KERNEL)
-+#include <unistd.h>
-+#define PAGE_SIZE		sysconf(_SC_PAGESIZE)
-+#endif
-+
- #define	SBUF_MINEXTENDSIZE	16		/* Should be power of 2. */
- #define	SBUF_MAXEXTENDSIZE	PAGE_SIZE
- #define	SBUF_MAXEXTENDINCR	PAGE_SIZE

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2011-07-03 13:33:31 UTC (rev 3525)
+++ trunk/freebsd-libs/debian/patches/series	2011-07-03 14:21:41 UTC (rev 3526)
@@ -1,3 +1,4 @@
+00_sbuf_page_size.diff
 01_sys_cam.diff
 02_libcam.diff
 03_libsbuf.diff
@@ -11,4 +12,3 @@
 11_netgraph.diff
 12_usb.diff
 13_jail.diff
-14_sbuf_page_size.diff