system/kvm-kmod: Updated for version 3.3.6.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

4 files changed, 20 insertions, 24 deletions

diff --git a/system/kvm-kmod/fixup_udev_rules.diff b/system/kvm-kmod/fixup_udev_rules.diff
index 24f34879e59b9..c51f8fc661278 100644
--- a/system/kvm-kmod/fixup_udev_rules.diff
+++ b/system/kvm-kmod/fixup_udev_rules.diff
@@ -1,7 +1,7 @@
-diff -Nur kvm-kmod-3.2.orig/scripts/65-kvm.rules kvm-kmod-3.2/scripts/65-kvm.rules
---- kvm-kmod-3.2.orig/scripts/65-kvm.rules	2012-01-08 07:02:08.000000000 -0600
-+++ kvm-kmod-3.2/scripts/65-kvm.rules	2012-02-12 11:59:06.317519510 -0600
-@@ -1,2 +1,2 @@
+--- kvm-kmod-3.3.6.orig/scripts/65-kvm.rules	2012-05-14 12:55:51.000000000 -0600
++++ kvm-kmod-3.3.6/scripts/65-kvm.rules	2012-05-17 05:34:28.507551599 -0600
+@@ -1,2 +1,3 @@
 -KERNEL=="kvm", MODE="0660", GROUP="kvm"
-+KERNEL=="kvm", MODE="0660", GROUP="@KVMGROUP@"
++KERNEL=="kvm", GROUP="@KVMGROUP@", MODE="0660"
++KERNEL=="vhost-net", GROUP="@KVMGROUP@", MODE="0660"
  ACTION=="add|change", SUBSYSTEM=="dmi", KERNEL=="id", RUN+="/bin/sh -c 'grep -q vmx /proc/cpuinfo && /sbin/modprobe kvm-intel; grep -q svm /proc/cpuinfo && /sbin/modprobe kvm-amd'"
diff --git a/system/kvm-kmod/kvm-kmod.SlackBuild b/system/kvm-kmod/kvm-kmod.SlackBuild
index 0154402de5a3c..efce63ee14ef3 100644
--- a/system/kvm-kmod/kvm-kmod.SlackBuild
+++ b/system/kvm-kmod/kvm-kmod.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kvm-kmod
-VERSION=${VERSION:-3.3}
+VERSION=${VERSION:-3.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,8 +75,7 @@ sed "s,@KVMGROUP@,$KVMGROUP," $CWD/fixup_udev_rules.diff | patch -p1 || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-  --arch=$ARCH \
-  --kerneldir=/lib/modules/$KERNEL/source
+  --arch=$ARCH
 
 make \
   PREFIX=/usr \
@@ -95,18 +94,15 @@ rm -r $PKG/usr/lib${LIBDIRSUFFIX}
 # Move /etc/udev to /lib/udev
 mv $PKG/etc/udev $PKG/lib
 
-# Make modprobe prefer the new modules in /lib/modules/$KERNEL/updates/
+# Make modprobe prefer the new modules in /lib/modules/$KERNEL/extra/
 # We don't want to install this with a .new suffix, because we want it
 # removed with the package.
-#mkdir -p $PKG/etc/depmod.d
-#cat << EOF > $PKG/etc/depmod.d/kvm-$KERNEL.conf
-#override kvm $KERNEL updates
-#override kvm-amd $KERNEL updates
-#override kvm-intel $KERNEL updates
-#EOF
-# This isn't needed any more, it appears - seems that anything in the
-# updates/x86/ directory automatically overrides the others.  I'm going
-# to leave the above snippet in place at least for now though...
+mkdir -p $PKG/etc/depmod.d
+cat << EOF > $PKG/etc/depmod.d/kvm-$KERNEL.conf
+override kvm $KERNEL extra
+override kvm-amd $KERNEL extra
+override kvm-intel $KERNEL extra
+EOF
 
 # We don't want the modules.* files in the package
 rm -f $PKG/lib/modules/${KERNEL}/modules.*
diff --git a/system/kvm-kmod/kvm-kmod.info b/system/kvm-kmod/kvm-kmod.info
index 57a8bd46d1367..7a63541d98fa9 100644
--- a/system/kvm-kmod/kvm-kmod.info
+++ b/system/kvm-kmod/kvm-kmod.info
@@ -1,10 +1,10 @@
 PRGNAM="kvm-kmod"
-VERSION="3.3"
+VERSION="3.3.6"
 HOMEPAGE="http://www.linux-kvm.org/page/Main_Page"
-DOWNLOAD="http://downloads.sourceforge.net/kvm/kvm-kmod-3.3.tar.bz2"
-MD5SUM="03415142561bf1c4c44a9ff0f0d036f7"
+DOWNLOAD="http://downloads.sourceforge.net/kvm/kvm-kmod-3.3.6.tar.bz2"
+MD5SUM="eb59cf6f4af504189874fd4049607e6e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Stu Miller"
 EMAIL="slackbuilds@go4it2day.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/system/kvm-kmod/slack-desc b/system/kvm-kmod/slack-desc
index c41bb22d50590..dcaf1dd8d1915 100644
--- a/system/kvm-kmod/slack-desc
+++ b/system/kvm-kmod/slack-desc
@@ -5,12 +5,12 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-        |-----handy-ruler--------------------------------------------------------|
+        |-----handy-ruler------------------------------------------------------|
 kvm-kmod: kvm-kmod (KVM kernel modules only)
 kvm-kmod:
 kvm-kmod: KVM (Kernel-based Virtual Machine) is a full virtualization solution
 kvm-kmod: for Linux on x86 hardware containing virtualization extensions
-kvm-kmod: (Intel VT or AMD-V). 
+kvm-kmod: (Intel VT or AMD-V).
 kvm-kmod:
 kvm-kmod: KVM is divided into the KVM-KMOD package (kernel modules) and the
 kvm-kmod: QEMU-KVM package (slightly modified QEMU) which are both available