diff mbox

ntp: rebase nano patch to apply cleanly

Message ID 1423663210-4391-1-git-send-email-danomimanchego123@gmail.com
State Accepted
Commit cfa6311d2a0c6dfa5e3041ef371d272a774b695f
Headers show

Commit Message

Danomi Manchego Feb. 11, 2015, 2 p.m. UTC 
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

---

Note: Done to remove the fuzz that breaks git-apply operation.
---
 package/ntp/0001-nano.patch | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Comments

Peter Korsgaard Feb. 12, 2015, 7:50 a.m. UTC | #1 
>>>>> "Danomi" == Danomi Manchego <danomimanchego123@gmail.com> writes:

 > Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

Committed, thanks.
diff mbox

Patch

diff --git a/package/ntp/0001-nano.patch b/package/ntp/0001-nano.patch
index d16046c..bce3478 100644
--- a/package/ntp/0001-nano.patch
+++ b/package/ntp/0001-nano.patch
@@ -3,10 +3,15 @@  http://bugs.gentoo.org/show_bug.cgi?id=270483
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-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 <danomimanchego123@gmail.com>
+
+
+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))