aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-07-19 11:05:18 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-07-19 13:08:05 +0200
commitb65649056b1ca3e0ffa4e7d281f21c9edec5496c (patch)
tree53a4919734667af015d5e37802c673159c461d05 /main
parent0506722e21955765f56dfc4b6f2af39ad6b1a338 (diff)
downloadaports-b65649056b1ca3e0ffa4e7d281f21c9edec5496c.tar.gz
aports-b65649056b1ca3e0ffa4e7d281f21c9edec5496c.tar.bz2
aports-b65649056b1ca3e0ffa4e7d281f21c9edec5496c.tar.xz
main/libvirt: fix package and service deps
- daemon needs ip6tables ebtables and dnsmasq - we need load tun kernel module - libvirt service needs virtlogd ref #5769
Diffstat (limited to 'main')
-rw-r--r--main/libvirt/APKBUILD14
-rw-r--r--main/libvirt/libvirt.initd3
2 files changed, 11 insertions, 6 deletions
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index 82b0d3b9a6..aa30fa78aa 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -2,12 +2,12 @@
pkgname=libvirt
pkgver=1.3.5
_ver="${pkgver/_rc/-rc}"
-pkgrel=1
+pkgrel=2
pkgdesc="A virtualization API for several hypervisor and container systems"
url="http://libvirt.org/"
arch="all"
license="LGPL"
-_daemon_deps="bridge-utils dmidecode iptables"
+_daemon_deps="bridge-utils dmidecode dnsmasq ebtables ip6tables iptables"
_client_deps="pm-utils gnutls-utils netcat-openbsd"
depends=""
depends_dev="libtirpc-dev"
@@ -93,6 +93,9 @@ package() {
install -D -m755 $srcdir/virtlogd.initd $pkgdir/etc/init.d/virtlogd
install -D -m755 $srcdir/virtlockd.initd $pkgdir/etc/init.d/virtlockd
+ install -d "$pkgdir"/etc/modules-load.d
+ echo "tun" > "$pkgdir"/etc/modules-load.d/libvirt
+
rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null
return 0
@@ -115,6 +118,7 @@ daemon() {
"$subpkgdir"/usr/sbin
mv "$pkgdir"/etc/init.d "$subpkgdir"/etc
mv "$pkgdir"/etc/conf.d "$subpkgdir"/etc
+ mv "$pkgdir"/etc/modules-load.d "$subpkgdir"/etc
mv "$pkgdir"/etc/$pkgname/libvirtd.conf "$subpkgdir"/etc/libvirt/
mv "$pkgdir"/usr/sbin/libvirtd "$subpkgdir"/usr/sbin/
mv "$pkgdir"/etc/logrotate.d/libvirtd "$subpkgdir"/etc/logrotate.d/
@@ -176,7 +180,7 @@ _common_drivers() {
md5sums="f9dc1e63d559eca50ae0ee798a4c6c6d libvirt-1.3.5.tar.gz
1c84a7baeafe0a7f4e9d7ae5180311b7 libvirt.confd
-3e7f800197cad204e36274b54aba2be3 libvirt.initd
+bb94cd55d0029de387e6cb41e41f9167 libvirt.initd
e979ad068888cc824be210bd51c82f82 virtlogd.initd
4fb24502be354972041b37186ef5406c virtlockd.initd
9da7723b114b2d87558e92828366fbcb musl-fix-includes.patch
@@ -184,7 +188,7 @@ bc6ed2ce739dcc40542bb4e6bc94c0d3 fix-fortify-virnetlink.patch
989f7e79636e863e3db5203ec8bac39b CVE-2016-5008.patch"
sha256sums="93a23c44eb431da46c9458f95a66e29c9b98e37515d44b6be09e75b35ec94ac8 libvirt-1.3.5.tar.gz
851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1 libvirt.confd
-d07461d86c4db3fb74e4d4af23ff7fb1ee9e7f0ec471d9a5f3fbf0dd9ca148ad libvirt.initd
+e198935231f34601f1aafccdda132ca6ef22ea1bcc376446e2ceb04e6cd89800 libvirt.initd
51c030d7ba9a9dad1f927020592d7aef2dc2cd4abf38bd4ca97eee60943c7901 virtlogd.initd
552ba1f6edf92513a3041cbd3655ce782dc413c6f60995e77e6e3245ad1ef1f2 virtlockd.initd
8dfa9dbe71ee21dc53e44bd7cc0127adde1bf3371d6b393657b386bb83f8139b musl-fix-includes.patch
@@ -192,7 +196,7 @@ d07461d86c4db3fb74e4d4af23ff7fb1ee9e7f0ec471d9a5f3fbf0dd9ca148ad libvirt.initd
dd3753a52e6ad3b6e46e9460242b7ad076ace6a054b683f96504342ca526b260 CVE-2016-5008.patch"
sha512sums="6c6a09623d3d4d426311bfa7039f5e39584d5f891b8e761bbdb3022601ea066b8e1c3f8d609326e8ba4081ae40b7b03086fbc8ba5759d218b8616ec98200a89d libvirt-1.3.5.tar.gz
9aba6ab73219a635c64a340ee8887356e644445c9128734cbce73f5d54778378da2f10a190365ad88a7db8bc95b1fb17f0c6ca41fc41bb786c09e1afe84d65dc libvirt.confd
-6dadee33f6696182971d24028d6d4e1a3036f93305d54f9ae4919dcb93e813375d981037244900b6c533f46e5132dc053cf168020d1aa1c2545c28c811469553 libvirt.initd
+734afb83b7a4703dd238f1d89dbc853a8c73bcf1994af648c41ab01ae4088e5c7a423f0cb91e5e31f2ae5e60c66d08a6e1583a1e3b88bb5554e0f9fd15ecc15c libvirt.initd
36b85f473d292be8df415256d01a562131d8ae61450ba3893658090a12d589ca32215382f56f286a830b4e59ffd98fbe1d92004f2ce14ca0834451b943cd8f2f virtlogd.initd
a4c4d26e4111931acbe7594451bf963a36c8db33c64b1bc447ab4758bb92803510bebee0511d6bc16ba80c289ab6f87e74377d47bf560412f9adb9c161a206d9 virtlockd.initd
b6142256bf2700b9e5335c60fe5628e4095a24689c31d54afcab46f46a06b9c0ae676f87f77a487377eafbec11fb7afa9b994aef48a10a39e82f47c45df008ba musl-fix-includes.patch
diff --git a/main/libvirt/libvirt.initd b/main/libvirt/libvirt.initd
index 5099978dfc..693b77b886 100644
--- a/main/libvirt/libvirt.initd
+++ b/main/libvirt/libvirt.initd
@@ -3,7 +3,8 @@
extra_started_commands="reload"
depend() {
- need net
+ need net virtlogd
+ use virtlockd
after firewall
}