summaryrefslogtreecommitdiffstats
path: root/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-10-30 15:18:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-10-30 15:18:17 +0000
commite35d42e890024b1612780444a785132abbdfd70d (patch)
tree07678de2e87495f95e348b444494e1da5620cba8 /package/utils/busybox/patches/230-ntpd_delayed_resolve.patch
parentce0989439850a1306dc2e61d711b5dd50b9f2b13 (diff)
downloadmaster-31e0f0ae-e35d42e890024b1612780444a785132abbdfd70d.tar.gz
master-31e0f0ae-e35d42e890024b1612780444a785132abbdfd70d.tar.bz2
master-31e0f0ae-e35d42e890024b1612780444a785132abbdfd70d.zip
busybox: update to version 1.24.1
Patches applied upstream and dropped: 280-fix_find_regression.patch 300-ip-addr-improvements.patch Fixed upstream: 290-ash-fix-a-regression-in-handling-local-variables.patch (see thread: http://lists.busybox.net/pipermail/busybox/2015-April/082783.html) Signed-off-by: Magnus Kroken <mkroken@gmail.com> SVN-Revision: 47288
Diffstat (limited to 'package/utils/busybox/patches/230-ntpd_delayed_resolve.patch')
-rw-r--r--package/utils/busybox/patches/230-ntpd_delayed_resolve.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch b/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch
index 1543e53173..b0af08efb5 100644
--- a/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch
+++ b/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch
@@ -1,6 +1,6 @@
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
-@@ -251,6 +251,7 @@ typedef struct {
+@@ -265,6 +265,7 @@ typedef struct {
typedef struct {
len_and_sockaddr *p_lsa;
char *p_dotted;
@@ -8,7 +8,7 @@
int p_fd;
int datapoint_idx;
uint32_t lastpkt_refid;
-@@ -756,8 +757,9 @@ add_peers(const char *s)
+@@ -766,8 +767,9 @@ add_peers(const char *s)
peer_t *p;
p = xzalloc(sizeof(*p));
@@ -20,7 +20,7 @@
p->p_fd = -1;
p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3);
p->next_action_time = G.cur_time; /* = set_next(p, 0); */
-@@ -806,6 +808,25 @@ send_query_to_peer(peer_t *p)
+@@ -816,6 +818,25 @@ send_query_to_peer(peer_t *p)
*
* Uncomment this and use strace to see it in action:
*/