Updated to 4.0

Fix lto

2 files changed, 16 insertions, 52 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0b17728..1417d23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,32 +12,31 @@
 # Arch version is not configured for openrc
 # Arch version uses /etc/chrony.conf instead of /etc/chrony/chrony.conf
 
+
 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' 'nss' 'readline' 'libcap' 'libcap.so' 'libedit' 'libseccomp' 'libseccomp.so'
+         'nettle' 'libnettle.so' 'gnutls')
 makedepends=('asciidoctor')
 options=('!emptydirs')
 backup=('etc/chrony/chrony.conf')
 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)
-b2sums=('503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053'
+        chrony.tmpfiles)
+b2sums=('1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e'
         'SKIP'
         'e310a05f95d84741f7ddbbc496c52a9f603bb79afc47e57d291a92ae02efb630a357fda378ab5a11875c3997d073e05019d88dce7bbf4377a0228f328ba78fec'
-        'e709df2f97b523ef1c7a9dae3232ccbd235ac8f025eba866165272f8ba0372a0aba965d3aae1402395e43331bd629b9d8f3fbffd75fc254f4a7e5ecd47f73130'
-        '210e5c1e80c0a13b3c96369837d86d9ae5350b30baeac6f2e4dd2bc780c476a5e900270edfe75a7bd501a28194448d45491c2920c58f4ab7895f47af25858226')
+        'e709df2f97b523ef1c7a9dae3232ccbd235ac8f025eba866165272f8ba0372a0aba965d3aae1402395e43331bd629b9d8f3fbffd75fc254f4a7e5ecd47f73130')
 validpgpkeys=('8B1F4A9ADA73D401E3085A0B5FF06F29BA1E013B') # Miroslav Lichvar <mlichvar@redhat.com> 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' \
@@ -48,11 +47,12 @@ prepare() {
 
 build() {
   cd ${pkgname}-${pkgver}
-  export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=4 -fPIE"
-  export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=4 -fPIE"
+  export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=auto -fPIE"
+  export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=auto -fPIE"
   export LDFLAGS="$LDFLAGS,-pie"
   ./configure \
     --prefix=/usr \
+    --enable-readline \
     --enable-scfilter \
     --enable-ntp-signd \
     --with-user=chrony \
@@ -63,10 +63,12 @@ build() {
   make
 }
 
-#check() {
-#  cd ${pkgname}-${pkgver}
-#  make check
-#}
+if [ "$_cross" != "1" ]; then
+  check() {
+    cd ${pkgname}-${pkgver}
+    make check
+  }
+fi
 
 package() {
   cd ${pkgname}-${pkgver}
diff --git a/fix-util-unit-test-for-NTP-era-split.patch b/fix-util-unit-test-for-NTP-era-split.patch
deleted file mode 100644
index 28a6545..0000000
--- a/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;