Update ntpsec to 1.2.0

3 files changed, 40 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f5111bb24a8..b6e93d427eda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ntpsec
 	pkgdesc = Security-hardened Network Time Protocol implementation
-	pkgver = 1.1.9
-	pkgrel = 3
+	pkgver = 1.2.0
+	pkgrel = 1
 	url = https://www.ntpsec.org/
 	arch = i686
 	arch = x86_64
@@ -24,14 +24,16 @@ pkgbase = ntpsec
 	backup = etc/ntp.conf
 	backup = etc/ntp.d/default.conf
 	backup = etc/ntp.d/use-pool
-	source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.9.tar.gz
-	source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.9.tar.gz.asc
+	source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.0.tar.gz
+	source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.0.tar.gz.asc
 	source = use-arch-pool.patch
+	source = Fix-the-libntpc-install-path.patch
 	source = ntpsec.sysusers
-	validpgpkeys = B48237761A2690222C995F445A22E330161C3978
-	sha512sums = e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b
-	sha512sums = SKIP
+	validpgpkeys = E57235D22764129FA4F2F4D17F52608ED0E49D76
+	sha512sums = 9e18b3ca2f786a1ea323ba2384b51cff3d862115cea1ae576fc98172c476ac5e7d0d0fc873e47be0b19b050204ea9ed49669d94e66eb94525068dd1b08a8ae71
+	sha512sums = 8acc04e778d6e9a7e267312fa9d5102c5fb6fbf545766f8f2f07b2d3ad649908f532798a922d2ade10ecaeb84c691e74064704594c55eefc802770a33d7bfeb0
 	sha512sums = 7edb1d2dd41b135fa489de1802ea9b4079e9cb6556fa6457924bf7363bef7375987b9e4bb6507730ad906199ba55a44103d0655ad1f517b0426083be5b3e218c
+	sha512sums = 7a469b021aa1953ec229633d6796d8d39a073959f4d9af4d08e6a07eeb18dcad590cfb6df534624b78b1196aaab2ddf147bc6fb90e41ff49ab6cbdfb1b75bac5
 	sha512sums = ac4ce13fe88a383382abb92cb34ab231467cbc9dcb8ac8780480d467f295ddf65e217b6415bbadabd8c7ac9832b0fd9058b837946aa2d5dcfd9f3bb81cff6b31
 
 pkgname = ntpsec
diff --git a/Fix-the-libntpc-install-path.patch b/Fix-the-libntpc-install-path.patch
new file mode 100644
index 000000000000..3b0d51593869
--- /dev/null
+++ b/Fix-the-libntpc-install-path.patch
@@ -0,0 +1,24 @@
+From 2c81d1cba0ccf59593d2c154a099fa1e766838ac Mon Sep 17 00:00:00 2001
+From: James Browning <jamesb.fe80@gmail.com>
+Date: Wed, 14 Oct 2020 11:06:19 -0700
+Subject: [PATCH 01/18] FFI: Fix the libntpc install path.
+
+---
+ libntp/wscript | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libntp/wscript b/libntp/wscript
+index 34d84f68b..6f7659997 100644
+--- a/libntp/wscript
++++ b/libntp/wscript
+@@ -53,7 +53,6 @@ def build(ctx):
+         # Loadable FFI stub
+         ctx(
+             features="c cshlib",
+-            install_path='${LIBDIR}/ntp',
+             includes=[ctx.bldnode.parent.abspath(), "../include"],
+             source=["ntp_c.c", "pymodule-mac.c"] + libntp_source_sharable,
+             target="../pylib/ntpc",  # Put the output in the pylib directory
+-- 
+2.29.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 411ecaf27b7d..bc4c5d3e54c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Gregory Boyce <gregory@auburndaletech.com>
 
 pkgname=ntpsec
-pkgver=1.1.9
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="Security-hardened Network Time Protocol implementation"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://www.ntpsec.org/"
@@ -18,12 +18,14 @@ conflicts=('ntp')
 source=("ftp://ftp.ntpsec.org/pub/releases/$pkgname-$pkgver.tar.gz"
         "ftp://ftp.ntpsec.org/pub/releases/$pkgname-$pkgver.tar.gz.asc"
         use-arch-pool.patch
+        Fix-the-libntpc-install-path.patch
         ntpsec.sysusers)
-sha512sums=('e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b'
-            'SKIP'
+sha512sums=('9e18b3ca2f786a1ea323ba2384b51cff3d862115cea1ae576fc98172c476ac5e7d0d0fc873e47be0b19b050204ea9ed49669d94e66eb94525068dd1b08a8ae71'
+            '8acc04e778d6e9a7e267312fa9d5102c5fb6fbf545766f8f2f07b2d3ad649908f532798a922d2ade10ecaeb84c691e74064704594c55eefc802770a33d7bfeb0'
             '7edb1d2dd41b135fa489de1802ea9b4079e9cb6556fa6457924bf7363bef7375987b9e4bb6507730ad906199ba55a44103d0655ad1f517b0426083be5b3e218c'
+            '7a469b021aa1953ec229633d6796d8d39a073959f4d9af4d08e6a07eeb18dcad590cfb6df534624b78b1196aaab2ddf147bc6fb90e41ff49ab6cbdfb1b75bac5'
             'ac4ce13fe88a383382abb92cb34ab231467cbc9dcb8ac8780480d467f295ddf65e217b6415bbadabd8c7ac9832b0fd9058b837946aa2d5dcfd9f3bb81cff6b31')
-validpgpkeys=('B48237761A2690222C995F445A22E330161C3978')
+validpgpkeys=('E57235D22764129FA4F2F4D17F52608ED0E49D76')
 backup=('etc/ntp.conf'
         'etc/ntp.d/default.conf'
         'etc/ntp.d/use-pool')