[gentoo-commits] repo/gentoo:master commit in: net-libs/libnet/files/

[Conrad Kostecki]

commit:     cfd86e6389fc607cfb8ccf85781fe3ce447c7141
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 27 17:05:55 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 18:16:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfd86e63

net-libs/libnet: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28860
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch  |  11 --
 net-libs/libnet/files/libnet-1.0.2a-endian.patch   |  20 ---
 net-libs/libnet/files/libnet-1.0.2a-funroll.patch  |  12 --
 .../libnet/files/libnet-1.0.2a-gcc33-fix.patch     |  13 --
 net-libs/libnet/files/libnet-1.0.2a-slot.patch     | 189 ---------------------
 net-libs/libnet/files/libnet-1.0.2a-test.patch     |  54 ------
 6 files changed, 299 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
deleted file mode 100644
index 5c81dbfe9485..000000000000
--- a/net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/libnet-1.0.2a-endian.patch b/net-libs/libnet/files/libnet-1.0.2a-endian.patch
deleted file mode 100644
index aad0bacb2f2e..000000000000
--- a/net-libs/libnet/files/libnet-1.0.2a-endian.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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>

diff --git a/net-libs/libnet/files/libnet-1.0.2a-funroll.patch b/net-libs/libnet/files/libnet-1.0.2a-funroll.patch
deleted file mode 100644
index dd77d05dff2a..000000000000
--- a/net-libs/libnet/files/libnet-1.0.2a-funroll.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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-1.0.2a-gcc33-fix.patch b/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch
deleted file mode 100644
index c4f3ae925705..000000000000
--- a/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/libnet.h
-+++ b/include/libnet.h
-@@ -84,8 +84,8 @@
- #define LIBNET_VERSION  "1.0.2a"
- 
- #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
--#error "byte order has not been specified, you'll
--need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
-+#error "byte order has not been specified, you'll \
-+need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the \
- documentation regarding the libnet-config script."
- #endif
- 

diff --git a/net-libs/libnet/files/libnet-1.0.2a-slot.patch b/net-libs/libnet/files/libnet-1.0.2a-slot.patch
deleted file mode 100644
index bcc0d56113f5..000000000000
--- a/net-libs/libnet/files/libnet-1.0.2a-slot.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -18,17 +18,17 @@
- LIB_PREFIX  =   @libdir@/
- MAN_PREFIX  =   @MAN_PREFIX@
- 
--LIBNET      =   libnet
--LIBPWRITE   =   libpwrite
-+LIBNET      =   libnet-1.0
-+LIBPWRITE   =   libpwrite-1.0
- LIB         =   lib/$(LIBNET).a
- MAN         =   doc/$(LIBNET).3
- INCLUDE     =   include/$(LIBNET).h
--INCLUDE-H   =   include/$(LIBNET)/$(LIBNET)-headers.h
--INCLUDE-F   =   include/$(LIBNET)/$(LIBNET)-functions.h
--INCLUDE-S   =   include/$(LIBNET)/$(LIBNET)-structures.h
--INCLUDE-M   =   include/$(LIBNET)/$(LIBNET)-macros.h
--INCLUDE-A   =   include/$(LIBNET)/$(LIBNET)-asn1.h
--INCLUDE-O   =   include/$(LIBNET)/$(LIBNET)-ospf.h
-+INCLUDE-H   =   include/libnet/$(LIBNET)-headers.h
-+INCLUDE-F   =   include/libnet/$(LIBNET)-functions.h
-+INCLUDE-S   =   include/libnet/$(LIBNET)-structures.h
-+INCLUDE-M   =   include/libnet/$(LIBNET)-macros.h
-+INCLUDE-A   =   include/libnet/$(LIBNET)-asn1.h
-+INCLUDE-O   =   include/libnet/$(LIBNET)-ospf.h
- CONFIG      =   $(LIBNET)-config
- DEFINES     +=  @DEFS@
- RANLIB      =   @RANLIB@
-@@ -94,7 +94,7 @@
- install: libnet
- 	$(ENSUREDIR) $(DESTDIR)$(prefix) 755
- 	$(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
--	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
-+	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)/libnet/ 755
- 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
- 	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
- 	$(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
-@@ -102,12 +102,12 @@
- 	rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
- 	cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a
- 	$(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
--	$(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
-+	$(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)/libnet/
-+	$(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)/libnet/
-+	$(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)/libnet/
-+	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)/libnet/
-+	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)/libnet/
-+	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)/libnet/
- 	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
- 	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
- 
-@@ -142,6 +142,6 @@
- 	    cd support/bpf-lkm/etherspoof && rm -rf Makefile; \
- 	fi
- 	rm -f config.log config.cache config.status Makefile include/config.h \
--	version.h support/bpf-lkm/etherspoof conftest* libnet-config
-+	version.h support/bpf-lkm/etherspoof conftest* libnet-1.0-config
- 
- # EOF
---- 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 \
-     test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
--    libnet-config, chmod +x libnet-config)
-+    libnet-1.0-config, chmod +x libnet-1.0-config)
- 
- dnl EOF
---- a/include/libnet.h
-+++ b/include/libnet.h
-@@ -74,12 +74,12 @@
- #include <errno.h>
- #include <assert.h>
- 
--#include "./libnet/libnet-headers.h"
--#include "./libnet/libnet-structures.h"
--#include "./libnet/libnet-macros.h"
--#include "./libnet/libnet-asn1.h"
--#include "./libnet/libnet-functions.h"
--#include "./libnet/libnet-ospf.h"
-+#include "./libnet/libnet-1.0-headers.h"
-+#include "./libnet/libnet-1.0-structures.h"
-+#include "./libnet/libnet-1.0-macros.h"
-+#include "./libnet/libnet-1.0-asn1.h"
-+#include "./libnet/libnet-1.0-functions.h"
-+#include "./libnet/libnet-1.0-ospf.h"
- 
- #define LIBNET_VERSION  "1.0.2a"
- 
---- a/libnet-config.in
-+++ b/libnet-config.in
-@@ -9,12 +9,12 @@
- 
- libnet_defines="@LIBNET_CONFIG_DEFINES@"
- libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
--libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
-+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet-1.0"
- 
- usage()
- {
-         cat <<EOF
--Usage: libnet-config [OPTIONS]
-+Usage: libnet-1.0-config [OPTIONS]
- Options:
-         [--libs]
-         [--cflags]
---- 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
- DEFINES     +=  @DEFS@
--LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
-+LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
- 
- .c.o:
- 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- a/test/ICMP/Makefile.in
-+++ b/test/ICMP/Makefile.in
-@@ -15,7 +15,7 @@
- 		ping_of_death.o
- 
- DEFINES     +=  @DEFS@
--LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
-+LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
- 
- .c.o:
- 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- a/test/IP/Makefile.in
-+++ b/test/IP/Makefile.in
-@@ -10,7 +10,7 @@
- OBJECTS     =   
- 
- DEFINES     +=  @DEFS@
--LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
-+LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
- 
- .c.o:
- 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- a/test/OSPF/Makefile.in
-+++ b/test/OSPF/Makefile.in
-@@ -12,7 +12,7 @@
- 		ospf_request.o   \
- 
- DEFINES     +=  @DEFS@
--LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
-+LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
- 
- .c.o:
- 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- a/test/Random/Makefile.in
-+++ b/test/Random/Makefile.in
-@@ -9,7 +9,7 @@
- CFLAGS      =   @CFLAGS@
- OBJECTS     =   prand_trials.o
- DEFINES     +=  @DEFS@
--LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
-+LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
- 
- .c.o:
- 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- a/test/TCP/Makefile.in
-+++ b/test/TCP/Makefile.in
-@@ -13,7 +13,7 @@
-                 tcp+data+ipopt.o
- 
- DEFINES     +=  @DEFS@
--LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
-+LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
- 
- .c.o:
- 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- a/test/UDP/Makefile.in
-+++ b/test/UDP/Makefile.in
-@@ -11,7 +11,7 @@
-                 udp+data.o
- 
- DEFINES     +=  @DEFS@
--LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
-+LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
- 
- .c.o:
- 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@

diff --git a/net-libs/libnet/files/libnet-1.0.2a-test.patch b/net-libs/libnet/files/libnet-1.0.2a-test.patch
deleted file mode 100644
index 8bbb2ac45d19..000000000000
--- a/net-libs/libnet/files/libnet-1.0.2a-test.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -9,31 +9,31 @@
- all: test
- 
- test:
--	if ! test -e ../lib/libnet.a; then \
--	    cd .. &&  make; \
-+	if ! test -e ../lib/libnet-1.0.a; then \
-+	    cd .. &&  $(MAKE); \
- 	fi
--	cd Random; make all
--	cd ICMP; make all
--	cd UDP; make all
--	cd TCP; make all
--	cd Ethernet; make all
--	cd OSPF; make all
-+	cd Random; $(MAKE) all
-+	cd ICMP; $(MAKE) all
-+	cd UDP; $(MAKE) all
-+	cd TCP; $(MAKE) all
-+	cd Ethernet; $(MAKE) all
-+	cd OSPF; $(MAKE) all
- 
- clean:
--	cd Random; make clean
--	cd ICMP; make clean
--	cd UDP; make clean
--	cd TCP; make clean
--	cd Ethernet; make clean
--	cd OSPF; make clean
-+	cd Random; $(MAKE) clean
-+	cd ICMP; $(MAKE) clean
-+	cd UDP; $(MAKE) clean
-+	cd TCP; $(MAKE) clean
-+	cd Ethernet; $(MAKE) clean
-+	cd OSPF; $(MAKE) clean
- 
- distclean: clean
--	cd TCP; make distclean
--	cd UDP; make distclean
--	cd ICMP; make distclean
--	cd Random; make distclean
--	cd Ethernet; make distclean
--	cd OSPF; make distclean
-+	cd TCP; $(MAKE) distclean
-+	cd UDP; $(MAKE) distclean
-+	cd ICMP; $(MAKE) distclean
-+	cd Random; $(MAKE) distclean
-+	cd Ethernet; $(MAKE) distclean
-+	cd OSPF; $(MAKE) distclean
- 	rm -f Makefile
- 
- # EOF