From 5c035320532cbecaf60e9ab0607b2e65bc79c419 Mon Sep 17 00:00:00 2001
From: Thomas Penteker <tek@serverop.de>
Date: Thu, 4 Jun 2009 19:09:27 +0200
Subject: [PATCH] ntp: include patch for 64-bit (thx nipuL)

---
 ntp/.md5sum        |  3 ++-
 ntp/Pkgfile        |  5 ++++-
 ntp/ntp-64bit.diff | 17 +++++++++++++++++
 ntp/ntpdate        |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 ntp/ntp-64bit.diff

diff --git a/ntp/.md5sum b/ntp/.md5sum
index f7488a2e9..aba5eefe2 100644
--- a/ntp/.md5sum
+++ b/ntp/.md5sum
@@ -1,4 +1,5 @@
 8c19ff62ed4f7d64f8e2aa59cb11f364  ntp-4.2.4p7.tar.gz
+0c5675c46a226de4504f5b855326b6b7  ntp-64bit.diff
 de14b18b5f2be841a9c3434012c19f6c  ntp.conf
 2aaeeae50b860296490b03dc5fbe1736  ntpd
-512b61440eae365871a86c5415b12e86  ntpdate
+3714dba66445d1b41d6c699447c7a65e  ntpdate
diff --git a/ntp/Pkgfile b/ntp/Pkgfile
index b72181335..59c02259e 100644
--- a/ntp/Pkgfile
+++ b/ntp/Pkgfile
@@ -10,7 +10,8 @@ release=2
 source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/$name-$version.tar.gz
         ntpd
         ntpdate
-        ntp.conf)
+        ntp.conf
+        ntp-64bit.diff)
 
 build () {
    mkdir -p $PKG/etc/{rc.d,ntp} \
@@ -21,6 +22,8 @@ build () {
 
    cd $name-$version
 
+   patch -p1 -i ../ntp-64bit.diff
+
    ./configure \
       --prefix=/usr \
       --with-sntp \
diff --git a/ntp/ntp-64bit.diff b/ntp/ntp-64bit.diff
new file mode 100644
index 000000000..281cc99b2
--- /dev/null
+++ b/ntp/ntp-64bit.diff
@@ -0,0 +1,17 @@
+--- a/include/ntp_syscall.h	2009-05-19 16:44:55.048156467 -0400
++++ b/include/ntp_syscall.h	2009-05-19 16:46:19.293323686 -0400
+@@ -14,6 +14,14 @@
+ # include <sys/timex.h>
+ #endif
+ 
++#if defined(ADJ_NANO) && !defined(MOD_NANO)
++#define MOD_NANO ADJ_NANO
++#endif
++
++#if defined(ADJ_TAI) && !defined(MOD_TAI)
++#define MOD_TAI ADJ_TAI
++#endif
++
+ #ifndef NTP_SYSCALLS_LIBC
+ #ifdef NTP_SYSCALLS_STD
+ # define ntp_adjtime(t)		syscall(SYS_ntp_adjtime, (t))
diff --git a/ntp/ntpdate b/ntp/ntpdate
index 72904c5c4..539f283d7 100755
--- a/ntp/ntpdate
+++ b/ntp/ntpdate
@@ -5,7 +5,7 @@
 
 case $1 in
 start)
-  /usr/bin/ntpdate pool.ntp.org 1>/dev/null
+  /usr/bin/ntpdate pool.ntp.org 1>/dev/null &
   ;;
 stop)
   ;;