Merge branch 'edge' into next

3 files changed, 26 insertions, 2 deletions

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 74816352ec5a..d0ffc48eab44 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -2,6 +2,7 @@ AUX man-pages/genmans.sh 1882 BLAKE2B f2da7801ad33b15486bba29832587281bab0abd472
 AUX man-pages/ntp.conf.5.patch 503 BLAKE2B 039ae4ba832249fb47e15d7782644ad8b1bdd0058fbdcb5e22404ac5a51deb9736de9cd840b7eacd4f5bd865de80a83113a898428289aa1c2fb8fda72f038666 SHA512 6e75a7900c2cde0484e57e18b1244ed188b58be54b6622c3777251a2f412a27a98c41a65d6d62d93f9e84856f211bb268bd005aca146bc27aed982daf63f24fe
 AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f177a684cab9fcc9350b225073daee9731a60dd11d712cbebb124a52337cb466174699aab5f8559d53ae1 SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd
 AUX ntp-4.2.8-gc-tests.patch 1183 BLAKE2B a92f418a901f65b06e154be27794cc4f8fa99bf0c19f1f8240c79682503bf9742d3ebd00e6d189884db702bb814caee6b197f4be3233eaf01d1d54c40a01e6e0 SHA512 b761776bdb0ea50781c57c19e6f132a7ba596e944e06bef53d1d9a4ab154f6c941ef1dd7b7d7130de546d59d9d6a7df25517590f015f9a91ea7fede41d95b471
+AUX ntp-4.2.8-gcc10-fno-common.patch 729 BLAKE2B 42692a4ae85bbf59d8f9ea22109b189b597234cee236d18229efb4e53181b6288c04a25f77300ca98af10fca9d15cb3df6bd962244eb40047ae6fa345b906b72 SHA512 794a2879a686423609f424fb73b7a1416cb0253b262b4c6b3bd42d9bb46441987daa87873bd343cc2987a9d65da887bb132c95c2bb1515ffb39637f9e64b1569
 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f
 AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4
 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 BLAKE2B b92635ce5512c9907b974ba2a07c567219783192379f1da8fef445637a3d36f9d52cd1be055d7e5df733448ddd41b490b02210ed8aec5770f84dc63d46650636 SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9
@@ -27,5 +28,5 @@ DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b33
 DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8
 EBUILD ntp-4.2.8_p13-r2.ebuild 4542 BLAKE2B fb88e178f76f757530d020a9987f8fd3f70b81e22486e8e30c997635c500795b04eb5bcfcd5cd6acfa0db7fd480f3903e65a91763cb68d9b3e3a3b77f3dde2be SHA512 bf5dddbd1d8b3b387864275b70edb49440696e846e2631227f8092e737c97d9346b1b52cbf02033f61833912907a16442fa46464098aed0ff471ba2d1f7c4914
 EBUILD ntp-4.2.8_p13.ebuild 4482 BLAKE2B d1b16d12c8f6229096d925d9764c265e74e84935d55b47c35f3a05d7eb0c68d9c9890c069c078533b61797322bf960c30c7bb8c2caa4726a528c13998bb5ab8d SHA512 d5a96d8e3f1aa99b8bcef1c3d2846e4590f272b343ea7fbd099a332b935429219db5f1320764e2c2072d6b0390ae1917a70d7d331579b5d7b25e7fd8de80a57e
-EBUILD ntp-4.2.8_p14-r2.ebuild 4554 BLAKE2B 53716498d82265c1db38cff06915df334754d5af5a17b587fb39e3a36ea2c78198a4c6a635e822164458f9b4c8c85cf6c514172a8444ef4fb5fc16b82d59a97c SHA512 8c946674cd2407c27d870e890a575a70cf7866a9a52941f32f599bb8d6153e34a3cfae78d78b9c9f87eaa03267baed7bc241d2e402763a88d01fa34f995a2384
+EBUILD ntp-4.2.8_p14-r2.ebuild 4595 BLAKE2B f1e6d0463c435249205a44d6215099e79278172acc560770723b293409432c265a9cb2d0a1733a2331ec453bc03fc8ae6e714aa33d403df3810d72437d12378b SHA512 7badaee6ba22252b003d3345b3cf08d2e9365f0721350279bebda13ec10e1bd8139c413947c45cb0ef63d0acc006f31d597c3cee634b1602f154a71a2daa8175
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch
new file mode 100644
index 000000000000..d2ed719d8ff7
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch
@@ -0,0 +1,22 @@
+--- ntp-4.2.8p14/include/ntp_config.h.psl
++++ ntp-4.2.8p14/include/ntp_config.h
+@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag {
+  * Poll Skew List
+  */
+ 
+-psl_item psl[17-3+1];		/* values for polls 3-17 */
++extern psl_item psl[17-3+1];	/* values for polls 3-17 */
+ 				/* To simplify the runtime code we */
+ 				/* don't want to have to special-case */
+ 				/* dealing with a default */
+--- ntp-4.2.8p14/ntpd/ntp_config.c.psl
++++ ntp-4.2.8p14/ntpd/ntp_config.c
+@@ -202,6 +202,8 @@ int	cryptosw;		/* crypto command called
+ 
+ extern char *stats_drift_file;	/* name of the driftfile */
+ 
++psl_item psl[17-3+1];        /* values for polls 3-17 */
++
+ #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED
+ /*
+  * backwards compatibility flags
diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
index b2cbb8b926a9..2b72249e9970 100644
--- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
 	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
 	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
+	"${FILESDIR}"/${PN}-4.2.8-gcc10-fno-common.patch
 )
 
 src_prepare() {