[Glibc-bsd-commits] r2842 - trunk/kfreebsd-kernel-headers/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2009-11-14 13:38:09 +0000 (Sat, 14 Nov 2009)
New Revision: 2842

Modified:
   trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
   trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
Log:
kfreebsd-kernel-headers fixes for freebsd-utils 8.0



Modified: trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff	2009-11-14 13:36:30 UTC (rev 2841)
+++ trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff	2009-11-14 13:38:09 UTC (rev 2842)
@@ -1,7 +1,7 @@
 diff -Nur sys/osreldate.h sys/osreldate.h
 --- src/sys/osreldate.h
 +++ src/sys/osreldate.h
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,15 @@
 +
 +/* kFreeBSD 8.0 headers */
 +
@@ -10,6 +10,7 @@
 +#define _SYS_CDEFS_H_
 +#define __XSTRING(x)    __STRING(x)     /* expand x, then stringify */
 +#define __aligned(x)    __attribute__((__aligned__(x)))
++#define __packed    	 __attribute__((__packed__))
 +#endif
 +
 +#undef __FreeBSD_kernel__

Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2009-11-14 13:36:30 UTC (rev 2841)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2009-11-14 13:38:09 UTC (rev 2842)
@@ -1,7 +1,7 @@
 Index: kfreebsd-source-8.0/sys/net/route.h
 ===================================================================
 --- kfreebsd-source-8.0.orig/sys/net/route.h	2009-11-12 15:48:55.000000000 +0000
-+++ kfreebsd-source-8.0/sys/net/route.h	2009-11-12 16:28:19.000000000 +0000
++++ kfreebsd-source-8.0/sys/net/route.h	2009-11-14 13:21:07.000000000 +0000
 @@ -33,6 +33,8 @@
  #ifndef _NET_ROUTE_H_
  #define _NET_ROUTE_H_
@@ -13,8 +13,8 @@
   *
 Index: kfreebsd-source-8.0/sys/net/if_dl.h
 ===================================================================
---- kfreebsd-source-8.0.orig/sys/net/if_dl.h	2009-11-12 16:22:12.000000000 +0000
-+++ kfreebsd-source-8.0/sys/net/if_dl.h	2009-11-12 16:28:19.000000000 +0000
+--- kfreebsd-source-8.0.orig/sys/net/if_dl.h	2009-11-14 13:21:07.000000000 +0000
++++ kfreebsd-source-8.0/sys/net/if_dl.h	2009-11-14 13:21:07.000000000 +0000
 @@ -59,13 +59,13 @@
   * Structure of a Link-Level sockaddr:
   */
@@ -39,7 +39,7 @@
 Index: kfreebsd-source-8.0/sys/net/if_var.h
 ===================================================================
 --- kfreebsd-source-8.0.orig/sys/net/if_var.h	2009-11-12 15:48:55.000000000 +0000
-+++ kfreebsd-source-8.0/sys/net/if_var.h	2009-11-12 16:28:19.000000000 +0000
++++ kfreebsd-source-8.0/sys/net/if_var.h	2009-11-14 13:28:30.000000000 +0000
 @@ -33,6 +33,9 @@
  #ifndef	_NET_IF_VAR_H_
  #define	_NET_IF_VAR_H_
@@ -50,6 +50,15 @@
  /*
   * Structures defining a network interface, providing a packet
   * transport mechanism (ala level 0 of the PUP protocols).
+@@ -84,7 +87,7 @@
+ #endif /* _KERNEL */
+ #include <sys/lock.h>		/* XXX */
+ #include <sys/mutex.h>		/* XXX */
+-#include <sys/rwlock.h>		/* XXX */
++#include <sys/_rwlock.h>		/* XXX */
+ #include <sys/sx.h>		/* XXX */
+ #include <sys/event.h>		/* XXX */
+ #include <sys/_task.h>
 @@ -696,8 +699,19 @@
   */
  struct ifaddr {
@@ -75,7 +84,7 @@
 Index: kfreebsd-source-8.0/sys/netinet/in_var.h
 ===================================================================
 --- kfreebsd-source-8.0.orig/sys/netinet/in_var.h	2009-11-12 15:48:57.000000000 +0000
-+++ kfreebsd-source-8.0/sys/netinet/in_var.h	2009-11-12 16:29:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/netinet/in_var.h	2009-11-14 13:21:07.000000000 +0000
 @@ -34,7 +34,9 @@
  #define _NETINET_IN_VAR_H_
  
@@ -89,7 +98,7 @@
 Index: kfreebsd-source-8.0/sys/netinet/ip_var.h
 ===================================================================
 --- kfreebsd-source-8.0.orig/sys/netinet/ip_var.h	2009-11-12 15:48:57.000000000 +0000
-+++ kfreebsd-source-8.0/sys/netinet/ip_var.h	2009-11-12 16:28:19.000000000 +0000
++++ kfreebsd-source-8.0/sys/netinet/ip_var.h	2009-11-14 13:21:07.000000000 +0000
 @@ -34,6 +34,8 @@
  #define	_NETINET_IP_VAR_H_
  
@@ -102,7 +111,7 @@
 Index: kfreebsd-source-8.0/sys/netinet6/in6_var.h
 ===================================================================
 --- kfreebsd-source-8.0.orig/sys/netinet6/in6_var.h	2009-11-12 15:48:58.000000000 +0000
-+++ kfreebsd-source-8.0/sys/netinet6/in6_var.h	2009-11-12 16:28:19.000000000 +0000
++++ kfreebsd-source-8.0/sys/netinet6/in6_var.h	2009-11-14 13:21:07.000000000 +0000
 @@ -70,6 +70,9 @@
  #include <sys/libkern.h>
  #endif
@@ -116,7 +125,7 @@
 Index: kfreebsd-source-8.0/sys/sys/fnv_hash.h
 ===================================================================
 --- kfreebsd-source-8.0.orig/sys/sys/fnv_hash.h	2009-11-12 15:49:02.000000000 +0000
-+++ kfreebsd-source-8.0/sys/sys/fnv_hash.h	2009-11-12 16:28:19.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/fnv_hash.h	2009-11-14 13:21:07.000000000 +0000
 @@ -8,6 +8,8 @@
   * $FreeBSD: src/sys/sys/fnv_hash.h,v 1.3.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
   */