diff options
| author | Milan P. Stanić <mps@arvanta.net> | 2019-05-27 10:26:06 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-05-27 21:37:37 +0200 |
| commit | 9bc9928814f96a4de01d942cf29091282a41e700 (patch) | |
| tree | ef75c5def55b231505188a763e88a47831bb6ebb /main | |
| parent | 949f14e7bfcb4691bd1f05724a5f6b0777cbb527 (diff) | |
| download | aports-9bc9928814f96a4de01d942cf29091282a41e700.tar.bz2 aports-9bc9928814f96a4de01d942cf29091282a41e700.tar.xz | |
main/chrony: upgrade to 3.5
remove 0001-hash-include-util.h-for-MIN-macro patch which is applied
upstream
Diffstat (limited to 'main')
| -rw-r--r-- | main/chrony/0001-hash-include-util.h-for-MIN-macro.patch | 23 | ||||
| -rw-r--r-- | main/chrony/APKBUILD | 8 |
2 files changed, 3 insertions, 28 deletions
diff --git a/main/chrony/0001-hash-include-util.h-for-MIN-macro.patch b/main/chrony/0001-hash-include-util.h-for-MIN-macro.patch deleted file mode 100644 index bdba5eb80e..0000000000 --- a/main/chrony/0001-hash-include-util.h-for-MIN-macro.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 948ecf84314f78da82e0e2b07b6570ca9cff86c8 Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar <mlichvar@redhat.com> -Date: Thu, 20 Sep 2018 15:01:16 +0200 -Subject: [PATCH] hash: include util.h for MIN macro - -The hash_intmd5.c file inadvertently relied on the system headers to -provide the MIN macro, but it is missing with some libc implementations. ---- - hash_intmd5.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hash_intmd5.c b/hash_intmd5.c -index 0b60f9b..49da1cf 100644 ---- a/hash_intmd5.c -+++ b/hash_intmd5.c -@@ -29,6 +29,7 @@ - #include "sysincl.h" - #include "hash.h" - #include "memory.h" -+#include "util.h" - - #include "md5.c" - diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD index 0a802f193d..967e6771fc 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.4 -pkgrel=2 +pkgver=3.5 +pkgrel=0 _ver=${pkgver/_/-} pkgdesc="NTP client and server programs" url="https://chrony.tuxfamily.org" @@ -17,7 +17,6 @@ makedepends="asciidoctor libcap-dev texinfo" checkdepends="bash" subpackages="$pkgname-doc $pkgname-openrc" source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz - 0001-hash-include-util.h-for-MIN-macro.patch fix-tests.patch max_resolve_interval.patch @@ -83,8 +82,7 @@ package() { touch "$pkgdir"/var/lib/chrony/chrony.drift } -sha512sums="4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7513ba630d6fa27453ecfd81f0ece0e26d5ee2f98ca47fbc9887181a36918 chrony-3.4.tar.gz -47767eaec7be0dfd41b3bf8bf733cbabbc949a8ab6987a655336b54789649c43df6d79f96712c71535ef1df11e2e9f9ef02f7e380e1a201cc3d2b7b4dbfc3026 0001-hash-include-util.h-for-MIN-macro.patch +sha512sums="c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c chrony-3.5.tar.gz 067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch 0490770cc214b4ccf76470420e0b33e6c41ad16344d6503973a28346b002e2cee441e9ae982be1a8f21696da26f436f2ce36a5201e9628becb83bad3487d9170 chronyd.confd |