diff options
Diffstat (limited to 'recipes/ntp/ntp-4.2.2p3')
-rw-r--r-- | recipes/ntp/ntp-4.2.2p3/ipv6only-workaround.patch | 13 | ||||
-rw-r--r-- | recipes/ntp/ntp-4.2.2p3/tickadj.c.patch | 32 |
2 files changed, 45 insertions, 0 deletions
diff --git a/recipes/ntp/ntp-4.2.2p3/ipv6only-workaround.patch b/recipes/ntp/ntp-4.2.2p3/ipv6only-workaround.patch new file mode 100644 index 0000000000..5301621dc2 --- /dev/null +++ b/recipes/ntp/ntp-4.2.2p3/ipv6only-workaround.patch @@ -0,0 +1,13 @@ +Index: ntp-4.2.2p3/ntpdate/ntpdate.c +=================================================================== +--- ntp-4.2.2p3.orig/ntpdate/ntpdate.c ++++ ntp-4.2.2p3/ntpdate/ntpdate.c +@@ -1777,8 +1777,6 @@ init_io(void) + if (res->ai_family == AF_INET6) + if (setsockopt(fd[nbsock], IPPROTO_IPV6, IPV6_V6ONLY, (void*) &optval, sizeof(optval)) < 0) { + netsyslog(LOG_ERR, "setsockopt() IPV6_V6ONLY failed: %m"); +- exit(1); +- /*NOTREACHED*/ + } + #endif + diff --git a/recipes/ntp/ntp-4.2.2p3/tickadj.c.patch b/recipes/ntp/ntp-4.2.2p3/tickadj.c.patch new file mode 100644 index 0000000000..9ef9de9e1f --- /dev/null +++ b/recipes/ntp/ntp-4.2.2p3/tickadj.c.patch @@ -0,0 +1,32 @@ +Index: ntp-4.2.2p3-r0/ntp-4.2.2p3/util/tickadj.c +=================================================================== +--- ntp-4.2.2p3/util/tickadj.c 2004-02-25 06:58:33.000000000 +0100 ++++ ntp-4.2.2p3/util/tickadj.c 2007-07-07 01:00:54.000000000 +0200 +@@ -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"); + } |