From cecf2e7e8b9ed84fdf4cfcdaceb5e9e4fc0f2cff Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 20:31:38 -0500
Subject: ntp: Bump to latest. ref #647

---
 abs/core/ntp/PKGBUILD                |  2 +-
 abs/core/ntp/changelog               | 25 +++++++++++++++++++++++++
 abs/core/ntp/fix-ipv6.patch          | 10 ----------
 abs/core/ntp/ntp-4.2.4_p7-nano.patch | 20 --------------------
 abs/core/ntp/ntp-client.conf         |  0
 abs/core/ntp/ntp.conf                |  0
 abs/core/ntp/ntpd                    |  0
 abs/core/ntp/ntpdate                 |  0
 8 files changed, 26 insertions(+), 31 deletions(-)
 mode change 100755 => 100644 abs/core/ntp/PKGBUILD
 delete mode 100644 abs/core/ntp/fix-ipv6.patch
 delete mode 100644 abs/core/ntp/ntp-4.2.4_p7-nano.patch
 mode change 100755 => 100644 abs/core/ntp/ntp-client.conf
 mode change 100755 => 100644 abs/core/ntp/ntp.conf
 mode change 100755 => 100644 abs/core/ntp/ntpd
 mode change 100755 => 100644 abs/core/ntp/ntpdate

diff --git a/abs/core/ntp/PKGBUILD b/abs/core/ntp/PKGBUILD
old mode 100755
new mode 100644
index 69669c7..290b6b2
--- a/abs/core/ntp/PKGBUILD
+++ b/abs/core/ntp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 117473 2011-04-03 17:50:26Z andrea $
+# $Id$
 # Maintainer: kevin <kevin@archlinux.org>
 
 pkgname=ntp
diff --git a/abs/core/ntp/changelog b/abs/core/ntp/changelog
index e69de29..528a078 100644
--- a/abs/core/ntp/changelog
+++ b/abs/core/ntp/changelog
@@ -0,0 +1,25 @@
+2011-04-03  andrea <andrea@archlinux.org>
+
+    * ntp 4.2.6p3-3
+    - Use 'ntpd -p' to get the PID in ntpd
+    - Don't run the ntp client in background in ntpdate
+
+2011-03-28  andrea <andrea@archlinux.org>
+
+    * ntp 4.2.6p3-2
+    - Improved daemon scripts
+
+2010-10-16  kevin  <kevin@archlinux.org>
+
+    * ntp 4.2.6p3
+    - Implemented FS#18469, replace ntpdate with ntpd -q
+    - Removed LIBS
+    - Removed old IPv6 and nano patch
+
+2010-10-16  kevin  <kevin@archlinux.org>
+
+    * ntp 4.2.6p2
+    - Added changelog
+    - Set LIBS to use librt since configure doesn't set it
+    - Convert PKGBUILD to build()/package() format
+    - removed "|| return 1"
diff --git a/abs/core/ntp/fix-ipv6.patch b/abs/core/ntp/fix-ipv6.patch
deleted file mode 100644
index eecd766..0000000
--- a/abs/core/ntp/fix-ipv6.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ntp-4.2.4p7-orig/configure.ac	2009-06-18 14:48:12.151346763 +0200
-+++ ntp-4.2.4p7/configure.ac	2009-06-18 14:50:07.054692531 +0200
-@@ -4456,6 +4456,7 @@
- 		[
- 		    AC_LANG_PROGRAM(
- 			[
-+                            #define _GNU_SOURCE
- 			    #include <sys/types.h>
- 			    #include <sys/socket.h>
- 			    #include <netinet/in.h>
diff --git a/abs/core/ntp/ntp-4.2.4_p7-nano.patch b/abs/core/ntp/ntp-4.2.4_p7-nano.patch
deleted file mode 100644
index b31ea0a..0000000
--- a/abs/core/ntp/ntp-4.2.4_p7-nano.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://bugs.gentoo.org/270483
-
-ripped from fedora
-
---- ntp-4.2.4p7/include/ntp_syscall.h
-+++ ntp-4.2.4p7/include/ntp_syscall.h
-@@ -14,5 +14,13 @@
- # 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
diff --git a/abs/core/ntp/ntp-client.conf b/abs/core/ntp/ntp-client.conf
old mode 100755
new mode 100644
diff --git a/abs/core/ntp/ntp.conf b/abs/core/ntp/ntp.conf
old mode 100755
new mode 100644
diff --git a/abs/core/ntp/ntpd b/abs/core/ntp/ntpd
old mode 100755
new mode 100644
diff --git a/abs/core/ntp/ntpdate b/abs/core/ntp/ntpdate
old mode 100755
new mode 100644
-- 
cgit v0.12

