Wed Mar 6 00:03:52 PST 2013

3 files changed, 56 insertions, 13 deletions

diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 4f57d8083..510c68258 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 172024 2012-11-26 16:12:59Z tpowa $
+# $Id: PKGBUILD 179325 2013-03-05 14:58:22Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=1.2.1
-pkgrel=1
+pkgver=1.4.0
+pkgrel=2
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
 makedepends=('texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
+depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
 source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+        doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
         65-kvm.rules)
+replaces=('qemu-kvm')
 options=(!strip)
 
 build()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's/lib64/lib/g' x86_64.ld
+  sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld
+  # fix building with tex version 5.0
+  # https://bugs.launchpad.net/qemu/+bug/1130533
+  patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
   ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
               --python=/usr/bin/python2 \
               --audio-card-list=ac97,sb16,es1370,hda \
-              --enable-docs 
+              --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu
               make
 }
 
@@ -33,6 +38,11 @@ package() {
 
   install -D -m644 "${srcdir}/65-kvm.rules" \
                    "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
+  # bridge_helper needs suid
+  # https://bugs.archlinux.org/task/32565
+  chmod u+s "${pkgdir}/usr/lib/qemu/qemu-bridge-helper"
+  # add sample config
+  echo "allow br0" > ${pkgdir}/etc/qemu/bridge.conf.sample
   # strip scripts directory
     find "${pkgdir}/usr/src/linux-${_kernver}/scripts"  -type f -perm -u+w 2>/dev/null | while read binary ; do
       case "$(file -bi "$binary")" in
@@ -42,5 +52,6 @@ package() {
     done
 
 }
-md5sums=('189bc5b87281a72f8c72a0f7ebaa6d00'
+md5sums=('78f13b774814b6b7ebcaf4f9b9204318'
+         'b431782f310bfc6af4ef21a8068f866b'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch b/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
new file mode 100644
index 000000000..bacc87e80
--- /dev/null
+++ b/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
@@ -0,0 +1,30 @@
+diff --git a/qemu-options.hx b/qemu-options.hx
+index 4bc9c85..3af60bf 100644
+--- a/qemu-options.hx
++++ b/qemu-options.hx
+@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or remote networked
+ devices.
+ 
+ Syntax for specifying a sheepdog device
+-@table @list
+-``sheepdog:<vdiname>''
+-
+-``sheepdog:<vdiname>:<snapid>''
+-
+-``sheepdog:<vdiname>:<tag>''
+-
+-``sheepdog:<host>:<port>:<vdiname>''
+-
+-``sheepdog:<host>:<port>:<vdiname>:<snapid>''
+-
+-``sheepdog:<host>:<port>:<vdiname>:<tag>''
++@table @code
++@item sheepdog:<vdiname>
++@item sheepdog:<vdiname>:<snapid>
++@item sheepdog:<vdiname>:<tag>
++@item sheepdog:<host>:<port>:<vdiname>
++@item sheepdog:<host>:<port>:<vdiname>:<snapid>
++@item sheepdog:<host>:<port>:<vdiname>:<tag>
+ @end table
+ 
+ Example
diff --git a/extra/qemu/qemu.install b/extra/qemu/qemu.install
index fd92c60eb..f4fabcc54 100644
--- a/extra/qemu/qemu.install
+++ b/extra/qemu/qemu.install
@@ -3,18 +3,20 @@ post_install() {
   #
   groupadd kvm -f -g 78
   echo ">>> PLEASE READ FOR KVM USAGE!"
-  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
   echo ">>>  Add yourself to the group 'kvm'."
-  echo ""
+}
+
+post_upgrade() {
   if [ "$(vercmp $2 0.11)" -lt 0 ]; then
     echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
     echo "is no longer supported and will be removed from the repositories. You"
     echo "can safely uninstall it from your system."
   fi
-}
-
-post_upgrade() {
-  post_install $1
+  if [ "$(vercmp $2 1.3.1)" -lt 0 ]; then
+    echo "With the release of qemu 1.3.0, qemu-kvm binary is removed."
+    echo "You need to change the emulator path, if you use libvirt by using:"
+    echo "'virsh edit <vm-name>'"
+  fi
 }
 
 post_remove() {