From 34c56e014ff44329416b609e1be208fd8e2ad4bf Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Jan 2011 13:24:10 -0300 Subject: ntp: bump to version 4.2.6p3 and fix glibc build failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump to version 4.2.6p3 and fix a build failure with external toolchains that use certain glibc versions as point out by speakman on IRC. Signed-off-by: Gustavo Zacarias Acked-by: Daniel Nyström Signed-off-by: Peter Korsgaard --- package/ntp/ntp-4.2.6_p2-adjtimex.patch | 33 --------------------------------- package/ntp/ntp-adjtimex.patch | 33 +++++++++++++++++++++++++++++++++ package/ntp/ntp-nano.patch | 23 +++++++++++++++++++++++ package/ntp/ntp.mk | 2 +- 4 files changed, 57 insertions(+), 34 deletions(-) delete mode 100644 package/ntp/ntp-4.2.6_p2-adjtimex.patch create mode 100644 package/ntp/ntp-adjtimex.patch create mode 100644 package/ntp/ntp-nano.patch diff --git a/package/ntp/ntp-4.2.6_p2-adjtimex.patch b/package/ntp/ntp-4.2.6_p2-adjtimex.patch deleted file mode 100644 index 40625fa18..000000000 --- a/package/ntp/ntp-4.2.6_p2-adjtimex.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://support.ntp.org/bugs/show_bug.cgi?id=769 -http://bugs.gentoo.org/254030 - ---- ntp/util/tickadj.c -+++ ntp/util/tickadj.c -@@ -21,7 +21,8 @@ - # include - #endif /* HAVE_UNISTD_H */ - --#ifdef HAVE___ADJTIMEX /* Linux */ -+/* proper handling here has been moved to upstream ntp bugzilla */ -+#ifdef linux - - #include - struct timex txc; -@@ -91,7 +92,7 @@ - } - - if (!errflg) { -- if (__adjtimex(&txc) < 0) -+ if (adjtimex(&txc) < 0) - perror("adjtimex"); - else if (!quiet) - printf("tick = %ld\ntick_adj = %d\n", -@@ -146,7 +147,7 @@ - #endif - } - -- if (__adjtimex(&txc) < 0) -+ if (adjtimex(&txc) < 0) - { - perror("adjtimex"); - } diff --git a/package/ntp/ntp-adjtimex.patch b/package/ntp/ntp-adjtimex.patch new file mode 100644 index 000000000..40625fa18 --- /dev/null +++ b/package/ntp/ntp-adjtimex.patch @@ -0,0 +1,33 @@ +https://support.ntp.org/bugs/show_bug.cgi?id=769 +http://bugs.gentoo.org/254030 + +--- ntp/util/tickadj.c ++++ ntp/util/tickadj.c +@@ -21,7 +21,8 @@ + # include + #endif /* HAVE_UNISTD_H */ + +-#ifdef HAVE___ADJTIMEX /* Linux */ ++/* proper handling here has been moved to upstream ntp bugzilla */ ++#ifdef linux + + #include + struct timex txc; +@@ -91,7 +92,7 @@ + } + + if (!errflg) { +- if (__adjtimex(&txc) < 0) ++ if (adjtimex(&txc) < 0) + perror("adjtimex"); + else if (!quiet) + printf("tick = %ld\ntick_adj = %d\n", +@@ -146,7 +147,7 @@ + #endif + } + +- if (__adjtimex(&txc) < 0) ++ if (adjtimex(&txc) < 0) + { + perror("adjtimex"); + } diff --git a/package/ntp/ntp-nano.patch b/package/ntp/ntp-nano.patch new file mode 100644 index 000000000..d16046cb0 --- /dev/null +++ b/package/ntp/ntp-nano.patch @@ -0,0 +1,23 @@ +Fixes issues with glibc header files, see +http://bugs.gentoo.org/show_bug.cgi?id=270483 + +Signed-off-by: Gustavo Zacarias + +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 @@ + # include + #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/package/ntp/ntp.mk b/package/ntp/ntp.mk index 51e395620..7e09b5edd 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -3,7 +3,7 @@ # ntp # ############################################################# -NTP_VERSION = 4.2.6p2 +NTP_VERSION = 4.2.6p3 NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2 -- cgit v1.2.3