Merge branch '3.0' into 3.1

qemu-all/.footprint

@@ -1,6 +1,9 @@
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/qemu/
 -rw-r--r--	root/root	etc/qemu/target-x86_64.conf (EMPTY)
+drwxr-xr-x	root/root	etc/udev/
+drwxr-xr-x	root/root	etc/udev/rules.d/
+-rw-r--r--	root/root	etc/udev/rules.d/60-kvm.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/qemu-aarch64

qemu-all/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  Thomas Penteker, tek at serverop dot de
 # Packager:    Lucas Hazel, lucas at die dot net dot au
 # Depends on:  libsdl
-# Nice to have: libseccomp libiscsi 
+# Nice to have: libseccomp libiscsi libusb usbredir
  
 name=qemu-all
 version=2.0.0
@@ -38,5 +38,9 @@ build() {
   install -D -m 644 qemu-img.1 $PKG/usr/man/man1/qemu-img.1
   install -D -m 644 qemu-nbd.8 $PKG/usr/man/man8/qemu-nbd.8
 
+  install -d $PKG/etc/udev/rules.d/
+  echo 'KERNEL=="kvm", NAME="kvm", OWNER="root", GROUP="kvm", MODE="0660"' > \
+  $PKG/etc/udev/rules.d/60-kvm.rules
+
   rm -rf $PKG/usr/share/locale
 }

qemu-all/pre-install

@@ -0,0 +1,2 @@
+#!/bin/sh
+getent group kvm || /usr/sbin/groupadd kvm

qemu/.footprint

@@ -1,6 +1,9 @@
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/qemu/
 -rw-r--r--	root/root	etc/qemu/target-x86_64.conf (EMPTY)
+drwxr-xr-x	root/root	etc/udev/
+drwxr-xr-x	root/root	etc/udev/rules.d/
+-rw-r--r--	root/root	etc/udev/rules.d/60-kvm.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/qemu-ga

qemu/Pkgfile

@@ -39,5 +39,9 @@ build() {
   install -D -m 644 qemu-img.1 $PKG/usr/man/man1/qemu-img.1
   install -D -m 644 qemu-nbd.8 $PKG/usr/man/man8/qemu-nbd.8
 
+  install -d $PKG/etc/udev/rules.d/
+  echo 'KERNEL=="kvm", NAME="kvm", OWNER="root", GROUP="kvm", MODE="0660"' > \
+  $PKG/etc/udev/rules.d/60-kvm.rules
+
   rm -rf $PKG/usr/share/locale
 }

qemu/pre-install

@@ -0,0 +1,2 @@
+#!/bin/sh
+getent group kvm || /usr/sbin/groupadd kvm

talloc/.footprint

@@ -3,14 +3,14 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/pytalloc.h
 -rw-r--r--	root/root	usr/include/talloc.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libpytalloc-util.so -> libpytalloc-util.so.2.1.0
-lrwxrwxrwx	root/root	usr/lib/libpytalloc-util.so.2 -> libpytalloc-util.so.2.1.0
--rwxr-xr-x	root/root	usr/lib/libpytalloc-util.so.2.1.0
--rwxr-xr-x	root/root	usr/lib/libtalloc-compat1-2.1.0.so
-lrwxrwxrwx	root/root	usr/lib/libtalloc.so -> libtalloc.so.2.1.0
-lrwxrwxrwx	root/root	usr/lib/libtalloc.so.1 -> libtalloc-compat1-2.1.0.so
-lrwxrwxrwx	root/root	usr/lib/libtalloc.so.2 -> libtalloc.so.2.1.0
--rwxr-xr-x	root/root	usr/lib/libtalloc.so.2.1.0
+lrwxrwxrwx	root/root	usr/lib/libpytalloc-util.so -> libpytalloc-util.so.2.1.1
+lrwxrwxrwx	root/root	usr/lib/libpytalloc-util.so.2 -> libpytalloc-util.so.2.1.1
+-rwxr-xr-x	root/root	usr/lib/libpytalloc-util.so.2.1.1
+-rwxr-xr-x	root/root	usr/lib/libtalloc-compat1-2.1.1.so
+lrwxrwxrwx	root/root	usr/lib/libtalloc.so -> libtalloc.so.2.1.1
+lrwxrwxrwx	root/root	usr/lib/libtalloc.so.1 -> libtalloc-compat1-2.1.1.so
+lrwxrwxrwx	root/root	usr/lib/libtalloc.so.2 -> libtalloc.so.2.1.1
+-rwxr-xr-x	root/root	usr/lib/libtalloc.so.2.1.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/pytalloc-util.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/talloc.pc

talloc/.md5sum

@@ -1,2 +1,2 @@
-85a69bfb5808fcadf378bd9eadb1f9c2  talloc-2.1.0.tar.gz
+5dffb86414218a91864ed4453ba9be07  talloc-2.1.1.tar.gz
 f13ecbd75403227ebd4959238401fba2  talloc.3

talloc/Pkgfile

@@ -5,7 +5,7 @@
 # Depends on: python
 
 name=talloc
-version=2.1.0
+version=2.1.1
 release=1
 source=(ftp://ftp.samba.org/pub/$name/$name-$version.tar.gz
         talloc.3)