commit: 90da8c63c427e196caf5e8b8c7bbd5af52f0cc49 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun Oct 20 09:31:11 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun Oct 20 09:32:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90da8c63
net-libs/libpcap: Old Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-libs/libpcap/Manifest | 2 - .../files/libpcap-1.6.1-prefix-solaris.patch | 35 --------- .../files/libpcap-1.8.1-cross-compile.patch | 16 ----- net-libs/libpcap/files/libpcap-1.8.1-darwin.patch | 15 ---- .../files/libpcap-1.8.1-disable-remote.patch | 31 -------- net-libs/libpcap/files/libpcap-1.8.1-libnl.patch | 22 ------ net-libs/libpcap/files/libpcap-1.9.0-os.patch | 33 --------- net-libs/libpcap/files/libpcap-9999-parallel.patch | 22 ------ net-libs/libpcap/libpcap-1.8.1-r2.ebuild | 83 ---------------------- net-libs/libpcap/libpcap-1.8.1.ebuild | 80 --------------------- net-libs/libpcap/libpcap-1.9.0-r1.ebuild | 78 -------------------- net-libs/libpcap/libpcap-1.9.0.ebuild | 77 -------------------- 12 files changed, 494 deletions(-) diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest index cfa9abb5df5..1ae3f9ec963 100644 --- a/net-libs/libpcap/Manifest +++ b/net-libs/libpcap/Manifest @@ -1,3 +1 @@ -DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882 -DIST libpcap-1.9.0.tar.gz 819766 BLAKE2B bf98029eea58328c1c820966b100d8467373c9469c107bfe36bcf17e5250d64c45a331050b8a1027c4f4eb1600925b873e4fe43d866ba5a9dc5dcc7995137de1 SHA512 b94d63204f74fd155c1409c50b84c4a02d5b9db7069a24d42d496056416923183331f587903f9101d8464b74efc7db22f113c48e518bd7fb3082b333bbc337fd DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f 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 324aead551a..00000000000 --- 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 361cdeb5ec5..00000000000 --- 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 650bea82518..00000000000 --- 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 df68a5f0aa0..00000000000 --- 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 61dfc4e201d..00000000000 --- 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 d3ec8014084..00000000000 --- 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 61381a8e6d6..00000000000 --- 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 <alfredoalvarezernan...@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 diff --git a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild deleted file mode 100644 index 92a37da429b..00000000000 --- a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools multilib-minimal ltprune - -DESCRIPTION="A system-independent library for user-level network packet capture" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/libpcap -" -SRC_URI=" - https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="bluetooth dbus netlink static-libs usb" - -RDEPEND=" - bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - sys-devel/flex - virtual/yacc - dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) -" - -S=${WORKDIR}/${PN}-${P} - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch - "${FILESDIR}"/${PN}-1.8.1-cross-compile.patch - "${FILESDIR}"/${PN}-1.8.1-darwin.patch - "${FILESDIR}"/${PN}-1.8.1-libnl.patch - "${FILESDIR}"/${PN}-1.8.1-usbmon.patch - "${FILESDIR}"/${PN}-1.8.1-disable-remote.patch - "${FILESDIR}"/${PN}-9999-parallel.patch -) - -src_prepare() { - default - - eapply_user - - echo ${PV} > VERSION || die - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - $(use_enable bluetooth) \ - $(use_enable usb) \ - $(use_enable dbus) \ - $(use_with netlink libnl) \ - --enable-ipv6 -} - -multilib_src_compile() { - emake all shared -} - -multilib_src_install_all() { - dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} - - # remove static libraries (--disable-static does not work) - if ! use static-libs; then - find "${ED}" -name '*.a' -exec rm {} + || die - fi - prune_libtool_files - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi -} diff --git a/net-libs/libpcap/libpcap-1.8.1.ebuild b/net-libs/libpcap/libpcap-1.8.1.ebuild deleted file mode 100644 index 9fc1dee0199..00000000000 --- a/net-libs/libpcap/libpcap-1.8.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools multilib-minimal ltprune - -DESCRIPTION="A system-independent library for user-level network packet capture" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/libpcap -" -SRC_URI=" - https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="bluetooth dbus netlink static-libs usb" - -RDEPEND=" - bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - sys-devel/flex - virtual/yacc - dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) -" - -S=${WORKDIR}/${PN}-${P} - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch - "${FILESDIR}"/${PN}-1.8.1-cross-compile.patch - "${FILESDIR}"/${PN}-1.8.1-darwin.patch - "${FILESDIR}"/${PN}-1.8.1-libnl.patch - "${FILESDIR}"/${PN}-1.8.1-usbmon.patch - "${FILESDIR}"/${PN}-9999-parallel.patch -) - -src_prepare() { - default - - echo ${PV} > VERSION || die - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - $(use_enable bluetooth) \ - $(use_enable usb) \ - $(use_enable dbus) \ - $(use_with netlink libnl) \ - --enable-ipv6 -} - -multilib_src_compile() { - emake all shared -} - -multilib_src_install_all() { - dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} - - # remove static libraries (--disable-static does not work) - if ! use static-libs; then - find "${ED}" -name '*.a' -exec rm {} + || die - fi - prune_libtool_files - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h - fi -} diff --git a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild deleted file mode 100644 index 4fcee8fb7f7..00000000000 --- a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools multilib-minimal ltprune - -DESCRIPTION="A system-independent library for user-level network packet capture" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/libpcap -" -SRC_URI=" - https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="bluetooth dbus netlink static-libs usb" - -RDEPEND=" - bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - sys-devel/flex - virtual/yacc - dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) -" - -S=${WORKDIR}/${PN}-${P/_} - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.1-darwin.patch - "${FILESDIR}"/${PN}-1.8.1-usbmon.patch - "${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch - "${FILESDIR}"/${PN}-1.9.0-os.patch -) - -src_prepare() { - default - - echo ${PV} > VERSION || die - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - $(use_enable bluetooth) \ - $(use_enable usb) \ - $(use_enable dbus) \ - $(use_with netlink libnl) \ - --enable-ipv6 -} - -multilib_src_compile() { - emake all shared -} - -multilib_src_install_all() { - dodoc CREDITS CHANGES VERSION TODO README.* doc/README.* - - # remove static libraries (--disable-static does not work) - if ! use static-libs; then - find "${ED}" -name '*.a' -exec rm {} + || die - fi - prune_libtool_files - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi -} diff --git a/net-libs/libpcap/libpcap-1.9.0.ebuild b/net-libs/libpcap/libpcap-1.9.0.ebuild deleted file mode 100644 index 2aec97348ef..00000000000 --- a/net-libs/libpcap/libpcap-1.9.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools multilib-minimal ltprune - -DESCRIPTION="A system-independent library for user-level network packet capture" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/libpcap -" -SRC_URI=" - https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="bluetooth dbus netlink static-libs usb" - -RDEPEND=" - bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - sys-devel/flex - virtual/yacc - dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) -" - -S=${WORKDIR}/${PN}-${P/_} - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch - "${FILESDIR}"/${PN}-1.8.1-darwin.patch - "${FILESDIR}"/${PN}-1.8.1-usbmon.patch -) - -src_prepare() { - default - - echo ${PV} > VERSION || die - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - $(use_enable bluetooth) \ - $(use_enable usb) \ - $(use_enable dbus) \ - $(use_with netlink libnl) \ - --enable-ipv6 -} - -multilib_src_compile() { - emake all shared -} - -multilib_src_install_all() { - dodoc CREDITS CHANGES VERSION TODO README.* doc/README.* - - # remove static libraries (--disable-static does not work) - if ! use static-libs; then - find "${ED}" -name '*.a' -exec rm {} + || die - fi - prune_libtool_files - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi -}
