gentoo resync : 03.12.2017

6 files changed, 25 insertions, 22 deletions

diff --git a/net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch b/net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch
new file mode 100644
index 000000000000..5c81dbfe9485
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -143,7 +143,7 @@
+     AC_DEFINE(_BSD_SOURCE)
+     AC_DEFINE(__BSD_SOURCE)
+     AC_DEFINE(__FAVOR_BSD)
+-    LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
++    LIBNET_CONFIG_DEFINES="-D_DEFAULT_SOURCE -D__FAVOR_BSD"
+     AC_CHECK_HEADERS(net/ethernet.h, \
+         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
+     MAN_PREFIX="$prefix/man/man3/"
diff --git a/net-libs/libnet/files/1.0.2a-endian.patch b/net-libs/libnet/files/libnet-1.0.2a-endian.patch
index aad0bacb2f2e..aad0bacb2f2e 100644
--- a/net-libs/libnet/files/1.0.2a-endian.patch
+++ b/net-libs/libnet/files/libnet-1.0.2a-endian.patch
diff --git a/net-libs/libnet/files/libnet-1.0.2a-funroll.patch b/net-libs/libnet/files/libnet-1.0.2a-funroll.patch
new file mode 100644
index 000000000000..dd77d05dff2a
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.0.2a-funroll.patch
@@ -0,0 +1,12 @@
+--- a/configure.in.JeR
++++ b/configure.in
+@@ -51,8 +51,7 @@
+ dnl
+ if test $ac_cv_prog_gcc = yes; then
+ dnl if test -z $CFLAGS; then 
+-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
+-    CFLAGS="$CCOPTS"
++:
+ dnl fi
+ fi
+ 
diff --git a/net-libs/libnet/files/libnet-gcc33-fix b/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch
index 6f711abc8ebf..c4f3ae925705 100644
--- a/net-libs/libnet/files/libnet-gcc33-fix
+++ b/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch
@@ -1,5 +1,5 @@
---- Libnet-1.0.2a-orig/include/libnet.h	2001-02-07 00:19:25.000000000 +0100
-+++ Libnet-1.0.2a/include/libnet.h	2003-07-24 18:34:33.000000000 +0200
+--- a/include/libnet.h
++++ b/include/libnet.h
 @@ -84,8 +84,8 @@
  #define LIBNET_VERSION  "1.0.2a"
  
diff --git a/net-libs/libnet/files/1.0.2a-slot.patch b/net-libs/libnet/files/libnet-1.0.2a-slot.patch
index bcc0d56113f5..bcc0d56113f5 100644
--- a/net-libs/libnet/files/1.0.2a-slot.patch
+++ b/net-libs/libnet/files/libnet-1.0.2a-slot.patch
diff --git a/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch b/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch
deleted file mode 100644
index 25ddbc7b1104..000000000000
--- a/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -157,14 +157,14 @@
- case "$target_os" in
- 
- *linux*)
--    AC_DEFINE(_BSD_SOURCE, 1,
-+    AC_DEFINE(_DEFAULT_SOURCE, 1,
-         [Define as necessary to "unhide" header symbols.])
--    AC_DEFINE(__BSD_SOURCE, 1,
-+    AC_DEFINE(__DEFAULT_SOURCE, 1,
-         [Define as necessary to "unhide" header symbols.])
-     AC_DEFINE(__FAVOR_BSD, 1,
-         [Define if we should favor the BSD APIs when possible in Linux.])
- 
--    LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
-+    LIBNET_CONFIG_DEFINES="-D_DEFAULT_SOURCE -D__DEFAULT_SOURCE -D__FAVOR_BSD"
-     AC_CHECK_HEADERS(net/ethernet.h, \
-         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
-     ;;