aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-10-26 13:25:55 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-10-26 13:27:05 +0000
commit67c8945b73512567425e43923d0ef14db41ed2ac (patch)
treec7f3ba53861459812744eec81d952369db969fe8
parente5412705b673d7a1650741b4c45d87ef915674f1 (diff)
downloadalpine_aports-67c8945b73512567425e43923d0ef14db41ed2ac.tar.bz2
alpine_aports-67c8945b73512567425e43923d0ef14db41ed2ac.tar.xz
alpine_aports-67c8945b73512567425e43923d0ef14db41ed2ac.zip
main/open-iscsi*: upgrade to 2.0-872
Diffstat
-rw-r--r--main/open-iscsi-grsec/APKBUILD18
-rw-r--r--main/open-iscsi-grsec/CVE-2009-1297.patch31
-rw-r--r--main/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch33
-rw-r--r--main/open-iscsi/APKBUILD20
-rw-r--r--main/open-iscsi/CVE-2009-1297.patch31
-rw-r--r--main/open-iscsi/open-iscsi-2.0.871-makefile-cleanup.patch33
6 files changed, 13 insertions, 153 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 @@
2 2
3_flavor=grsec 3_flavor=grsec
4_realname=open-iscsi 4_realname=open-iscsi
5_realver=2.0-871 5_realver=2.0-872
6# source the kernel version 6# source the kernel version
7if [ -f ../../main/linux-$_flavor/APKBUILD ]; then 7if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
8 . ../../main/linux-$_flavor/APKBUILD 8 . ../../main/linux-$_flavor/APKBUILD
@@ -13,7 +13,7 @@ _abi_release=$pkgver-${_flavor}
13_kpkgrel=$pkgrel 13_kpkgrel=$pkgrel
14_ksrc=/usr/src/linux-headers-${_abi_release} 14_ksrc=/usr/src/linux-headers-${_abi_release}
15 15
16_iscsiver=2.0-871 16_iscsiver=$_realver
17 17
18pkgname=${_realname}-${_flavor} 18pkgname=${_realname}-${_flavor}
19pkgver=$_kver 19pkgver=$_kver
@@ -27,17 +27,13 @@ install=
27makedepends="linux-${_flavor}-dev=${_kernelver}" 27makedepends="linux-${_flavor}-dev=${_kernelver}"
28subpackages= 28subpackages=
29source="http://www.open-iscsi.org/bits/$_realname-$_realver.tar.gz 29source="http://www.open-iscsi.org/bits/$_realname-$_realver.tar.gz
30 Makefile.kernel.patch 30 Makefile.kernel.patch"
31 CVE-2009-1297.patch
32 open-iscsi-2.0.871-makefile-cleanup.patch"
33 31
34_builddir="$srcdir/$_realname-$_realver" 32_builddir="$srcdir/$_realname-$_realver"
35 33
36prepare() { 34prepare() {
37 cd "$_builddir" 35 cd "$_builddir"
38 patch -p0 < ../../CVE-2009-1297.patch || return 1 36 patch -p2 < "$srcdir"/Makefile.kernel.patch || return 1
39 patch -p1 < ../../open-iscsi-2.0.871-makefile-cleanup.patch || return 1
40 patch -p2 < ../../Makefile.kernel.patch || return 1
41} 37}
42 38
43build() { 39build() {
@@ -53,7 +49,5 @@ package() {
53 install_kernel 49 install_kernel
54} 50}
55 51
56md5sums="0c403e8c9ad41607571ba0e6e8ff196e open-iscsi-2.0-871.tar.gz 52md5sums="b4df94f08c241352bb964043b3e44779 open-iscsi-2.0-872.tar.gz
57c5289f800ceebf59319fea284d476cdf Makefile.kernel.patch 53c5289f800ceebf59319fea284d476cdf Makefile.kernel.patch"
58d1584790b4e12f087e60089880b53d2b CVE-2009-1297.patch
59734300d7b7590dc9ae9b2fb7f5b51bf0 open-iscsi-2.0.871-makefile-cleanup.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 @@
1--- utils.orig/iscsi_discovery 2009-10-26 23:09:08.000000000 +0100
2+++ utils/iscsi_discovery 2009-10-26 23:11:56.000000000 +0100
3@@ -104,24 +104,22 @@
4
5 connected=0
6 discovered=0
7- df=/tmp/discovered.$$
8
9 dbg "starting discovery to $ip"
10- iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df}
11- while read portal target
12+ disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})"
13+ echo "${disc}" | while read portal target
14 do
15 portal=${portal%,*}
16 select_transport
17- done < ${df}
18+ done
19
20- discovered=$(cat ${df} | wc -l)
21+ discovered=$(echo "${disc}" | wc -l)
22 if [ ${discovered} = 0 ]; then
23 echo "failed to discover targets at ${ip}"
24 exit 2
25 else
26 echo "discovered ${discovered} targets at ${ip}"
27 fi
28- /bin/rm -f ${df}
29 }
30
31 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 @@
1diff -Nuar open-iscsi-2.0-871.orig/usr/Makefile open-iscsi-2.0-871/usr/Makefile
2--- open-iscsi-2.0-871.orig/usr/Makefile 2009-07-10 20:55:58.000000000 -0700
3+++ open-iscsi-2.0-871/usr/Makefile 2009-11-12 00:58:16.467960344 -0800
4@@ -48,14 +48,14 @@
5 all: $(PROGRAMS)
6
7 iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o
8- $(CC) $(CFLAGS) $^ -o $@
9+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
10
11 iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) strings.o discovery.o iscsiadm.o
12- $(CC) $(CFLAGS) $^ -o $@
13+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
14
15 iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
16 iscsistart.o statics.o
17- $(CC) $(CFLAGS) -static $^ -o $@
18+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
19 clean:
20 rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
21
22diff -Nuar open-iscsi-2.0-871.orig/utils/Makefile open-iscsi-2.0-871/utils/Makefile
23--- open-iscsi-2.0-871.orig/utils/Makefile 2009-07-10 20:55:58.000000000 -0700
24+++ open-iscsi-2.0-871/utils/Makefile 2009-11-12 00:58:56.404623435 -0800
25@@ -6,7 +6,7 @@
26 all: $(PROGRAMS)
27
28 iscsi-iname: md5.o iscsi-iname.o
29- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
30+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(DBM_LIB) $^
31
32 clean:
33 rm -f *.o $(PROGRAMS) .depend
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 @@
1# Maintainer: Leonardo Arena <rnalrd@gmail.com> 1# Maintainer: Leonardo Arena <rnalrd@gmail.com>
2pkgname=open-iscsi 2pkgname=open-iscsi
3pkgver=2.0.871 3pkgver=2.0.872
4_realver=2.0-871 4_realver=${pkgver%.*}-${pkgver##*.}
5pkgrel=3 5pkgrel=0
6pkgdesc="High performance, transport independent, multi-platform iSCSI initiator" 6pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
7url="http://www.open-iscsi.org" 7url="http://www.open-iscsi.org"
8license="GPL-2" 8license="GPL-2"
@@ -10,9 +10,7 @@ depends=
10makedepends= 10makedepends=
11install="" 11install=""
12subpackages="$pkgname-doc" 12subpackages="$pkgname-doc"
13source="http://www.open-iscsi.org/bits/$pkgname-$_realver.tar.gz 13source="http://kernel.org/pub/linux/kernel/people/mnc/open-iscsi/releases/open-iscsi-$_realver.tar.gz
14 CVE-2009-1297.patch
15 open-iscsi-2.0.871-makefile-cleanup.patch
16 iscsid.initd 14 iscsid.initd
17 iscsid.confd" 15 iscsid.confd"
18 16
@@ -20,8 +18,6 @@ _builddir="$srcdir"/$pkgname-$_realver
20 18
21prepare() { 19prepare() {
22 cd "$_builddir" 20 cd "$_builddir"
23 patch -p0 < ../../CVE-2009-1297.patch || return 1
24 patch -p1 < ../../open-iscsi-2.0.871-makefile-cleanup.patch || return 1
25} 21}
26 22
27build() { 23build() {
@@ -38,12 +34,10 @@ package() {
38 mv $pkgdir/sbin/iscsi_discovery $pkgdir/usr/bin 34 mv $pkgdir/sbin/iscsi_discovery $pkgdir/usr/bin
39 mv $pkgdir/sbin/iscsiadm $pkgdir/usr/bin 35 mv $pkgdir/sbin/iscsiadm $pkgdir/usr/bin
40 mv $pkgdir/sbin/iscsid $pkgdir/usr/sbin 36 mv $pkgdir/sbin/iscsid $pkgdir/usr/sbin
41 install -Dm755 ../../iscsid.initd "$pkgdir"/etc/init.d/iscsid 37 install -Dm755 "$srcdir"/iscsid.initd "$pkgdir"/etc/init.d/iscsid
42 install -Dm644 ../../iscsid.confd "$pkgdir"/etc/conf.d/iscsid 38 install -Dm644 "$srcdir"/iscsid.confd "$pkgdir"/etc/conf.d/iscsid
43} 39}
44 40
45md5sums="0c403e8c9ad41607571ba0e6e8ff196e open-iscsi-2.0-871.tar.gz 41md5sums="b4df94f08c241352bb964043b3e44779 open-iscsi-2.0-872.tar.gz
46d1584790b4e12f087e60089880b53d2b CVE-2009-1297.patch
47734300d7b7590dc9ae9b2fb7f5b51bf0 open-iscsi-2.0.871-makefile-cleanup.patch
483e89cb86395756dafebc4f1490f0de10 iscsid.initd 423e89cb86395756dafebc4f1490f0de10 iscsid.initd
49b762b687d4628791b4362df22cf22d34 iscsid.confd" 43b762b687d4628791b4362df22cf22d34 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 @@
1--- utils.orig/iscsi_discovery 2009-10-26 23:09:08.000000000 +0100
2+++ utils/iscsi_discovery 2009-10-26 23:11:56.000000000 +0100
3@@ -104,24 +104,22 @@
4
5 connected=0
6 discovered=0
7- df=/tmp/discovered.$$
8
9 dbg "starting discovery to $ip"
10- iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df}
11- while read portal target
12+ disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})"
13+ echo "${disc}" | while read portal target
14 do
15 portal=${portal%,*}
16 select_transport
17- done < ${df}
18+ done
19
20- discovered=$(cat ${df} | wc -l)
21+ discovered=$(echo "${disc}" | wc -l)
22 if [ ${discovered} = 0 ]; then
23 echo "failed to discover targets at ${ip}"
24 exit 2
25 else
26 echo "discovered ${discovered} targets at ${ip}"
27 fi
28- /bin/rm -f ${df}
29 }
30
31 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 @@
1diff -Nuar open-iscsi-2.0-871.orig/usr/Makefile open-iscsi-2.0-871/usr/Makefile
2--- open-iscsi-2.0-871.orig/usr/Makefile 2009-07-10 20:55:58.000000000 -0700
3+++ open-iscsi-2.0-871/usr/Makefile 2009-11-12 00:58:16.467960344 -0800
4@@ -48,14 +48,14 @@
5 all: $(PROGRAMS)
6
7 iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o
8- $(CC) $(CFLAGS) $^ -o $@
9+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
10
11 iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) strings.o discovery.o iscsiadm.o
12- $(CC) $(CFLAGS) $^ -o $@
13+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
14
15 iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
16 iscsistart.o statics.o
17- $(CC) $(CFLAGS) -static $^ -o $@
18+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
19 clean:
20 rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
21
22diff -Nuar open-iscsi-2.0-871.orig/utils/Makefile open-iscsi-2.0-871/utils/Makefile
23--- open-iscsi-2.0-871.orig/utils/Makefile 2009-07-10 20:55:58.000000000 -0700
24+++ open-iscsi-2.0-871/utils/Makefile 2009-11-12 00:58:56.404623435 -0800
25@@ -6,7 +6,7 @@
26 all: $(PROGRAMS)
27
28 iscsi-iname: md5.o iscsi-iname.o
29- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
30+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(DBM_LIB) $^
31
32 clean:
33 rm -f *.o $(PROGRAMS) .depend
© 2015 Mike Crute