diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-11 12:29:23 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-11 12:29:23 +0100 |
commit | 407f9b8fde3ad9cc55f39f7a548cde6056dab494 (patch) | |
tree | 0375ea8ddab3502bf6883066f43fc7e328d5c704 /package/libnet | |
parent | 2ecefcf609e484d04d1546581191831e07ad71ec (diff) | |
parent | abb858ae43374dc13a5fcef19b9e0ba9442013bb (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libnet')
-rw-r--r-- | package/libnet/Makefile | 6 | ||||
-rw-r--r-- | package/libnet/patches/patch-src_libnet_link_linux_c | 30 |
2 files changed, 33 insertions, 3 deletions
diff --git a/package/libnet/Makefile b/package/libnet/Makefile index b1cee13d9..2f765cc71 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libnet -PKG_VERSION:= 1.1.5 -PKG_RELEASE:= 3 -PKG_MD5SUM:= a9bc1d75a610efcfee200d3e28d8eb8f +PKG_VERSION:= 1.1.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 710296fe424a49344e5fcc0d09e53317 PKG_DESCR:= a low-level packet creation library PKG_SECTION:= libs PKG_DEPENDS:= libpcap diff --git a/package/libnet/patches/patch-src_libnet_link_linux_c b/package/libnet/patches/patch-src_libnet_link_linux_c new file mode 100644 index 000000000..565aae510 --- /dev/null +++ b/package/libnet/patches/patch-src_libnet_link_linux_c @@ -0,0 +1,30 @@ +* from alpinelinux +--- libnet-1.1.6.orig/src/libnet_link_linux.c 2012-03-19 17:59:50.000000000 +0100 ++++ libnet-1.1.6/src/libnet_link_linux.c 2013-12-21 15:19:01.000000000 +0100 +@@ -30,26 +30,15 @@ + #include <sys/time.h> + + #include <net/if.h> +-#if (__GLIBC__) + #include <netinet/if_ether.h> + #include <net/if_arp.h> +-#else +-#include <linux/if_arp.h> +-#include <linux/if_ether.h> +-#endif + + #if (HAVE_PACKET_SOCKET) + #ifndef SOL_PACKET + #define SOL_PACKET 263 + #endif /* SOL_PACKET */ +-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 + #include <netpacket/packet.h> + #include <net/ethernet.h> /* the L2 protocols */ +-#else +-#include <asm/types.h> +-#include <linux/if_packet.h> +-#include <linux/if_ether.h> /* The L2 protocols */ +-#endif + #endif /* HAVE_PACKET_SOCKET */ + + #include "../include/libnet.h" |