diff options
| author | Christian Kampka <christian@kampka.net> | 2015-11-03 12:11:06 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-04 10:31:16 +0000 |
| commit | 99a67a527fa000fbe2254f0b92c66b3301ebeea9 (patch) | |
| tree | ca21509f5c22cf91751e10f4973263036367c0f6 | |
| parent | 5df764bc0ce145571a52b38d32f86bbcc82c3034 (diff) | |
| download | aports-99a67a527fa000fbe2254f0b92c66b3301ebeea9.tar.bz2 aports-99a67a527fa000fbe2254f0b92c66b3301ebeea9.tar.xz | |
main/chrony: new upstream version 2.2
| -rw-r--r-- | main/chrony/0001-uclibc-res-do-not-call-res_init.patch | 26 | ||||
| -rw-r--r-- | main/chrony/APKBUILD | 20 |
2 files changed, 8 insertions, 38 deletions
diff --git a/main/chrony/0001-uclibc-res-do-not-call-res_init.patch b/main/chrony/0001-uclibc-res-do-not-call-res_init.patch deleted file mode 100644 index bbd18255cc..0000000000 --- a/main/chrony/0001-uclibc-res-do-not-call-res_init.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6908e8eedf5232519a1f85942249040051e48fa8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Wed, 30 May 2012 16:23:50 +0300 -Subject: [PATCH 1/2] uclibc/res: do not call res_init - -it prevents rereading of resolv.conf in uclibc, but enables that -for glibc. ---- - nameserv.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/nameserv.c b/nameserv.c -index 1770845..9ecf1d9 100644 ---- a/nameserv.c -+++ b/nameserv.c -@@ -177,7 +177,6 @@ DNS_IPAddress2Name(IPAddr *ip_addr, char *name, int len) - void - DNS_Reload(void) - { -- res_init(); - } - - /* ================================================== */ --- -1.7.10.2 - diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD index 7ae5bcae7d..ba30089b54 100644 --- a/main/chrony/APKBUILD +++ b/main/chrony/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=chrony -pkgver=2.1.1 -pkgrel=7 +pkgver=2.2 +pkgrel=0 _ver=${pkgver/_/-} pkgdesc="NTP client and server programs" url="http://chrony.tuxfamily.org/" @@ -15,7 +15,6 @@ depends="" makedepends="libcap-dev texinfo" subpackages="$pkgname-doc" source="http://download.tuxfamily.org/chrony/$pkgname-$_ver.tar.gz - 0001-uclibc-res-do-not-call-res_init.patch max_resolve_interval.patch chronyd.confd chronyd.initd @@ -43,8 +42,8 @@ prepare() { build() { - cd "$_builddir" - CPPFLAGS="$CPPFLAGS -I./pps-tools/" \ + cd "$_builddir" + CPPFLAGS="$CPPFLAGS -I./pps-tools/" \ ./configure \ --prefix=/usr \ --infodir=/usr/share/info \ @@ -72,7 +71,7 @@ package() { mkdir -p "$pkgdir"/var/lib/chrony \ "$pkgdir"/var/log/chrony \ "$pkgdir"/etc/chrony - + # chrony.drift must be writable by chrony user chown $pkgusers:$pkggroups "$pkgdir"/etc/chrony install -m644 "$srcdir"/chrony.conf "$pkgdir"/etc/chrony/chrony.conf @@ -82,24 +81,21 @@ package() { touch "$pkgdir"/var/lib/chrony/chrony.drift } -md5sums="15e470a51ab6e09e65bc0a2fbc5299af chrony-2.1.1.tar.gz -c479553205e2dfe1409c7924b0d0f81b 0001-uclibc-res-do-not-call-res_init.patch +md5sums="17bc77d3d2ce942675f9600b60452717 chrony-2.2.tar.gz a756428186bb27884d157a9f2c9732c6 max_resolve_interval.patch d62521b4c8837e15262c47ac88359307 chronyd.confd 93642fa5d3eed62c15a183f72023ec6f chronyd.initd 455da71ae961667dc7823300f3cf8ab4 chrony.logrotate 15fd3724c7e171c3e75a29d217e707b2 chrony.conf 28f6835098a216f4a620f9218d15b5b8 timepps.h" -sha256sums="b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4 chrony-2.1.1.tar.gz -4aec957ff59adbba1058e5376c73fe74e1e6fb511d9ca6cb5b6e74fca8c75a9f 0001-uclibc-res-do-not-call-res_init.patch +sha256sums="d3fd820fa63badf54ee0e48a649b94ea739df3aac5efa104bd90f89795aa2485 chrony-2.2.tar.gz 61528337a48ac82f0c393547b78a972c57fb3727ff75407c4335c9b014eb8db5 max_resolve_interval.patch 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99 chronyd.confd a621ef2c5694c635e982de525357dff518562a3400378948e216a43dcf00ace6 chronyd.initd 4c4f95b03f7e2e240ad26943da44591b300862e328c97ef5690f5a9a66c97650 chrony.logrotate d50a474d654ff4a1b742e712bbfc2d9e6c75e04b28ec9b86ee2054bdaf830fc0 chrony.conf ab4f459ee9d1037d7fa962a66ea652b08935539a4f443dc216e82b5717d8bb22 timepps.h" -sha512sums="bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b085d232773ce732eea82f28fa87f4c56ac5b6a7388275c67889daf641499 chrony-2.1.1.tar.gz -5b1d0766eceee000d97dfb20c34f95319ac295729c16e571d7fe382e7d737c7335a1a98b67d89792056f969d4bb9eb7296c343ee4bb16c6a0805606f505d16c5 0001-uclibc-res-do-not-call-res_init.patch +sha512sums="40e5f3b803016a8ce2a3450f24e07e02b54c8b0134c005342e52e1f122592af646186ca231644801bdb7bbb00c576347da34e162d33920ef71f4018204e8a866 chrony-2.2.tar.gz 19faf017e4502947a9b549b8165bf31bf11b814f2bf7b013a1ac11460afa654287d58de341cfa1f10b6a34334ed7d1d34e58b350c3c68bf6336530712d4db13c max_resolve_interval.patch 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 chronyd.confd 9a18c9744d7b78d9b9be3f0ae0b43cb988b294c342764802e0d5df835d450e748584c0b345f7161f14d84e15c8bbd491514ee9dc45e4a65f1276c52124d2e312 chronyd.initd |