gentoo resync : 28.04.2021

14 files changed, 23 insertions, 359 deletions

diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 896578cb989a..099878a6269a 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,23 +1,13 @@
-AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc
-AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
-AUX lldpd-1.0.2-seccomp-add-misc.patch 789 BLAKE2B 49fb6cf10946154a7573778c558b5ac5754e1f2dfa87c7011c44b9515df5d4e06d6271e21e3a0104823603a6e5644cee944354621c937fe358eba79f5f03c8d8 SHA512 bcc473debe7f45c533057ca1ecd6ab717bbeb663aaee223045239152fcf7c92c1dcf5e77c5bd0d36f0dbc08739dc8fd90bfcc7c82c8019a3508f496cf7df2d34
-AUX lldpd-1.0.3-fix-fdp-without-cdp.patch 775 BLAKE2B 900476f2bd2e6671ed9fd1eb99f727d5b153681db85e83d28baaa6fef99bbb1e408488475b6370df337742e735b6d56f53183f1cd2072c1dbc9da5fb194bd7af SHA512 bdc0f61a467c5a5d5fddc64b3e9822a94fedc7d61cce96ab3996fd2b12e418453da27f9de7879f13b0feccf1080b8559e848b113826ca0733e60b0d28cc5aacf
-AUX lldpd-1.0.5-cpp.patch 617 BLAKE2B 71a520303bbde126425f6e1432407d5cc6b4f363c74a3019761433a58fdbe404e9d90836c7fce1d8caef428fa0eb874739fc1115458f8ec7a403e275311987bd SHA512 16b7669e7f0fc6403d79121db056cbd5fe2cf892aa8a23c64b5253266164fcea27cc559b8deca8a0af7e1e3b5b0baa289302e46f057fe781f3ba0f6c7042171b
-AUX lldpd-1.0.5-seccomp.patch 2282 BLAKE2B 6a3cd06b65576c4f2c54636778a628960104980d3bf0b05f4164b0062c7604fb694517457f0ad13a4b83086de5219b23ca7a795b7cfb16b2baf15680e5ad7036 SHA512 6818b88d17cab0b924a3f145ce82c24ee9e3ae6a450b82413f5979cd51fb1b58fe51a9fa98e5225e0f4229bf227a029abba5f02636319b74b01394e5723ddb95
-AUX lldpd-1.0.6-seccomp.patch 779 BLAKE2B 73fe88ab41f0e110da120e07098488e8370868a818028e3d49ae397c93b131bc79914ae06e55db5e2b4fc518e0f08f446a4725871ec5411e5407527dc8767392 SHA512 0f2d35b71cf3466f16030ccb2ca9d7843d7e9563e9f1110d4d65b2004438fa58ff2a345f4831037bd6dbace0d43337b7c37126839dd36d34ea7e5bf1df0700ef
+AUX lldpd-1.0.10-glibc-2.33.patch 699 BLAKE2B 55dc33fa9b9e4ca274b8c97f1c84766686e01585797404c2b71aa9f046acf356b8b3c1dd7f8e9f80693204d73b7b69059646ed46320dabd954b97b321e7f43cd SHA512 c1ef0dd52408d64860b813ea79bf64a1587d7c58e1582faf936260e640e2aedbc0c53f1b3d6a18acdfddbce161f50400f97f246a18ecdc22212f93cc97a47cc4
 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
 AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d24c4fa2b5b72426af5ee5ac57d40cfb2d1bc3ea6c1b253e1daaa341d998d66889bbc94c83d2438 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
-DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
-DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9
-DIST lldpd-1.0.5.tar.gz 1624872 BLAKE2B 0c85cd05bd9e24c06038675be0e9e03228981bb815d8eb93ba1565eb2001dfbf24c183c9d10a1a3d194f49990e252a53730ef69a8b0e9e3151de40bb2ae5a5b8 SHA512 ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e
-DIST lldpd-1.0.6.tar.gz 1814839 BLAKE2B d4bf30a7ae5a5de93f67ef6b06662e287a4c2eff76f157dc9b0a551b4473e0b0896e7af1cd39866f2ee0013ebdf572e762d8543a00bda0d0a1136cfedc7f2ba9 SHA512 b0930cf3202eba6bcbb7d5f941bda16ebbdde15f1839c6664c2896f92a7c2842cbe87baa32c7ce85f1d1fe012a8ceb9975a06244644a4bc3759241a4a1d058d1
+DIST lldpd-1.0.10.tar.gz 1961631 BLAKE2B 06d3b7d659dae0df4b10f3568a6ffa96c8e848863eb5ecb11b046806b4c23afdae084ffcab8b07b93e6a111dea2c24bd2cfc81a7f1c2559a39b3b2ed8f80814f SHA512 6835bfe36cbaffb0e7f0dbc958d234b7a16787bd51d0c5423c7b775d71dc89635ab28c005e2df550c40f4ee76ab461c0c7cb2a09b011878cadaca18153485d8f
 DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69
-EBUILD lldpd-1.0.3.ebuild 2541 BLAKE2B 0328fc61859fb18450cd5b147a7b6b73dcaf4c56820bd3c219c424dcf5626c5ae1f658985fc09df1a2083723cc2aebf2464e07e5c037cc9ad89f7d6b0ac062f5 SHA512 1e9829bf9aa96e3575841be49babbe2adfb8b22182e255b76867b4705278ebcc23efb74f7b16ad8c8cdcc3ecf320f823a67568cbf444efaeaac39b65163f55ac
-EBUILD lldpd-1.0.4.ebuild 2515 BLAKE2B 52583299069a44be65e63277f9920fe6bb625bc130c05802c883206f0462ec59bfb8464ef0d5f6ec63b8e6103e08cfdec3cd5967585605686b0d47701ec6cabe SHA512 1f4e29b84fa0b99cd62f0afe09a756e02fe9fd9bbc6b6f2ffd68f326265d9b6e385ddc9690c6b99cabbd49229cce3f94f93185e58b8cdecbc6fec486699ec468
-EBUILD lldpd-1.0.5-r1.ebuild 2356 BLAKE2B 9faf6d79c27053c19f25022987dbbc9a99cf66161c8d9e16d1ed98a570517417143c294dad4e7f40590031ab4d7a9001384aa1e4f1c0e88a05ed34e4bdbe5511 SHA512 a11a3320a374b9efacb62f2bbee7bc87ec8d36eff0642bb107c9fa107f03b50b7a6eeb21b46521cc88030c32e71c847f339f9ef2a4fc93b1e1b5fcb537577424
-EBUILD lldpd-1.0.6.ebuild 2322 BLAKE2B ba665c9657f5acb8667905e9e254f94dcc9fb755252d693f1c2a91eeb752e920810d165b8cf7b0b2e9f9910c05104ff0f57f3c1e10d3a7fff58a52b3503ca97e SHA512 d05b15681677e773a9dd4b9e441e4a37a091c541a7cecf073e6b36a0f8e048edea4d37b46b2e5511233ed3d830072a5b81e28d4f3594a56d51fde3254cfa41c1
-EBUILD lldpd-1.0.7.ebuild 2268 BLAKE2B 824700814c2aec26b73079dc0399a5913b32cabab16bb344088520d822b3ec1b1dbc5936b9cbf6b3a89fca886ef17528d4a4084645c81178f88c2c4e23dd13e7 SHA512 e1d9ece9bfb4bead21013713e5cfaf8e67bf7885f066c487eb75792d059bea027abae67be375c1a7ae1f79b94640371ff5c8f7d88c4e096a937f4737864647d8
+DIST lldpd-1.0.9.tar.gz 1961522 BLAKE2B 83a853bb3bde7abd15b4aa167d213d97677db817aba773b152f032b0d0bf299d5cc891c56871182b2f11fc3bfb2d6c88153f32973fdec5844df5c6fc6bc97b8b SHA512 5f5d5abed7fc73efc59932a1f2ee07eedbdca6f82d002221886b4ddf704955aef432acb92084adc72a965fef3e660f3c95b2a1b8892cf05d9616921501e6aae0
+EBUILD lldpd-1.0.10.ebuild 2326 BLAKE2B 1e76187519ffaf61aef78f797ebc8affd1346100e6a9a478cf8dbb5cc90be0ddeda49f0e587aead3a7d99ff6f40d513e6b177fc19db7ffae58ca94539c0cc836 SHA512 0a39c30bf96d95816f422b12ed54fa2beb6bb0a1a4cd5eae12eafc8461dbb98237752bf73cf118714f7f80da73546cc7668c6292dfbdbd956d32c9df24ff0475
+EBUILD lldpd-1.0.7.ebuild 2266 BLAKE2B 6d4ead882fa1b191b8e693a5adf762bf4859ca6dde3307773b703eff9443626ec833f21087db64f977c678477c3feea1d586061e7c038e92aa16d36b4c2163d1 SHA512 ea5e0b3e5d5999e9908ce6070bca40a8d4cc42de57688f1e4466661c49d5a637d74c3b82383798339b3a6b729467b000ec6d5e3339eb4ea8faaff19754aa8c67
+EBUILD lldpd-1.0.9.ebuild 2268 BLAKE2B 824700814c2aec26b73079dc0399a5913b32cabab16bb344088520d822b3ec1b1dbc5936b9cbf6b3a89fca886ef17528d4a4084645c81178f88c2c4e23dd13e7 SHA512 e1d9ece9bfb4bead21013713e5cfaf8e67bf7885f066c487eb75792d059bea027abae67be375c1a7ae1f79b94640371ff5c8f7d88c4e096a937f4737864647d8
 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch b/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch
deleted file mode 100644
index 987ef9a515c5..000000000000
--- a/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index 97f4233..36184cd 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -167,6 +167,8 @@ priv_seccomp_init(int remote, int child)
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvmsg), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 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/files/lldpd-1.0.1-seccomp-add-brk.patch b/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch
deleted file mode 100644
index 40cc428ec8f2..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -purN lldpd-1.0.1.orig/src/daemon/priv-seccomp.c lldpd-1.0.1/src/daemon/priv-seccomp.c
---- lldpd-1.0.1.orig/src/daemon/priv-seccomp.c	2018-06-12 07:48:04.282557213 +0200
-+++ lldpd-1.0.1/src/daemon/priv-seccomp.c	2018-06-12 07:52:26.214348537 +0200
-@@ -162,6 +162,7 @@ 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(wait4), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(brk), 0)) < 0 || /* brk needed for newer libc */
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0)) < 0 ||
diff --git a/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch
new file mode 100644
index 000000000000..876a9ce31cd5
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch
@@ -0,0 +1,12 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index 6d2736a..533f6fe 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -180,6 +180,7 @@ priv_seccomp_init(int remote, int child)
+ 	    (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 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fstat), 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(connect), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(futex), 0)) < 0 ||
+ 
diff --git a/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch b/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch
deleted file mode 100644
index c5e6d2edb78f..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index fe48ad3..791b76b 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -148,6 +148,7 @@ priv_seccomp_init(int remote, int child)
- 	if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(kill), 0)) < 0 ||
diff --git a/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch
deleted file mode 100644
index 17099a2f819b..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 4e7ec8233cd185941eaa9e41785cfc53f92799b4
-Author: Vincent Bernat <vincent@bernat.ch>
-Date:   Tue Jan 8 17:19:15 2019 -0500
-
-    build: fix compilation with `--enable-fdp --disable-cdp`
-    
-    Fix #315
-
-diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h
-index c3ffa10..f6b03d7 100644
---- a/src/lldpd-structs.h
-+++ b/src/lldpd-structs.h
-@@ -129,7 +129,7 @@ struct lldpd_dot3_power {
- MARSHAL(lldpd_dot3_power);
- #endif
- 
--#ifdef ENABLE_CDP
-+#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
- struct cdpv2_power {
- 	u_int16_t request_id;
- 	u_int16_t management_id;
-@@ -273,7 +273,7 @@ struct lldpd_port {
- 	struct lldpd_med_power	 p_med_power;
- #endif
- 
--#ifdef ENABLE_CDP
-+#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
- 	struct cdpv2_power p_cdp_power;
- #endif
- 
diff --git a/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch b/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch
deleted file mode 100644
index 0c3fc1964d40..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
-index 0d5f2f3..cc41a8a 100644
---- a/src/daemon/Makefile.am
-+++ b/src/daemon/Makefile.am
-@@ -108,7 +108,7 @@ CLEANFILES    += syscall-names.h
- syscall-names.h:
- 	$(AM_V_GEN)
- 	$(AM_V_at)echo "static const char *syscall_names[] = {" > $@ ;\
--	echo "#include <sys/syscall.h>" | cpp -dM | grep '^#define __NR_' | \
-+	echo "#include <sys/syscall.h>" | $(CPP) -dM | grep '^#define __NR_' | \
- 		LC_ALL=C sed -r -n -e 's/^\#define[ \t]+__NR_([a-z0-9_]+)[ \t]+([0-9]+)(.*)/ [\2] = "\1",/p' >> $@ ;\
- 	echo "};" >> $@
- nodist_liblldpd_la_SOURCES += syscall-names.h
diff --git a/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch b/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch
deleted file mode 100644
index 4ac67afeec5f..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index 5a6e2ae..5cef36f 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -148,6 +148,7 @@ priv_seccomp_init(int remote, int child)
- 	if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 ||
-@@ -163,6 +164,7 @@ 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(wait4), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(brk), 0)) < 0 || /* brk needed for newer libc */
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0)) < 0 ||
-@@ -172,6 +174,10 @@ priv_seccomp_init(int remote, int child)
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 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 ||
- 	    /* 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/files/lldpd-1.0.6-seccomp.patch b/net-misc/lldpd/files/lldpd-1.0.6-seccomp.patch
deleted file mode 100644
index f0d38bd25a5a..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.6-seccomp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index 6d2736a..5bab871 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -170,6 +170,7 @@ priv_seccomp_init(int remote, int child)
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendto), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(poll), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvmsg), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 ||
diff --git a/net-misc/lldpd/lldpd-1.0.6.ebuild b/net-misc/lldpd/lldpd-1.0.10.ebuild
index b202dbd60a58..416283761d45 100644
--- a/net-misc/lldpd/lldpd-1.0.6.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.10.ebuild
@@ -40,7 +40,7 @@ BDEPEND="virtual/pkgconfig
 REQUIRED_USE="graph? ( doc )"
 
 PATCHES=(
-	"${FILESDIR}/lldpd-1.0.6-seccomp.patch"
+	"${FILESDIR}/lldpd-1.0.10-glibc-2.33.patch"
 )
 
 src_prepare() {
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
deleted file mode 100644
index 7a948e636cc0..000000000000
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd bash-completion-r1 autotools ltprune tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="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="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5:=
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	seccomp? ( sys-libs/libseccomp )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)
-	test? ( dev-libs/check )"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
-	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
-	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
-	"${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
-	"${FILESDIR}/lldpd-1.0.3-fix-fdp-without-cdp.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	elibtoolize
-}
-
-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
-	prune_libtool_files
-
-	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
-}
diff --git a/net-misc/lldpd/lldpd-1.0.4.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild
deleted file mode 100644
index 1619bcba5066..000000000000
--- a/net-misc/lldpd/lldpd-1.0.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils user systemd bash-completion-r1 autotools tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="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="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5:=
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	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=(
-	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
-	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
-	"${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	elibtoolize
-}
-
-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
-}
diff --git a/net-misc/lldpd/lldpd-1.0.7.ebuild b/net-misc/lldpd/lldpd-1.0.7.ebuild
index 13a686c29d3d..4310953a675c 100644
--- a/net-misc/lldpd/lldpd-1.0.7.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.7.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 )"
diff --git a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild b/net-misc/lldpd/lldpd-1.0.9.ebuild
index 1151f58a48b2..13a686c29d3d 100644
--- a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.9.ebuild
@@ -10,8 +10,8 @@ HOMEPAGE="https://vincentbernat.github.com/lldpd/"
 SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
-SLOT="0/4.8.0"
-KEYWORDS="amd64 x86"
+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 )"
@@ -20,7 +20,7 @@ RDEPEND="
 	acct-group/lldpd
 	acct-user/lldpd
 	dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5:=
+	>=dev-libs/libevent-2.1.11:=
 	sys-libs/readline:0=
 	seccomp? ( sys-libs/libseccomp:= )
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
@@ -39,11 +39,6 @@ BDEPEND="virtual/pkgconfig
 
 REQUIRED_USE="graph? ( doc )"
 
-PATCHES=(
-	"${FILESDIR}/lldpd-1.0.5-seccomp.patch"
-	"${FILESDIR}/lldpd-1.0.5-cpp.patch"
-)
-
 src_prepare() {
 	default