aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-10-07 17:12:45 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-10-07 21:30:20 +0000
commit034dd590108a37e340f08b64643830ef05604401 (patch)
tree002cb173096c6b3377c82bdb20c7b31dd09173ca
parent18fcbf3c567a0abda060b4fdfdc9ef60fe73882b (diff)
downloadaports-034dd590108a37e340f08b64643830ef05604401.tar.gz
aports-034dd590108a37e340f08b64643830ef05604401.tar.bz2
aports-034dd590108a37e340f08b64643830ef05604401.tar.xz
main/chrony: upgrade to 4.0
-rw-r--r--main/chrony/APKBUILD8
-rw-r--r--main/chrony/fix-util-unit-test-for-NTP-era-split.patch38
2 files changed, 3 insertions, 43 deletions
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 66cdfbaa41..dff4132ce6 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrony
-pkgver=3.5.1
-pkgrel=1
+pkgver=4.0
+pkgrel=0
pkgdesc="NTP client and server programs"
url="https://chrony.tuxfamily.org"
pkgusers="$pkgname"
@@ -15,7 +15,6 @@ makedepends="asciidoctor libcap-dev texinfo"
checkdepends="bash"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://download.tuxfamily.org/chrony/chrony-$pkgver.tar.gz
- fix-util-unit-test-for-NTP-era-split.patch
fix-tests.patch
max_resolve_interval.patch
@@ -81,8 +80,7 @@ package() {
touch "$pkgdir"/var/lib/chrony/chrony.drift
}
-sha512sums="489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984 chrony-3.5.1.tar.gz
-de2cde80fcd7ae1f064420b1b01e739b53a3d4ecc38afd832ff9911a4a4ae4bbc455ecb23a815d55e893069e7926b8ae2006cc0194d69387ccc3efee7043df7a fix-util-unit-test-for-NTP-era-split.patch
+sha512sums="a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9 chrony-4.0.tar.gz
067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch
b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch
0490770cc214b4ccf76470420e0b33e6c41ad16344d6503973a28346b002e2cee441e9ae982be1a8f21696da26f436f2ce36a5201e9628becb83bad3487d9170 chronyd.confd
diff --git a/main/chrony/fix-util-unit-test-for-NTP-era-split.patch b/main/chrony/fix-util-unit-test-for-NTP-era-split.patch
deleted file mode 100644
index 28a6545d5f..0000000000
--- a/main/chrony/fix-util-unit-test-for-NTP-era-split.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2d9eb5b6fa5225a7300c8eed95712969249900fb Mon Sep 17 00:00:00 2001
-From: Miroslav Lichvar <mlichvar@redhat.com>
-Date: Fri, 3 Jan 2020 11:25:55 +0100
-Subject: [PATCH] test: fix util unit test for NTP era split
-
-The current default NTP era split passed the Unix epoch (~50 years ago),
-which means the epoch converted to an NTP timestamp and back ends up in
-the next NTP era (year 2106).
-
-Fix the test to take into account the era split.
----
- test/unit/util.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/test/unit/util.c b/test/unit/util.c
-index f4d9f33..af9e90c 100644
---- a/test/unit/util.c
-+++ b/test/unit/util.c
-@@ -100,11 +100,19 @@ void test_unit(void) {
- ntp_ts.hi = htonl(JAN_1970);
- ntp_ts.lo = 0xffffffff;
- UTI_Ntp64ToTimespec(&ntp_ts, &ts);
-+#if defined(HAVE_LONG_TIME_T) && NTP_ERA_SPLIT > 0
-+ TEST_CHECK(ts.tv_sec == 0x100000000LL * (1 + (NTP_ERA_SPLIT - 1) / 0x100000000LL));
-+#else
- TEST_CHECK(ts.tv_sec == 0);
-+#endif
- TEST_CHECK(ts.tv_nsec == 999999999);
-
- UTI_AddDoubleToTimespec(&ts, 1e-9, &ts);
-+#if defined(HAVE_LONG_TIME_T) && NTP_ERA_SPLIT > 0
-+ TEST_CHECK(ts.tv_sec == 1 + 0x100000000LL * (1 + (NTP_ERA_SPLIT - 1) / 0x100000000LL));
-+#else
- TEST_CHECK(ts.tv_sec == 1);
-+#endif
- TEST_CHECK(ts.tv_nsec == 0);
-
- ntp_fuzz.hi = 0;