ntp: rebase nano patch to apply cleanly
PATCH 1/1 ntp: rebase nano patch to apply cleanly
Signed-off-by Danomi Manchego <[email protected]>
---
Note: Done to remove the fuzz that breaks git-apply operation.
--- package/ntp/0001-nano.patch | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
package/ntp/0001-nano.patch +11 -6
@@ -3,10 +3,15 @@ http://bugs.gentoo.org/show_bug.cgi?id=270483 Signed-off-by: Gustavo Zacarias <[email protected]> -diff -Nura ntp-4.2.6p2.orig/include/ntp_syscall.h ntp-4.2.6p2/include/ntp_syscall.h ---- ntp-4.2.6p2.orig/include/ntp_syscall.h 2009-12-09 04:36:37.000000000 -0300 -+++ ntp-4.2.6p2/include/ntp_syscall.h 2011-01-27 13:09:05.072336628 -0300 -@@ -14,6 +14,14 @@ +Rebase to apply cleanly. + +Signed-off-by: Danomi Manchego <[email protected]> + + +diff -purN a/include/ntp_syscall.h b/include/ntp_syscall.h +--- a/include/ntp_syscall.h 2015-02-11 08:42:37.794576469 -0500 ++++ b/include/ntp_syscall.h 2015-02-11 08:43:03.216957279 -0500 +@@ -10,6 +10,14 @@ # include <sys/timex.h> #endif
@@ -19,5 +24,5 @@ diff -Nura ntp-4.2.6p2.orig/include/ntp_syscall.h ntp-4.2.6p2/include/ntp_syscal +#endif + #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) + # ifdef NTP_SYSCALLS_STD + # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t))
Signature · 1 line
1.9.1
PATCH 1/1 ntp: rebase nano patch to apply cleanly
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Danomi" == Danomi Manchego <[email protected]> writes:
Signed-off-by Danomi Manchego <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard