| 1 |
commit: 47924c9cc6c4597423b6147b2c246ab6438fa027 |
| 2 |
Author: Stephen Arnold <nerdboy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 9 23:54:18 2020 +0000 |
| 4 |
Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 10 00:01:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47924c9c |
| 7 |
|
| 8 |
net-misc/ntpsec: add upstream patch and expand py3 compat |
| 9 |
|
| 10 |
* closes bugs #709258 and #710414 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.67, Repoman-2.3.17 |
| 13 |
Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org> |
| 14 |
|
| 15 |
...ternalize-sys_maxclock-fix-for-bug-708522.patch | 23 ++++++++++++++++++++++ |
| 16 |
net-misc/ntpsec/ntpsec-1.1.8.ebuild | 4 +++- |
| 17 |
net-misc/ntpsec/ntpsec-9999.ebuild | 2 +- |
| 18 |
3 files changed, 27 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-misc/ntpsec/files/ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch b/net-misc/ntpsec/files/ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..caeaf1824cc |
| 23 |
--- /dev/null |
| 24 |
+++ b/net-misc/ntpsec/files/ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch |
| 25 |
@@ -0,0 +1,23 @@ |
| 26 |
+From ccdd9d4b941b30fc44b301595e42809dbe48628d Mon Sep 17 00:00:00 2001 |
| 27 |
+From: James Browning <JamesB.fe80@×××××.com> |
| 28 |
+Date: Sun, 26 Jan 2020 09:58:36 -0800 |
| 29 |
+Subject: [PATCH] Externalize sys_maxclock from include/ntpd.h ... |
| 30 |
+ |
| 31 |
+I think this will shut up the Fedora Rawhide runners |
| 32 |
+--- |
| 33 |
+ include/ntpd.h | 2 +- |
| 34 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 35 |
+ |
| 36 |
+diff --git a/include/ntpd.h b/include/ntpd.h |
| 37 |
+index c4f9b9e45..ee16678e1 100644 |
| 38 |
+--- a/include/ntpd.h |
| 39 |
++++ b/include/ntpd.h |
| 40 |
+@@ -369,7 +369,7 @@ extern int peer_associations; /* mobilized associations */ |
| 41 |
+ * System variables are declared here. See Section 3.2 of the |
| 42 |
+ * specification. |
| 43 |
+ */ |
| 44 |
+-int sys_maxclock; /* maximum candidates */ |
| 45 |
++extern int sys_maxclock; /* maximum candidates */ |
| 46 |
+ struct system_variables { |
| 47 |
+ uint8_t sys_leap; /* system leap indicator */ |
| 48 |
+ uint8_t sys_stratum; /* system stratum */ |
| 49 |
|
| 50 |
diff --git a/net-misc/ntpsec/ntpsec-1.1.8.ebuild b/net-misc/ntpsec/ntpsec-1.1.8.ebuild |
| 51 |
index 1316806dc69..128e2a23826 100644 |
| 52 |
--- a/net-misc/ntpsec/ntpsec-1.1.8.ebuild |
| 53 |
+++ b/net-misc/ntpsec/ntpsec-1.1.8.ebuild |
| 54 |
@@ -3,7 +3,7 @@ |
| 55 |
|
| 56 |
EAPI=6 |
| 57 |
|
| 58 |
-PYTHON_COMPAT=( python3_6 ) |
| 59 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
| 60 |
PYTHON_REQ_USE='threads(+)' |
| 61 |
|
| 62 |
inherit flag-o-matic python-r1 waf-utils systemd |
| 63 |
@@ -62,6 +62,8 @@ DEPEND="${CDEPEND} |
| 64 |
|
| 65 |
WAF_BINARY="${S}/waf" |
| 66 |
|
| 67 |
+PATCHES=( "${FILESDIR}/${P}-externalize-sys_maxclock-fix-for-bug-708522.patch" ) |
| 68 |
+ |
| 69 |
src_prepare() { |
| 70 |
default |
| 71 |
# Remove autostripping of binaries |
| 72 |
|
| 73 |
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild |
| 74 |
index 1316806dc69..36dc8d08088 100644 |
| 75 |
--- a/net-misc/ntpsec/ntpsec-9999.ebuild |
| 76 |
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild |
| 77 |
@@ -3,7 +3,7 @@ |
| 78 |
|
| 79 |
EAPI=6 |
| 80 |
|
| 81 |
-PYTHON_COMPAT=( python3_6 ) |
| 82 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
| 83 |
PYTHON_REQ_USE='threads(+)' |
| 84 |
|
| 85 |
inherit flag-o-matic python-r1 waf-utils systemd |
Archives