gentoo resync : 02.08.2019

9 files changed, 3 insertions, 353 deletions

diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 4be2cd44ab0d..2176c5569ea7 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,12 +1,3 @@
-AUX libnftnl-1.1.1-big-endian-1.patch 2069 BLAKE2B de0c7ac336dc01d25eb8f2a8ff837e35f9f95275ec1e0b1f32b113a1d2717e98d6281e3034a60a52b2f38e7b120f30dbba9137e330fe715793511ab3025843b0 SHA512 70cca0769923efc99f204608b59712862608e94d4030a1f16c5d8141896fb91c3e458054fd8e7b069014fe3279d209a7b5e7da996633e12781a28f224f0e9cf4
-AUX libnftnl-1.1.1-big-endian-2.patch 1383 BLAKE2B cae500d1ebdde1dd1d7dc7b572ab0a5b30f775b1c9b874ec889ef1bccb2981795e69107268b9ab67aad17864d648ce2c63e29ab54596dbf11072631fa868f44c SHA512 9cae1b05c3b3794219609c95ad547a51ec2249b2457531eb6be1450f0c17a5c4a91ce8b2d3694490e986dba1b587b2df8dcf4f014f6704bef7250f8ec2bfac69
-AUX libnftnl-1.1.1-big-endian-3.patch 1179 BLAKE2B 8ca66b878b2ddbe73aa361b3886e033662d585c5a6d35dfd693877b9f706cbfeec689272f8f43ea41bed77a908e69873f946f967d76bdae0fd45be6992f93b64 SHA512 c1249763339cb633ceb556d97c483f437d6fcc095253df076e46ff3c7c613455ea8296abca53656ad7fea14c7903373c115bb7344abb11acc17b67c67db4bf57
-DIST libnftnl-1.0.8.tar.bz2 400496 BLAKE2B d2563f707ceb40b8cd7c4b4fdede64943fabcc8a639eb61c844f7b941786a49b1c029e375977759717e5cb8f8dc2019ddcbf48223347f868713d1a077d51d8a8 SHA512 df9f5967908ce5e6a6a85fe4328bdf6e7501ce6b0e42239b750782aeb76c30b1aae80dd07f73a06fb077d072b1269c4e0c5fd525feed1055400201567d215ef9
-DIST libnftnl-1.1.1.tar.bz2 372562 BLAKE2B 9dee45bb485399c4677f636c8aa065a7e4e80102f17beb4aa066278a6ef753e7c1aaf02c6a853edc70f018ebef5e8389a05ca384116ec06761f0a29e278f4e54 SHA512 87f092e2b6576121538c8ac7ce92d8c918723e36dd02e2fcfcb7dcaf2ae705bbcd62c79c9076574ef73f461f7df5d10e72bcaeda29e4a7e60ea1401d998424a6
-DIST libnftnl-1.1.2.tar.bz2 366014 BLAKE2B c9170b9a948b949e443fcbbc0b795095a8e51b0cb77e5ba23853fe8c3005baa476afd5d7fa4d7bfcb733b912f0ecb868d22aa2b4c88dbf68e7b56e1a5b23c1db SHA512 808e0efd2ff32a65cca1e6113cc29aece1335364b94ad87438d19b0887d0bd34de11942fa411e4105ef153f2cce862ded17ebc441c413b839ac506471e530569
 DIST libnftnl-1.1.3.tar.bz2 366521 BLAKE2B 9a46a46b68fd6d3e0ffc3d28713ee9a70017dd4d05763a49a655f172ae77928d9b54554e7609851f3a18e9465c53f53c1828311162013bc067493e4e02ff3fb8 SHA512 3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe
-EBUILD libnftnl-1.0.8-r1.ebuild 1377 BLAKE2B e190c94cf83463237be825f2419d1597270d3dc712554ea15482471c6b117b2c5baa1012b27bda2c663da9c558289b53c144baedf055b1259aafa246bd62272e SHA512 e8da2ffced3cd834ab8a28d711493c018fd2e1102f0d36ec7a83955b457cccbacf9f38bf8cfacffe0bac133491045918c3452b643084a896e1e4dd296fa25b30
-EBUILD libnftnl-1.1.1-r1.ebuild 1508 BLAKE2B eb4514ffe545e8c94fcdafd5d63c1c54268c953655d7d6f61ffcc09a950030b0278f1ff7913c888f124af96139457abe7060e5e0c46fd09e3fffa740047ed704 SHA512 4cb3acc19da3de2a2e9035c105327b1b4d5c4e517fc65557a50418d4ee43f19c46c1f7f57a80459dfed9201303234690d692e3dbe7c5e85a1ed1b2e18fc78649
-EBUILD libnftnl-1.1.2-r1.ebuild 1182 BLAKE2B 0bdb1c075c1a79d3e7df690c26a7e5ac361807e32324e15ac316bed4f04ed82f4525b694c31c402b9f7da6d6155b82d6b2929071eb1cae263989d66fb21e8227 SHA512 da9db5505ddf227c70fde149faba980dcc300c2de0f8795db672938a4776cc5ab7ce6a01007e139b2aaa3d1be39c3c49ef6b2051f10721bd510cff1ec308abd2
-EBUILD libnftnl-1.1.3.ebuild 1166 BLAKE2B 7df3cdf25be2ba9ee17624afcaf55391b3f44e22a4cc6d6861a31f0a7ebe93308fd1f27b5312ec58439639b2d53e6fe4d3fe6e1287961b62c3149fbfb9126e05 SHA512 984843aa0c0cbc5b5e332ea7c0a791051929ca8b4062784ddf64b4ac131844c019dcfc008080f10b6c2e959f244cb88051bb461cc5848f6bc2096240bf06f024
-MISC metadata.xml 317 BLAKE2B ec8bdc87d1d0694e81566b611db8e455e851b86a2403ca8ac0c36f774f23b89fb9ee4e55dbc818efba807aec0487dd1956f2fb17393b327500dbe69118d5030b SHA512 bfdf498de4ccd1d1a4f78c7e94a90b2bf203e16b8ddec5949bb88c953279026f95da956ef94b39140d44bbcd8cb4008f9f4b777fd895576da8414051c4487beb
+EBUILD libnftnl-1.1.3.ebuild 1164 BLAKE2B dc02a9509e9ccafa71367c221dadf10fd26b60110fe8eb86ea8f635f52ebcd12631fe875641be64707112a7ab59d43be15f55bb9c2e8578e216bd1478dd20022 SHA512 9b243c291ff51787ec8216701a5ec035fc08f0fb9691c2f2388d86fc539589a37ce52f73b6c5b2c9cd14cd02bc135dd44c96d13ecddbb7f7a7dd6ca6876e0d6f
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-1.patch b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-1.patch
deleted file mode 100644
index e91333e21bb0..000000000000
--- a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-1.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 9737856067b97cbb869e04fc6b6e65c1d859f521 Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-Date: Fri, 22 Jun 2018 14:18:57 +0200
-Subject: utils: Fix nftnl_get_value() on big endian
-
-This function basically did:
-
-| memcpy(out, val, <len of requested type>);
-
-which works only for little endian integer types. Fix this by assigning
-the 64bit input value to a variable of the right size and use that as
-input for above memcpy() call.
-
-Signed-off-by: Phil Sutter <phil@nwl.cc>
----
- src/utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 42 insertions(+), 2 deletions(-)
-
-diff --git a/src/utils.c b/src/utils.c
-index 3e44960..4d9ee78 100644
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -72,6 +72,15 @@ static struct {
- 
- int nftnl_get_value(enum nftnl_type type, void *val, void *out)
- {
-+	union {
-+		uint8_t u8;
-+		uint16_t u16;
-+		uint32_t u32;
-+		int8_t s8;
-+		int16_t s16;
-+		int32_t s32;
-+	} values;
-+	void *valuep = NULL;
- 	int64_t sval;
- 	uint64_t uval;
- 
-@@ -85,7 +94,6 @@ int nftnl_get_value(enum nftnl_type type, void *val, void *out)
- 			errno = ERANGE;
- 			return -1;
- 		}
--		memcpy(out, &uval, basetype[type].len);
- 		break;
- 	case NFTNL_TYPE_S8:
- 	case NFTNL_TYPE_S16:
-@@ -97,10 +105,42 @@ int nftnl_get_value(enum nftnl_type type, void *val, void *out)
- 			errno = ERANGE;
- 			return -1;
- 		}
--		memcpy(out, &sval, basetype[type].len);
- 		break;
- 	}
- 
-+	switch (type) {
-+	case NFTNL_TYPE_U8:
-+		values.u8 = uval;
-+		valuep = &values.u8;
-+		break;
-+	case NFTNL_TYPE_U16:
-+		values.u16 = uval;
-+		valuep = &values.u16;
-+		break;
-+	case NFTNL_TYPE_U32:
-+		values.u32 = uval;
-+		valuep = &values.u32;
-+		break;
-+	case NFTNL_TYPE_U64:
-+		valuep = &uval;
-+		break;
-+	case NFTNL_TYPE_S8:
-+		values.s8 = sval;
-+		valuep = &values.s8;
-+		break;
-+	case NFTNL_TYPE_S16:
-+		values.s16 = sval;
-+		valuep = &values.s16;
-+		break;
-+	case NFTNL_TYPE_S32:
-+		values.s32 = sval;
-+		valuep = &values.s32;
-+		break;
-+	case NFTNL_TYPE_S64:
-+		valuep = &sval;
-+		break;
-+	}
-+	memcpy(out, valuep, basetype[type].len);
- 	return 0;
- }
- 
--- 
-cgit v1.2.1
-
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-2.patch b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-2.patch
deleted file mode 100644
index c6fb5a25a893..000000000000
--- a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5d592ce6c4596b25d5779a224d03c096bc25db54 Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-Date: Fri, 22 Jun 2018 14:18:58 +0200
-Subject: expr/data_reg: Fix JSON parsing on big endian
-
-Since reg->len is a 32bit variable, one needs to pass NFTNL_TYPE_U32 to
-nftnl_jansson_parse_val(). Otherwise, only the most significant byte in
-that variable is being written to.
-
-Since the value could potentially be larger than 255, increase node_name
-buffer to avoid a compiler warning.
-
-Signed-off-by: Phil Sutter <phil@nwl.cc>
----
- src/expr/data_reg.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
-index 1b28b29..ad7f4cb 100644
---- a/src/expr/data_reg.c
-+++ b/src/expr/data_reg.c
-@@ -59,10 +59,10 @@ static int nftnl_data_reg_verdict_json_parse(union nftnl_data_reg *reg, json_t *
- static int nftnl_data_reg_value_json_parse(union nftnl_data_reg *reg, json_t *data,
- 					 struct nftnl_parse_err *err)
- {
--	char node_name[8] = {};	/* strlen("data256") + 1 == 8 */
-+	char node_name[32] = {};
- 	int ret, remain = sizeof(node_name), offset = 0, i;
- 
--	if (nftnl_jansson_parse_val(data, "len", NFTNL_TYPE_U8, &reg->len, err) < 0)
-+	if (nftnl_jansson_parse_val(data, "len", NFTNL_TYPE_U32, &reg->len, err) < 0)
- 			return DATA_NONE;
- 
- 	for (i = 0; i < div_round_up(reg->len, sizeof(uint32_t)); i++) {
--- 
-cgit v1.2.1
-
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-3.patch b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-3.patch
deleted file mode 100644
index d726ccfdc2d9..000000000000
--- a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 043060b18d27f24fe723e39bc2c9e5f50dde60dd Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-Date: Fri, 22 Jun 2018 14:18:59 +0200
-Subject: expr/exthdr: Fix JSON parsing on big endian
-
-When setting NFTNL_EXPR_EXTHDR_TYPE, one needs to call
-nftnl_expr_set_u8() and not nftnl_expr_set_u32(). Otherwise 'type'
-variable is assigned to uint32_t parameter before being passed to
-nftnl_expr_exthdr_set() as void pointer which casts it to uint8_t.
-On big endian systems, the latter would only consider the most
-significant byte instead of the least significant one.
-
-Signed-off-by: Phil Sutter <phil@nwl.cc>
----
- src/expr/exthdr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
-index 75cafbc..a351835 100644
---- a/src/expr/exthdr.c
-+++ b/src/expr/exthdr.c
-@@ -270,7 +270,7 @@ nftnl_expr_exthdr_json_parse(struct nftnl_expr *e, json_t *root,
- 		type = str2exthdr_type(exthdr_type);
- 		if (type < 0)
- 			return -1;
--		nftnl_expr_set_u32(e, NFTNL_EXPR_EXTHDR_TYPE, type);
-+		nftnl_expr_set_u8(e, NFTNL_EXPR_EXTHDR_TYPE, type);
- 	}
- 
- 	if (nftnl_jansson_parse_val(root, "offset", NFTNL_TYPE_U32, &uval32,
--- 
-cgit v1.2.1
-
diff --git a/net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild b/net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild
deleted file mode 100644
index 469321c67eb3..000000000000
--- a/net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info toolchain-funcs usr-ldscript
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0/7" # libnftnl.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~ppc ~ppc64 x86"
-IUSE="examples json static-libs test threads"
-
-RDEPEND=">=net-libs/libmnl-1.0.0
-	json? ( >=dev-libs/jansson-2.3 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-REQUIRED_USE="test? ( json )"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with json json-parsing)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	cd tests || die
-	./test-script.sh || die
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.1.1-r1.ebuild b/net-libs/libnftnl/libnftnl-1.1.1-r1.ebuild
deleted file mode 100644
index e6bf90ec6c46..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info toolchain-funcs usr-ldscript
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0/7" # libnftnl.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~x86"
-IUSE="examples json static-libs test"
-
-RDEPEND=">=net-libs/libmnl-1.0.3
-	json? ( >=dev-libs/jansson-2.3 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-REQUIRED_USE="test? ( json )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-big-endian-1.patch
-	"${FILESDIR}"/${P}-big-endian-2.patch
-	"${FILESDIR}"/${P}-big-endian-3.patch
-)
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with json json-parsing)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	cd tests || die
-	./test-script.sh || die
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild b/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild
deleted file mode 100644
index b1708f1cde2b..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info toolchain-funcs usr-ldscript
-
-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"
-
-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"
-
-RDEPEND=">=net-libs/libmnl-1.0.3"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.1.3.ebuild b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
index ac6405559337..0be1b2401e8a 100644
--- a/net-libs/libnftnl/libnftnl-1.1.3.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
@@ -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"
 
 RDEPEND=">=net-libs/libmnl-1.0.3"
diff --git a/net-libs/libnftnl/metadata.xml b/net-libs/libnftnl/metadata.xml
index cdf9238d83cd..56c124413057 100644
--- a/net-libs/libnftnl/metadata.xml
+++ b/net-libs/libnftnl/metadata.xml
@@ -5,7 +5,4 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
-<use>
-	<flag name="json">Supports parsing of JSON</flag>
-</use>
 </pkgmetadata>