From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Sep 2020 14:09:07 +0100 Subject: gentoo resync : 02.09.2020 --- net-libs/libpcap/Manifest | 5 +- net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch | 14 ++++ net-libs/libpcap/libpcap-1.10.0_pre.ebuild | 86 ++++++++++++++++++++++ net-libs/libpcap/libpcap-9999.ebuild | 1 + 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch create mode 100644 net-libs/libpcap/libpcap-1.10.0_pre.ebuild (limited to 'net-libs/libpcap') diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest index 041af64b9c60..344cb97a22c4 100644 --- a/net-libs/libpcap/Manifest +++ b/net-libs/libpcap/Manifest @@ -1,9 +1,12 @@ +AUX libpcap-1.10.0-usbmon.patch 620 BLAKE2B 463f446051bd6df5afd679ee95c13792ab4ce1962cd8cd1de7acfc1c40c887741ee0a8a5725566781833711e4c8286942ba6e0fb2ee262e2177df82f2175942d SHA512 77fc6eb400bbf265ed1290bead8c317bdcdbeaf5a73aacfd95c3a1e77dfe8d5a33dfe49043462051552e3550273219b10939fc2cf4eda7298317c7b4490428ea AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a2a1bdb97e5c1334e64b27cd969ea6a2f8d9d6301e4a4ec48dec2cec0e53cd68c887bbc445ab056a1f603696a34e SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90 AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73ce1a621277593d8d818119eac910d51a1cf320175409363d94ef5157ccad3768753b2a6d00c404ea6db4b18911bb0e551c5d19447cfb SHA512 00cceca448928c233658600c65534abb76fc76b327c652c241925297ee251e540802b00b9fb7c5f4cafd8c47244df5d73e4c060d99b199e8c2a45f56dcd504f1 AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174191e13d28658e380baa2d48f828736a0ff176de4b5fdaa7c0bf42c36509dfffd0c6d49cec45669d03201fad8efaf90c75 SHA512 57f51c1f2fc093bacf43a96c7156e82946a3f11025b3afe3c24c2704fb4a9a7750e0526d41a17d52d649f55b44d642d5daa3a76f0ae18aaca582591f20acd1c1 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75 +DIST libpcap-1.10.0-bp.tar.gz 911001 BLAKE2B bbcb1f48c5cbe8bfc46003cbf7c691e0b3a2051e319aa3ec761de045ac11bbacafe1a06b52c4cd332eb85e598a0a1ff5403ae7c3a611cc0cdd2eeab859587487 SHA512 c3d6047192ab1521687d856f2a954a38bfd8d42aedb853559a698ed3c24bfe5698efb6f81c0280b696229165c1088a58471e8d62f071343fcb14b1464f65fe3f DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f +EBUILD libpcap-1.10.0_pre.ebuild 1964 BLAKE2B 3bc100b209597d14e241590612975d9f90e51d9d4992fac6f4909183ec4d6e47ca493c17d644ed0b3d99919ec64d4ddbff18a0376244bf30e4bfc1e0ea06379a SHA512 2b71c759029a5d0e32c82cd2ae9e25c04870783ea880f00231a9e2cf84ca13417be6d72fade91ee6bc0d60314afa57b33254b2b8af36490b3d7c9cca4dc0758e EBUILD libpcap-1.9.1-r3.ebuild 1915 BLAKE2B 07c0a1f8b90631cea3b1feb04a9b1c67cea39e5c994370f652c0e9fbcdb8f778631e74048cfe6dc9d7d1daf726b3d1ea96de6c0e0b767244056a145d7fb3deb0 SHA512 b77569c6ff1a51967507e8f722c40f8ee4473ae294bf80cb6af74e7300dcaff848be08305f77e35627dda12c919b625ccef510b245343cc7a7a71bdbb4c1ac5b EBUILD libpcap-1.9.1.ebuild 1740 BLAKE2B fe8f2ffdb8548719fa379514c6deb9753c7f9d49b26fbdd2f54ec3f922c7b2ae166449883bd85695dd1b397bacdf108b3996e20d4c62a3bf336dcbd1c09c6cf0 SHA512 12b202747893fdf2170caf1ef1355046dd388162bec8790fa638e6ecc7f6819bb19b1d41b5246899cb28214ee8cfa50e799d0d51457a857e32f1daaef5022d91 -EBUILD libpcap-9999.ebuild 1681 BLAKE2B 61f14972b19ff6acf3e11fa251b1fb3871537eb562e891ecf28b36446d077e76c2794e26afd802c41496fdcd01daeecee23a0f6991ab783710475d553a58dc70 SHA512 9bd65255fd37e834d05799fcb580c48f104f117e7eeb19e86aa559ee5e9f8235a19c0945c68e7b933d61f92a4c26097eb4638eac0fca596e0f81260971a1645e +EBUILD libpcap-9999.ebuild 1722 BLAKE2B 23bf6d429b4010ef74e9db6be8512a9ae5b7cd013836ceefcdf88ad6d680a8000a39953b0d259679a826e99bc2af7d04a1e87db06d30aa10d6c06e1c99fe8a8a SHA512 b3f929fc29f5d2f96fffe31554d65ecdee1523b7bf4fb8b4bc911999223816bdc376254a208cf142c1e8d9ba36177a4a19909c18e95ca7bb72b93652d0c96b3d MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2 diff --git a/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch b/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch new file mode 100644 index 000000000000..e5524ac3baee --- /dev/null +++ b/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch @@ -0,0 +1,14 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -2225,10 +2225,7 @@ + AC_DEFINE(PCAP_SUPPORT_LINUX_USBMON, 1, [target host supports Linux usbmon for USB sniffing]) + MODULE_C_SRC="$MODULE_C_SRC pcap-usb-linux.c" + AC_MSG_RESULT(yes) +- ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null` +- if test $? -ne 0 ; then +- ac_usb_dev_name="usbmon" +- fi ++ ac_usb_dev_name="usbmon" + AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing]) + AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name) + # diff --git a/net-libs/libpcap/libpcap-1.10.0_pre.ebuild b/net-libs/libpcap/libpcap-1.10.0_pre.ebuild new file mode 100644 index 000000000000..3a80522a9f77 --- /dev/null +++ b/net-libs/libpcap/libpcap-1.10.0_pre.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools multilib-minimal + +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/_pre/-bp}.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug" + +RDEPEND=" + bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] ) + rdma? ( sys-cluster/rdma-core ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + sys-devel/flex + virtual/yacc + dbus? ( virtual/pkgconfig ) +" + +S=${WORKDIR}/${PN}-${P/_pre/-bp} + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.1-pcap-config.patch + "${FILESDIR}"/${PN}-1.10.0-usbmon.patch +) + +src_prepare() { + default + + if ! [[ -f VERSION ]]; then + echo ${PV} > VERSION || die + fi + + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" \ + econf \ + $(use_enable bluetooth) \ + $(use_enable dbus) \ + $(use_enable rdma) \ + $(use_enable remote) \ + $(use_enable usb) \ + $(use_enable yydebug) \ + $(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 + + find "${ED}" -name '*.la' -delete || die + + # 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-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild index 53f9d5815924..b716f8505940 100644 --- a/net-libs/libpcap/libpcap-9999.ebuild +++ b/net-libs/libpcap/libpcap-9999.ebuild @@ -34,6 +34,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.9.1-pcap-config.patch + "${FILESDIR}"/${PN}-1.10.0-usbmon.patch "${FILESDIR}"/${PN}-9999-prefix-darwin.patch ) -- cgit v1.2.3