main/open-iscsi*: upgrade to 2.0-872

3 files changed, 6 insertions, 76 deletions

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"
diff --git a/main/open-iscsi-grsec/CVE-2009-1297.patch b/main/open-iscsi-grsec/CVE-2009-1297.patch
deleted file mode 100644
index d1728fff7e..0000000000
--- a/main/open-iscsi-grsec/CVE-2009-1297.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- utils.orig/iscsi_discovery	2009-10-26 23:09:08.000000000 +0100
-+++ utils/iscsi_discovery	2009-10-26 23:11:56.000000000 +0100
-@@ -104,24 +104,22 @@
- 
- 	connected=0
- 	discovered=0
--	df=/tmp/discovered.$$
- 
- 	dbg "starting discovery to $ip"
--	iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df}
--	while read portal target
-+	disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})"
-+	echo "${disc}" | while read portal target
- 	do
- 		portal=${portal%,*}
- 		select_transport
--	done < ${df}
-+	done
- 
--	discovered=$(cat ${df} | wc -l)
-+	discovered=$(echo "${disc}" | wc -l)
- 	if [ ${discovered} = 0 ]; then
- 		echo "failed to discover targets at ${ip}"
- 		exit 2
- 	else
- 		echo "discovered ${discovered} targets at ${ip}"
- 	fi
--	/bin/rm -f ${df}
- }
- 
- try_login()
diff --git a/main/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch b/main/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch
deleted file mode 100644
index 6ca2a4eaba..0000000000
--- a/main/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar open-iscsi-2.0-871.orig/usr/Makefile open-iscsi-2.0-871/usr/Makefile
---- open-iscsi-2.0-871.orig/usr/Makefile	2009-07-10 20:55:58.000000000 -0700
-+++ open-iscsi-2.0-871/usr/Makefile	2009-11-12 00:58:16.467960344 -0800
-@@ -48,14 +48,14 @@
- all: $(PROGRAMS)
- 
- iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o
--	$(CC) $(CFLAGS) $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) strings.o discovery.o iscsiadm.o
--	$(CC) $(CFLAGS) $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- 		iscsistart.o statics.o
--	$(CC) $(CFLAGS) -static $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- clean:
- 	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
- 
-diff -Nuar open-iscsi-2.0-871.orig/utils/Makefile open-iscsi-2.0-871/utils/Makefile
---- open-iscsi-2.0-871.orig/utils/Makefile	2009-07-10 20:55:58.000000000 -0700
-+++ open-iscsi-2.0-871/utils/Makefile	2009-11-12 00:58:56.404623435 -0800
-@@ -6,7 +6,7 @@
- all: $(PROGRAMS)
- 
- iscsi-iname: md5.o iscsi-iname.o
--	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(DBM_LIB) $^
- 
- clean:
- 	rm -f *.o $(PROGRAMS) .depend