main/busybox: cherry-pick ntpd fixes from master and mailing list

1 files changed, 30 insertions, 1 deletions

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 2468fe41ae..4ec81de07d 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.24.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -42,6 +42,14 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	3002-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
 	3003-su-FEATURE_SU_NULLOK_SECURE.patch
 
+	4001-ntpd-step-when-offset-1-sec-not-0.125-sec.patch
+	4002-ntpd-shorter-message.patch
+	4003-ntpd-print-packet-delay-in-clock-update-message.patch
+	4004-ntpd-more-informative-poll-lowering-message.patch
+	4005-ntpd-do-not-use-a-peer-more-than-once-say-if-two-pee.patch
+	4006-ntpd-if-peer-does-not-reply-anymore-try-re-resolving.patch
+	4007-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
+
 	0001-ash-backport-fix-for-here-document-issues.patch
 	0001-ash-fix-error-during-recursive-processing-of-here-do.patch
 
@@ -180,6 +188,13 @@ ad908fc45563148d9f22b50c6e78e0d4  2001-modutils-merge-module_entry-and-module_in
 94ab8b7b930df2f8f04da0e69da258da  3001-login-move-check_securetty-to-libbb.patch
 f7c45568bdb0d2295c43108691e78a40  3002-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
 f82d49c891c02516462db3cda29ccca7  3003-su-FEATURE_SU_NULLOK_SECURE.patch
+574ba81293941dda3910a3d43699a53b  4001-ntpd-step-when-offset-1-sec-not-0.125-sec.patch
+84bc3bc18532032c35553cc4d67810bf  4002-ntpd-shorter-message.patch
+e891282cda76773643dd23077fc574e7  4003-ntpd-print-packet-delay-in-clock-update-message.patch
+5fc2eb488f6c2a87b8eb8aa4948ae2c1  4004-ntpd-more-informative-poll-lowering-message.patch
+f5adc07a1937c4ee36e231f32799515e  4005-ntpd-do-not-use-a-peer-more-than-once-say-if-two-pee.patch
+95479321232337dac85ff1d073ab0830  4006-ntpd-if-peer-does-not-reply-anymore-try-re-resolving.patch
+56af31d2b311983059f6ac8ebf84a5a3  4007-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 5f03ee6f3e93bbc6aedff0777b227810  0001-ash-backport-fix-for-here-document-issues.patch
 a4d1cf64fd1835a284ccc6dbc78e3ce0  0001-ash-fix-error-during-recursive-processing-of-here-do.patch
 ab539a54dcd1c23eb0963e17e768fef7  0001-libbb-fix-time-parsing-of-CC-YY-MMDDhhmm-.SS.patch
@@ -208,6 +223,13 @@ ea589dcd25037e3fefd2f3d6ac801a2a4a61a5cfd2d765785ea5558ed3937776  2003-modinfo-f
 34c694cc2ac69ee2d6bbfe45a20c68036b6299ad7e4a1a8df9bf1ce0a4637bd7  3001-login-move-check_securetty-to-libbb.patch
 ce24e38be870c90bdcb90e7b0445067adf7be0fac6b1154d2364a4db9ee3a9d8  3002-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
 d7b18672334ddeee7fbd6c0e92f26c5d2ef49ddefebf0b7f6eff8dc1ad8d3f7e  3003-su-FEATURE_SU_NULLOK_SECURE.patch
+d77cf90aa6e4b69ada75f8b26df3baecc0be7f7b6a4e7825d77b76ef2cad7cc1  4001-ntpd-step-when-offset-1-sec-not-0.125-sec.patch
+38c194685b40501d0806cf992f74904b408d3e2033aaeb4d82d72c0f5f6bd60f  4002-ntpd-shorter-message.patch
+c9e2973410af407f87e225630c977f2222d2ee35748a67b7cb87ecd20f4412db  4003-ntpd-print-packet-delay-in-clock-update-message.patch
+f04199c1593e4f3e073b358b5cf550e9b0d9ac5d2d88f2953fa12d682f7af14c  4004-ntpd-more-informative-poll-lowering-message.patch
+b32097ee018d4ccdc77a12572e25a9082d4f2b0d6fb48afacdb23b3c4c438687  4005-ntpd-do-not-use-a-peer-more-than-once-say-if-two-pee.patch
+2ddecb01475adf86fc2e5fe835bead109ffebc83480cfcc3da650249d8e99793  4006-ntpd-if-peer-does-not-reply-anymore-try-re-resolving.patch
+c4dca6fcef3de0ed5beb1716a3fd229dd29996a90da95eec898a13e0d9d85041  4007-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 f712ce190ce86084d56977e125d1561615394f3d9b840e926537868260e19d79  0001-ash-backport-fix-for-here-document-issues.patch
 1d3f8f7b6d0972f8e56437fce8efbafe70e2d869fbe82f06eba11e0103fce224  0001-ash-fix-error-during-recursive-processing-of-here-do.patch
 97dfec94c94f00b628a702ad81b235414af611e011bfc26c29be46c67063c101  0001-libbb-fix-time-parsing-of-CC-YY-MMDDhhmm-.SS.patch
@@ -236,6 +258,13 @@ daadb1b255a8d30f2a13b84c2120427998d8173cf10754b9117e19a6fea8926d1820005f4d99a4a6
 1832d2a09625cb60998c54330a751f13dec97da2c4133db29c10f77fa3314fd2ef2002a45eab7215ed1a0dd8b84a8a4c7d4c1d225b5ee012fe357a8777707a17  3001-login-move-check_securetty-to-libbb.patch
 ed8d060b85d4da1681eb35ba64c5b249391e6a7edbeb55b8952897f08fe9bafac33593992772d80a6df42dd3af0e175ce9575ee51c49fbc875008ad0ac2f6f06  3002-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
 c6579970450e7c711461ab1953f534ae855c4a355b4a452b3fc52a286355c87e41f8951b1b5217d0f659e3173ace8718d42dad3dcc878899cf9decdf4d3fe238  3003-su-FEATURE_SU_NULLOK_SECURE.patch
+4675882f0b255ca73e88b9b4c9ef8b19c0141b8d1a92ea6fd3758c284b9835ac97bf0340f2ce629160c4cb8e5783f32d315187e00596c00d59f1f9cf6d83241d  4001-ntpd-step-when-offset-1-sec-not-0.125-sec.patch
+b5a22fb015e45231b9a4d827d2ef3ecea1f6c56c401d4ed228e5ce0fc6c282fe692da57ecbb31fbe25058a80d310e6058d2ee59b0a32b187a7b76051a1736f24  4002-ntpd-shorter-message.patch
+9a4462dbb1bb9976c72adde30597455602110bc6cb992fbad1e3374d9bb806912d549084c5ee096d95345c23cc59e7dc7ab102a83272f66a0d1898399f5b4640  4003-ntpd-print-packet-delay-in-clock-update-message.patch
+0fd4554b5f2752e6989772bbafb0360df3a79bb7a6828e5026c2b7adbdb474e20d82a5e6b32a52f1acb899e27b3d6329f61fa706d35ccf05977c58aeb2d39754  4004-ntpd-more-informative-poll-lowering-message.patch
+e27e4d07cc1d13d8eb8e04ab282fa89bf7511c2ed1cdeb35721e6dbe14756c20486a462bf5f5b5caced4a2ad3de79780c5ea59ce1a7d7639aea21c9afe929699  4005-ntpd-do-not-use-a-peer-more-than-once-say-if-two-pee.patch
+71cdd9e06cdf670c249177408ef66c1de8590a82bdfe616fa002f0f2385c043876d1529bf8352e8da834f0e68807650c531975f70a28ec82f2b16fc596271351  4006-ntpd-if-peer-does-not-reply-anymore-try-re-resolving.patch
+2241d12663cd3479e29080a680dd0d22f30db15a672b5143433ce6fdf249ab18fd0edfcc34dafd65308db49f1c7cbd77066050d8b8920871ecb5c7b5a77ba035  4007-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 d55cab6ed08434e2a278edf1be6171b921bcaee47598988e4de6b390a01569e10394c54d5d4a27e6eba251ce68df5cc1ece358be32a9c31bdf1f7e9147cf5180  0001-ash-backport-fix-for-here-document-issues.patch
 c14a632f9477c13ea99b24a73c81c9c44ead8b536970acd758e739b43a6260860039674341192ce7bb20a9204ee7d93dcd9541e526f2437d4d2d88637b400867  0001-ash-fix-error-during-recursive-processing-of-here-do.patch
 6fc77e0edcbb61a64c179b0259e0634a82362ac0ca9a77f305eb75f6a89a10395e8a37cbcef925821b428c00237a0a3575af2c3ef194933f52ad55b0eb0dd6f2  0001-libbb-fix-time-parsing-of-CC-YY-MMDDhhmm-.SS.patch