From 414cf52c44c7caf09565c9286b9326ac8ac63428 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 21 Dec 2013 15:24:43 +0100
Subject: update to latest upstream version, fix musl compile, add patch from
 alpinelinux

---
 package/libnet/Makefile                            |  6 ++---
 .../libnet/patches/patch-src_libnet_link_linux_c   | 30 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 package/libnet/patches/patch-src_libnet_link_linux_c

(limited to 'package/libnet')

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"
-- 
cgit v1.2.3