From 67c8945b73512567425e43923d0ef14db41ed2ac Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 26 Oct 2010 13:25:55 +0000
Subject: main/open-iscsi*: upgrade to 2.0-872

---
 main/open-iscsi-grsec/APKBUILD | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'main/open-iscsi-grsec/APKBUILD')

diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD
index 1bda4a7f2e..4382786ad5 100644
--- a/main/open-iscsi-grsec/APKBUILD
+++ b/main/open-iscsi-grsec/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=grsec
 _realname=open-iscsi
-_realver=2.0-871
+_realver=2.0-872
 # source the kernel version
 if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
 	. ../../main/linux-$_flavor/APKBUILD
@@ -13,7 +13,7 @@ _abi_release=$pkgver-${_flavor}
 _kpkgrel=$pkgrel
 _ksrc=/usr/src/linux-headers-${_abi_release}
 
-_iscsiver=2.0-871
+_iscsiver=$_realver
 
 pkgname=${_realname}-${_flavor}
 pkgver=$_kver
@@ -27,17 +27,13 @@ install=
 makedepends="linux-${_flavor}-dev=${_kernelver}"
 subpackages=
 source="http://www.open-iscsi.org/bits/$_realname-$_realver.tar.gz
-	Makefile.kernel.patch
-	CVE-2009-1297.patch
-	open-iscsi-2.0.871-makefile-cleanup.patch"
+	Makefile.kernel.patch"
 
 _builddir="$srcdir/$_realname-$_realver"
 
 prepare() {
 	cd "$_builddir"
-	patch -p0 < ../../CVE-2009-1297.patch || return 1
-	patch -p1 < ../../open-iscsi-2.0.871-makefile-cleanup.patch || return 1
-	patch -p2 < ../../Makefile.kernel.patch || return 1
+	patch -p2 < "$srcdir"/Makefile.kernel.patch || return 1
 }
 
 build() {
@@ -53,7 +49,5 @@ package() {
 	 install_kernel
 }
 
-md5sums="0c403e8c9ad41607571ba0e6e8ff196e  open-iscsi-2.0-871.tar.gz
-c5289f800ceebf59319fea284d476cdf  Makefile.kernel.patch
-d1584790b4e12f087e60089880b53d2b  CVE-2009-1297.patch
-734300d7b7590dc9ae9b2fb7f5b51bf0  open-iscsi-2.0.871-makefile-cleanup.patch"
+md5sums="b4df94f08c241352bb964043b3e44779  open-iscsi-2.0-872.tar.gz
+c5289f800ceebf59319fea284d476cdf  Makefile.kernel.patch"
-- 
cgit v1.2.3