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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-15 19:11:12 +0000 (Mon, 15 Sep 2014)
New Revision: 5522

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
   trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff
   trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
   trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff
Log:
Refresh patches against kfreebsd-source-10.1 10.1~svn271306-1:
- 000_bruno_haible.diff
- 005_register_t.diff
- 009_inetutils.diff
- net_if_ioctls.diff


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2014-09-15 18:38:30 UTC (rev 5521)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2014-09-15 19:11:12 UTC (rev 5522)
@@ -12,6 +12,11 @@
   * Add net/if_pflog.h (Closes: #756553)
     - add atomic.c testcase (Romain Francoise)
   * Enable testing for -Wimplicit-function-declaration
+  * Refresh patches against kfreebsd-source-10.1 10.1~svn271306-1:
+    - 000_bruno_haible.diff
+    - 005_register_t.diff
+    - 009_inetutils.diff
+    - net_if_ioctls.diff
 
  -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Wed, 03 Sep 2014 13:06:24 +0100
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2014-09-15 18:38:30 UTC (rev 5521)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2014-09-15 19:11:12 UTC (rev 5522)
@@ -494,7 +494,7 @@
  
  struct thread;
  /*
-@@ -692,9 +791,15 @@
+@@ -728,9 +827,15 @@
  #include <sys/cdefs.h>
  
  __BEGIN_DECLS
@@ -586,7 +586,7 @@
 --- a/sys/netinet/if_ether.h
 +++ b/sys/netinet/if_ether.h
 @@ -30,11 +30,9 @@
-  * $FreeBSD$
+  * $FreeBSD: stable/10/sys/netinet/if_ether.h 249925 2013-04-26 12:50:32Z glebius $
   */
  
 -#ifndef _NETINET_IF_ETHER_H_

Modified: trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff	2014-09-15 18:38:30 UTC (rev 5521)
+++ trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff	2014-09-15 19:11:12 UTC (rev 5522)
@@ -5,7 +5,7 @@
 
 --- a/sys/amd64/include/apicvar.h
 +++ b/sys/amd64/include/apicvar.h
-@@ -32,6 +32,7 @@
+@@ -29,6 +29,7 @@
  #ifndef _MACHINE_APICVAR_H_
  #define _MACHINE_APICVAR_H_
  
@@ -79,7 +79,7 @@
  #endif
 --- a/sys/i386/include/apicvar.h
 +++ b/sys/i386/include/apicvar.h
-@@ -32,6 +32,8 @@
+@@ -29,6 +29,8 @@
  #ifndef _MACHINE_APICVAR_H_
  #define _MACHINE_APICVAR_H_
  

Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2014-09-15 18:38:30 UTC (rev 5521)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2014-09-15 19:11:12 UTC (rev 5522)
@@ -1,9 +1,9 @@
 --- a/sys/net/route.h
 +++ b/sys/net/route.h
-@@ -33,6 +33,8 @@
- #ifndef _NET_ROUTE_H_
- #define _NET_ROUTE_H_
+@@ -35,6 +35,8 @@
  
+ #include <sys/counter.h>
+ 
 +#include <sys/socket.h>
 +
  /*

Modified: trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff	2014-09-15 18:38:30 UTC (rev 5521)
+++ trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff	2014-09-15 19:11:12 UTC (rev 5522)
@@ -1,7 +1,7 @@
 --- a/sys/net/if.h
 +++ b/sys/net/if.h
 @@ -30,11 +30,20 @@
-  * $FreeBSD$
+  * $FreeBSD: stable/10/sys/net/if.h 264076 2014-04-03 14:58:52Z glebius $
   */
  
 -#ifndef _NET_IF_H_
@@ -31,7 +31,7 @@
  
  /*
   * Structure used to query names of interface cloners.
-@@ -410,6 +418,8 @@
+@@ -416,6 +424,8 @@
  	 (sizeof(struct ifreq) - sizeof(struct sockaddr) + \
  	  (ifr).ifr_addr.sa_len) : sizeof(struct ifreq))
  
@@ -40,7 +40,7 @@
  struct ifaliasreq {
  	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
  	struct	sockaddr ifra_addr;
-@@ -443,6 +453,8 @@
+@@ -449,6 +459,8 @@
  	void            *ifd_data;
  };
  
@@ -49,7 +49,7 @@
  /* 
   * Structure used to retrieve aux status data from interfaces.
   * Kernel suppliers to this interface should respect the formatting
-@@ -515,8 +527,6 @@
+@@ -521,8 +533,6 @@
  	struct	sockaddr_storage dstaddr; /* out */
  };
  
@@ -58,7 +58,7 @@
  #ifdef _KERNEL
  #ifdef MALLOC_DECLARE
  MALLOC_DECLARE(M_IFADDR);
-@@ -543,4 +553,6 @@
+@@ -549,4 +559,6 @@
  #include <net/if_var.h>
  #endif