summaryrefslogtreecommitdiff
path: root/package/ntp/ntp-adjtimex.patch
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-01-27 13:24:10 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2011-01-30 00:40:13 +0100
commit34c56e014ff44329416b609e1be208fd8e2ad4bf (patch)
treef656fb75f94adf246f9495ec6051ba094db7aa30 /package/ntp/ntp-adjtimex.patch
parent950a63a75383ec42795ec4a0c1559bbc832912be (diff)
ntp: bump to version 4.2.6p3 and fix glibc build failure
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 <gustavo@zacarias.com.ar> Acked-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/ntp/ntp-adjtimex.patch')
-rw-r--r--package/ntp/ntp-adjtimex.patch33
1 files changed, 33 insertions, 0 deletions
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 <unistd.h>
+ #endif /* HAVE_UNISTD_H */
+
+-#ifdef HAVE___ADJTIMEX /* Linux */
++/* proper handling here has been moved to upstream ntp bugzilla */
++#ifdef linux
+
+ #include <sys/timex.h>
+ 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");
+ }