[iscsi-initiator-utils: 46/109] Resolves: #602286

[Chris Leech]

commit 3f51ea4f97c7df074545caa7876bc098902e5272
Author: mchristi <mchristi at redhat.com>
Date:   Fri Jun 18 23:17:31 2010 +0000

    Resolves: #602286

 iscsi-initiator-utils-dont-use-static.patch |   12 ++++++++++++
 iscsi-initiator-utils.spec                  |   13 ++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/iscsi-initiator-utils-dont-use-static.patch b/iscsi-initiator-utils-dont-use-static.patch
new file mode 100644
index 0000000..763d784
--- /dev/null
+++ b/iscsi-initiator-utils-dont-use-static.patch
@@ -0,0 +1,12 @@
+diff -aup open-iscsi-2.0-872-rc1-bnx2i/usr/Makefile open-iscsi-2.0-872-rc1-bnx2i.work/usr/Makefile
+--- open-iscsi-2.0-872-rc1-bnx2i/usr/Makefile	2010-06-18 18:04:51.000000000 -0500
++++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/Makefile	2010-06-18 18:13:33.000000000 -0500
+@@ -60,7 +60,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_
+ 
+ iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
+ 		iscsistart.o statics.o
+-	$(CC) $(CFLAGS) -static $^ -o $@
++	$(CC) $(CFLAGS) $^ -o $@
+ clean:
+ 	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
+ 
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 96fa476..e1221af 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.872
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc1-bnx2i.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -34,13 +34,15 @@ Patch10: iscsi-initiator-utils-fix-lib-sysfs-init.patch
 Patch11: iscsi-initiator-utils-fix-uip-init-race.patch
 # Fix discovery daemon iscsid shutdown
 Patch12: iscsi-initiator-utils-fix-dd-stop.patch
-
+# Don't compile iscsistart as static
+Patch13: iscsi-initiator-utils-dont-use-static.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
 URL: http://www.open-iscsi.org
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel flex bison python-devel doxygen glibc-static
+BuildRequires: openssl-devel flex bison python-devel doxygen
+
 Requires(post): chkconfig
 Requires(preun): chkconfig /sbin/service
 
@@ -74,6 +76,7 @@ developing applications that use %{name}.
 %patch10 -p1 -b .fix-lib-sysfs-init
 %patch11 -p1 -b .fix-uip-init-race
 %patch12 -p1 -b .fix-dd-stop
+%patch13 -p1 -b .dont-use-static
 
 %build
 cd utils/open-isns
@@ -192,6 +195,10 @@ fi
 %{_includedir}/libiscsi.h
 
 %changelog
+* Fri Jun 18 2010 Mike Christie <mchristi at redhat.com> 6.2.0.872.5
+- 602286 No need to compile iscsistart as static. This also fixes
+  the segfault when hostnames are passed in for the portal ip.
+
 * Tue May 18 2010 Mike Christie <mchristi at redhat.com> 6.2.0.872.4
 - 590580 libiscsi get_firmware_foo does not work without first creating a
   libiscsi context