From 9f0282c5f0deb5b5bc295bce8ff7b413193327b9 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Fri, 28 Aug 2020 01:15:41 +0000
Subject: user/sntpd: Update to 3.0

---
 user/sntpd/APKBUILD     | 19 +++++++------------
 user/sntpd/select.patch |  8 ++++----
 2 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'user/sntpd')

diff --git a/user/sntpd/APKBUILD b/user/sntpd/APKBUILD
index d15fbff92..5171813e7 100644
--- a/user/sntpd/APKBUILD
+++ b/user/sntpd/APKBUILD
@@ -1,24 +1,17 @@
 # Maintainer: Samuel Holland <samuel@sholland.org>
 pkgname=sntpd
-pkgver=3.0_git20190119
-_commit=7e372536855687f0af3c7ddde5fcb965b93d5d1e
+pkgver=3.0
 pkgrel=0
 pkgdesc="A small SNTP client for UNIX systems, implementing RFC 1305 and RFC 4330"
 url="https://github.com/troglobit/sntpd"
 arch="all"
 license="GPL-2.0-only"
 depends=""
-makedepends="autoconf automake"
+makedepends=""
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/troglobit/sntpd/archive/$_commit.tar.gz
+source="https://github.com/troglobit/sntpd/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
 	select.patch
 	"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	autoreconf -vif
-}
 
 build() {
 	./configure \
@@ -31,6 +24,8 @@ build() {
 		--localstatedir=/var \
 		--disable-debug \
 		--enable-replay \
+		--with-adjtimex \
+		--with-ntpclient \
 		--without-systemd
 	make
 }
@@ -43,5 +38,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="49a9d16c2aef82c3d009f3e5678763d440764c67e4d7b27b07deac71ae9cb6d3b64a0991d3a79904b397441d9ce480287bb022d5e466fc99bbc393dc9d79b2a5  sntpd-3.0_git20190119.tar.gz
-09ddc920bdbb00480859a8e9cd7b06bcfe73a6d51d070dde6bf78038bae11092fff9c72a401e1a3d7e3e6f6dcd1bdb6cec3b025ccc07608a8feb0ddaa854c678  select.patch"
+sha512sums="664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea  sntpd-3.0.tar.gz
+966ae71a41f31b37b0be8dc361471f72d085ca06161deeedc37cc82d6b80852ca79b37bfc8f9948988bedaeba6a77a0b4edf19848a12e8107ec13ab86524c5dd  select.patch"
diff --git a/user/sntpd/select.patch b/user/sntpd/select.patch
index 00121d80b..f0e25055a 100644
--- a/user/sntpd/select.patch
+++ b/user/sntpd/select.patch
@@ -1,10 +1,10 @@
 select(3) does not modify its timeout in musl, as permitted by POSIX
---- sntpd-7e372536855687f0af3c7ddde5fcb965b93d5d1e/src/sntpd.c
-+++ sntpd-7e372536855687f0af3c7ddde5fcb965b93d5d1e/src/sntpd.c
-@@ -686,7 +686,7 @@ static void primary_loop(int usd, struct ntp_control *ntpc)
- 					ERR(errno, "Failed select()");
+--- sntpd-3.0/src/sntpd.c
++++ sntpd-3.0/src/sntpd.c
+@@ -663,7 +663,7 @@ static void loop(struct ntp_control *ntpc)
  				continue;
  			}
+ 
 -			if (to.tv_sec == 0) {
 +			if (1) {
  				if (probes_sent >= ntpc->probe_count && ntpc->probe_count != 0)
-- 
cgit v1.2.3-70-g09d2