From 554605fdc9f117c7ee99599b544562d53051ecc5 Mon Sep 17 00:00:00 2001
From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org>
Date: Thu, 10 Aug 2023 02:41:37 +0000
Subject: [PATCH] main/chrony: upgrade to 4.4

---
 main/chrony/APKBUILD                   | 15 ++++-----------
 main/chrony/max_resolve_interval.patch |  4 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 65498e2796d9..9f2c0636fcd8 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=4.3
-pkgrel=5
+pkgver=4.4
+pkgrel=0
 pkgdesc="NTP client and server programs"
 url="https://chrony.tuxfamily.org"
 pkgusers="$pkgname"
@@ -17,10 +17,6 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-openrc"
 source="https://download.tuxfamily.org/chrony/chrony-$pkgver.tar.gz
 	max_resolve_interval.patch
 
-	$pkgname-musl-seccomp-1.patch::https://gitlab.com/chrony/chrony/-/commit/e16bcca61787788dd42fca6cbae9b87176e8a213.diff
-	$pkgname-musl-seccomp-2.patch::https://gitlab.com/chrony/chrony/-/commit/ca10b9e0722acc5f055261e2337d48b930dbf114.diff
-	$pkgname-test-fix.patch::https://gitlab.com/chrony/chrony/-/commit/61da7d09135239f5a976b749ddb484111400c29c.diff
-
 	chronyd.confd
 	chronyd.initd
 	chrony.conf
@@ -87,11 +83,8 @@ package() {
 }
 
 sha512sums="
-1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df  chrony-4.3.tar.gz
-b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247  max_resolve_interval.patch
-46e77128bfd7b3b9454cfbe7031a380a72116a035ce09d28b768cea26eeab52acd5ca7b4f8334cca80fc832cedbd441a46c96eefdbbc7656332854988ae4b7bf  chrony-musl-seccomp-1.patch
-70d08cfc13b29cf20927d4accf46876fb5f98a43492a24440a9918147c028f1e4d0afeabf4c7cb66abb901408c87ad22a017b462a2a7ef402f93c4d5349ff04a  chrony-musl-seccomp-2.patch
-59675ed5d7fa91af2f594900ef584a97ac954be38013e8a63763a93ce9d031d137825f00cb6e7b3ee2061427b885a6c8c19d9a470a176a2e4ca48b67307b599b  chrony-test-fix.patch
+45e060eb0c5892552f28dc436429e5823409cc93533127af27b64d08ff9c769fdc72694272232114f5ca1884c2bc8b5e842fae7956dc457358e937bcd3dda4d7  chrony-4.4.tar.gz
+f6f2056d1e70785f66b0fbec6e3ec9b0184785eac262e28e2a2c4d5a49762bf780ed7c2c7990a93f6ef063c167cea01fb8828705be558d0b8ff8c07d6962239f  max_resolve_interval.patch
 c1ce577ed1af9f3d88a6a2880a4834ae0c6a7f45870d9396d2aacd7716eb8de346ce458e1a45fdd48b1e8b8f5cd3afcba9534ac47fedb517604c9d910a342fac  chronyd.confd
 cc19b01a2a2cc26738f52c2c15d88db47240dcd00987ce5e75ba69fae8385b83a2643946f390d7ce0b73826b8de878989788b36ae5e43b2daac4477cbf9752f6  chronyd.initd
 663c6316bcca762de119d88e4bb6536bfe0fea19939fe1b673900847619e7f1d6783b789b38ebba97b5dc3778dedf798bafd65f00f8bd7e312bfed7df0caaf71  chrony.conf
diff --git a/main/chrony/max_resolve_interval.patch b/main/chrony/max_resolve_interval.patch
index 6343d912235b..d6a5f373e9f1 100644
--- a/main/chrony/max_resolve_interval.patch
+++ b/main/chrony/max_resolve_interval.patch
@@ -2,12 +2,12 @@ Try fix behaviour when network is not available at bootup
 
 --- ./ntp_sources.c.orig
 +++ ./ntp_sources.c
-@@ -87,7 +85,7 @@
+@@ -109,7 +109,7 @@
  
  #define RESOLVE_INTERVAL_UNIT 7
  #define MIN_RESOLVE_INTERVAL 2
 -#define MAX_RESOLVE_INTERVAL 9
 +#define MAX_RESOLVE_INTERVAL 6
- #define MIN_REPLACEMENT_INTERVAL 8
+ #define MAX_REPLACEMENT_INTERVAL 9
  
  static struct UnresolvedSource *unresolved_sources = NULL;
-- 
GitLab