Thu May 3 00:01:52 UTC 2012

8 files changed, 187 insertions, 13 deletions

diff --git a/testing/qemu-kvm/65-kvm.rules b/testing/qemu-kvm/65-kvm.rules
new file mode 100644
index 000000000..c2f7317aa
--- /dev/null
+++ b/testing/qemu-kvm/65-kvm.rules
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/testing/qemu-kvm/PKGBUILD b/testing/qemu-kvm/PKGBUILD
new file mode 100644
index 000000000..e0183c52f
--- /dev/null
+++ b/testing/qemu-kvm/PKGBUILD
@@ -0,0 +1,74 @@
+# $Id: PKGBUILD 158037 2012-05-01 16:34:50Z tomegun $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=qemu-kvm
+pkgver=1.0.1
+pkgrel=2
+pkgdesc="Latest KVM QEMU is 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://www.linux-kvm.org"
+depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'libpulse')
+makedepends=('git' 'iasl' 'texi2html' 'perl' 'python2')
+backup=('etc/qemu/target-x86_64.conf')
+install=qemu-kvm.install
+conflicts=('qemu')
+provides=('qemu')
+replaces=('kvm')
+source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz
+        65-kvm.rules)
+options=(!strip)
+
+build()
+{
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    # fix esound building
+    ./configure --prefix=/usr \
+                --python=/usr/bin/python2 \
+                --sysconfdir=/etc \
+                --audio-drv-list=alsa,sdl,oss,pa \
+                --audio-card-list=ac97,sb16,es1370,hda \
+                --enable-docs
+    make
+
+    # Use latest seabios version
+    # https://bugs.archlinux.org/task/27616
+    cd "${srcdir}/"
+    git clone git://git.seabios.org/seabios.git
+    cd seabios
+    #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+    sed -i -e 's/python/python2/g' Makefile
+    make clean
+    make
+}
+
+package()
+{
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    
+    # Use latest seabios version
+    # https://bugs.archlinux.org/task/27616
+    cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
+
+    # symbolic link for backwards compatibility
+    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm"
+    # symbolic link for to qemu binary for emulator apps
+    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu"
+    # symbolic link for to qemu binary for emulator apps
+    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/kvm"
+    # fix man page
+    mv "${pkgdir}/usr/share/man/man1/qemu.1" \
+                     "${pkgdir}/usr/share/man/man1/qemu-kvm.1"
+    # install udev rules
+    install -D -m644 "${srcdir}/65-kvm.rules" \
+                     "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
+    # strip scripts directory
+    find "${pkgdir}/usr/bin"  -type f -perm -u+w 2>/dev/null | while read binary ; do
+      case "$(file -bi "$binary")" in
+        *application/x-executable*) # Binaries
+        /usr/bin/strip $STRIP_BINARIES "$binary";;
+      esac
+    done
+}
+md5sums=('f23711fb9f3c70f802829b109ba9aa27'
+         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/testing/qemu-kvm/qemu-kvm.install b/testing/qemu-kvm/qemu-kvm.install
new file mode 100644
index 000000000..5161df93a
--- /dev/null
+++ b/testing/qemu-kvm/qemu-kvm.install
@@ -0,0 +1,15 @@
+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() {
+  post_install $1
+}
+
+post_remove() {
+  groupdel kvm
+}
diff --git a/testing/qemu/65-kvm.rules b/testing/qemu/65-kvm.rules
new file mode 100644
index 000000000..c2f7317aa
--- /dev/null
+++ b/testing/qemu/65-kvm.rules
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/testing/qemu/PKGBUILD b/testing/qemu/PKGBUILD
new file mode 100644
index 000000000..e93300578
--- /dev/null
+++ b/testing/qemu/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 158035 2012-05-01 16:34:16Z tomegun $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=qemu
+pkgver=1.0.1
+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=('iasl' 'git' 'texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse')
+backup=('etc/qemu/target-x86_64.conf')
+install=qemu.install
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
+        65-kvm.rules)
+options=(!strip)
+
+build()
+{
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e 's/lib64/lib/g' x86_64.ld
+  ./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
+              make
+  # Use latest seabios version
+  # https://bugs.archlinux.org/task/27616
+  cd "${srcdir}/"
+  git clone git://git.seabios.org/seabios.git
+  cd seabios
+  #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  make clean
+  make PYTHON=python2
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  # Use latest seabios version
+  # https://bugs.archlinux.org/task/27616
+  cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
+
+  install -D -m644 "${srcdir}/65-kvm.rules" \
+                   "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
+  # 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
+        *application/x-executable*) # Binaries
+        /usr/bin/strip $STRIP_BINARIES "$binary";;
+      esac
+    done
+
+}
+md5sums=('5efd1091f01e3bc31bfdec27b8edeb00'
+         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/testing/qemu/qemu.install b/testing/qemu/qemu.install
new file mode 100644
index 000000000..fd92c60eb
--- /dev/null
+++ b/testing/qemu/qemu.install
@@ -0,0 +1,23 @@
+# kvm:  the new package version
+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 ""
+  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
+}
+
+post_remove() {
+  #
+  groupdel kvm
+}
diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD
index 55c1b7916..9ea9cccd7 100644
--- a/testing/samba/PKGBUILD
+++ b/testing/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 157516 2012-04-28 21:41:15Z dreisner $
+# $Id: PKGBUILD 158041 2012-05-01 17:24:23Z tomegun $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.4
+pkgver=3.6.5
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.4
-pkgrel=3
+_realver=3.6.5
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -114,10 +114,10 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   # fix logrotate
   sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
   # nsswitch libraries
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
-  ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
-  ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2
+  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so
+  ln -s libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so.2
+  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so
+  ln -s libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so.2
   # winbind krb5 locator
   mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5
   install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5
@@ -154,7 +154,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   done
   install -D -m644 ${srcdir}/smbd.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf 
 }
-md5sums=('d8e070e2a3b12f202f347e4427469bc2'
+md5sums=('2f0c14547333c1b48fd4728b031e7040'
          'dfc6f9018c556b9783c7140de183727f'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/testing/xfsprogs/PKGBUILD b/testing/xfsprogs/PKGBUILD
index 309fbad3e..4c6c87ee5 100644
--- a/testing/xfsprogs/PKGBUILD
+++ b/testing/xfsprogs/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 154211 2012-03-24 10:24:07Z tpowa $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 158040 2012-05-01 17:23:55Z tomegun $
+#
 pkgname=xfsprogs
 pkgver=3.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="XFS filesystem utilities"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://oss.sgi.com/projects/xfs/"
 groups=('base')
-depends=('util-linux-ng>=2.16')
+depends=('util-linux')
 options=('!makeflags' '!libtool')
 # We mirror the sources as upstream tends to move them once a new release is out
 source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz")
@@ -18,6 +18,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   export OPTIMIZER="-march=${CARCH/_/-} -O1"
   export DEBUG=-DNDEBUG
+  ./configure --prefix=/usr
   make
 }
 
@@ -26,4 +27,7 @@ package() {
   make DIST_ROOT="${pkgdir}" install install-dev
   chown -R root $pkgdir
   chgrp -R root $pkgdir
+  # add hack as we cannot set rootlibdir
+  mv "${pkgdir}"/lib/libhandle.so* "${pkgdir}/usr/lib/"
+  rm -rf "${pkgdir}/lib"
 }