gentoo resync : 05.12.2021

4 files changed, 131 insertions, 3 deletions

diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index dae826e43b35..0a0087d43115 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,4 +1,5 @@
 AUX lldpd-1.0.10-glibc-2.33.patch 699 BLAKE2B 55dc33fa9b9e4ca274b8c97f1c84766686e01585797404c2b71aa9f046acf356b8b3c1dd7f8e9f80693204d73b7b69059646ed46320dabd954b97b321e7f43cd SHA512 c1ef0dd52408d64860b813ea79bf64a1587d7c58e1582faf936260e640e2aedbc0c53f1b3d6a18acdfddbce161f50400f97f246a18ecdc22212f93cc97a47cc4
+AUX lldpd-1.0.13-glibc-2.33.patch 1059 BLAKE2B 24f02e0278d3d804d4b2edf76d5bd2f17a6f6663e1e980174622441a19aa0370f5dba0b6a03ee6465fe348e16068a85b0fe1aa357f43d980ad2b5d7247c258ce SHA512 adf9f746958885b50788af72b50596dc8bbc99182a866bb365e61fd601e659c372366cdee63c704ccc10c839f5ce66066bb2fe7bc23368d8f6348a1ddc918425
 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
 AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
@@ -7,11 +8,13 @@ AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c04
 DIST lldpd-1.0.10.tar.gz 1961631 BLAKE2B 06d3b7d659dae0df4b10f3568a6ffa96c8e848863eb5ecb11b046806b4c23afdae084ffcab8b07b93e6a111dea2c24bd2cfc81a7f1c2559a39b3b2ed8f80814f SHA512 6835bfe36cbaffb0e7f0dbc958d234b7a16787bd51d0c5423c7b775d71dc89635ab28c005e2df550c40f4ee76ab461c0c7cb2a09b011878cadaca18153485d8f
 DIST lldpd-1.0.11.tar.gz 1962748 BLAKE2B 13b6efe44a7dd0f9ec681ec5ef96358ca01c500f0238460ce633b59a1506d9caf405baf3ac910be9baa5840f3751b9d9e0bda127c96083f012eb4af75ba7b9e9 SHA512 2433c81d892b8f8f43c4a897eedfde6fff41db8514fc212bd60b71d080b963b12346017f554657d5abe6d0f02256cf49c9f8b82c8e402763ad0a5c53d459ac32
 DIST lldpd-1.0.12.tar.gz 1965028 BLAKE2B 7725d650573d463e267670135fad20717b2fe2ee5f1c5b9f68a68890f6e74e7cac52bcb0aefad68b8bcade9eacd18f6aa783eec4a71e895adc173ddd2a554322 SHA512 893add53c814d904894dd768ea2e412f288bd7767090fb9b5f686ce3fed65a436ed1365039e5d7f8ef8f5ae9206800b087c71515caa16d1d375389dd7558050f
+DIST lldpd-1.0.13.tar.gz 1973988 BLAKE2B ad22d6f19e566886fda1b879e2ac39c59a0cf061e17df404f0cc68504453517a438d1bb0ac2350b7ba3cafb53ae0996deace93918a6af1043aebff5bf3720fad SHA512 b78440622882a822c9114c3617323ac3c8ce759040bb5b8a9f7357ca20e2993ab0130ee9ad85f65d5f38996665d599d70bbb9dd202e2557035e98545a4304aef
 DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69
 DIST lldpd-1.0.9.tar.gz 1961522 BLAKE2B 83a853bb3bde7abd15b4aa167d213d97677db817aba773b152f032b0d0bf299d5cc891c56871182b2f11fc3bfb2d6c88153f32973fdec5844df5c6fc6bc97b8b SHA512 5f5d5abed7fc73efc59932a1f2ee07eedbdca6f82d002221886b4ddf704955aef432acb92084adc72a965fef3e660f3c95b2a1b8892cf05d9616921501e6aae0
 EBUILD lldpd-1.0.10-r1.ebuild 2362 BLAKE2B f4b71aaf10388d9648d542cb7bdf2b39e04e4f4af0be4b89281c4fc1735909da03997c62c8b2523c844a54f4b988b585f9c43fe204e61afe22fcfcc005802997 SHA512 dafbae1310b0eb8b7040136853778e6b78d86f111246727e02c93c85a95e0c157a355fe52e97f744c20d6342db7a3b04ca6c32b9bb30ed3dcd923eaf980200a6
 EBUILD lldpd-1.0.11-r1.ebuild 2360 BLAKE2B 6a1fb9c77f31d6324d19c194372fff28a2ccac6483e8849199a295930361b1b46670dac8f35ef6a82a4cdc39b5651639f4741da8be00b6d7c02cd313e581c0b4 SHA512 3a64968141e8c2d6959f07a846b9e6f347a4936a6af5e77bb5370ac2786de5fd660781c5f37e4750405f723a73837878151bbbe19ddc4dde74681e91b8b58386
-EBUILD lldpd-1.0.12.ebuild 2362 BLAKE2B f4b71aaf10388d9648d542cb7bdf2b39e04e4f4af0be4b89281c4fc1735909da03997c62c8b2523c844a54f4b988b585f9c43fe204e61afe22fcfcc005802997 SHA512 dafbae1310b0eb8b7040136853778e6b78d86f111246727e02c93c85a95e0c157a355fe52e97f744c20d6342db7a3b04ca6c32b9bb30ed3dcd923eaf980200a6
+EBUILD lldpd-1.0.12-r1.ebuild 2361 BLAKE2B 6b316330ffbea95e188b91f8a154a8f1c01d1809aa6d8ff2f3401437f669091e9475bcb9d0fe778454204ef7f980c8cd493fb2157d8ac5d52044e1e633ae98fa SHA512 7e4a84cbaee7765b208c48e25b4e9953f5ec88765e379fbd07804fd307d9a2269be4736595b8e7a054d9bfbae827616d6aa2119534378668c2508ea622637c3b
+EBUILD lldpd-1.0.13-r1.ebuild 2385 BLAKE2B ca1b95739c82eb9c3e0f86893e976d13458401d29d1e21b7acc9bb50b8a0fb5a669c8d445507832ceef7837680aafc8b0f47e088b9d659f1b56469e2f3e387af SHA512 4b11c554e69bac70b3add782fd8ddb5bab598bbfcada199afc175bba893ce5d68c6d6f13794a4dc969e34899ad044b706c86097cc8f8263ae2289fa0c935c815
 EBUILD lldpd-1.0.7-r1.ebuild 2302 BLAKE2B 9b3336bd039900e932aee6bca5965177fa9bbdb865b818df72c5a6ab4024fc7d8ec37d119bf947f324df94a70c86366acab7640b07f6bedf98eedc34638c112d SHA512 62383e53e503debae1fc6e3ba4534c0e7d9a76bc4b6e94bff9d4aa65c4ba38c78ea116d6584639067fed2c12369a624734882c20880810406ba43b6ec90f5563
 EBUILD lldpd-1.0.9-r1.ebuild 2304 BLAKE2B fcf481e2ecb171fc7d1ff7e1125f56b57d5e45a5470e90968f2cbcbf2d7e09a303139c5c43a7440f918642d1728b7ac05d705e9b3be2366f48d8ac7c4b1f23fa SHA512 57c900810484bcbd1a6274793ef88cfcac332bcdee7ae20b58dab2b66b81a7d1aa45d6e5cc778cc0c72f4b293488f86264e26c8453db03ba05e54bbdb62cc73e
 MISC metadata.xml 2769 BLAKE2B 0e26b610c20744dafbe488e868e76ecb5b8540f1ad519952db8bd9586df14f6ae6ca0af66af443b5846861842351774013d03212b454fb488b2ee0788c2f424a SHA512 dc50bb275f32bae3d4ed6bba7007502c632c07f8f33876c211e52d159a62cc927ff263dae8f00c948e2ce10f88140b1a0fb970201c2cd2604a879147defabe12
diff --git a/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch
new file mode 100644
index 000000000000..68f3592ec9b6
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/827736
+https://github.com/lldpd/lldpd/commit/e57bf5ea66a70ff87bba5c39c0e10c071b4af824
+
+From: Benedikt Neuffer <benedikt.neuffer@kit.edu>
+Date: Sat, 27 Nov 2021 17:07:50 +0100
+Subject: [PATCH] linux: add missing SECCOMP rules
+
+Signed-off-by: Benedikt Neuffer <benedikt.neuffer@kit.edu>
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -176,6 +176,8 @@ priv_seccomp_init(int remote, int child)
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(clock_gettime), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(gettimeofday), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(pread64), 0)) < 0 ||
+ 	    /* The following are for resolving addresses */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||
diff --git a/net-misc/lldpd/lldpd-1.0.12.ebuild b/net-misc/lldpd/lldpd-1.0.12-r1.ebuild
index 2e1925b588b5..7f942ca82105 100644
--- a/net-misc/lldpd/lldpd-1.0.12.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/4.9.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 	seccomp sonmp snmp static-libs test readline xml zsh-completion"
 RESTRICT="!test? ( test )"
@@ -40,7 +40,7 @@ BDEPEND="virtual/pkgconfig
 REQUIRED_USE="graph? ( doc )"
 
 PATCHES=(
-	"${FILESDIR}/lldpd-1.0.10-glibc-2.33.patch"
+	"${FILESDIR}/${PN}-1.0.13-glibc-2.33.patch"
 )
 
 src_prepare() {
diff --git a/net-misc/lldpd/lldpd-1.0.13-r1.ebuild b/net-misc/lldpd/lldpd-1.0.13-r1.ebuild
new file mode 100644
index 000000000000..146a3f5d5986
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.13-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd bash-completion-r1 autotools tmpfiles
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://lldpd.github.io/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/4.9.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml zsh-completion"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/lldpd
+	acct-user/lldpd
+	dev-libs/libbsd
+	>=dev-libs/libevent-2.1.11:=
+	sys-libs/readline:0=
+	seccomp? ( sys-libs/libseccomp:= )
+	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
+	xml? ( dev-libs/libxml2:= )
+	zsh-completion? ( app-shells/zsh )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+"
+BDEPEND="virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)
+"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+	# Can drop this on next release; upstream.
+	"${FILESDIR}/${P}-glibc-2.33.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}