summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndřej Surý2016-01-21 10:26:51 +0100
committerOndřej Surý2016-01-21 10:30:41 +0100
commit0bc505722c97ea0f595cce4371061f94f7c951df (patch)
tree6b1ee45331bca39f218a4160e98f35ca061552f6
parent6eb8130086203e7a0a6fa9c35bf1343afa5bf940 (diff)
downloadaur-0bc505722c97ea0f595cce4371061f94f7c951df.tar.gz
Update knot to 2.1.0-2: Fix the automatic upgrade call to knot1to2; add systemd tmpfiles configuration; use unified /usr/bin as sbindir
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--install4
-rw-r--r--knot.tmpfiles2
4 files changed, 15 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index de45453d94fb..0eaa7a72363b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Jan 21 09:13:52 UTC 2016
+# Thu Jan 21 09:26:20 UTC 2016
pkgbase = knot
pkgdesc = high-performance authoritative-only DNS server
pkgver = 2.1.0
- pkgrel = 1
+ pkgrel = 2
url = https://www.knot-dns.cz/
install = install
arch = i686
@@ -20,8 +20,10 @@ pkgbase = knot
depends = jansson
source = https://secure.nic.cz/files/knot-dns/knot-2.1.0.tar.xz
source = knot.service
+ source = knot.tmpfiles
sha256sums = 1f6ea98da000386bf86e015655a9ec974d361b62711caf06b55f3d9bb2aa85a9
sha256sums = caa870a9c93c57c6311f9e8fb5685a9179bb9839a27a30cc1712c91df0d15090
+ sha256sums = 592ffb904b697b8c09ab95b3874ad00637333f1805ab2ab0ee50b4f484108ee2
pkgname = knot
diff --git a/PKGBUILD b/PKGBUILD
index 690f9bec2f5f..2f3dbcda0298 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
srcname=knot
pkgname=${srcname}
pkgver=2.1.0
-pkgrel=1
+pkgrel=2
pkgdesc='high-performance authoritative-only DNS server'
url='https://www.knot-dns.cz/'
arch=('i686' 'x86_64')
@@ -14,15 +14,18 @@ install=install
depends=('liburcu>=0.5.4' 'gnutls>=3.0' 'zlib' 'liblmdb' 'jansson')
makedepends=('autoconf>=2.65' 'libtool' 'flex>=2.5.3' 'bison>=2.3')
source=("https://secure.nic.cz/files/knot-dns/${srcname}-${pkgver}.tar.xz"
- 'knot.service')
+ 'knot.service'
+ 'knot.tmpfiles')
sha256sums=('1f6ea98da000386bf86e015655a9ec974d361b62711caf06b55f3d9bb2aa85a9'
- 'caa870a9c93c57c6311f9e8fb5685a9179bb9839a27a30cc1712c91df0d15090')
+ 'caa870a9c93c57c6311f9e8fb5685a9179bb9839a27a30cc1712c91df0d15090'
+ '592ffb904b697b8c09ab95b3874ad00637333f1805ab2ab0ee50b4f484108ee2')
build() {
cd "${srcdir}/${srcname}-${pkgver}"
./configure \
--prefix /usr \
+ --sbindir /usr/bin \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--libexecdir=/usr/lib/knot \
@@ -44,6 +47,7 @@ package() {
make DESTDIR="${pkgdir}/" install
install -Dm 644 "${srcdir}/knot.service" "${pkgdir}/usr/lib/systemd/system/knot.service"
+ install -Dm 644 "${srcdir}/knot.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/knot.conf"
}
check() {
diff --git a/install b/install
index 04c6b71c6ffc..d99e22986544 100644
--- a/install
+++ b/install
@@ -5,10 +5,10 @@ post_install() {
chmod 700 /var/lib/knot
if [ -r /etc/knot/knot.conf -a ! -r /etc/knot/knot.conf.pacorig ]; then
- knot1to2 --in /etc/knot/knot.conf --out /etc/knot/knot.conf.pacnew
+ /usr/lib/knot/knot1to2 --in /etc/knot/knot.conf --out /etc/knot/knot.conf.pacnew
mv /etc/knot/knot.conf /etc/knot/knot.conf.pacorig
mv /etc/knot/knot.conf.pacnew /etc/knot/knot.conf
- echo 'warning: Old Knot DNS 1.6 configuration has beend saved as /etc/knot/knot.conf.pacorig'
+ echo 'warning: Old Knot DNS 1.6 configuration has been saved as /etc/knot/knot.conf.pacorig'
fi
}
diff --git a/knot.tmpfiles b/knot.tmpfiles
new file mode 100644
index 000000000000..aab781525228
--- /dev/null
+++ b/knot.tmpfiles
@@ -0,0 +1,2 @@
+#Type Path Mode UID GID Age Argument
+ d /run/knot 0755 knot knot - -