diff options
Diffstat (limited to 'external/meta-openembedded/meta-networking/recipes-support/ntp')
| -rw-r--r-- | external/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf | 6 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-networking/recipes-support/ntp/ntp/reproducibility-respect-source-date-epoch.patch | 16 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb (renamed from external/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb) | 17 |
3 files changed, 13 insertions, 26 deletions
diff --git a/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf b/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf index 676e1864..b5900309 100644 --- a/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf +++ b/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf @@ -14,4 +14,8 @@ driftfile /var/lib/ntp/drift server 127.127.1.0 fudge 127.127.1.0 stratum 14 # Defining a default security setting -restrict default +restrict -4 default notrap nomodify nopeer noquery +restrict -6 default notrap nomodify nopeer noquery + +restrict 127.0.0.1 # allow local host +restrict ::1 # allow local host diff --git a/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp/reproducibility-respect-source-date-epoch.patch b/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp/reproducibility-respect-source-date-epoch.patch deleted file mode 100644 index 58e71c3b..00000000 --- a/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp/reproducibility-respect-source-date-epoch.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ntp-4.2.8p12.original/scripts/build/mkver.in 2018-11-12 14:06:49.333020430 +1300 -+++ ntp-4.2.8p12/scripts/build/mkver.in 2018-11-12 14:15:04.947480167 +1300 -@@ -15,7 +15,12 @@ - *) ConfStr="${ConfStr}-@VER_SUFFIX@" ;; - esac - --ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`" -+if [ -n "$SOURCE_DATE_EPOCH" ]; then -+ ConfStr="$ConfStr `LC_TIME=C TZ=UTC date -d@$SOURCE_DATE_EPOCH 2>/dev/null`" || -+ ConfStr="$ConfStr `LC_TIME=C TZ=UTC date -r $SOURCE_DATE_EPOCH`" -+else -+ ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`" -+fi - - if [ ! -f .version ]; then - echo 0 > .version diff --git a/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb b/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb index dc18a602..7e168825 100644 --- a/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb +++ b/external/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb @@ -6,14 +6,13 @@ or satellite receiver or modem." HOMEPAGE = "http://support.ntp.org" SECTION = "net" LICENSE = "NTP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4cee33257467509e498f4cd9a6a4bd53" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19" DEPENDS = "libevent" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ file://ntp-4.2.4_p6-nano.patch \ file://reproducibility-fixed-path-to-posix-shell.patch \ - file://reproducibility-respect-source-date-epoch.patch \ file://ntpd \ file://ntp.conf \ file://ntpdate \ @@ -25,8 +24,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -SRC_URI[md5sum] = "ea040ab9b4ca656b5229b89d6b822f13" -SRC_URI[sha256sum] = "288772cecfcd9a53694ffab108d1825a31ba77f3a8466b0401baeca3bc232a38" +SRC_URI[sha256sum] = "f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19" inherit autotools update-rc.d useradd systemd pkgconfig @@ -105,7 +103,7 @@ do_install_append() { rmdir --ignore-fail-on-non-empty ${D}${libexecdir} } -PACKAGES += "ntpdate sntp ntpq ${PN}-tickadj ${PN}-utils" +PACKAGES += "ntpdate sntp ntpdc ntpq ${PN}-tickadj ${PN}-utils" # NOTE: you don't need ntpdate, use "ntpd -q -g -x" # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms @@ -117,8 +115,8 @@ RDEPENDS_${PN} += "libgcc" RPROVIDES_${PN}-utils = "${PN}-bin" RREPLACES_${PN}-utils = "${PN}-bin" RCONFLICTS_${PN}-utils = "${PN}-bin" -# ntpq was split out of ntp-utils -RDEPENDS_${PN}-utils = "ntpq" +# ntpdc and ntpq were split out of ntp-utils +RDEPENDS_${PN}-utils = "ntpdc ntpq" SYSTEMD_PACKAGES = "${PN} ntpdate sntp" SYSTEMD_SERVICE_${PN} = "ntpd.service" @@ -136,9 +134,9 @@ RCONFLICTS_ntpdate += "ntpdate-systemd" RSUGGESTS_${PN} = "iana-etc" -FILES_${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \ +FILES_${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd \ ${NTP_USER_HOME} \ - ${systemd_unitdir}/ntp-units.d/60-ntpd.list ${libexecdir}\ + ${systemd_unitdir}/ntp-units.d/60-ntpd.list \ " FILES_${PN}-tickadj = "${sbindir}/tickadj" FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib" @@ -153,6 +151,7 @@ FILES_sntp = "${sbindir}/sntp \ ${sysconfdir}/default/sntp \ ${systemd_unitdir}/system/sntp.service \ " +FILES_ntpdc = "${sbindir}/ntpdc" FILES_ntpq = "${sbindir}/ntpq" CONFFILES_${PN} = "${sysconfdir}/ntp.conf" |