summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2018-02-23 20:20:56 -0500
committerAnthony G. Basile <blueness@gentoo.org>2018-02-23 20:21:11 -0500
commitf108aece8a44161ce4f4a6b957ca737b989d11e1 (patch)
tree3a55d783f0e44bbca99fa42bc3dd1729461ea392 /net-misc/ntpsec
parentdev-python/docker-py: Version bump to 3.1.0 (diff)
downloadgentoo-f108aece8a44161ce4f4a6b957ca737b989d11e1.tar.gz
gentoo-f108aece8a44161ce4f4a6b957ca737b989d11e1.tar.bz2
gentoo-f108aece8a44161ce4f4a6b957ca737b989d11e1.zip
net-misc/ntpsec: fix config files and remove strip executables
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'net-misc/ntpsec')
-rw-r--r--net-misc/ntpsec/metadata.xml1
-rw-r--r--net-misc/ntpsec/ntpsec-1.0.0-r1.ebuild (renamed from net-misc/ntpsec/ntpsec-1.0.0.ebuild)40
2 files changed, 26 insertions, 15 deletions
diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml
index 7bb04cc47d2c..018f5f40f71b 100644
--- a/net-misc/ntpsec/metadata.xml
+++ b/net-misc/ntpsec/metadata.xml
@@ -15,6 +15,7 @@ NTPsec project - a secure, hardened, and improved implementation of Network Time
<use>
<flag name="early">Drop root privileges early</flag>
<flag name="gdb">Enable debugging with gdb</flag>
+ <flag name="heat">Install contrib heat generating scripts</flag>
<flag name="nist">Enable lockclock</flag>
<flag name="ntpviz">Make visualizations of offsets, jiffies, etc.</flag>
<flag name="rclock_oncore">Oncore driver</flag>
diff --git a/net-misc/ntpsec/ntpsec-1.0.0.ebuild b/net-misc/ntpsec/ntpsec-1.0.0-r1.ebuild
index d4cca435dbb5..91a7ea1e911c 100644
--- a/net-misc/ntpsec/ntpsec-1.0.0.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.0.0-r1.ebuild
@@ -32,7 +32,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# net-misc/pps-tools oncore,pps
@@ -40,7 +40,8 @@ CDEPEND="${PYTHON_DEPS}
${BDEPEND}
sys-libs/libcap
dev-python/psutil
- dev-libs/openssl:*
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
seccomp? ( sys-libs/libseccomp )
"
RDEPEND="${CDEPEND}
@@ -68,16 +69,21 @@ src_configure() {
local string_127=""
local rclocks="";
local CLOCKSTRING=""
+
for refclock in ${NTPSEC_REFCLOCK[@]} ; do
- if use rclock_${refclock} ; then
+ if use rclock_${refclock} ; then
string_127+="$refclock,"
fi
done
CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+ # Remove autostripping of binaries
+ sed -i -e '/Strip binaries/d' wscript
+
waf-utils_src_configure --nopyc --nopyo --refclock="${CLOCKSTRING}" \
- $(use doc && echo "--enable-doc") \
+ $(use doc && echo "--enable-doc") \
$(use early && echo "--enable-early-droproot") \
- $(use gdb && echo "--enable-debug-gdb") \
+ $(use gdb && echo "--enable-debug-gdb") \
$(use nist && echo "--enable-lockclock") \
$(use samba && echo "--enable-mssntp") \
$(use seccomp && echo "--enable-seccomp") \
@@ -88,19 +94,23 @@ src_configure() {
src_install() {
waf-utils_src_install
- mv -v "${ED}/usr/"{,share/}man
- dosbin "${S}/contrib/ntpheat"{,usb}
- dodoc "${S}/contrib/logrotate-ntpd"
- systemd_newunit "${FILESDIR}/ntpd.service" ntpd.service
+
+ # Install heat generating scripts
+ use heat && dosbin "${S}/contrib/ntpheat"{,usb}
+
+ # Install the openrc files
newinitd "${FILESDIR}/ntpd.rc-r1" "ntp"
newconfd "${FILESDIR}/ntpd.confd" "ntp"
- mkdir "${ED}/etc/systemd/system/"
- cp -v "${FILESDIR}/ntpd.service" "${ED}/etc/systemd/system/"
- # ntpd.confd ntpd.rc-r1 ntpd.service
- mkdir -pv "${ED}/etc/"{logrotate,ntp-conf}.d
+ # Install the systemd unit file
+ systemd_newunit "${FILESDIR}/ntpd.service" ntpd.service
+
+ # Install a log rotate script
+ mkdir -pv "${ED}/etc/"logrotate.d
cp -v "${S}/etc/logrotate-config.ntpd" "${ED}/etc/logrotate.d/ntpd"
+
+ # Install the configuration files
cp -Rv "${S}/etc/ntp.d/" "${ED}/etc/"
- mv -v "${ED}/etc/ntp.d/example.conf" "${ED}/etc/ntp.conf"
- sed "s|includefile |includefile ntp-conf.d/|" -i "${ED}/etc/ntp.conf"
+ mv -v "${ED}/etc/ntp.d/default.conf" "${ED}/etc/ntp.conf"
+ sed "s|includefile |includefile ntp.d/|" -i "${ED}/etc/ntp.conf"
}