main/chrony: upgrade to 3.3, clarify license

This commit is contained in:
prspkt 2018-04-04 17:44:42 +00:00 committed by Timo Teräs
parent 4a7bf0fbb8
commit 7b7e85a8e8
2 changed files with 12 additions and 15 deletions

View File

@ -2,18 +2,18 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrony pkgname=chrony
pkgver=3.2 pkgver=3.3
pkgrel=3 pkgrel=0
_ver=${pkgver/_/-} _ver=${pkgver/_/-}
pkgdesc="NTP client and server programs" pkgdesc="NTP client and server programs"
url="https://chrony.tuxfamily.org/" url="https://chrony.tuxfamily.org"
pkgusers="$pkgname" pkgusers="$pkgname"
pkggroups="$pkgname" pkggroups="$pkgname"
arch="all" arch="all"
license="GPL-2.0" license="GPL-2.0-only"
install="$pkgname.pre-install $pkgname.pre-upgrade" install="$pkgname.pre-install $pkgname.pre-upgrade"
depends="" depends=""
makedepends="libcap-dev texinfo asciidoctor" makedepends="asciidoctor libcap-dev texinfo"
checkdepends="bash" checkdepends="bash"
subpackages="$pkgname-doc" subpackages="$pkgname-doc"
source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz
@ -25,18 +25,15 @@ source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz
chrony.conf chrony.conf
timepps.h timepps.h
" "
builddir="$srcdir/$pkgname-$_ver"
builddir="$srcdir"/$pkgname-$_ver
prepare() { prepare() {
cd "$builddir" default_prepare
# We copy timepps.h to the local build directory instead of # We copy timepps.h to the local build directory instead of
# creating a pps-tools-dev package for ppstime.h # creating a pps-tools-dev package for ppstime.h
# (See https://github.com/ago/pps-tools) # (See https://github.com/ago/pps-tools)
mkdir -p pps-tools/sys mkdir -p pps-tools/sys
cp "$srcdir"/timepps.h "$builddir"/pps-tools/sys/ cp "$srcdir"/timepps.h pps-tools/sys/
# apply patches (if any)
default_prepare
} }
build() { build() {
@ -84,9 +81,9 @@ package() {
touch "$pkgdir"/var/lib/chrony/chrony.drift touch "$pkgdir"/var/lib/chrony/chrony.drift
} }
sha512sums="496af5bed91600f268c1a0fa577bb8c7785e485f78598b666829c674e94770c16548cec4289a2ae9d0a51191d2705eda00886cb6cccae3828aa201a49d4783a4 chrony-3.2.tar.gz sha512sums="36975d863599141e8e5b071d35cf67326b27f5b0da7ec942dbb4530377d10472b0729eea632e0702718b515cb2d5fd41a7eba158e6dade7f05adfb1bdffa5df0 chrony-3.3.tar.gz
067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch 067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch
19faf017e4502947a9b549b8165bf31bf11b814f2bf7b013a1ac11460afa654287d58de341cfa1f10b6a34334ed7d1d34e58b350c3c68bf6336530712d4db13c max_resolve_interval.patch b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch
6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 chronyd.confd 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 chronyd.confd
9a18c9744d7b78d9b9be3f0ae0b43cb988b294c342764802e0d5df835d450e748584c0b345f7161f14d84e15c8bbd491514ee9dc45e4a65f1276c52124d2e312 chronyd.initd 9a18c9744d7b78d9b9be3f0ae0b43cb988b294c342764802e0d5df835d450e748584c0b345f7161f14d84e15c8bbd491514ee9dc45e4a65f1276c52124d2e312 chronyd.initd
ab38f06bf45888846778ad935e24abb30d13b6805e9a750bc694ff953695fa8c5b33aac560f5f7f96dc46031c1a38660e5c418b6fce6fb34a87908a9a3c99357 chrony.logrotate ab38f06bf45888846778ad935e24abb30d13b6805e9a750bc694ff953695fa8c5b33aac560f5f7f96dc46031c1a38660e5c418b6fce6fb34a87908a9a3c99357 chrony.logrotate

View File

@ -2,7 +2,7 @@ Try fix behaviour when network is not available at bootup
--- ./ntp_sources.c.orig --- ./ntp_sources.c.orig
+++ ./ntp_sources.c +++ ./ntp_sources.c
@@ -85,7 +85,7 @@ @@ -87,7 +85,7 @@
#define RESOLVE_INTERVAL_UNIT 7 #define RESOLVE_INTERVAL_UNIT 7
#define MIN_RESOLVE_INTERVAL 2 #define MIN_RESOLVE_INTERVAL 2