main/chrony: upgrade to 2.1.1

main/chrony/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=chrony
-pkgver=2.0
+pkgver=2.1.1
 pkgrel=0
 _ver=${pkgver/_/-}
 pkgdesc="NTP client and server programs"
@@ -36,8 +36,6 @@ prepare() {
 		*.diff|*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1
 		esac
 	done
-	sed -i "s:/etc/chrony:/etc/chrony/chrony:g" \
-		chrony*.[158] || return 1
 }
 
 
@@ -49,6 +47,7 @@ build() {
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
+		--sysconfdir=/etc/$pkgname \
 		--disable-readline \
 		|| return 1
 
@@ -69,25 +68,25 @@ package() {
 	touch "$pkgdir"/etc/chrony/chrony.drift
 	install -m644 "$srcdir"/chrony.conf "$pkgdir"/etc/chrony/chrony.conf
 }
-md5sums="b5623977a27fcfa5e853503679bd0897  chrony-2.0.tar.gz
+md5sums="15e470a51ab6e09e65bc0a2fbc5299af  chrony-2.1.1.tar.gz
 c479553205e2dfe1409c7924b0d0f81b  0001-uclibc-res-do-not-call-res_init.patch
-f44f29a3d128267480c86f37757d795e  max_resolve_interval.patch
+a756428186bb27884d157a9f2c9732c6  max_resolve_interval.patch
 d62521b4c8837e15262c47ac88359307  chronyd.confd
 2d5cd89a21dc3c2fbb0c30cd89e41ad3  chronyd.initd
 468eaf2b5465d60b3ee021ce3f948ab1  chrony.logrotate
 46f42c52953d398ca44d6baa449618d7  chrony.conf
 28f6835098a216f4a620f9218d15b5b8  timepps.h"
-sha256sums="f4da5f5071e77314b49281c48c35a03d07d76cbc7ec19e787b4414a86023b68b  chrony-2.0.tar.gz
+sha256sums="b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4  chrony-2.1.1.tar.gz
 4aec957ff59adbba1058e5376c73fe74e1e6fb511d9ca6cb5b6e74fca8c75a9f  0001-uclibc-res-do-not-call-res_init.patch
-756bde2116827b02e4e8f813727cef845a11517b94d97a200351f4ca86150a23  max_resolve_interval.patch
+61528337a48ac82f0c393547b78a972c57fb3727ff75407c4335c9b014eb8db5  max_resolve_interval.patch
 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99  chronyd.confd
 ac58a3e5ffb26202e501223418f12a110f50e1008c059337536c363e3ecfcdc6  chronyd.initd
 d25ce3f5ce4a28184931c68a97340a5b332cbaf071434d172f262122240ad652  chrony.logrotate
 43e1bf9c3b0eb95c6330afdc9063f24353086f057d258c00ea711975a86c1194  chrony.conf
 ab4f459ee9d1037d7fa962a66ea652b08935539a4f443dc216e82b5717d8bb22  timepps.h"
-sha512sums="ab44151cabfe6afe3b141d49476b6453517282a105e50549a50054bb8104251af1a484ebbf15558c44683bc90420ead354ddc8a64770f82bee53f30c4840a3d2  chrony-2.0.tar.gz
+sha512sums="bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b085d232773ce732eea82f28fa87f4c56ac5b6a7388275c67889daf641499  chrony-2.1.1.tar.gz
 5b1d0766eceee000d97dfb20c34f95319ac295729c16e571d7fe382e7d737c7335a1a98b67d89792056f969d4bb9eb7296c343ee4bb16c6a0805606f505d16c5  0001-uclibc-res-do-not-call-res_init.patch
-a051129c0ce7b46cd7c989f5694de3a2e91906c8feac4f0d9c7759a50b0d95742f28462a7843e675c6268c0e4838164042d042d1863416c224f1e46878aab8a8  max_resolve_interval.patch
+19faf017e4502947a9b549b8165bf31bf11b814f2bf7b013a1ac11460afa654287d58de341cfa1f10b6a34334ed7d1d34e58b350c3c68bf6336530712d4db13c  max_resolve_interval.patch
 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640  chronyd.confd
 d182fc81df9c9751f487434990127bbd40eb9e4a567d1810d987fbd48746d28890a9174d1ee65ceb203452234d17db0cf1f2c4073459ee2aa2b8c62e6fa221de  chronyd.initd
 8c2f9b396bde7f0124fdc4bb25fb31d154ae4ec73717401e5dd36a3730cd55ff91e60c70bcafb917883e437993ee245ad56e7a12c3711b482c6df592896a42dc  chrony.logrotate

main/chrony/max_resolve_interval.patch

@@ -2,12 +2,12 @@ Try fix behaviour when network is not available at bootup
 
 --- ./ntp_sources.c.orig
 +++ ./ntp_sources.c
-@@ -76,7 +76,7 @@
+@@ -85,7 +85,7 @@
  
  #define RESOLVE_INTERVAL_UNIT 7
  #define MIN_RESOLVE_INTERVAL 2
 -#define MAX_RESOLVE_INTERVAL 9
 +#define MAX_RESOLVE_INTERVAL 6
+ #define MIN_REPLACEMENT_INTERVAL 8
  
  static struct UnresolvedSource *unresolved_sources = NULL;
- static int resolving_interval = 0;