From e81e7e5656763b1b102ada305870969b78a7e3ac Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Thu, 28 Aug 2003 20:52:06 +0000
Subject: [PATCH] fixed iproute2 and linux24-header to like each other again

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1241 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE       |  4 ++
 .../base/iproute2/makefile-adaptions.patch    |  4 +-
 .../base/linux24/95-inet-for-userspace.patch  | 38 +++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 package/base/linux24/95-inet-for-userspace.patch

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 3248a7b11..85bd231d2 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -1,4 +1,8 @@
 
+*) 2003-08-28 (2.0.0-rc1 - 2.0.0-rc2)
+
+ - fixed iproute2 and linux24-header to like each other again
+
 *) 2003-08-27 (2.0.0-rc1 - 2.0.0-rc2)
 
  - Juergen Sawinski: bison and coda (yacc C++ fix) and added fmnewpackage.sh
diff --git a/package/base/iproute2/makefile-adaptions.patch b/package/base/iproute2/makefile-adaptions.patch
index 1bf4b16f8..84d3208bb 100644
--- a/package/base/iproute2/makefile-adaptions.patch
+++ b/package/base/iproute2/makefile-adaptions.patch
@@ -24,8 +24,8 @@ The include order need to be changed since a usr/include/utils.h might
 exist (cdparanoia). With new gcc the source yields some warnings so
 -Werror needs to be stripped ...
 
---- Makefile.orig	2001-08-02 08:37:03.000000000 +0200
-+++ Makefile	2003-08-28 22:29:43.000000000 +0200
+--- ./Makefile.orig	2001-08-02 08:37:03.000000000 +0200
++++ ./Makefile	2003-08-28 22:29:43.000000000 +0200
 @@ -28,8 +28,8 @@
  endif
  
diff --git a/package/base/linux24/95-inet-for-userspace.patch b/package/base/linux24/95-inet-for-userspace.patch
new file mode 100644
index 000000000..7cc0972d7
--- /dev/null
+++ b/package/base/linux24/95-inet-for-userspace.patch
@@ -0,0 +1,38 @@
+
+The in.h file need protection for some defines where the types are not known
+to the user-space and pkt_sched.h missed the inclusion of the types.h
+header which types it utilizes ...
+
+ - Rene Rebe <rene@rocklinux.org>
+
+--- ./include/linux/in.h.orig	2003-08-28 22:11:50.000000000 +0200
++++ ./include/linux/in.h	2003-08-28 22:12:27.000000000 +0200
+@@ -135,6 +135,8 @@
+ 	(sizeof(struct ip_msfilter) - sizeof(__u32) \
+ 	+ (numsrc) * sizeof(__u32))
+ 
++#ifdef __KERNEL__
++
+ struct group_req
+ {
+ 	__u32			gr_interface;	/* interface index */
+@@ -161,6 +163,8 @@
+ 	(sizeof(struct group_filter) - sizeof(struct sockaddr_storage) \
+ 	+ (numsrc) * sizeof(struct sockaddr_storage))
+ 
++#endif
++
+ struct in_pktinfo
+ {
+ 	int		ipi_ifindex;
+--- ./include/linux/pkt_sched.h.orig	2003-08-28 22:20:44.000000000 +0200
++++ ./include/linux/pkt_sched.h	2003-08-28 22:21:11.000000000 +0200
+@@ -1,6 +1,8 @@
+ #ifndef __LINUX_PKT_SCHED_H
+ #define __LINUX_PKT_SCHED_H
+ 
++#include <linux/types.h>
++
+ /* Logical priority bands not depending on specific packet scheduler.
+    Every scheduler will map them to real traffic classes, if it has
+    no more precise mechanism to classify packets.