diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8_p12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8_p13 similarity index 59% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8_p12 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8_p13 index 61b6af267a..8011c946a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8_p12 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8_p13 @@ -1,14 +1,14 @@ -DEFINED_PHASES=configure install prepare setup -DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig +DEFINED_PHASES=configure install postinst prepare setup +DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig DESCRIPTION=Network Time Protocol suite/programs EAPI=6 HOMEPAGE=http://www.ntp.org/ -IUSE=caps debug ipv6 libressl openntpd parse-clocks perl readline samba selinux snmp ssl threads vim-syntax zeroconf -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint +IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint LICENSE=HPND BSD ISC PDEPEND=openntpd? ( net-misc/openntpd ) -RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd ) +RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd ) SLOT=0 -SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p12.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p12-manpages.tar.xz +SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p13.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p13-manpages.tar.xz _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=60884e02aacf398cd787efe8860c65d5 +_md5_=088dd6d4d87c2b974daa13d27a446fe5 diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/Manifest index 657e596c28..171e56db1a 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/Manifest @@ -1,2 +1,2 @@ -DIST ntp-4.2.8p12-manpages.tar.xz 25700 BLAKE2B 0a84908556e997bdd08a78cd04f7f38a32a8441138f31d0adf7fefc380da79e509bea4a8bc67154501e359638f4edcab561d14cbdd1d573473bd2ea5a14f0c48 SHA512 e6df0099b9f62db63d200702267276ee094e8d00b20a67d2181f3f32fe6b871c49ac2eedbc2186b3255c919820c05eac528718b80afe7ed7ed7654b55c361f7c -DIST ntp-4.2.8p12.tar.gz 7079642 BLAKE2B d7d7817afaf9f94bf230951901b7531aff03c0828eecd40ca6fcc836ffd081387837afee44978742b507a9bee58788022fe9556733e8861dcc37d63f5637b3d1 SHA512 5382dcd1bb7feca8f28fc650f68892cb53f9364ebeb3780754cfbe71b1602057fdfd6eb27956afe79014a435624d77e2648d9e07f4d86ce7a98f5a4438d08310 +DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2 +DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075 diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp-client.confd b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp-client.confd new file mode 100644 index 0000000000..786004da83 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp-client.confd @@ -0,0 +1,21 @@ +# /etc/conf.d/ntp-client + +# Command to run to set the clock initially +# Most people should just leave this line alone ... +# however, if you know what you're doing, and you +# want to use ntpd to set the clock, change this to 'ntpd' +NTPCLIENT_CMD="ntpdate" + +# Options to pass to the above command +# This default setting should work fine but you should +# change the default 'pool.ntp.org' to something closer +# to your machine. See http://www.pool.ntp.org/ or +# try running `netselect -s 3 pool.ntp.org`. +NTPCLIENT_OPTS="-s -b -u \ + 0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org \ + 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" + +# If you use hostnames above, then you should depend on dns +# being up & running before we try to run. Otherwise, you +# can disable this. +rc_use="dns" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp-client.rc b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp-client.rc new file mode 100644 index 0000000000..5b5d594473 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp-client.rc @@ -0,0 +1,31 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + before cron portmap + after net + use dns logger +} + +checkconfig() { + if ! type "${NTPCLIENT_CMD}" >/dev/null 2>&1 ; then + eerror "Please edit /etc/conf.d/ntp-client" + eerror "Unable to locate the client command ${NTPCLIENT_CMD}!" + return 1 + fi + if [ -z "${NTPCLIENT_OPTS}" ] ; then + eerror "Please edit /etc/conf.d/ntp-client" + eerror "I need to know what server/options to use!" + return 1 + fi + return 0 +} + +start() { + checkconfig || return $? + + ebegin "Setting clock via the NTP client '${NTPCLIENT_CMD}'" + "${NTPCLIENT_CMD}" ${NTPCLIENT_OPTS} + eend $? "Failed to set clock" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf index bbd8e21437..97bed8dd13 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf @@ -1,8 +1,34 @@ -# Common pool -server 0.coreos.pool.ntp.org -server 1.coreos.pool.ntp.org -server 2.coreos.pool.ntp.org -server 3.coreos.pool.ntp.org +# NOTES: +# DHCP clients can append or replace NTP configuration files. +# You should consult your DHCP client documentation about its +# default behaviour and how to change it. + +# Name of the servers ntpd should sync with +# Please respect the access policy as stated by the responsible person. +#server ntp.example.tld iburst + +# Common pool for random people +#server pool.ntp.org + +# Pools for Gentoo users +server 0.gentoo.pool.ntp.org +server 1.gentoo.pool.ntp.org +server 2.gentoo.pool.ntp.org +server 3.gentoo.pool.ntp.org + +## +# A list of available servers can be found here: +# http://www.pool.ntp.org/ +# http://www.pool.ntp.org/#use +# A good way to get servers for your machine is: +# netselect -s 3 pool.ntp.org +## + +# you should not need to modify the following paths +driftfile /var/lib/ntp/ntp.drift + +#server ntplocal.example.com prefer +#server timeserver.example.org # Warning: Using default NTP settings will leave your NTP # server accessible to all hosts on the Internet. @@ -11,9 +37,18 @@ server 3.coreos.pool.ntp.org # from accessing the NTP server, uncomment: #restrict default ignore + # Default configuration: # - Allow only time queries, at a limited rate, sending KoD when in excess. # - Allow all local queries (IPv4, IPv6) -restrict default nomodify nopeer noquery notrap limited kod +restrict default nomodify nopeer noquery limited kod restrict 127.0.0.1 restrict [::1] + + +# To allow machines within your network to synchronize +# their clocks with your server, but ensure they are +# not allowed to configure the server or used as peers +# to synchronize against, uncomment this line. +# +#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.tmpfiles b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.tmpfiles deleted file mode 100644 index ac582aaeab..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -d /var/lib/ntp 0755 ntp ntp - - -L /etc/ntp.conf - - - - /usr/share/ntp/ntp.conf diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.confd b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.confd new file mode 100644 index 0000000000..2b74282c57 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.confd @@ -0,0 +1,6 @@ +# /etc/conf.d/ntpd + +# Options to pass to the ntpd process +# Most people should leave this line alone ... +# however, if you know what you're doing, feel free to tweak +NTPD_OPTS="-g -u ntp:ntp" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.rc-r1 b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.rc-r1 new file mode 100644 index 0000000000..7573411c99 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.rc-r1 @@ -0,0 +1,22 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="ntpd - the network time protocol daemon" +pidfile="/var/run/ntpd.pid" +command="/usr/sbin/ntpd" +command_args="-p ${pidfile} ${NTPD_OPTS}" +start_stop_daemon_args="--pidfile ${pidfile}" + +depend() { + use net dns logger + after ntp-client +} + +start_pre() { + if [ ! -f /etc/ntp.conf ] ; then + eerror "Please create /etc/ntp.conf" + return 1 + fi + return 0 +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service-r2 similarity index 70% rename from sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service rename to sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service-r2 index 65c109b243..5f11b27e92 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service-r2 @@ -4,9 +4,8 @@ After=ntpdate.service sntp.service Conflicts=systemd-timesyncd.service [Service] -ExecStart=/usr/sbin/ntpd -g -n -f /var/lib/ntp/ntp.drift +ExecStart=/usr/sbin/ntpd -g -n PrivateTmp=true -Restart=always [Install] WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service-r1 similarity index 64% rename from sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service rename to sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service-r1 index 0d16f19bc0..f9bc9ddefc 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service-r1 @@ -3,11 +3,10 @@ Description=Set time via NTP using ntpdate After=network-online.target nss-lookup.target Before=time-sync.target Wants=time-sync.target -Conflicts=systemd-timesyncd.service +Conflicts=systemd-timesyncd.service [Service] Type=oneshot -Environment="SERVER=0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org" ExecStart=/usr/sbin/ntpdate -b -u $SERVER RemainAfterExit=yes diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service.conf b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service.conf new file mode 100644 index 0000000000..75e4f41b41 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service.conf @@ -0,0 +1,2 @@ +[Service] +Environment="SERVER=0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.confd b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.confd new file mode 100644 index 0000000000..d11983a3fb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.confd @@ -0,0 +1,4 @@ +# /etc/conf.d/sntp + +# Options to pass to sntp +SNTP_OPTS="-s 0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.rc b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.rc new file mode 100644 index 0000000000..4ed56ae2bf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.rc @@ -0,0 +1,26 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/bin/sntp" + +depend() { + before cron portmap + after net + use dns logger +} + +start_pre() { + if [ -z "${SNTP_OPTS}" ] ; then + eerror "Please edit /etc/conf.d/sntp" + eerror "I need to know what server/options to use!" + return 1 + fi + return 0 +} + +start() { + ebegin "Setting clock via SNTP" + ${command} ${SNTP_OPTS} + eend $? "Failed to set clock" +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service-r2 similarity index 65% rename from sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service rename to sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service-r2 index 98aa475770..9bdd578ffb 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service-r2 @@ -3,11 +3,10 @@ Description=Set time via SNTP After=network.target NetworkManager-wait-online.service nss-lookup.target Before=time-sync.target Wants=time-sync.target -Conflicts=systemd-timesyncd.service +Conflicts=systemd-timesyncd.service [Service] Type=oneshot -Environment="SERVER=0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org" ExecStart=/usr/bin/sntp -s $SERVER RemainAfterExit=yes diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service.conf b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service.conf new file mode 100644 index 0000000000..75e4f41b41 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service.conf @@ -0,0 +1,2 @@ +[Service] +Environment="SERVER=0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p12.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p13.ebuild similarity index 68% rename from sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p12.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p13.ebuild index df8a20e9dc..c925543d0c 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p13.ebuild @@ -13,8 +13,8 @@ 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 libressl openntpd parse-clocks perl readline samba selinux snmp ssl threads vim-syntax zeroconf" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" +IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] @@ -23,7 +23,7 @@ CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) + libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools )" DEPEND="${CDEPEND} @@ -52,7 +52,6 @@ pkg_setup() { src_prepare() { default - use perl || sed -i -e '/^SUBDIRS *=/,/[^\\]$/{/scripts/d;}' Makefile.am || die append-cppflags -D_GNU_SOURCE #264109 # Make sure every build uses the same install layout. #539092 find sntp/loc/ -type f '!' -name legacy -delete || die @@ -98,10 +97,19 @@ src_install() { dodoc INSTALL WHERE-TO-START doman "${WORKDIR}"/man/*.[58] - insinto /usr/share/ntp + insinto /etc doins "${FILESDIR}"/ntp.conf - use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/usr/share/ntp/ntp.conf #524726 - systemd_newtmpfilesd "${FILESDIR}"/ntp.tmpfiles ntp.conf + use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726 + newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd + newconfd "${FILESDIR}"/ntpd.confd ntpd + newinitd "${FILESDIR}"/ntp-client.rc ntp-client + newconfd "${FILESDIR}"/ntp-client.confd ntp-client + newinitd "${FILESDIR}"/sntp.rc sntp + newconfd "${FILESDIR}"/sntp.confd sntp + if ! use caps ; then + sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die + fi + sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die keepdir /var/lib/ntp use prefix || fowners ntp:ntp /var/lib/ntp @@ -110,9 +118,10 @@ src_install() { cd "${ED}" || die rm usr/sbin/ntpd || die rm -r var/lib || die + rm etc/{conf,init}.d/ntpd || die rm usr/share/man/*/ntpd.8 || die else - systemd_dounit "${FILESDIR}"/ntpd.service + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service if use caps ; then sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ "${D%/}$(systemd_get_systemunitdir)"/ntpd.service \ @@ -121,6 +130,17 @@ src_install() { systemd_enable_ntpunit 60-ntpd ntpd.service fi - systemd_dounit "${FILESDIR}"/ntpdate.service - systemd_dounit "${FILESDIR}"/sntp.service + systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf + systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service + systemd_install_serviced "${FILESDIR}"/sntp.service.conf +} + +pkg_postinst() { + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then + eerror "The notrust option was found in your /etc/ntp.conf!" + ewarn "If your ntpd starts sending out weird responses," + ewarn "then make sure you have keys properly setup and see" + ewarn "https://bugs.gentoo.org/41827" + fi }