From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- net-libs/libpcap/Manifest | 6 +- net-libs/libpcap/files/libpcap-1.9.0-os.patch | 33 +++++++++ .../libpcap-1.9.0-pcap-config-includedir.patch | 36 ++++++++++ .../files/libpcap-9999-prefix-solaris.patch | 35 ---------- net-libs/libpcap/libpcap-1.9.0-r1.ebuild | 78 ++++++++++++++++++++++ net-libs/libpcap/libpcap-9999.ebuild | 2 +- 6 files changed, 152 insertions(+), 38 deletions(-) create mode 100644 net-libs/libpcap/files/libpcap-1.9.0-os.patch create mode 100644 net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch delete mode 100644 net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch create mode 100644 net-libs/libpcap/libpcap-1.9.0-r1.ebuild (limited to 'net-libs/libpcap') diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest index a4ce06f043cc..912671aca81f 100644 --- a/net-libs/libpcap/Manifest +++ b/net-libs/libpcap/Manifest @@ -4,13 +4,15 @@ AUX libpcap-1.8.1-darwin.patch 395 BLAKE2B 629e349f4734ed1fd234082abf06eb2b1280c AUX libpcap-1.8.1-disable-remote.patch 776 BLAKE2B 085500b64c4f1da871b0ca13115dd95981f96279581908dd5bd779187970c82423531bcbd916955cc3deb1e15b71488adc9dcb5a92207cded6f162d7e137f3a8 SHA512 929243aa68ecf8ee4605fc993a9c64d1b7dba29990765f60a44c158ac7cc8c64f2c06861eae441cf8ee7379ebf3067ba5a2cd2df859212010180e85d2c3c6cd4 AUX libpcap-1.8.1-libnl.patch 688 BLAKE2B 8f3c68374815f86c894c5fb9d29969bb5b76f757cf7e35e44b4d0021a2b67b3a39b70dd070070fd8a82ab68550e2c60bfbf4eb8a95e6a5c478316eceb398b4ad SHA512 f56a8f4b87c2f9bfb70e2b31b2e4dcb4fb80654b13cf541f9ff42f193cb9bb4e90a3ad9ef7e91c6ebc8667525bfc75ab78b54381d3f1709f10aaf9f48fd3a1f0 AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a2a1bdb97e5c1334e64b27cd969ea6a2f8d9d6301e4a4ec48dec2cec0e53cd68c887bbc445ab056a1f603696a34e SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90 +AUX libpcap-1.9.0-os.patch 784 BLAKE2B 7b3d493ef9b4ffc62e113c22bd8b0f8e49cc2aa1abf91a98bc3d47114e53dff641ad256705c1a979ec0568d9b8b8ad14f47341d46eb44c945820219cbd39bb13 SHA512 ae64c22c12b812a15fc52f65aa26bf3860be6b5d64d63864dca140f03c6b435f30368447abb21f6ffc52a4e6d8ddf0e3a39ae40d11735e4314ba0829637563b9 +AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73ce1a621277593d8d818119eac910d51a1cf320175409363d94ef5157ccad3768753b2a6d00c404ea6db4b18911bb0e551c5d19447cfb SHA512 00cceca448928c233658600c65534abb76fc76b327c652c241925297ee251e540802b00b9fb7c5f4cafd8c47244df5d73e4c060d99b199e8c2a45f56dcd504f1 AUX libpcap-9999-parallel.patch 640 BLAKE2B cb1b081fba0b53af09ead5e4c0bc3e5b7856ad2c0ebaf68dc99b8a375158a112c47e0dfad7763caff7b0f7da8ce5b1ebfcb79a6cf3cf72636605dfd4097fb711 SHA512 82e0c48f2fc42c8df4a21009b9afac18ca4aaa14db822c0c85b4ea420434391dec3b5da90261d7afe01879354b43ef425c7464c9fe98a407a4b232590e361117 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75 -AUX libpcap-9999-prefix-solaris.patch 838 BLAKE2B 01d20a5cb097113c305161a8e1688ca99f375c1ddf06a65a762639e2e39f2d1b87cc60e10fb96a3117ced39e5b6a717c0a0d9580c1e4a3db2e128a5bd59f0d5d SHA512 541986573369e05ae24c2f092afd0eb77c18f5aaadaaa0f822dde039ae0734f88e5a86e51a26edcb42a4c99d3300a028ee1993005f8a2f39ae9ea64c89c1612f DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882 DIST libpcap-1.9.0.tar.gz 819766 BLAKE2B bf98029eea58328c1c820966b100d8467373c9469c107bfe36bcf17e5250d64c45a331050b8a1027c4f4eb1600925b873e4fe43d866ba5a9dc5dcc7995137de1 SHA512 b94d63204f74fd155c1409c50b84c4a02d5b9db7069a24d42d496056416923183331f587903f9101d8464b74efc7db22f113c48e518bd7fb3082b333bbc337fd EBUILD libpcap-1.8.1-r2.ebuild 2003 BLAKE2B 7dcbc9656cbda85903363e4d3e6cb149df76c44d75243fafb8e2e414a7f39026e434f9309905b1879e4b6059ac252ddf19d350459e7206c53f89839a61f92ffa SHA512 bb143dfad1307d0a3246eea173a3fbf9ce66f35e156c61e24b873f402bc1c3d40f3d1142edcf7daccc5c09ff62e720e4eefb3944d8f38ddf3c6fb4081e395f6b EBUILD libpcap-1.8.1.ebuild 1916 BLAKE2B 8e51e1f17444dad1614f3f182c0eaacef1ccdaf5a6c83bae406e52484ed260ac0ddcc987b4271e5efbcd6e424ecd36a12137539f18b50365ae134eae4956bc99 SHA512 0ee228ce842d912be7b808ba7c4749d931f370914915e6dcc7702eb77c366a561af169ebe6b22657ebebdd1b7dcf3b40760f99099445cc2428589f1243583a69 +EBUILD libpcap-1.9.0-r1.ebuild 1850 BLAKE2B b58af5a4955c4476724d65f45c4adc44fb950cc327e282d6fb0cf4cb081624f7cbf5f931c557a6b14aaa9b0c992267031f7cb116b80fa0981450ba689d24ae12 SHA512 259c29e531b016747fb9b2ca02782c6e484068bb45b573adf6c4c878f10f056b859db669c63e9cff9ed141aed8e8401ea173452e9b03e424a58dff18e7133e10 EBUILD libpcap-1.9.0.ebuild 1807 BLAKE2B ef1334b7356fe43b302f8526e70b8c244824ccd60b9e3825484f56f4d46a2f76d23dfac18d7f1c36aebfbba097252e6c27e8f706049cbe0b3c1985a8e938025a SHA512 31f6a00350d35015c7cd6de63715d0e5fcdb86be2aa81067d201c2a9b00196e0d23736969b1a1df7c915fffbbe9e524e57d35f1550ecb644f93659c728fe6116 -EBUILD libpcap-9999.ebuild 1501 BLAKE2B e700c6d566c7281c6f3718453edb5134354d2543bd75ac58cd72322b6286ef048e145ee55587bc9af671c9cea9c7ace892e108ab1585d98d3263de4120c7f437 SHA512 c7a059189411599db2b02e4c44abeba54e03f681918b79c9022ed12e5a9b9c792b6d25f20d6b0ddc740d912bfa82ab973dabb7dff42f53cfd454261379bc415d +EBUILD libpcap-9999.ebuild 1510 BLAKE2B ca653872343d7f710dcf2ebfcf0a85f40fd82392cb030ba6ea0d1b01be98dfb132c748e7baf55c4556300634ee08836886f507b642b5172f6c3ba7ead3e84361 SHA512 472ada950b336389d86c12ef428636702e009a8a0e7fe63ecd0f3eb497a669b97e145b5cd91a4c3e04f1c803470a313502be2f89d400747c91fbc9023c9fcb8f MISC metadata.xml 475 BLAKE2B a914e052c15c557f921c504f0cf128704ed8854bd8107dd2019a5584dd86f80ad06545ef8780e01447c309801207e2f83e286a90ad755ddebd7447d27bba1336 SHA512 ff92cbd5725e74f72d117b57d85858851ddf3b27046bf7d5b9e29cac8e07c98bb21e2a81ff8ffcec08adb062a42deb051019d60911a8b86ecd232a37e1b88170 diff --git a/net-libs/libpcap/files/libpcap-1.9.0-os.patch b/net-libs/libpcap/files/libpcap-1.9.0-os.patch new file mode 100644 index 000000000000..d3ec8014084f --- /dev/null +++ b/net-libs/libpcap/files/libpcap-1.9.0-os.patch @@ -0,0 +1,33 @@ +--- 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-1.9.0-pcap-config-includedir.patch b/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch new file mode 100644 index 000000000000..cd2c9fe61f2f --- /dev/null +++ b/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch @@ -0,0 +1,36 @@ +--- a/pcap-config.in ++++ b/pcap-config.in +@@ -59,13 +59,13 @@ + # + if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] + then +- echo "-I$includedir -L$libdir -lpcap $LIBS" ++ echo "-L$libdir -lpcap $LIBS" + elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] + then +- echo "-I$includedir -L$libdir $LIBS" ++ echo "-L$libdir $LIBS" + elif [ "$show_cflags" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_libs" = 1 ] + then + echo "-L$libdir -lpcap $LIBS" +@@ -80,13 +80,13 @@ + # + if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] + then +- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME" ++ echo "-L$libdir $RPATH -l$PACKAGE_NAME" + elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_cflags" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_libs" = 1 ] + then + echo "-L$libdir $RPATH -l$PACKAGE_NAME" diff --git a/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch deleted file mode 100644 index 358cb123ff2b..000000000000 --- a/net-libs/libpcap/files/libpcap-9999-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*|haiku*|midipix*) -+ freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*|solaris*) - # - # 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/libpcap-1.9.0-r1.ebuild b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild new file mode 100644 index 000000000000..69742603f3c5 --- /dev/null +++ b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild @@ -0,0 +1,78 @@ +# 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=" + http://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-fbsd ~x86-fbsd ~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-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild index 45652829cdd0..3e6c9db1d115 100644 --- a/net-libs/libpcap/libpcap-9999.ebuild +++ b/net-libs/libpcap/libpcap-9999.ebuild @@ -30,8 +30,8 @@ DEPEND=" " PATCHES=( + "${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch "${FILESDIR}"/${PN}-9999-prefix-darwin.patch - "${FILESDIR}"/${PN}-9999-prefix-solaris.patch ) src_prepare() { -- cgit v1.2.3