From ea7d0590f81cc8b29aa0f4f7864227b4ebfd6dc2 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 10 May 2023 17:06:58 +0200 Subject: [PATCH] net-libs/libnftnl: Sync with Gentoo It's from Gentoo commit a467d215a6b4c87e6bc5d6db891db78e6811cea2. --- .../portage-stable/net-libs/libnftnl/Manifest | 6 ++- ...-1.2.0-r1.ebuild => libnftnl-1.2.4.ebuild} | 29 ++++++++++---- ...-1.1.9-r1.ebuild => libnftnl-1.2.5.ebuild} | 40 +++++++++++++++---- .../net-libs/libnftnl/libnftnl-9999.ebuild | 31 +++++++++----- .../net-libs/libnftnl/metadata.xml | 2 +- 5 files changed, 80 insertions(+), 28 deletions(-) rename sdk_container/src/third_party/portage-stable/net-libs/libnftnl/{libnftnl-1.2.0-r1.ebuild => libnftnl-1.2.4.ebuild} (65%) rename sdk_container/src/third_party/portage-stable/net-libs/libnftnl/{libnftnl-1.1.9-r1.ebuild => libnftnl-1.2.5.ebuild} (54%) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/Manifest index 8f5b9f2156..65ce619400 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/Manifest @@ -1,2 +1,4 @@ -DIST libnftnl-1.1.9.tar.bz2 389639 BLAKE2B 230a78cc350910735c622f4996a217490ee2384a0f6809784aa3ba0de484f540ea83d8cb72933c05961103ba20339b3eae3e866135a222b6f96df0ef01ac8066 SHA512 8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25 -DIST libnftnl-1.2.0.tar.bz2 388751 BLAKE2B 6f61e7af8e50577029b1cf5ba7260f3803a64c410c7d35be8bbf3b6f9445d9db3be367442f56fb81f3ed49bc3efeab8dd2ed51bab4a1e4427f552d48e4bb559a SHA512 2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380 +DIST libnftnl-1.2.4.tar.bz2 395444 BLAKE2B 43a89fd2f7d9fd77e59423b599fe209c821da660669c7fe3c569ac262b78cfe1942ab9fd597bf09a0c93b7d1ff465ca79bd925967be93333a11468845ef785fd SHA512 5375d1d15627aabf25129433630395f53009b22a255fcd113b302af7f2f0a234fd54c827b0ef1c8fd3a13e272a1696f780560672d4af6abad0e19805f9d56326 +DIST libnftnl-1.2.4.tar.bz2.sig 566 BLAKE2B f7598f5ed56cf101a61358206d1e4e3fe3fa12514d6d6a89a00f4ec853d4473aefbfbedf7ce062160bd6c7578e5a09bfb6a5bf1c2b98f5858a8d9f4f9ce5be38 SHA512 89bb5ea536632518aad62e798868284fe82ba75d2af09b6505d506910aafdbaaed48b84b82fcf4ffb241672e51b696f8e24983636184b9713795c90f281f8683 +DIST libnftnl-1.2.5.tar.xz 335744 BLAKE2B 8ad2b264cce6458dd992dd14197abe224fb5afc14e8d06296dbc917d83724dacaee876191165fe83831e842e45995f9ea874957b02ee19580783a576c2d56ccd SHA512 576ccd0815063a6ef3095b5514c3d286b4450fad98fbf7a85cd537f66adf043e7e6295d4c84cc3cbfd18cf9a29576d15a88cc439a61a3e654841a27c71babea1 +DIST libnftnl-1.2.5.tar.xz.sig 566 BLAKE2B 1e47872354b714781b2ee3d9b375a9fe97a2e97a283d8b88bb7c0ec12cf779cfdfc668dbe64eb4d3bb3afff37bef2e5bc49fed6e3522c869c96c6f344ca18c25 SHA512 ca10b3856d8e690cd5ae763661972c5e4f4be2cca63f8120ad6550ece286078938efabba927070f830fc703cc17d16e8cbc1b4c8564bf888c199ea53c0b6a500 diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.2.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.2.4.ebuild similarity index 65% rename from sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.2.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.2.4.ebuild index 412e1e9f3a..4abbc36e39 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.2.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.2.4.ebuild @@ -1,29 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools linux-info usr-ldscript +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc +inherit linux-info usr-ldscript verify-sig DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem" HOMEPAGE="https://netfilter.org/projects/nftables/" if [[ ${PV} =~ ^[9]{4,}$ ]]; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://git.netfilter.org/${PN}" else - SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" + SRC_URI=" + https://netfilter.org/projects/${PN}/files/${P}.tar.bz2 + verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig ) + " + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" + + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi LICENSE="GPL-2" SLOT="0/11" # libnftnl.so version IUSE="examples static-libs test" - RESTRICT="!test? ( test )" -RDEPEND=">=net-libs/libmnl-1.0.4:=" -BDEPEND="virtual/pkgconfig" +RDEPEND=" + >=net-libs/libmnl-1.0.4:= +" +BDEPEND+=" + virtual/pkgconfig +" DEPEND="${RDEPEND}" pkg_setup() { @@ -37,6 +46,7 @@ pkg_setup() { src_prepare() { default + [[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf } @@ -44,12 +54,15 @@ src_configure() { local myeconfargs=( $(use_enable static-libs static) ) + econf "${myeconfargs[@]}" } src_install() { default + gen_usr_ldscript -a nftnl + find "${ED}" -type f -name '*.la' -delete || die if use examples; then diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.1.9-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.2.5.ebuild similarity index 54% rename from sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.1.9-r1.ebuild rename to sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.2.5.ebuild index 6b04d75ee3..b50a3e600e 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.1.9-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-1.2.5.ebuild @@ -1,23 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-info usr-ldscript +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc +inherit linux-info usr-ldscript verify-sig DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem" HOMEPAGE="https://netfilter.org/projects/nftables/" -SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2" + +if [[ ${PV} =~ ^[9]{4,}$ ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.netfilter.org/${PN}" +else + SRC_URI=" + https://netfilter.org/projects/${PN}/files/${P}.tar.xz + verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.xz.sig ) + " + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" + + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" +fi LICENSE="GPL-2" SLOT="0/11" # libnftnl.so version -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="examples static-libs test" - RESTRICT="!test? ( test )" -RDEPEND=">=net-libs/libmnl-1.0.4:=" -BDEPEND="virtual/pkgconfig" +RDEPEND=" + >=net-libs/libmnl-1.0.4:= +" +BDEPEND+=" + virtual/pkgconfig +" DEPEND="${RDEPEND}" pkg_setup() { @@ -29,16 +44,25 @@ pkg_setup() { fi } +src_prepare() { + default + + [[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf +} + src_configure() { local myeconfargs=( $(use_enable static-libs static) ) + econf "${myeconfargs[@]}" } src_install() { default + gen_usr_ldscript -a nftnl + find "${ED}" -type f -name '*.la' -delete || die if use examples; then diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-9999.ebuild index 75e1ab39a6..2515991d1a 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/libnftnl-9999.ebuild @@ -1,29 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools linux-info usr-ldscript +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc +inherit linux-info usr-ldscript verify-sig DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem" HOMEPAGE="https://netfilter.org/projects/nftables/" if [[ ${PV} =~ ^[9]{4,}$ ]]; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://git.netfilter.org/${PN}" else - SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI=" + https://netfilter.org/projects/${PN}/files/${P}.tar.xz + verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.xz.sig ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi LICENSE="GPL-2" SLOT="0/11" # libnftnl.so version IUSE="examples static-libs test" - RESTRICT="!test? ( test )" -RDEPEND=">=net-libs/libmnl-1.0.4:=" -BDEPEND="virtual/pkgconfig" +RDEPEND=" + >=net-libs/libmnl-1.0.4:= +" +BDEPEND+=" + virtual/pkgconfig +" DEPEND="${RDEPEND}" pkg_setup() { @@ -37,6 +46,7 @@ pkg_setup() { src_prepare() { default + [[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf } @@ -44,12 +54,15 @@ src_configure() { local myeconfargs=( $(use_enable static-libs static) ) + econf "${myeconfargs[@]}" } src_install() { default + gen_usr_ldscript -a nftnl + find "${ED}" -type f -name '*.la' -delete || die if use examples; then diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/metadata.xml b/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/metadata.xml index 56c1244130..73dda144f9 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-libs/libnftnl/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org