| 1 |
commit: 281e0e7ae7ed000d93843ad33319acf70c625c18 |
| 2 |
Author: Peter Alfredsen <crabbedhaloablution <AT> icloud <DOT> com> |
| 3 |
AuthorDate: Tue Dec 15 11:43:10 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 8 14:53:58 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281e0e7a |
| 7 |
|
| 8 |
net-misc/chrony: add nss support |
| 9 |
|
| 10 |
NSS is no longer a null-option. |
| 11 |
|
| 12 |
Do note that with --as-needed, chronyd will only link against libfreebl3.so, not other parts of NSS. |
| 13 |
NSS, though, is kind of useless since it's only good for sechash support. |
| 14 |
|
| 15 |
Signed-off-by: Peter Alfredsen <crabbedhaloablution <AT> icloud.com> |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
net-misc/chrony/chrony-9999.ebuild | 14 +++++++++----- |
| 19 |
net-misc/chrony/metadata.xml | 1 + |
| 20 |
2 files changed, 10 insertions(+), 5 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild |
| 23 |
index 705bbb05914..81b51b9af84 100644 |
| 24 |
--- a/net-misc/chrony/chrony-9999.ebuild |
| 25 |
+++ b/net-misc/chrony/chrony-9999.ebuild |
| 26 |
@@ -20,8 +20,13 @@ S="${WORKDIR}/${P/_/-}" |
| 27 |
|
| 28 |
LICENSE="GPL-2" |
| 29 |
SLOT="0" |
| 30 |
-IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux" |
| 31 |
-REQUIRED_USE="sechash? ( nettle )" |
| 32 |
+IUSE="+caps +cmdmon html ipv6 libedit +nettle nss +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux" |
| 33 |
+REQUIRED_USE=" |
| 34 |
+ sechash? ( || ( nettle nss ) ) |
| 35 |
+ nettle? ( !nss ) |
| 36 |
+ !sechash? ( !nss ) |
| 37 |
+ !sechash? ( !nts? ( !nettle ) ) |
| 38 |
+ " |
| 39 |
RESTRICT="test" |
| 40 |
|
| 41 |
BDEPEND="nettle? ( virtual/pkgconfig )" |
| 42 |
@@ -40,6 +45,7 @@ DEPEND=" |
| 43 |
) |
| 44 |
libedit? ( dev-libs/libedit ) |
| 45 |
nettle? ( dev-libs/nettle:= ) |
| 46 |
+ nss? ( dev-libs/nss:= ) |
| 47 |
seccomp? ( sys-libs/libseccomp ) |
| 48 |
html? ( dev-ruby/asciidoctor ) |
| 49 |
pps? ( net-misc/pps-tools ) |
| 50 |
@@ -84,8 +90,6 @@ src_configure() { |
| 51 |
|
| 52 |
tc-export CC PKG_CONFIG |
| 53 |
|
| 54 |
- # Note: ncurses and nss switches are mentioned in the configure script but |
| 55 |
- # do nothing |
| 56 |
# not an autotools generated script |
| 57 |
local myconf=( |
| 58 |
$(use_enable seccomp scfilter) |
| 59 |
@@ -94,6 +98,7 @@ src_configure() { |
| 60 |
$(usex ipv6 '' --disable-ipv6) |
| 61 |
$(usex libedit '' --without-editline) |
| 62 |
$(usex nettle '' --without-nettle) |
| 63 |
+ $(usex nss '' --without-nss) |
| 64 |
$(usex ntp '' --disable-ntp) |
| 65 |
$(usex phc '' --disable-phc) |
| 66 |
$(usex pps '' --disable-pps) |
| 67 |
@@ -109,7 +114,6 @@ src_configure() { |
| 68 |
--sysconfdir="${EPREFIX}/etc/chrony" |
| 69 |
--with-hwclockfile="${EPREFIX}/etc/adjtime" |
| 70 |
--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" |
| 71 |
- --without-nss |
| 72 |
--without-tomcrypt |
| 73 |
) |
| 74 |
|
| 75 |
|
| 76 |
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml |
| 77 |
index 6d7a44f2f91..fe7394a48bf 100644 |
| 78 |
--- a/net-misc/chrony/metadata.xml |
| 79 |
+++ b/net-misc/chrony/metadata.xml |
| 80 |
@@ -26,6 +26,7 @@ |
| 81 |
<flag name="cmdmon">Support for command and monitoring</flag> |
| 82 |
<flag name="html">Install HTML documentation</flag> |
| 83 |
<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for hash functions</flag> |
| 84 |
+ <flag name="nss">Use <pkg>dev-libs/nss</pkg> for hash functions</flag> |
| 85 |
<flag name="ntp">Support for the Network Time Protocol (NTP)</flag> |
| 86 |
<flag name="phc">Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag> |
| 87 |
<flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag> |
Archives