chrony/chrony-fix-open.patch

23 lines
775 B
Diff
Raw Normal View History

Accepting request 528207 from home:markkp:branches:network:time - Upgraded to version 3.2: Enhancements * Improve stability with NTP sources and reference clocks * Improve stability with hardware timestamping * Improve support for NTP interleaved modes * Control frequency of system clock on macOS 10.13 and later * Set TAI-UTC offset of system clock with leapsectz directive * Minimise data in client requests to improve privacy * Allow transmit-only hardware timestamping * Add support for new timestamping options introduced in Linux 4.13 * Add root delay, root dispersion and maximum error to tracking log * Add mindelay and asymmetry options to server/peer/pool directive * Add extpps option to PHC refclock to timestamp external PPS signal * Add pps option to refclock directive to treat any refclock as PPS * Add width option to refclock directive to filter wrong pulse edges * Add rxfilter option to hwtimestamp directive * Add -x option to disable control of system clock * Add -l option to log to specified file instead of syslog * Allow multiple command-line options to be specified together * Allow starting without root privileges with -Q option * Update seccomp filter for new glibc versions * Dump history on exit by default with dumpdir directive * Use hardening compiler options by default Bug fixes * Don't drop PHC samples with low-resolution system clock * Ignore outliers in PHC tracking, RTC tracking, manual input * Increase polling interval when peer is not responding * Exit with error message when include directive fails * Don't allow slash after hostname in allow/deny directive/command * Try to connect to all addresses in chronyc before giving up - Upgraded clknetsim to version 71dbbc5. - Reworked chrony-fix-open.patch to fit the new version OBS-URL: https://build.opensuse.org/request/show/528207 OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=29
2017-09-22 07:52:47 +00:00
Index: chrony-3.2/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c
===================================================================
--- chrony-3.2.orig/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c
Accepting request 528207 from home:markkp:branches:network:time - Upgraded to version 3.2: Enhancements * Improve stability with NTP sources and reference clocks * Improve stability with hardware timestamping * Improve support for NTP interleaved modes * Control frequency of system clock on macOS 10.13 and later * Set TAI-UTC offset of system clock with leapsectz directive * Minimise data in client requests to improve privacy * Allow transmit-only hardware timestamping * Add support for new timestamping options introduced in Linux 4.13 * Add root delay, root dispersion and maximum error to tracking log * Add mindelay and asymmetry options to server/peer/pool directive * Add extpps option to PHC refclock to timestamp external PPS signal * Add pps option to refclock directive to treat any refclock as PPS * Add width option to refclock directive to filter wrong pulse edges * Add rxfilter option to hwtimestamp directive * Add -x option to disable control of system clock * Add -l option to log to specified file instead of syslog * Allow multiple command-line options to be specified together * Allow starting without root privileges with -Q option * Update seccomp filter for new glibc versions * Dump history on exit by default with dumpdir directive * Use hardening compiler options by default Bug fixes * Don't drop PHC samples with low-resolution system clock * Ignore outliers in PHC tracking, RTC tracking, manual input * Increase polling interval when peer is not responding * Exit with error message when include directive fails * Don't allow slash after hostname in allow/deny directive/command * Try to connect to all addresses in chronyc before giving up - Upgraded clknetsim to version 71dbbc5. - Reworked chrony-fix-open.patch to fit the new version OBS-URL: https://build.opensuse.org/request/show/528207 OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=29
2017-09-22 07:52:47 +00:00
+++ chrony-3.2/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c
@@ -1008,6 +1008,8 @@ int open(const char *pathname, int flags
else if (!strcmp(pathname, "/dev/ptp1"))
return SYSCLK_FD;
+ if (!_open)
+ _open = (int (*)(const char *pathname, int flags))dlsym(RTLD_NEXT, "open");
r = _open(pathname, flags);
assert(r < 0 || (r < BASE_SOCKET_FD && r < BASE_TIMER_FD));
@@ -1026,6 +1028,8 @@ int close(int fd) {
return 0;
}
+ if (!_close)
+ _close = (int (*)(int fd))dlsym(RTLD_NEXT, "close");
return _close(fd);
}