Date: Friday, January 22, 2021 @ 19:31:25 Author: anthraxx Revision: 824952
upgpkg: chrony 4.0-1 Modified: chrony/trunk/PKGBUILD Deleted: chrony/trunk/fix-util-unit-test-for-NTP-era-split.patch --------------------------------------------+ PKGBUILD | 20 ++++++++------ fix-util-unit-test-for-NTP-era-split.patch | 38 --------------------------- 2 files changed, 12 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-01-22 19:30:37 UTC (rev 824951) +++ PKGBUILD 2021-01-22 19:31:25 UTC (rev 824952) @@ -8,13 +8,14 @@ # Contributor: Elisamuel Resto <[email protected]> pkgname=chrony -pkgver=3.5.1 +pkgver=4.0 pkgrel=1 pkgdesc='Lightweight NTP client and server' url='https://chrony.tuxfamily.org/' arch=('x86_64') license=('GPL2') -depends=('glibc' 'nss' 'readline' 'libcap' 'libcap.so' 'libedit' 'libseccomp' 'libseccomp.so' 'nettle') +depends=('glibc' 'libcap' 'libcap.so' 'libedit' 'libedit.so' 'libseccomp' 'libseccomp.so' + 'nettle' 'libnettle.so' 'gnutls') makedepends=('asciidoctor') options=('!emptydirs') backup=('etc/chrony.conf') @@ -21,18 +22,19 @@ source=(https://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}.tar.gz.asc::https://download.tuxfamily.org/chrony/${pkgname}-${pkgver}-tar-gz-asc.txt chrony.sysusers - chrony.tmpfiles - fix-util-unit-test-for-NTP-era-split.patch) -sha256sums=('1ba82f70db85d414cd7420c39858e3ceca4b9eb8b028cbe869512c3a14a2dca7' + chrony.tmpfiles) +sha256sums=('be27ea14c55e7a4434b2fa51d53018c7051c42fa6a3198c9aa6a1658bae0c625' 'SKIP' '56aa817638c8f959169d514f1e7fc727ef31e7d3beda4fca5165292c7602ee42' - 'c0b52787f68f3ef365eef64f53f22b4fb0046a91f0e38923f9d16f1ca19c3f3a' - '69fad197b790f1fdb273b9d1905c3025dd38abf82fa93ffe675d096bf0f3d45b') + 'c0b52787f68f3ef365eef64f53f22b4fb0046a91f0e38923f9d16f1ca19c3f3a') +b2sums=('1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e' + 'SKIP' + 'e310a05f95d84741f7ddbbc496c52a9f603bb79afc47e57d291a92ae02efb630a357fda378ab5a11875c3997d073e05019d88dce7bbf4377a0228f328ba78fec' + 'e709df2f97b523ef1c7a9dae3232ccbd235ac8f025eba866165272f8ba0372a0aba965d3aae1402395e43331bd629b9d8f3fbffd75fc254f4a7e5ecd47f73130') validpgpkeys=('8B1F4A9ADA73D401E3085A0B5FF06F29BA1E013B') # Miroslav Lichvar <[email protected]> has a dsa1024 key *in the wild* prepare() { cd ${pkgname}-${pkgver} - patch -Np1 < ../fix-util-unit-test-for-NTP-era-split.patch sed -i \ -e 's|pool pool.ntp.org|pool 2.arch.pool.ntp.org|g' \ -e 's|server foo.example.net|server 0.arch.pool.ntp.org|g' \ @@ -46,6 +48,7 @@ cd ${pkgname}-${pkgver} ./configure \ --prefix=/usr \ + --enable-readline \ --enable-scfilter \ --enable-ntp-signd \ --with-user=chrony \ @@ -71,6 +74,7 @@ install -Dm 644 examples/chrony.logrotate "${pkgdir}/etc/logrotate.d/chrony" install -Dm 644 README NEWS FAQ -t "${pkgdir}/usr/share/doc/${pkgname}" install -Dm 644 examples/* -t "${pkgdir}/usr/share/doc/${pkgname}/examples" + echo "chronyd.service" | install -Dm 644 /dev/stdin "${pkgdir}/usr/lib/systemd/ntp-units.d/chrony.list" install -Dm 644 examples/chrony.conf.example3 "${pkgdir}/etc/chrony.conf" sed -i \ Deleted: fix-util-unit-test-for-NTP-era-split.patch =================================================================== --- fix-util-unit-test-for-NTP-era-split.patch 2021-01-22 19:30:37 UTC (rev 824951) +++ fix-util-unit-test-for-NTP-era-split.patch 2021-01-22 19:31:25 UTC (rev 824952) @@ -1,38 +0,0 @@ -From 2d9eb5b6fa5225a7300c8eed95712969249900fb Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar <[email protected]> -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;
