diff --git a/chrony-config.patch b/chrony-config.patch index 0cecc25..136b1c0 100644 --- a/chrony-config.patch +++ b/chrony-config.patch @@ -1,5 +1,7 @@ ---- chrony-3.1/examples/chrony.conf.example3 2017-01-31 05:22:11.000000000 -0500 -+++ chrony-3.1/examples/chrony.conf.example3 2017-01-31 11:53:04.000000000 -0500 +Index: chrony-3.2/examples/chrony.conf.example3 +=================================================================== +--- chrony-3.2.orig/examples/chrony.conf.example3 ++++ chrony-3.2/examples/chrony.conf.example3 @@ -27,12 +27,38 @@ # you can access at http://support.ntp.org/bin/view/Servers/WebHome or # you can use servers from the pool.ntp.org project. @@ -52,7 +54,7 @@ # If you want to enable NTP authentication with symmetric keys, you will need # to uncomment the following line and edit the file to set up the keys. -@@ -118,8 +144,8 @@ +@@ -124,8 +150,8 @@ driftfile /var/lib/chrony/drift # produce some graphs of your system's timekeeping performance, or you # need help in debugging a problem. diff --git a/chrony-fix-open.patch b/chrony-fix-open.patch index b0be6bd..a3c42f7 100644 --- a/chrony-fix-open.patch +++ b/chrony-fix-open.patch @@ -1,8 +1,8 @@ Index: chrony-3.2/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c =================================================================== ---- chrony-3.2/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c +--- chrony-3.2.orig/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c +++ chrony-3.2/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c -@@ -1000,6 +1000,8 @@ int open(const char *pathname, int flags +@@ -1008,6 +1008,8 @@ int open(const char *pathname, int flags else if (!strcmp(pathname, "/dev/ptp1")) return SYSCLK_FD; @@ -11,7 +11,7 @@ Index: chrony-3.2/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c r = _open(pathname, flags); assert(r < 0 || (r < BASE_SOCKET_FD && r < BASE_TIMER_FD)); -@@ -1018,6 +1020,8 @@ int close(int fd) { +@@ -1026,6 +1028,8 @@ int close(int fd) { return 0; } diff --git a/chrony.changes b/chrony.changes index 690fafe..4d639b2 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 28 16:17:08 UTC 2017 - mrueckert@suse.de + +- refresh patches to apply cleanly again + - chrony-config.patch + - chrony-fix-open.patch + ------------------------------------------------------------------- Wed Sep 20 23:57:53 UTC 2017 - mpost@suse.com