public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libnftnl/files/, net-libs/libnftnl/
@ 2019-07-29  1:51 Matt Turner
  0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2019-07-29  1:51 UTC (permalink / raw
  To: gentoo-commits

commit:     97a998ad91cba6d39851ce87b81a9fc630197202
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 01:47:41 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 01:51:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a998ad

net-libs/libnftnl: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/libnftnl/Manifest                         |  3 -
 .../files/libnftnl-1.1.1-big-endian-1.patch        | 93 ----------------------
 .../files/libnftnl-1.1.1-big-endian-2.patch        | 37 ---------
 .../files/libnftnl-1.1.1-big-endian-3.patch        | 33 --------
 net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild         | 61 --------------
 net-libs/libnftnl/libnftnl-1.1.1-r1.ebuild         | 67 ----------------
 net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild         | 47 -----------
 7 files changed, 341 deletions(-)

diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 623f9d82ae7..e14496a52c5 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,4 +1 @@
-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

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 e91333e21bb..00000000000
--- 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 c6fb5a25a89..00000000000
--- 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 d726ccfdc2d..00000000000
--- 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 469321c67eb..00000000000
--- 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 e6bf90ec6c4..00000000000
--- 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 b1708f1cde2..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libnftnl/files/, net-libs/libnftnl/
@ 2020-01-09 21:46 Thomas Deutschmann
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2020-01-09 21:46 UTC (permalink / raw
  To: gentoo-commits

commit:     c2daf278fd2012f5470e527979434180e3bf0c6a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 21:46:04 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 21:46:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2daf278

net-libs/libnftnl: fix nft-flowtable-test

Closes: https://bugs.gentoo.org/702204
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../libnftnl-1.1.5-fix-nft-flowtable-test.patch    | 40 ++++++++++++++++++++++
 net-libs/libnftnl/libnftnl-1.1.5.ebuild            |  2 ++
 2 files changed, 42 insertions(+)

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 00000000000..312ff16eecb
--- /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 <phil@nwl.cc>
+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 <phil@nwl.cc>
+Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ 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 9d15d542e45..176587558f1 100644
--- a/net-libs/libnftnl/libnftnl-1.1.5.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
@@ -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"


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libnftnl/files/, net-libs/libnftnl/
@ 2021-01-16 23:36 Lars Wendler
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2021-01-16 23:36 UTC (permalink / raw
  To: gentoo-commits

commit:     735670aa895065f217b9b26ee03001198ad21877
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 23:33:03 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 23:36:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735670aa

net-libs/libnftnl: Removed old

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-libs/libnftnl/Manifest                         |  4 --
 .../libnftnl-1.1.5-fix-nft-flowtable-test.patch    | 40 -----------------
 net-libs/libnftnl/libnftnl-1.1.3.ebuild            | 49 ---------------------
 net-libs/libnftnl/libnftnl-1.1.4.ebuild            | 49 ---------------------
 net-libs/libnftnl/libnftnl-1.1.5.ebuild            | 51 ----------------------
 net-libs/libnftnl/libnftnl-1.1.6.ebuild            | 49 ---------------------
 6 files changed, 242 deletions(-)

diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index c502d4bea6d..5e1bfb9cfb3 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,7 +1,3 @@
-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
-DIST libnftnl-1.1.6.tar.bz2 376340 BLAKE2B b5ca243af71462f7c91cae3f368bca7ba19151f5e14bdc459efc136cbf1d6f0234a097337dcee2a2e733a173c72c71496f34222dbd217e79b2a5b614315e6b30 SHA512 3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d
 DIST libnftnl-1.1.7.tar.bz2 387829 BLAKE2B e21ca38edbc7c651a061fcd6db80278ba99b4fe0c92c1912039fd0a1cd4b7636c87e17f538eaad8c6b963748c7c77800eaa83ddb80d344865504329984ac9c96 SHA512 80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407
 DIST libnftnl-1.1.8.tar.bz2 389632 BLAKE2B 5668bc3839abb99b44d2eecfa4fe391d1669b31d5f653f859ef2ae80ed355252bff20bc74773ec68024e0bf9e93c8993765b84e8d562fc2b2b1f7e3f5d3fed91 SHA512 173d8a7b95eb964a9fbe7ffcb46541a6bae976b4d4f2a28fbf9b03bf3e50a29b1ea12faa49926d2d33bc088580a833fc6e15ff59a30bcfe67c91c524f00c778e
 DIST libnftnl-1.1.9.tar.bz2 389639 BLAKE2B 230a78cc350910735c622f4996a217490ee2384a0f6809784aa3ba0de484f540ea83d8cb72933c05961103ba20339b3eae3e866135a222b6f96df0ef01ac8066 SHA512 8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25

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
deleted file mode 100644
index 312ff16eecb..00000000000
--- a/net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-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 <phil@nwl.cc>
-Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- 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.3.ebuild b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
deleted file mode 100644
index aa66c6d45c6..00000000000
--- a/net-libs/libnftnl/libnftnl-1.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libmnl-1.0.3"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${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 "${ED}" -type f -name '*.la' -delete || die
-
-	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.4.ebuild b/net-libs/libnftnl/libnftnl-1.1.4.ebuild
deleted file mode 100644
index ce7a01b0ab8..00000000000
--- a/net-libs/libnftnl/libnftnl-1.1.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libmnl-1.0.3"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${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 "${ED}" -type f -name '*.la' -delete || die
-
-	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.5.ebuild b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
deleted file mode 100644
index f3d8044e0da..00000000000
--- a/net-libs/libnftnl/libnftnl-1.1.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-RESTRICT="!test? ( test )"
-
-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"
-		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 "${ED}" -type f -name '*.la' -delete || die
-
-	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.6.ebuild b/net-libs/libnftnl/libnftnl-1.1.6.ebuild
deleted file mode 100644
index 06a2c10c99b..00000000000
--- a/net-libs/libnftnl/libnftnl-1.1.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libmnl-1.0.3"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${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 "${ED}" -type f -name '*.la' -delete || die
-
-	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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libnftnl/files/, net-libs/libnftnl/
@ 2022-06-05  6:56 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-06-05  6:56 UTC (permalink / raw
  To: gentoo-commits

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 <pablo@netfilter.org>
+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 <pablo@netfilter.org>
+--- 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-05  6:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-16 23:36 [gentoo-commits] repo/gentoo:master commit in: net-libs/libnftnl/files/, net-libs/libnftnl/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2022-06-05  6:56 Sam James
2020-01-09 21:46 Thomas Deutschmann
2019-07-29  1:51 Matt Turner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox