[gentoo-commits] gentoo-x86 commit in net-libs/libnet/files: 1.0.2a-slot.patch 1.0.2a-endian.patch

[Jeroen Roovers (jer)]

jer         12/04/28 16:59:10

  Modified:             1.0.2a-slot.patch
  Added:                1.0.2a-endian.patch
  Log:
  Apply endian patch by Christopher Friedt (bug #275885). Clean up patch. Respect CFLAGS.
  
  (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  net-libs/libnet/files/1.0.2a-slot.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnet/files/1.0.2a-slot.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnet/files/1.0.2a-slot.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnet/files/1.0.2a-slot.patch?r1=1.2&r2=1.3

Index: 1.0.2a-slot.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libnet/files/1.0.2a-slot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 1.0.2a-slot.patch	11 Jan 2005 14:10:22 -0000	1.2
+++ 1.0.2a-slot.patch	28 Apr 2012 16:59:10 -0000	1.3
@@ -1,6 +1,5 @@
-diff -ur Libnet-1.0.2a.orig/Makefile.in Libnet-1.0.2a/Makefile.in
---- Libnet-1.0.2a.orig/Makefile.in	2003-08-17 23:53:14.000000000 -0400
-+++ Libnet-1.0.2a/Makefile.in	2003-08-18 00:10:28.810521400 -0400
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -18,17 +18,17 @@
  LIB_PREFIX  =   @libdir@/
  MAN_PREFIX  =   @MAN_PREFIX@
@@ -63,9 +62,8 @@
 +	version.h support/bpf-lkm/etherspoof conftest* libnet-1.0-config
  
  # EOF
-diff -ur Libnet-1.0.2a.orig/configure.in Libnet-1.0.2a/configure.in
---- Libnet-1.0.2a.orig/configure.in	2003-08-17 23:53:14.000000000 -0400
-+++ Libnet-1.0.2a/configure.in	2003-08-17 23:54:35.000000000 -0400
+--- a/configure.in
++++ b/configure.in
 @@ -261,6 +261,6 @@
  AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
      test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
@@ -74,9 +72,8 @@
 +    libnet-1.0-config, chmod +x libnet-1.0-config)
  
  dnl EOF
-diff -ur Libnet-1.0.2a.orig/include/libnet.h Libnet-1.0.2a/include/libnet.h
---- Libnet-1.0.2a.orig/include/libnet.h	2003-08-17 23:53:14.000000000 -0400
-+++ Libnet-1.0.2a/include/libnet.h	2003-08-18 00:01:38.000000000 -0400
+--- a/include/libnet.h
++++ b/include/libnet.h
 @@ -74,12 +74,12 @@
  #include <errno.h>
  #include <assert.h>
@@ -96,9 +93,8 @@
  
  #define LIBNET_VERSION  "1.0.2a"
  
-diff -ur Libnet-1.0.2a.orig/libnet-config.in Libnet-1.0.2a/libnet-config.in
---- Libnet-1.0.2a.orig/libnet-config.in	2003-08-17 23:53:14.000000000 -0400
-+++ Libnet-1.0.2a/libnet-config.in	2003-08-17 23:54:53.000000000 -0400
+--- a/libnet-config.in
++++ b/libnet-config.in
 @@ -9,12 +9,12 @@
  
  libnet_defines="@LIBNET_CONFIG_DEFINES@"
@@ -114,9 +110,8 @@
  Options:
          [--libs]
          [--cflags]
-Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
---- Libnet-1.0.2a/test/Ethernet/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/Ethernet/Makefile.in	2005-01-11 23:32:08.825695008 +0930
+--- a/test/Ethernet/Makefile.in
++++ b/test/Ethernet/Makefile.in
 @@ -10,7 +10,7 @@
  CFLAGS      =   @CFLAGS@
  OBJECTS     =   arp.o tcp.o icmp_mask.o get_address.o poink.o
@@ -126,8 +121,8 @@
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/ICMP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/ICMP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+--- a/test/ICMP/Makefile.in
++++ b/test/ICMP/Makefile.in
 @@ -15,7 +15,7 @@
  		ping_of_death.o
  
@@ -137,8 +132,8 @@
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/IP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/IP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+--- a/test/IP/Makefile.in
++++ b/test/IP/Makefile.in
 @@ -10,7 +10,7 @@
  OBJECTS     =   
  
@@ -148,8 +143,8 @@
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/OSPF/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/OSPF/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+--- a/test/OSPF/Makefile.in
++++ b/test/OSPF/Makefile.in
 @@ -12,7 +12,7 @@
  		ospf_request.o   \
  
@@ -159,8 +154,8 @@
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/Random/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/Random/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+--- a/test/Random/Makefile.in
++++ b/test/Random/Makefile.in
 @@ -9,7 +9,7 @@
  CFLAGS      =   @CFLAGS@
  OBJECTS     =   prand_trials.o
@@ -170,8 +165,8 @@
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/TCP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/TCP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+--- a/test/TCP/Makefile.in
++++ b/test/TCP/Makefile.in
 @@ -13,7 +13,7 @@
                  tcp+data+ipopt.o
  
@@ -181,8 +176,8 @@
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/UDP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/UDP/Makefile.in	2005-01-11 23:32:08.827694704 +0930
+--- a/test/UDP/Makefile.in
++++ b/test/UDP/Makefile.in
 @@ -11,7 +11,7 @@
                  udp+data.o
  



1.1                  net-libs/libnet/files/1.0.2a-endian.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnet/files/1.0.2a-endian.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libnet/files/1.0.2a-endian.patch?rev=1.1&content-type=text/plain

Index: 1.0.2a-endian.patch
===================================================================
--- a/include/libnet.h
+++ b/include/libnet.h
@@ -32,6 +32,17 @@
 #ifndef __LIBNET_H
 #define __LIBNET_H
 
+#include <endian.h>
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+# define LIBNET_LIL_ENDIAN 1
+#else
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define LIBNET_BIG_ENDIAN 1
+# else
+#  error unrecognized __BYTE_ORDER
+# endif
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>