Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 20 years ago
parent
commit
8d48bd417a
2 changed files with 15 additions and 20 deletions
  1. +5
    -9
      package/base/dietlibc/pkg_patch/pkg_iproute2.patch
  2. +10
    -11
      package/base/iproute2/linux-asm-byteorder_h.patch

+ 5
- 9
package/base/dietlibc/pkg_patch/pkg_iproute2.patch

@ -97,16 +97,12 @@
int ifindex;
--- ./ip/iptunnel.c.orig 2003-04-06 17:08:43.000000000 +0200
+++ ./ip/iptunnel.c 2003-04-06 17:09:17.000000000 +0200
@@ -16,6 +16,9 @@
* Phil Karn <karn@ka9q.ampr.org> 990408: "pmtudisc" flag
*/
+#define _LINUX_TYPES_H
@@ -30,4 +30,5 @@
#include <sys/ioctl.h>
+#include <asm/byteorder.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <linux/if.h>
#include <linux/if_arp.h>
#include <netinet/in.h>
--- ./ip/iplink.c.orig 2003-04-06 17:09:55.000000000 +0200
+++ ./ip/iplink.c 2003-04-06 17:10:04.000000000 +0200
@@ -10,6 +10,9 @@

+ 10
- 11
package/base/iproute2/linux-asm-byteorder_h.patch

@ -22,13 +22,12 @@ diff -dur iproute2-ahu-20021020/ip/ipneigh.c iproute2-ahu-20021020-patch/ip/ipne
#include "rt_names.h"
diff -dur iproute2-ahu-20021020/ip/iproute.c iproute2-ahu-20021020-patch/ip/iproute.c
--- iproute2-ahu-20021020/ip/iproute.c 2002-10-19 17:01:12.000000000 +0000
+++ iproute2-ahu-20021020-patch/ip/iproute.c 2004-10-23 18:26:54.951214024 +0000
--- iproute2-ahu-20021020/ip/iproute.c 2002-10-19 17:01:12.000000000 +0000
+++ iproute2-ahu-20021020-patch/ip/iproute.c 2004-10-23 18:26:54.951214024 +0000
@@ -24,7 +24,20 @@
#include <sys/time.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <netinet/ip.h>
+
+#ifdef __CHECKER__
+#define __bitwise __attribute__((bitwise))
@ -42,7 +41,7 @@ diff -dur iproute2-ahu-20021020/ip/iproute.c iproute2-ahu-20021020-patch/ip/ipro
+#define __le64 __bitwise __u64
+#define __be64 __bitwise __u64
+
+ #include <netinet/ip.h>
#include <netinet/ip.h>
#include <arpa/inet.h>
#include <linux/in_route.h>
@ -72,10 +71,9 @@ diff -dur iproute2-ahu-20021020/ip/iprule.c iproute2-ahu-20021020-patch/ip/iprul
diff -dur iproute2-ahu-20021020/ip/iptunnel.c iproute2-ahu-20021020-patch/ip/iptunnel.c
--- iproute2-ahu-20021020/ip/iptunnel.c 2002-10-19 17:01:13.000000000 +0000
+++ iproute2-ahu-20021020-patch/ip/iptunnel.c 2004-10-23 18:32:03.606291320 +0000
@@ -27,6 +27,19 @@
#include <linux/if.h>
#include <linux/if_arp.h>
#include <netinet/in.h>
@@ -27,6 +26,19 @@
#include <fcntl.h>
#include <sys/socket.h>
+
+#ifdef __CHECKER__
+#define __bitwise __attribute__((bitwise))
@ -89,6 +87,7 @@ diff -dur iproute2-ahu-20021020/ip/iptunnel.c iproute2-ahu-20021020-patch/ip/ipt
+#define __le64 __bitwise __u64
+#define __be64 __bitwise __u64
+
#include <netinet/ip.h>
#include <arpa/inet.h>
#include <linux/if_tunnel.h>
#include <sys/ioctl.h>
#include <linux/if.h>
#include <linux/if_arp.h>
#include <netinet/in.h>

Loading…
Cancel
Save