From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- net-libs/libnftnl/Manifest | 3 +- .../libnftnl-1.1.5-fix-nft-flowtable-test.patch | 40 ++++++++++++++++++++++ net-libs/libnftnl/libnftnl-1.1.5.ebuild | 6 ++-- 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch (limited to 'net-libs/libnftnl') diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest index 78bd9af08a91..b43ba28042bd 100644 --- a/net-libs/libnftnl/Manifest +++ b/net-libs/libnftnl/Manifest @@ -1,7 +1,8 @@ +AUX libnftnl-1.1.5-fix-nft-flowtable-test.patch 1537 BLAKE2B 40a0d66fa2f391f4cf19de8d163ebee399338ba650cacf3d1ae35bd2942b1e14c9bf49d81184a0730cbd10fc5f08f0eb587da73aaf7734daf8904adfe6ea85e0 SHA512 6b3aabc393906c9c54d5c8ea2a6308793065494bd7d88fd1157070dc8a4b2d9232efc0a6bfdc957fc758a350d27327895dedb759e07457a8603d3d36aa69be7b DIST libnftnl-1.1.3.tar.bz2 366521 BLAKE2B 9a46a46b68fd6d3e0ffc3d28713ee9a70017dd4d05763a49a655f172ae77928d9b54554e7609851f3a18e9465c53f53c1828311162013bc067493e4e02ff3fb8 SHA512 3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe DIST libnftnl-1.1.4.tar.bz2 368262 BLAKE2B e5f396b582221b9f9a7d3303d65548e3597474b1cedf931728f3105b04a851eeeeff98fd2a49772f29849a9094c2e0cfef7d500050e8f205565e8dfd1ec7a49d SHA512 6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6 DIST libnftnl-1.1.5.tar.bz2 373930 BLAKE2B cfd06084fb7de5dd6120a22faa43ac578f170e5209564579ff26bdf49e2b70b5b3944275861e32fcc7f6f2bb1d9f43bf51157665d0d5faea259e14cf930030c0 SHA512 a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7 EBUILD libnftnl-1.1.3.ebuild 1191 BLAKE2B a95ebfa37d23c20e23d978f2cbb90629c4f0b525134e47106a3cf9c5a80de7b6bc924cdbc76f1b7ba532cc0fde5c56820a25ef36be5c63f235ac301bb6dcfed5 SHA512 d076046e9809dd532d7903b6b55f9958ed98cfe0139f1d11f29d4b4187161923d148b9280ebf3bc03a6505bca46b6d2e3d34c499315f44345e2bad4d4055a364 EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a -EBUILD libnftnl-1.1.5.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a +EBUILD libnftnl-1.1.5.ebuild 1256 BLAKE2B 8855d31b7e2bcc4f987864231f08bee17a440790c05f5d407a9d6ae91faf594912af5ab761e029950c7437a7d617eb29d106494e15214d54495db441b50cb26a SHA512 0ea44c78c770f3d8b1d6416be4b88a0cc55ce1e97ae7262282a9fa461bc36af12d8ff6e9594d5ffaf684ca7ef6a8692ef486781b5c63d54456e104e29e56828c MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch b/net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch new file mode 100644 index 000000000000..312ff16eecbf --- /dev/null +++ b/net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch @@ -0,0 +1,40 @@ +From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Mon, 2 Dec 2019 18:29:56 +0100 +Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE + +Marshalling code around that attribute has been dropped by commit +d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is +lost during the test. + +Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a +later point, leave the test code in place but just comment it out. + +Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") +Signed-off-by: Phil Sutter +Acked-by: Pablo Neira Ayuso +--- + tests/nft-flowtable-test.c | 2 ++ + 1 file changed, 2 insertions(+) + +(limited to 'tests/nft-flowtable-test.c') + +diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c +index 3edb00d..8ab8d4c 100644 +--- a/tests/nft-flowtable-test.c ++++ b/tests/nft-flowtable-test.c +@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE)) + print_err("Flowtable use mismatches"); ++#if 0 + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE)) + print_err("Flowtable size mismatches"); ++#endif + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS)) + print_err("Flowtable flags mismatches"); +-- +cgit v1.2.1 + diff --git a/net-libs/libnftnl/libnftnl-1.1.5.ebuild b/net-libs/libnftnl/libnftnl-1.1.5.ebuild index ce7a01b0ab8a..e9f2995b2868 100644 --- a/net-libs/libnftnl/libnftnl-1.1.5.ebuild +++ b/net-libs/libnftnl/libnftnl-1.1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0/11" # libnftnl.so version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="examples static-libs test" RESTRICT="!test? ( test )" @@ -20,6 +20,8 @@ RDEPEND=">=net-libs/libmnl-1.0.3" BDEPEND="virtual/pkgconfig" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${P}-fix-nft-flowtable-test.patch ) + pkg_setup() { if kernel_is ge 3 13; then CONFIG_CHECK="~NF_TABLES" -- cgit v1.2.3