summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Swanson2016-12-01 14:39:14 -0800
committerMike Swanson2016-12-01 14:39:14 -0800
commitcc00bb303c9b8abc60acf5b1ec23c6411c179ca1 (patch)
treec3e54d4e5d3e44714f6d2ed42486225af11879ed
parentffb1e6445862d992fca156d1418033031d679255 (diff)
downloadaur-cc00bb303c9b8abc60acf5b1ec23c6411c179ca1.tar.gz
Fix the building of docs by backporting a newer commit
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Python-3-portability-fix-for-waf-build.patch25
-rw-r--r--PKGBUILD34
3 files changed, 52 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 54ee7100296..aefb1727164 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Dec 1 22:04:21 UTC 2016
+# Thu Dec 1 22:38:48 UTC 2016
pkgbase = ntpsec
pkgdesc = Security-hardened Network Time Protocol implementation
pkgver = 0.9.5
- pkgrel = 2
+ pkgrel = 3
url = https://www.ntpsec.org/
arch = i686
arch = x86_64
@@ -25,9 +25,11 @@ pkgbase = ntpsec
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
pkgname = ntpsec
diff --git a/0001-Python-3-portability-fix-for-waf-build.patch b/0001-Python-3-portability-fix-for-waf-build.patch
new file mode 100644
index 00000000000..6a172862dba
--- /dev/null
+++ b/0001-Python-3-portability-fix-for-waf-build.patch
@@ -0,0 +1,25 @@
+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 1c6ac31fa4b..45932df8b46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=ntpsec
pkgver=0.9.5
-pkgrel=2
+pkgrel=3
pkgdesc="Security-hardened Network Time Protocol implementation"
arch=('i686' 'x86_64')
url="https://www.ntpsec.org/"
@@ -12,23 +12,35 @@ makedepends=('asciidoc' 'pps-tools' 'w3m')
optdepends=('gnuplot: for ntpviz'
'libevent: for ntpdig'
'python-psutil: Optional for ntpviz, allows running with ionice'
- 'ttf-liberation: Improves font quality in ntpviz renderings')
+ '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")
+ "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')
+ '1c6d50ba5404ac0573b93fc12101be1028c3ea5740318576a8bf6479abda27dc'
+ 'ad2ccebec3877832cc75802a39cec14dd8cc3fdde86ee9f59edb2e3e93ae19eb')
noextract=("ntpsec-$pkgver.tar.gz")
validpgpkeys=('DA3FDF774CC70FA64729EC4505D9B371477C7528')
prepare() {
- mkdir "$srcdir/ntpsec-$pkgver"
- tar -xf ntpsec-$pkgver.tar.gz -C "$srcdir/ntpsec-$pkgver"
- sed -i -e 's/sbin/bin/g' "$srcdir/ntpsec-$pkgver/etc/ntpd.service"
- sed -i -e '/ExecStop/d' "$srcdir/ntpsec-$pkgver/etc/ntpd.service"
+ mkdir "ntpsec-$pkgver"
+ tar -xf ntpsec-$pkgver.tar.gz -C "ntpsec-$pkgver"
+ cd "ntpsec-$pkgver"
+
+ for patch in ../*.patch; do
+ if [ ! -f "$patch" ]; then
+ break;
+ else
+ patch -p1 -i "$patch"
+ fi
+ done
+
+ sed -i -e 's/sbin/bin/g' "etc/ntpd.service"
+ sed -i -e '/ExecStop/d' "etc/ntpd.service"
}
build() {
@@ -36,8 +48,8 @@ build() {
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-debug-gdb --enable-seccomp --refclock=all \
+ --sbindir=/usr/bin --enable-doc --path-doc=/usr/share/doc/ntpsec
./waf build
a2x -f text docs/copyright.txt
}