summaryrefslogtreecommitdiff
path: root/net-libs/libpcap/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-11-03 16:06:58 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-11-03 16:06:58 +0000
commitbd4aeefe33e63f613512604e47bfca7b2187697d (patch)
treeadb35b5a9a00ee7ea591ab0c987f70167c23b597 /net-libs/libpcap/files
parent48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
gentoo resync : 03.11.2019
Diffstat (limited to 'net-libs/libpcap/files')
-rw-r--r--net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch35
-rw-r--r--net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch16
-rw-r--r--net-libs/libpcap/files/libpcap-1.8.1-darwin.patch15
-rw-r--r--net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch31
-rw-r--r--net-libs/libpcap/files/libpcap-1.8.1-libnl.patch22
-rw-r--r--net-libs/libpcap/files/libpcap-1.9.0-os.patch33
-rw-r--r--net-libs/libpcap/files/libpcap-9999-parallel.patch22
7 files changed, 0 insertions, 174 deletions
diff --git a/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
deleted file mode 100644
index 324aead551ae..000000000000
--- a/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Prefix' Solaris uses GNU ld
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -415,7 +415,7 @@
- aix*)
- ;;
-
-- freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
-+ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
- #
- # Platforms where the linker is the GNU linker
- # or accepts command-line arguments like
-@@ -429,10 +429,10 @@
- PIC_OPT=-fpic
- case "$host_cpu" in
-
-- sparc64*)
-+ sparc64*|sparcv9*)
- case "$host_os" in
-
-- freebsd*|openbsd*)
-+ freebsd*|solaris*|openbsd*)
- PIC_OPT=-fPIC
- ;;
- esac
-@@ -497,7 +497,7 @@
- V_SHLIB_OPT="-G -bnoentry -bexpall"
- ;;
-
-- freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
-+ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
- #
- # "cc" is GCC.
- #
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch b/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
deleted file mode 100644
index 361cdeb5ec50..000000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,7 +291,12 @@
- dnl XXX This could be done for cross-compiling, but for now it's not.
- dnl
- if test -z "$with_pcap" && test "$cross_compiling" = yes; then
-- AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...)
-+ if test -z "$with_pcap" ; then
-+ case $host in
-+ *-linux*) with_pcap="linux";;
-+ *) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);;
-+ esac
-+ fi
- fi
- AC_ARG_WITH(pcap,
- AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch b/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
deleted file mode 100644
index 650bea82518a..000000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
-Check for bluetooth/mgmt.h before use
-
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1117,7 +1117,7 @@
- if test "$enable_universal" != "no"; then
- case "$host_os" in
-
-- darwin[0-7].*)
-+ darwin**)
- #
- # Pre-Tiger. Build only for 32-bit PowerPC; no
- # need for any special compiler or linker flags.
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch b/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
deleted file mode 100644
index df68a5f0aa03..000000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-This patch was taken directly from debian: https://packages.debian.org/source/stretch/libpcap
-
-Disable bits of remote capture support inherited from the WinPCAP merge
-which cause applications to FTBFS if they define HAVE_REMOTE (#843384).
-
---- a/pcap/pcap.h
-+++ b/pcap/pcap.h
-@@ -506,6 +506,11 @@
- #define MODE_STAT 1
- #define MODE_MON 2
-
-+#ifdef HAVE_REMOTE
-+ /* Includes most of the public stuff that is needed for the remote capture */
-+ #include <remote-ext.h>
-+#endif /* HAVE_REMOTE */
-+
- #elif defined(MSDOS)
-
- /*
-@@ -526,11 +531,6 @@
-
- #endif /* _WIN32/MSDOS/UN*X */
-
--#ifdef HAVE_REMOTE
-- /* Includes most of the public stuff that is needed for the remote capture */
-- #include <remote-ext.h>
--#endif /* HAVE_REMOTE */
--
- #ifdef __cplusplus
- }
- #endif
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch b/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
deleted file mode 100644
index 61dfc4e201d9..000000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -453,10 +453,6 @@
-
- incdir=-I/usr/include/libnl3
- libnldir=
-- if test x$withval != x ; then
-- libnldir=-L${withval}/lib/.libs
-- incdir=-I${withval}/include
-- fi
-
- #
- # Try libnl 3.x first.
-@@ -471,7 +467,7 @@
- AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
- AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
- AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
-- V_INCLS="$V_INCLS ${incdir}"
-+ V_INCLS="${incdir} $V_INCLS"
- have_any_nl="yes"
- ],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
-
diff --git a/net-libs/libpcap/files/libpcap-1.9.0-os.patch b/net-libs/libpcap/files/libpcap-1.9.0-os.patch
deleted file mode 100644
index d3ec8014084f..000000000000
--- a/net-libs/libpcap/files/libpcap-1.9.0-os.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -415,7 +415,7 @@
- aix*)
- ;;
-
-- freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
-+ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
- #
- # Platforms where the linker is the GNU linker
- # or accepts command-line arguments like
-@@ -429,10 +429,10 @@
- PIC_OPT=-fpic
- case "$host_cpu" in
-
-- sparc64*)
-+ sparc64*|sparcv9*)
- case "$host_os" in
-
-- freebsd*|openbsd*)
-+ freebsd*|solaris*|openbsd*|linux*)
- PIC_OPT=-fPIC
- ;;
- esac
-@@ -497,7 +497,7 @@
- V_SHLIB_OPT="-G -bnoentry -bexpall"
- ;;
-
-- freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
-+ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
- #
- # "cc" is GCC.
- #
diff --git a/net-libs/libpcap/files/libpcap-9999-parallel.patch b/net-libs/libpcap/files/libpcap-9999-parallel.patch
deleted file mode 100644
index 61381a8e6d6c..000000000000
--- a/net-libs/libpcap/files/libpcap-9999-parallel.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001
-From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com>
-Date: Tue, 21 Feb 2017 11:41:43 +0100
-Subject: [PATCH] Makefile.in: Fix missing dependency
-
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 7044f0438..f5d443aed 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -465,7 +465,7 @@ grammar.h: grammar.c
- $(MAKE) $(MAKEFLAGS) grammar.c; \
- fi
-
--grammar.o: grammar.c
-+grammar.o: grammar.c scanner.h
- $(CC) $(FULL_CFLAGS) -c grammar.c
-
- gencode.o: $(srcdir)/gencode.c grammar.h scanner.h