[Glibc-bsd-commits] r4894 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-08-19 14:36:55 +0000 (Mon, 19 Aug 2013)
New Revision: 4894

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/control
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
   trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
   trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff
Log:
New upstream release.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-08-19 14:33:54 UTC (rev 4893)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-08-19 14:36:55 UTC (rev 4894)
@@ -1,5 +1,6 @@
-kfreebsd-kernel-headers (9.1-4) UNRELEASED; urgency=low
+kfreebsd-kernel-headers (9.2-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * Disable a few function declarations in <sys/types.h> which may
     potentially collide with the ones from Glibc.
   * Use 'defined(__GNUC__)' rather than '1' when replacing __GNUCLIKE_*
@@ -13,7 +14,7 @@
     the rest of the macros from colliding. Add a test for <sys/queue.h>
     collisions.
 
- -- Robert Millan <rmh at debian.org>  Sun, 04 Aug 2013 18:07:05 +0200
+ -- Robert Millan <rmh at debian.org>  Mon, 19 Aug 2013 16:33:59 +0200
 
 kfreebsd-kernel-headers (9.1-3) unstable; urgency=low
 

Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control	2013-08-19 14:33:54 UTC (rev 4893)
+++ trunk/kfreebsd-kernel-headers/debian/control	2013-08-19 14:36:55 UTC (rev 4894)
@@ -5,7 +5,7 @@
 Uploaders: Aurelien Jarno <aurel32 at debian.org>,
  Guillem Jover <guillem at debian.org>,
  Robert Millan <rmh at debian.org>
-Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-9.1,
+Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-9.2,
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-kernel-headers/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-kernel-headers/
 Standards-Version: 3.9.4

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2013-08-19 14:33:54 UTC (rev 4893)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2013-08-19 14:36:55 UTC (rev 4894)
@@ -578,7 +578,7 @@
  
  struct thread;
  /*
-@@ -796,9 +895,15 @@
+@@ -797,9 +896,15 @@
  #include <sys/cdefs.h>
  
  __BEGIN_DECLS

Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2013-08-19 14:33:54 UTC (rev 4893)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2013-08-19 14:36:55 UTC (rev 4894)
@@ -30,7 +30,7 @@
  #include <sys/sx.h>		/* XXX */
  #include <sys/event.h>		/* XXX */
  #include <sys/_task.h>
-@@ -730,8 +733,19 @@
+@@ -775,8 +778,19 @@
   */
  struct ifaddr {
  	struct	sockaddr *ifa_addr;	/* address of interface */
@@ -89,16 +89,16 @@
   * is allocated for each interface with an Internet address.
 --- a/sys/sys/fnv_hash.h
 +++ b/sys/sys/fnv_hash.h
-@@ -8,6 +8,8 @@
-  * $FreeBSD$
-  */
+@@ -10,6 +10,8 @@
+ #ifndef _SYS_FNV_HASH_H_
+ #define	_SYS_FNV_HASH_H_
  
 +#include <sys/types.h>
 +
  typedef u_int32_t Fnv32_t;
  typedef u_int64_t Fnv64_t;
  
-@@ -58,7 +60,7 @@
+@@ -60,7 +62,7 @@
  fnv_64_str(const char *str, Fnv64_t hval)
  {
  	const u_int8_t *s = (const u_int8_t *)str;

Modified: trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff	2013-08-19 14:33:54 UTC (rev 4893)
+++ trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff	2013-08-19 14:36:55 UTC (rev 4894)
@@ -4,8 +4,8 @@
 
 --- a/sys/sys/vnode.h
 +++ b/sys/sys/vnode.h
-@@ -40,7 +40,6 @@
- #include <sys/mutex.h>
+@@ -41,7 +41,6 @@
+ #include <sys/rangelock.h>
  #include <sys/selinfo.h>
  #include <sys/uio.h>
 -#include <sys/acl.h>