From f56d09493877605779d2846ec57aea94ef06d79d Mon Sep 17 00:00:00 2001
From: Niklas Nille Åkerström <nille.kungen[AT]gmail.com>
Date: Wed, 12 May 2010 17:46:13 +0200
Subject: system/vhba-module: Updated for version 1.2.1

---
 system/vhba-module/slack-desc                   |  1 +
 system/vhba-module/vhba-module-scatterlist.diff | 12 ------------
 system/vhba-module/vhba-module.SlackBuild       | 11 +++--------
 system/vhba-module/vhba-module.info             |  8 ++++----
 4 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 system/vhba-module/vhba-module-scatterlist.diff

(limited to 'system')

diff --git a/system/vhba-module/slack-desc b/system/vhba-module/slack-desc
index b4dbc1a1d7..ab38030776 100644
--- a/system/vhba-module/slack-desc
+++ b/system/vhba-module/slack-desc
@@ -16,3 +16,4 @@ vhba-module: suite, a free, GPL CD/DVD-ROM device emulator for linux.
 vhba-module:
 vhba-module: Homepage: http://cdemu.sourceforge.net/pkg_vhba.php
 vhba-module:
+vhba-module:
diff --git a/system/vhba-module/vhba-module-scatterlist.diff b/system/vhba-module/vhba-module-scatterlist.diff
deleted file mode 100644
index 6c3540abaf..0000000000
--- a/system/vhba-module/vhba-module-scatterlist.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- vhba-module-1.1.0.orig/kat/scatterlist_has_page_link.c	2008-09-13 18:44:36.000000000 +0200
-+++ vhba-module-1.1.0/kat/scatterlist_has_page_link.c	2008-09-13 19:01:33.000000000 +0200
-@@ -0,0 +1,9 @@
-+#include <linux/autoconf.h>
-+#include <linux/scatterlist.h>
-+
-+/* Note: scatterlist.page_link is used in kernel (2.6.24 <= version < X) */
-+
-+struct scatterlist s = { .page_link = 0 };
-+
-+//T#define KAT_SCATTERLIST_HAS_PAGE_LINK
-+//F#include <linux/scatterlist.h>
diff --git a/system/vhba-module/vhba-module.SlackBuild b/system/vhba-module/vhba-module.SlackBuild
index 439694be0a..b7f933fb2a 100644
--- a/system/vhba-module/vhba-module.SlackBuild
+++ b/system/vhba-module/vhba-module.SlackBuild
@@ -22,10 +22,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Added patch by Niklas "Nille" Åkerström
+# Added patch by Niklas "Nille" Åkerström
 
 PRGNAM=vhba-module
-SRC_VERSION=1.1.0
+SRC_VERSION=1.2.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -49,8 +49,6 @@ cd $PRGNAM-$SRC_VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# patch and change filename for scatterlist API in 2.6.24+ kernels.
-patch -p1 < $CWD/vhba-module-scatterlist.diff
 
 make KERNELRELEASE=$KERNELVERSION || exit 1
 
@@ -58,8 +56,6 @@ mkdir -p $PKG/lib/modules/$KERNELVERSION/extra
 install -m 0664 vhba.ko $PKG/lib/modules/$KERNELVERSION/extra/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -71,5 +67,4 @@ cd $PKG
 
 if [ "$1" = "--cleanup" ]; then
 	 rm -rf $PKG $TMP/$PRGNAM-$SRC_VERSION
- fi
-
+fi
diff --git a/system/vhba-module/vhba-module.info b/system/vhba-module/vhba-module.info
index 2f2eeff75e..90c40bf78b 100644
--- a/system/vhba-module/vhba-module.info
+++ b/system/vhba-module/vhba-module.info
@@ -1,8 +1,8 @@
 PRGNAM="vhba-module"
-VERSION="1.1.0"
+VERSION="1.2.1"
 HOMEPAGE="http://cdemu.sourceforge.net/pkg_vhba.php"
-DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-1.1.0.tar.bz2"
-MD5SUM="dd9dd9a03060498aaa5391819c17e201"
+DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-1.2.1.tar.bz2"
+MD5SUM="a3b6ad798f2b72ef599df797ef79e5ec"
 MAINTAINER="Niklas 'Nille' Åkerström"
 EMAIL="nille.kungen[AT]gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
-- 
cgit v1.2.3-80-g2a13