Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2018-01-16 09:24:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ntp" Tue Jan 16 09:24:07 2018 rev:112 rq:561845 version:4.2.8p10 Changes: -------- --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2017-11-30 12:41:14.370975513 +0100 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2018-01-16 09:24:09.124839692 +0100 @@ -1,0 +2,12 @@ +Thu Dec 21 13:55:11 UTC 2017 - [email protected] + +- Add ntp-reproducible.patch to make build reproducible (boo#1047218) + +------------------------------------------------------------------- +Tue Dec 19 15:26:04 UTC 2017 - [email protected] + +- Restart nptd if failed or aborted (FATE#315133). +- Do not try to set the HW clock when adding a server at runtime + to avoid blocking systemd. + +------------------------------------------------------------------- New: ---- ntp-reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.O1AebD/_old 2018-01-16 09:24:10.760763155 +0100 +++ /var/tmp/diff_new_pack.O1AebD/_new 2018-01-16 09:24:10.768762781 +0100 @@ -63,6 +63,7 @@ Patch29: ntp-pathfind.patch Patch30: ntp-move-kod-file.patch Patch31: ntp-warnings.patch +Patch32: ntp-reproducible.patch BuildRequires: autoconf BuildRequires: avahi-compat-mDNSResponder-devel @@ -143,6 +144,7 @@ %patch29 %patch30 %patch31 +%patch32 -p1 # fix DOS line breaks sed -i 's/\r//g' html/scripts/{footer.txt,style.css} ++++++ conf.ntpd.service ++++++ --- /var/tmp/diff_new_pack.O1AebD/_old 2018-01-16 09:24:10.904756419 +0100 +++ /var/tmp/diff_new_pack.O1AebD/_new 2018-01-16 09:24:10.904756419 +0100 @@ -12,6 +12,7 @@ Type=forking PIDFile=/var/run/ntp/ntpd.pid ExecStart=/usr/sbin/start-ntpd start +RestartSec=11min Restart=always PrivateTmp=true ++++++ conf.start-ntpd ++++++ --- /var/tmp/diff_new_pack.O1AebD/_old 2018-01-16 09:24:10.920755671 +0100 +++ /var/tmp/diff_new_pack.O1AebD/_new 2018-01-16 09:24:10.924755483 +0100 @@ -141,7 +141,6 @@ } function add_runtime_server() { - [ "$NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP" = "yes" ] && /usr/sbin/sntp -S -c $@ NTPC_CMD="keytype $NTP_KEYTYPE\nkeyid $NTP_KEYID\npasswd $NTP_PASSWD\n:config server $@\n" NTPQ_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPQ_BIN) logger -t $0 "runtime configuration: server $@" ++++++ ntp-reproducible.patch ++++++ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828989 From: Reiner Herrmann <[email protected]> Subject: ntp: please make the build reproducible Date: Wed, 29 Jun 2016 16:43:31 +0200 While working on the "reproducible builds" effort [1], we have noticed that ntp could not be built reproducibly. It embeds the build time into the version string. The attached patch removes this, so that it can be built reproducibly. Index: ntp-4.2.8p10/scripts/build/mkver.in =================================================================== --- ntp-4.2.8p10.orig/scripts/build/mkver.in +++ ntp-4.2.8p10/scripts/build/mkver.in @@ -15,8 +15,6 @@ case "@VER_SUFFIX@" in *) ConfStr="${ConfStr}-@VER_SUFFIX@" ;; esac -ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`" - if [ ! -f .version ]; then echo 0 > .version fi
