net-misc/ntpsec: update unit file to avoid CVE-2015-5300

Bug: https://bugs.gentoo.org/697024
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/net-misc/ntpsec/files/ntpd-r1.service b/net-misc/ntpsec/files/ntpd-r1.service
new file mode 100644 (file)
index 0000000..5da4738
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpd-r1.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Network Time Service
+After=network.target nss-lookup.target
+Conflicts=systemd-timesyncd.service
+
+[Service]
+Type=forking
+PrivateTmp=true
+EnvironmentFile=-/etc/conf.d/ntp
+ExecStart=/usr/sbin/ntpd ${NTPD_OPTS}
+# Specifying -g on the command line allows ntpd to make large adjustments to
+# the clock on boot.  However, if Restart=yes is set, a malicious (or broken)
+# server could send the incorrect time, trip the panic threshold, and when
+# ntpd restarts, serve it the incorrect time (which would be accepted).
+Restart=no
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-misc/ntpsec/ntpsec-1.1.7.ebuild b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
similarity index 98%
rename from net-misc/ntpsec/ntpsec-1.1.7.ebuild
rename to net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
index e5bf13be3bed544d49232024ff0207bae7a5d9fe..d6b4b3054594caedb58cae28f5a05e0ca8b65ba5 100644 (file)
--- a/net-misc/ntpsec/ntpsec-1.1.7.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
@@ -132,7 +132,7 @@ src_install() {
        newconfd "${FILESDIR}"/ntpd.confd ntp
 
        # Install the systemd unit file
-       systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+       systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
 
        # Prepare a directory for the ntp.drift file
        mkdir -pv "${ED}"/var/lib/ntp

diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 7cc6f74f6d34f0c37be0d5c296bf24fd4ae80530..050f701b387dfb8b764bfb6de75145d8cdbdc6f8 100644 (file)
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -131,7 +131,7 @@ src_install() {
        newconfd "${FILESDIR}"/ntpd.confd ntp
 
        # Install the systemd unit file
-       systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+       systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
 
        # Prepare a directory for the ntp.drift file
        mkdir -pv "${ED}"/var/lib/ntp