summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory Boyce2021-06-14 16:15:40 -0400
committerGregory Boyce2021-06-14 16:15:40 -0400
commitfdc94b77249c6eb0cfc4ec9249af5a50724104f2 (patch)
tree3e15260ef47f97d86e385f8deff7dcc892fd70a9
parent79eb06d8ddd74cc5549bb7b3487ac153a78b29de (diff)
downloadaur-fdc94b77249c6eb0cfc4ec9249af5a50724104f2.tar.gz
Updated to ntpsec 1.2.1, dropping cherry picked patch
-rw-r--r--.SRCINFO14
-rw-r--r--Fix-the-libntpc-install-path.patch24
-rw-r--r--PKGBUILD10
3 files changed, 10 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4ac7de342563..19b9947da6f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ntpsec
pkgdesc = Security-hardened Network Time Protocol implementation
- pkgver = 1.2.0
- pkgrel = 2
+ pkgver = 1.2.1
+ pkgrel = 0
url = https://www.ntpsec.org/
arch = i686
arch = x86_64
@@ -23,16 +23,14 @@ 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.2.0.tar.gz
- source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.0.tar.gz.asc
+ source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.1.tar.gz
+ source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.1.tar.gz.asc
source = use-arch-pool.patch
- source = Fix-the-libntpc-install-path.patch
source = ntpsec.sysusers
validpgpkeys = E57235D22764129FA4F2F4D17F52608ED0E49D76
- sha512sums = 9e18b3ca2f786a1ea323ba2384b51cff3d862115cea1ae576fc98172c476ac5e7d0d0fc873e47be0b19b050204ea9ed49669d94e66eb94525068dd1b08a8ae71
- sha512sums = 8acc04e778d6e9a7e267312fa9d5102c5fb6fbf545766f8f2f07b2d3ad649908f532798a922d2ade10ecaeb84c691e74064704594c55eefc802770a33d7bfeb0
+ sha512sums = 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
+ sha512sums = 9f5da76dc538aeee3fcd34f18b29566a122d2a08f5070ec662f7e1ddbd0f3518f9350479fc121afa9f7b55f107d1864f30ced564ae6ee6ef7cdb8b44f694d157
sha512sums = 7edb1d2dd41b135fa489de1802ea9b4079e9cb6556fa6457924bf7363bef7375987b9e4bb6507730ad906199ba55a44103d0655ad1f517b0426083be5b3e218c
- sha512sums = 7a469b021aa1953ec229633d6796d8d39a073959f4d9af4d08e6a07eeb18dcad590cfb6df534624b78b1196aaab2ddf147bc6fb90e41ff49ab6cbdfb1b75bac5
sha512sums = ac4ce13fe88a383382abb92cb34ab231467cbc9dcb8ac8780480d467f295ddf65e217b6415bbadabd8c7ac9832b0fd9058b837946aa2d5dcfd9f3bb81cff6b31
pkgname = ntpsec
diff --git a/Fix-the-libntpc-install-path.patch b/Fix-the-libntpc-install-path.patch
deleted file mode 100644
index 3b0d51593869..000000000000
--- a/Fix-the-libntpc-install-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 8d8d1871e646..06fa32300c48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Gregory Boyce <gregory@auburndaletech.com>
pkgname=ntpsec
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.2.1
+pkgrel=0
pkgdesc="Security-hardened Network Time Protocol implementation"
arch=('i686' 'x86_64' 'armv7h')
url="https://www.ntpsec.org/"
@@ -18,12 +18,10 @@ 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=('9e18b3ca2f786a1ea323ba2384b51cff3d862115cea1ae576fc98172c476ac5e7d0d0fc873e47be0b19b050204ea9ed49669d94e66eb94525068dd1b08a8ae71'
- '8acc04e778d6e9a7e267312fa9d5102c5fb6fbf545766f8f2f07b2d3ad649908f532798a922d2ade10ecaeb84c691e74064704594c55eefc802770a33d7bfeb0'
+sha512sums=('0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277'
+ '9f5da76dc538aeee3fcd34f18b29566a122d2a08f5070ec662f7e1ddbd0f3518f9350479fc121afa9f7b55f107d1864f30ced564ae6ee6ef7cdb8b44f694d157'
'7edb1d2dd41b135fa489de1802ea9b4079e9cb6556fa6457924bf7363bef7375987b9e4bb6507730ad906199ba55a44103d0655ad1f517b0426083be5b3e218c'
- '7a469b021aa1953ec229633d6796d8d39a073959f4d9af4d08e6a07eeb18dcad590cfb6df534624b78b1196aaab2ddf147bc6fb90e41ff49ab6cbdfb1b75bac5'
'ac4ce13fe88a383382abb92cb34ab231467cbc9dcb8ac8780480d467f295ddf65e217b6415bbadabd8c7ac9832b0fd9058b837946aa2d5dcfd9f3bb81cff6b31')
validpgpkeys=('E57235D22764129FA4F2F4D17F52608ED0E49D76')
backup=('etc/ntp.conf'