net-libs/libpcap: Sync with Gentoo

It's from Gentoo commit f7a0467760358bdf4042b0a162dd61f880ff1b90.
This commit is contained in:
Flatcar Buildbot 2023-01-02 07:56:56 +00:00 committed by Krzesimir Nowak
parent 0ab90ae41c
commit aa627d7f4a
4 changed files with 120 additions and 18 deletions

View File

@ -1,2 +1,4 @@
DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171 DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171
DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d
DIST libpcap-1.10.2.tar.gz 951063 BLAKE2B f8280c8e12065b4d86e451df8504c834da9c94b25029f0e5c22359d0ce35cf4e3490fa3343d0112209600ea01ffa54249c82c20e2859515884daee759e4a5e9b SHA512 ccacebf367db44ab74e588f88a4fd7cd82c58e478e6c35414ae36df58fb06d85d542597485b1d1393edfaacc2bc5d35578b7b87fee4965f6dfde10a03d2ddd32
DIST libpcap-1.10.2.tar.gz.sig 442 BLAKE2B c470ff70e58c13dfd1a6d72a00d83883515b9ca63e1561b3acbb75d744b043726df9b8dcb70dfa5ea1c0fa54624a407364d85e83fd3ec4dfd605aa401f5351df SHA512 122bf14c2525a05b2781f6d7bc029d73bcf4584c184220b9f9716def327cc0521ec78d658ad58bdf8a9cd9415ab9ad4d1d24ed1880db25ace6a01a93786bcc5e

View File

@ -38,8 +38,8 @@ RDEPEND="
" "
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
BDEPEND=" BDEPEND="
sys-devel/flex
app-alternatives/yacc app-alternatives/yacc
sys-devel/flex
dbus? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig )
" "
@ -70,8 +70,10 @@ src_prepare() {
} }
multilib_src_configure() { multilib_src_configure() {
ECONF_SOURCE="${S}" \ # bug #884275
econf \ export LEX=flex
ECONF_SOURCE="${S}" econf \
$(use_enable bluetooth) \ $(use_enable bluetooth) \
$(use_enable dbus) \ $(use_enable dbus) \
$(use_enable rdma) \ $(use_enable rdma) \

View File

@ -0,0 +1,97 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
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"
if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
inherit git-r3
else
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
inherit verify-sig
SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="BSD"
SLOT="0"
IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
RESTRICT="!test? ( test )"
RDEPEND="
bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
rdma? ( sys-cluster/rdma-core )
usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}"
BDEPEND="
app-alternatives/yacc
sys-devel/flex
dbus? ( virtual/pkgconfig )
"
if [[ ${PV} != *9999* ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
fi
src_prepare() {
default
if ! [[ -f VERSION ]]; then
echo ${PV} > VERSION || die
fi
eautoreconf
}
multilib_src_configure() {
# bug #884275
export LEX=flex
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
use test && emake testprogs
}
multilib_src_test() {
testprogs/findalldevstest || die
}
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
}

View File

@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors # Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=8
inherit autotools multilib-minimal inherit autotools multilib-minimal
@ -15,17 +15,16 @@ else
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
inherit verify-sig inherit verify-sig
# Note: drop -upstream on bump, this is just because we switched to the official SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
# distfiles for verify-sig SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
fi fi
LICENSE="BSD" LICENSE="BSD"
SLOT="0" SLOT="0"
IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug" IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
RESTRICT="!test? ( test )"
RDEPEND=" RDEPEND="
bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
@ -37,8 +36,8 @@ RDEPEND="
" "
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
BDEPEND=" BDEPEND="
sys-devel/flex
app-alternatives/yacc app-alternatives/yacc
sys-devel/flex
dbus? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig )
" "
@ -46,11 +45,6 @@ if [[ ${PV} != *9999* ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
fi fi
PATCHES=(
"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
"${FILESDIR}"/${PN}-1.10.1-pcap-config.patch
)
src_prepare() { src_prepare() {
default default
@ -62,8 +56,10 @@ src_prepare() {
} }
multilib_src_configure() { multilib_src_configure() {
ECONF_SOURCE="${S}" \ # bug #884275
econf \ export LEX=flex
ECONF_SOURCE="${S}" econf \
$(use_enable bluetooth) \ $(use_enable bluetooth) \
$(use_enable dbus) \ $(use_enable dbus) \
$(use_enable rdma) \ $(use_enable rdma) \
@ -76,6 +72,11 @@ multilib_src_configure() {
multilib_src_compile() { multilib_src_compile() {
emake all shared emake all shared
use test && emake testprogs
}
multilib_src_test() {
testprogs/findalldevstest || die
} }
multilib_src_install_all() { multilib_src_install_all() {