summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaikel Wever2017-09-04 16:11:26 +0200
committerMaikel Wever2017-09-04 16:11:26 +0200
commit9e43bff2a2060669444948cda861dfac7cbddcdd (patch)
tree136277fde8a85b1056b3731f9235ca8c164bf9b3
parent8e975cc07e5791eb19635eeca736e8188736fa52 (diff)
downloadaur-9e43bff2a2060669444948cda861dfac7cbddcdd.tar.gz
Fix dnsmasq and update to 2.17
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD8
-rw-r--r--dbus-dnsmasq-lxd.conf8
-rw-r--r--dnsmasq@lxd.service4
4 files changed, 16 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a95ec4a38346..44298376e96f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Jul 31 09:24:29 UTC 2017
+# Mon Sep 4 14:11:14 UTC 2017
pkgbase = lxd
pkgdesc = REST API, command line tool and OpenStack integration plugin for LXC.
- pkgver = 2.16
+ pkgver = 2.17
pkgrel = 1
url = https://github.com/lxc/lxd
arch = x86_64
@@ -20,19 +20,19 @@ pkgbase = lxd
conflicts = lxd-lts
options = !strip
options = !emptydirs
- source = https://github.com/lxc/lxd/archive/lxd-2.16.tar.gz
+ source = https://github.com/lxc/lxd/archive/lxd-2.17.tar.gz
source = lxd.service
source = dnsmasq-lxd.conf
source = dnsmasq@lxd.service
source = lxd.netctl
source = dbus-dnsmasq-lxd.conf
source = networkmanager-dnsmasq-lxd.conf
- md5sums = 1e28fae2c3eb199aa14db2b202e89175
+ md5sums = 179ccae9b1870538dff8629c079974f8
md5sums = 5dde136f2fbcdf5773a011a39c82cfc6
md5sums = b1fd16933c1b24aaa9ccc8f5a0e6478c
- md5sums = f2bc527eabb1fdba810b0393ee41edd4
+ md5sums = 15ae1bc51684d611bded2839ca55a37b
md5sums = 52c641ea0ba5477f5c1a1b857c03dda9
- md5sums = c9b5c98497e4ddc47d0c078b5b500f93
+ md5sums = c86b8c441ab014340186acc7799096f2
md5sums = 427926fddb1537f7a65d0a7274106df5
pkgname = lxd
diff --git a/PKGBUILD b/PKGBUILD
index a5b4c2984e9e..5bee98c87115 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Benjamin Asbach <archlinux-aur.lxd@impl.it>
pkgname=lxd
-pkgver=2.16
+pkgver=2.17
pkgrel=1
pkgdesc="REST API, command line tool and OpenStack integration plugin for LXC."
arch=('x86_64')
@@ -30,12 +30,12 @@ source=(
"networkmanager-dnsmasq-lxd.conf"
)
-md5sums=('1e28fae2c3eb199aa14db2b202e89175'
+md5sums=('179ccae9b1870538dff8629c079974f8'
'5dde136f2fbcdf5773a011a39c82cfc6'
'b1fd16933c1b24aaa9ccc8f5a0e6478c'
- 'f2bc527eabb1fdba810b0393ee41edd4'
+ '15ae1bc51684d611bded2839ca55a37b'
'52c641ea0ba5477f5c1a1b857c03dda9'
- 'c9b5c98497e4ddc47d0c078b5b500f93'
+ 'c86b8c441ab014340186acc7799096f2'
'427926fddb1537f7a65d0a7274106df5')
_gourl=github.com/lxc/lxd
diff --git a/dbus-dnsmasq-lxd.conf b/dbus-dnsmasq-lxd.conf
index fe64d7047380..e087c43644e5 100644
--- a/dbus-dnsmasq-lxd.conf
+++ b/dbus-dnsmasq-lxd.conf
@@ -6,11 +6,11 @@
<busconfig>
<policy user="root">
- <allow own="uk.org.thekelleys.dnsmasq-lxd"/>
- <allow send_destination="uk.org.thekelleys.dnsmasq-lxd"/>
+ <allow own="uk.org.thekelleys.dnsmasq.lxd"/>
+ <allow send_destination="uk.org.thekelleys.dnsmasq.lxd"/>
</policy>
<policy context="default">
- <deny own="uk.org.thekelleys.dnsmasq-lxd"/>
- <deny send_destination="uk.org.thekelleys.dnsmasq-lxd"/>
+ <deny own="uk.org.thekelleys.dnsmasq.lxd"/>
+ <deny send_destination="uk.org.thekelleys.dnsmasq.lxd"/>
</policy>
</busconfig>
diff --git a/dnsmasq@lxd.service b/dnsmasq@lxd.service
index a523cfec5118..3575ff20adfe 100644
--- a/dnsmasq@lxd.service
+++ b/dnsmasq@lxd.service
@@ -7,9 +7,9 @@ Documentation=man:dnsmasq(8)
[Service]
Type=dbus
-BusName=uk.org.thekelleys.dnsmasq-lxd
+BusName=uk.org.thekelleys.dnsmasq.lxd
ExecStartPre=/usr/bin/dnsmasq --test -C /etc/dnsmasq-lxd.conf
-ExecStart=/usr/bin/dnsmasq -k -C /etc/dnsmasq-lxd.conf --user=dnsmasq --pid-file
+ExecStart=/usr/bin/dnsmasq -k -C /etc/dnsmasq-lxd.conf --user=dnsmasq --enable-dbus=uk.org.thekelleys.dnsmasq.lxd --pid-file
ExecReload=/bin/kill -HUP $MAINPID
[Install]