Update to 0.9.6

PGP verification temporarily rescinded -- the file on the ftp is
not a detached signature. Will likely have it fixed upstream and make
a pkgver=2 version soon.

5 files changed, 14 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aefb1727164b..1f259e4bde5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Dec  1 22:38:48 UTC 2016
+# Sat Dec 31 10:16:31 UTC 2016
 pkgbase = ntpsec
 	pkgdesc = Security-hardened Network Time Protocol implementation
-	pkgver = 0.9.5
-	pkgrel = 3
+	pkgver = 0.9.6
+	pkgrel = 1
 	url = https://www.ntpsec.org/
 	arch = i686
 	arch = x86_64
@@ -21,15 +21,8 @@ pkgbase = ntpsec
 	optdepends = ttf-liberation: Improves font quality in ntpviz renderings
 	provides = ntp
 	conflicts = ntp
-	noextract = ntpsec-0.9.5.tar.gz
-	source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-0.9.5.tar.gz
-	source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-0.9.5.tar.gz.sig
-	source = autorevision-cache
-	source = 0001-Python-3-portability-fix-for-waf-build.patch
-	sha256sums = 4ddfb2c500428b14c272d6ad600438dec6ca76f87b0b20015dddfe7a18e5b7e3
-	sha256sums = SKIP
-	sha256sums = 1c6d50ba5404ac0573b93fc12101be1028c3ea5740318576a8bf6479abda27dc
-	sha256sums = ad2ccebec3877832cc75802a39cec14dd8cc3fdde86ee9f59edb2e3e93ae19eb
+	source = ftp://ftp.ntpsec.org/pub/releases/ntpsec-0.9.6.tar.gz
+	sha256sums = 9d15ac59b67911eb1b42fe5916e8d00ded8b71ba34f1ab4fc0f251fc0d90d5e5
 
 pkgname = ntpsec
 
diff --git a/.gitignore b/.gitignore
index 18b477fc228a..6e906ecd335e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 *.pkg.tar*
 *.src.tar*
 *.gz
-*.sig
+*.asc
 src
 pkg
diff --git a/0001-Python-3-portability-fix-for-waf-build.patch b/0001-Python-3-portability-fix-for-waf-build.patch
deleted file mode 100644
index 6a172862dba2..000000000000
--- a/0001-Python-3-portability-fix-for-waf-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4483a35cb2f872415fd7c2330827c61483fbfab Mon Sep 17 00:00:00 2001
-From: Thomas Nagy <nagy@waf.io>
-Date: Tue, 29 Nov 2016 17:25:49 -0500
-Subject: [PATCH] Python 3 portability fix for waf build.
-
----
- docs/wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/wscript b/docs/wscript
-index a036b76..2084ffd 100644
---- a/docs/wscript
-+++ b/docs/wscript
-@@ -1,7 +1,7 @@
- def build(ctx):
- 
- 	doc_source = ctx.path.ant_glob("*.txt")
--	doc_source = filter(lambda x: "body" not in str(x), doc_source)
-+	doc_source = ctx.path.ant_glob("*.txt", excl='*-body.txt')
- 
- 	ctx(
- 		target	= "doc",
--- 
-2.10.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 45932df8b467..664dfef17ff2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
 
 pkgname=ntpsec
-pkgver=0.9.5
-pkgrel=3
+pkgver=0.9.6
+pkgrel=1
 pkgdesc="Security-hardened Network Time Protocol implementation"
 arch=('i686' 'x86_64')
 url="https://www.ntpsec.org/"
@@ -15,21 +15,12 @@ optdepends=('gnuplot: for ntpviz'
             'ttf-liberation: Improves font quality in ntpviz renderings')
 provides=('ntp')
 conflicts=('ntp')
-source=("ftp://ftp.ntpsec.org/pub/releases/ntpsec-$pkgver.tar.gz"
-        "ftp://ftp.ntpsec.org/pub/releases/ntpsec-$pkgver.tar.gz.sig"
-        "autorevision-cache"
-        "0001-Python-3-portability-fix-for-waf-build.patch")
-sha256sums=('4ddfb2c500428b14c272d6ad600438dec6ca76f87b0b20015dddfe7a18e5b7e3'
-            'SKIP'
-            '1c6d50ba5404ac0573b93fc12101be1028c3ea5740318576a8bf6479abda27dc'
-            'ad2ccebec3877832cc75802a39cec14dd8cc3fdde86ee9f59edb2e3e93ae19eb')
-noextract=("ntpsec-$pkgver.tar.gz")
+source=("ftp://ftp.ntpsec.org/pub/releases/$pkgname-$pkgver.tar.gz")
+sha256sums=('9d15ac59b67911eb1b42fe5916e8d00ded8b71ba34f1ab4fc0f251fc0d90d5e5')
 validpgpkeys=('DA3FDF774CC70FA64729EC4505D9B371477C7528')
 
 prepare() {
-  mkdir "ntpsec-$pkgver"
-  tar -xf ntpsec-$pkgver.tar.gz -C "ntpsec-$pkgver"
-  cd "ntpsec-$pkgver"
+  cd "$pkgname-$pkgver"
 
   for patch in ../*.patch; do
     if [ ! -f "$patch" ]; then
@@ -40,16 +31,13 @@ prepare() {
   done
 
   sed -i -e 's/sbin/bin/g' "etc/ntpd.service"
-  sed -i -e '/ExecStop/d' "etc/ntpd.service"
 }
 
 build() {
   cd "$pkgname-$pkgver"
-  mkdir -p "build/main/wafhelpers"
-  cp "$srcdir/autorevision-cache" "build/main/wafhelpers/.autorevision-cache"
   ./waf configure --prefix=/usr --bindir=/usr/bin --libdir=/usr/lib \
         --enable-debug-gdb --enable-seccomp --refclock=all \
-        --sbindir=/usr/bin --enable-doc --path-doc=/usr/share/doc/ntpsec
+        --sbindir=/usr/bin --enable-doc --htmldir=/usr/share/doc/"$pkgname"
   ./waf build
   a2x -f text docs/copyright.txt
 }
@@ -65,10 +53,10 @@ package() {
 
   install -d "$pkgdir/etc/logrotate.d"
   install -d "$pkgdir/usr/lib/systemd/system"
-  install -d "$pkgdir/usr/share/licenses/ntpsec"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
   install -m 644 etc/logrotate-config.ntpd "$pkgdir/etc/logrotate.d/ntpd"
   install -m 644 etc/ntpd.service "$pkgdir/usr/lib/systemd/system/ntpd.service"
-  install -m 644 docs/copyright.text "$pkgdir/usr/share/licenses/ntpsec/COPYING"
+  install -m 644 docs/copyright.text "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
   # --mandir, it does nothing!
   mv "$pkgdir/usr/man" "$pkgdir/usr/share/man"
diff --git a/autorevision-cache b/autorevision-cache
deleted file mode 100644
index d0431e730e29..000000000000
--- a/autorevision-cache
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by autorevision - do not hand-hack!
-
-VCS_TYPE="git"
-VCS_BASENAME="ntpsec"
-VCS_UUID="5a60ff124237ba5d23101e4ca60016ebeae7cb50"
-VCS_NUM="11452"
-VCS_DATE="2016-11-24T04:20:49Z"
-VCS_BRANCH=""
-VCS_TAG="NTPsec_0_9_5"
-VCS_TICK="0"
-VCS_EXTRA=""
-
-VCS_ACTION_STAMP="2016-11-24T04:20:49Z!esr@thyrsus.com"
-VCS_FULL_HASH="190ee039df6230c12d459bac73a1d75e99455ebd"
-VCS_SHORT_HASH="190ee03"
-
-VCS_WC_MODIFIED="0"
-
-# end