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/APKBUILD                           | 20 +++++--------
 main/open-iscsi/CVE-2009-1297.patch                | 31 --------------------
 .../open-iscsi-2.0.871-makefile-cleanup.patch      | 33 ----------------------
 3 files changed, 7 insertions(+), 77 deletions(-)
 delete mode 100644 main/open-iscsi/CVE-2009-1297.patch
 delete mode 100644 main/open-iscsi/open-iscsi-2.0.871-makefile-cleanup.patch

(limited to 'main/open-iscsi')

diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD
index 37d5f37409..2382420ccb 100644
--- a/main/open-iscsi/APKBUILD
+++ b/main/open-iscsi/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=open-iscsi
-pkgver=2.0.871
-_realver=2.0-871
-pkgrel=3
+pkgver=2.0.872
+_realver=${pkgver%.*}-${pkgver##*.}
+pkgrel=0
 pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
 url="http://www.open-iscsi.org"
 license="GPL-2"
@@ -10,9 +10,7 @@ depends=
 makedepends=
 install=""
 subpackages="$pkgname-doc"
-source="http://www.open-iscsi.org/bits/$pkgname-$_realver.tar.gz
-	CVE-2009-1297.patch
-	open-iscsi-2.0.871-makefile-cleanup.patch
+source="http://kernel.org/pub/linux/kernel/people/mnc/open-iscsi/releases/open-iscsi-$_realver.tar.gz
 	iscsid.initd
 	iscsid.confd"
 
@@ -20,8 +18,6 @@ _builddir="$srcdir"/$pkgname-$_realver
 
 prepare() {
 	cd "$_builddir"
-	patch -p0 < ../../CVE-2009-1297.patch || return 1
-	patch -p1 < ../../open-iscsi-2.0.871-makefile-cleanup.patch || return 1
 }
 
 build() {
@@ -38,12 +34,10 @@ package() {
 	mv $pkgdir/sbin/iscsi_discovery $pkgdir/usr/bin
 	mv $pkgdir/sbin/iscsiadm $pkgdir/usr/bin
 	mv $pkgdir/sbin/iscsid $pkgdir/usr/sbin
-	install -Dm755 ../../iscsid.initd "$pkgdir"/etc/init.d/iscsid
-	install -Dm644 ../../iscsid.confd "$pkgdir"/etc/conf.d/iscsid
+	install -Dm755 "$srcdir"/iscsid.initd "$pkgdir"/etc/init.d/iscsid
+	install -Dm644 "$srcdir"/iscsid.confd "$pkgdir"/etc/conf.d/iscsid
 }
 
-md5sums="0c403e8c9ad41607571ba0e6e8ff196e  open-iscsi-2.0-871.tar.gz
-d1584790b4e12f087e60089880b53d2b  CVE-2009-1297.patch
-734300d7b7590dc9ae9b2fb7f5b51bf0  open-iscsi-2.0.871-makefile-cleanup.patch
+md5sums="b4df94f08c241352bb964043b3e44779  open-iscsi-2.0-872.tar.gz
 3e89cb86395756dafebc4f1490f0de10  iscsid.initd
 b762b687d4628791b4362df22cf22d34  iscsid.confd"
diff --git a/main/open-iscsi/CVE-2009-1297.patch b/main/open-iscsi/CVE-2009-1297.patch
deleted file mode 100644
index d1728fff7e..0000000000
--- a/main/open-iscsi/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/open-iscsi-2.0.871-makefile-cleanup.patch b/main/open-iscsi/open-iscsi-2.0.871-makefile-cleanup.patch
deleted file mode 100644
index 6ca2a4eaba..0000000000
--- a/main/open-iscsi/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
-- 
cgit v1.2.3