libnet-1.2.x: fix uClibc regression caused by #1410

Signed-off-by: Jo-Philipp Wich <redacted>

diff --git a/libs/libnet-1.2.x/Makefile b/libs/libnet-1.2.x/Makefile
index a9d7e750824028d844ba636e0439c3f4c00c7fcb..a7911633733d00d6338390cf6a3c9bc9568cb8b2 100644 (file)
--- a/libs/libnet-1.2.x/Makefile
+++ b/libs/libnet-1.2.x/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnet
 PKG_VERSION:=1.2-rc3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://sourceforge.net/projects/libnet-dev/files/

diff --git a/libs/libnet-1.2.x/patches/100-musl-compat.patch b/libs/libnet-1.2.x/patches/100-musl-compat.patch
index fcb4188a01ba8a9d947f4df99909552e64459512..b95366a07cfc66e6ccb2e7dc171ddcbd6b935621 100644 (file)
--- a/libs/libnet-1.2.x/patches/100-musl-compat.patch
+++ b/libs/libnet-1.2.x/patches/100-musl-compat.patch
@@ -1,11 +1,16 @@
 --- a/src/libnet_link_linux.c
 +++ b/src/libnet_link_linux.c
-@@ -30,7 +30,7 @@
+@@ -30,13 +30,8 @@
  #include <sys/time.h>
  
  #include <net/if.h>
 -#if (__GLIBC__)
-+#if (!__UCLIBC__)
  #include <netinet/if_ether.h>
  #include <net/if_arp.h>
- #else
+-#else
+-#include <linux/if_arp.h>
+-#include <linux/if_ether.h>
+-#endif
+ 
+ #if (HAVE_PACKET_SOCKET)
+ #ifndef SOL_PACKET