summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory Boyce2019-07-22 14:54:20 -0400
committerGregory Boyce2019-07-22 14:54:20 -0400
commitda100122654b70a215598df82a8b056ea3bd4a39 (patch)
tree856e6b745cea37a3747782602fb3e9112d540cfa
parent6f16596b961b6eb95d5d98cd43177ebfdfb6a753 (diff)
downloadaur-da100122654b70a215598df82a8b056ea3bd4a39.tar.gz
Upstream change caused issue with service file.
Reverting with patch while I see if there's a fix in the works.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--fix-unitfile.patch12
3 files changed, 20 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 95e9b696ee72..09b77ad4b861 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ntpsec
pkgdesc = Security-hardened Network Time Protocol implementation
pkgver = 1.1.6
- pkgrel = 1
+ pkgrel = 2
url = https://www.ntpsec.org/
arch = i686
arch = x86_64
@@ -25,11 +25,13 @@ pkgbase = ntpsec
source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.6.tar.gz
source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.6.tar.gz.asc
source = use-arch-pool.patch
+ source = fix-unitfile.patch
source = ntpsec.sysusers
validpgpkeys = B48237761A2690222C995F445A22E330161C3978
sha512sums = f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
sha512sums = SKIP
sha512sums = 7edb1d2dd41b135fa489de1802ea9b4079e9cb6556fa6457924bf7363bef7375987b9e4bb6507730ad906199ba55a44103d0655ad1f517b0426083be5b3e218c
+ sha512sums = 95d7a46db2c4afa99092e528fb4439ad0c289247d27a33ac51206dd0cd6a1358939c17d7571b20bcb2a1563a9cbfc56222cf7b855fdce66f179ef5c2837fb36f
sha512sums = ac4ce13fe88a383382abb92cb34ab231467cbc9dcb8ac8780480d467f295ddf65e217b6415bbadabd8c7ac9832b0fd9058b837946aa2d5dcfd9f3bb81cff6b31
pkgname = ntpsec
diff --git a/PKGBUILD b/PKGBUILD
index fef740148c8b..a6eff019d84b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=ntpsec
pkgver=1.1.6
-pkgrel=1
+pkgrel=2
pkgdesc="Security-hardened Network Time Protocol implementation"
arch=('i686' 'x86_64')
url="https://www.ntpsec.org/"
@@ -18,10 +18,12 @@ 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-unitfile.patch
ntpsec.sysusers)
sha512sums=('f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941'
'SKIP'
'7edb1d2dd41b135fa489de1802ea9b4079e9cb6556fa6457924bf7363bef7375987b9e4bb6507730ad906199ba55a44103d0655ad1f517b0426083be5b3e218c'
+ '95d7a46db2c4afa99092e528fb4439ad0c289247d27a33ac51206dd0cd6a1358939c17d7571b20bcb2a1563a9cbfc56222cf7b855fdce66f179ef5c2837fb36f'
'ac4ce13fe88a383382abb92cb34ab231467cbc9dcb8ac8780480d467f295ddf65e217b6415bbadabd8c7ac9832b0fd9058b837946aa2d5dcfd9f3bb81cff6b31')
validpgpkeys=('B48237761A2690222C995F445A22E330161C3978')
backup=('etc/ntp.d/default.conf'
@@ -42,9 +44,8 @@ prepare() {
build() {
cd "$pkgname-$pkgver"
- ./waf configure --prefix=/usr --sbindir=/usr/bin \
- --enable-debug-gdb --enable-seccomp --refclock=all \
- --enable-doc --htmldir=/usr/share/doc/ntpsec \
+ ./waf configure --prefix /usr --sbindir=/usr/bin --enable-debug-gdb --enable-seccomp \
+ --refclock=all --enable-doc --htmldir=/usr/share/doc/ntpsec \
--enable-leap-smear
./waf build
diff --git a/fix-unitfile.patch b/fix-unitfile.patch
new file mode 100644
index 000000000000..b1765d91cf42
--- /dev/null
+++ b/fix-unitfile.patch
@@ -0,0 +1,12 @@
+diff -ruN ntpsec-1.1.6/etc/ntpd.service ntpsec-1.1.6.new/etc/ntpd.service
+--- ntpsec-1.1.6/etc/ntpd.service 2019-06-21 22:41:51.000000000 -0400
++++ ntpsec-1.1.6.new/etc/ntpd.service 2019-07-22 14:47:21.187144655 -0400
+@@ -9,7 +9,7 @@
+ [Service]
+ Type=forking
+ PrivateTmp=true
+-ExecStart=@SBINDIR@/ntpd -g -N -u ntp:ntp
++ExecStart=/usr/sbin/ntpd -g -N -u ntp:ntp
+ # Specifying -g on the command line allows ntpd to make large adjustments to
+ # the clock on boot. However, if Restart=yes is set, a malicious (or broken)
+ # server could send the incorrect time, trip the panic threshold, and when