commit: 18687fccebb05fee5dbbab6308e26a205fcec718 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jun 5 06:44:12 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 5 06:44:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18687fcc
net-libs/libnftnl: backport symbol export fix Signed-off-by: Sam James <sam <AT> gentoo.org> .../libnftnl-1.2.1-missing-export-set_elem.patch | 21 +++++++++++++++++++++ ...ibnftnl-9999.ebuild => libnftnl-1.2.1-r1.ebuild} | 21 ++++++++++++++------- net-libs/libnftnl/libnftnl-9999.ebuild | 21 ++++++++++++++------- 3 files changed, 49 insertions(+), 14 deletions(-) diff --git a/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch b/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch new file mode 100644 index 000000000000..0ff574ddc48a --- /dev/null +++ b/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch @@ -0,0 +1,21 @@ +https://git.netfilter.org/libnftnl/commit/?id=accee9a75e0e6678863d092d6a4f4afbadf0eed9 + +From: Pablo Neira Ayuso <[email protected]> +Date: Wed, 18 May 2022 23:54:03 +0200 +Subject: set_elem: missing export symbol + +nftnl_set_elem_nlmsg_build_payload() is already available through .map +file and headers, add missing EXPORT_SYMBOL. + +Signed-off-by: Pablo Neira Ayuso <[email protected]> +--- a/src/set_elem.c ++++ b/src/set_elem.c +@@ -300,6 +300,7 @@ err: + return NULL; + } + ++EXPORT_SYMBOL(nftnl_set_elem_nlmsg_build_payload); + void nftnl_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh, + struct nftnl_set_elem *e) + { +cgit v1.2.3 diff --git a/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-1.2.1-r1.ebuild similarity index 79% copy from net-libs/libnftnl/libnftnl-9999.ebuild copy to net-libs/libnftnl/libnftnl-1.2.1-r1.ebuild index 215d4c569086..49e48df43765 100644 --- a/net-libs/libnftnl/libnftnl-9999.ebuild +++ b/net-libs/libnftnl/libnftnl-1.2.1-r1.ebuild @@ -3,33 +3,36 @@ EAPI=7 -inherit autotools linux-info usr-ldscript verify-sig +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 verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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" +BDEPEND+=" virtual/pkgconfig" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-missing-export-set_elem.patch +) + pkg_setup() { if kernel_is ge 3 13; then CONFIG_CHECK="~NF_TABLES" @@ -41,6 +44,7 @@ pkg_setup() { src_prepare() { default + [[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf } @@ -48,12 +52,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/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-9999.ebuild index 215d4c569086..49e48df43765 100644 --- a/net-libs/libnftnl/libnftnl-9999.ebuild +++ b/net-libs/libnftnl/libnftnl-9999.ebuild @@ -3,33 +3,36 @@ EAPI=7 -inherit autotools linux-info usr-ldscript verify-sig +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 verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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" +BDEPEND+=" virtual/pkgconfig" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-missing-export-set_elem.patch +) + pkg_setup() { if kernel_is ge 3 13; then CONFIG_CHECK="~NF_TABLES" @@ -41,6 +44,7 @@ pkg_setup() { src_prepare() { default + [[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf } @@ -48,12 +52,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
