summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Swanson2016-12-03 07:43:55 -0800
committerMike Swanson2016-12-03 07:43:55 -0800
commite6ee678ed4b46f2de345aa2157b83b045ec55e7d (patch)
tree4629dee776e46b366137e7bc82d7656626db882a
parentcc00bb303c9b8abc60acf5b1ec23c6411c179ca1 (diff)
downloadaur-e6ee678ed4b46f2de345aa2157b83b045ec55e7d.tar.gz
ntpsec-git
-rw-r--r--.SRCINFO24
-rw-r--r--.gitignore3
-rw-r--r--0001-Python-3-portability-fix-for-waf-build.patch25
-rw-r--r--PKGBUILD49
-rw-r--r--autorevision-cache19
5 files changed, 32 insertions, 88 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aefb1727164..7045b479af9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
# Generated by mksrcinfo v8
-# Thu Dec 1 22:38:48 UTC 2016
-pkgbase = ntpsec
- pkgdesc = Security-hardened Network Time Protocol implementation
- pkgver = 0.9.5
- pkgrel = 3
+# Sat Dec 3 15:43:30 UTC 2016
+pkgbase = ntpsec-git
+ pkgdesc = Security-hardened Network Time Protocol implementation (Git HEAD)
+ pkgver = 0.9.5.r151.2356444
+ pkgrel = 1
url = https://www.ntpsec.org/
arch = i686
arch = x86_64
license = custom
makedepends = asciidoc
+ makedepends = git
makedepends = pps-tools
makedepends = w3m
depends = avahi
@@ -20,16 +21,11 @@ pkgbase = ntpsec
optdepends = python-psutil: Optional for ntpviz, allows running with ionice
optdepends = ttf-liberation: Improves font quality in ntpviz renderings
provides = ntp
+ provides = ntpsec
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
+ conflicts = ntpsec
+ source = git+https://gitlab.com/NTPsec/ntpsec
sha256sums = SKIP
- sha256sums = 1c6d50ba5404ac0573b93fc12101be1028c3ea5740318576a8bf6479abda27dc
- sha256sums = ad2ccebec3877832cc75802a39cec14dd8cc3fdde86ee9f59edb2e3e93ae19eb
-pkgname = ntpsec
+pkgname = ntpsec-git
diff --git a/.gitignore b/.gitignore
index 18b477fc228..0b72faafedd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
*.pkg.tar*
*.src.tar*
-*.gz
-*.sig
+/ntpsec/
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 6a172862dba..00000000000
--- 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 45932df8b46..59c780ee84c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,31 @@
# Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
-pkgname=ntpsec
-pkgver=0.9.5
-pkgrel=3
-pkgdesc="Security-hardened Network Time Protocol implementation"
+pkgname=ntpsec-git
+pkgver=0.9.5.r151.2356444
+pkgrel=1
+pkgdesc="Security-hardened Network Time Protocol implementation (Git HEAD)"
arch=('i686' 'x86_64')
url="https://www.ntpsec.org/"
license=('custom')
depends=('avahi' 'libevent' 'libseccomp' 'python')
-makedepends=('asciidoc' 'pps-tools' 'w3m')
+makedepends=('asciidoc' 'git' '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')
-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")
+provides=('ntp' 'ntpsec')
+conflicts=('ntp' 'ntpsec')
+source=("git+https://gitlab.com/NTPsec/ntpsec")
+sha256sums=('SKIP')
validpgpkeys=('DA3FDF774CC70FA64729EC4505D9B371477C7528')
+pkgver() {
+ cd "${pkgname%%-git}"
+ printf "%s" "$(git describe --long | sed -e 's/NTPsec_//' -e 's/\_/-/g' -e 's/\([^-]*-\)g/r\1/;s/-/./g')"
+}
+
prepare() {
- mkdir "ntpsec-$pkgver"
- tar -xf ntpsec-$pkgver.tar.gz -C "ntpsec-$pkgver"
- cd "ntpsec-$pkgver"
+ cd "${pkgname%%-git}"
for patch in ../*.patch; do
if [ ! -f "$patch" ]; then
@@ -40,35 +36,32 @@ 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"
+ cd "${pkgname%%-git}"
./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
}
check() {
- cd "$pkgname-$pkgver"
+ cd "${pkgname%%-git}"
./waf check
}
package() {
- cd "$pkgname-$pkgver"
+ cd "${pkgname%%-git}"
./waf install --destdir="$pkgdir/"
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 d0431e730e2..00000000000
--- 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