[packages/open-iscsi] - updated to 2.0-873 - disabled openssl code, it's unused upstream

[baggins]

commit 2ead0998a9c9e1d6f6c5dee939ec698fe4e64b2c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Mar 25 10:53:01 2014 +0100

    - updated to 2.0-873
    - disabled openssl code, it's unused upstream

 open-iscsi-build.patch | 12 ++++++------
 open-iscsi.spec        | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/open-iscsi.spec b/open-iscsi.spec
index 40a98ba..da74320 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -3,19 +3,19 @@
 # - for use in /sbin only openslp should be static (or libslp moved to /lib)
 #
 # Conditional build:
-%bcond_with	dynamic	# link utilities dynamically
+%bcond_with	dynamic		# link utilities dynamically
 #
-%define		subver	872
-%define		rel		3
+%define		ver	2.0
+%define		subver	873
 Summary:	iSCSI - SCSI over IP
 Summary(pl.UTF-8):	iSCSI - SCSI po IP
 Name:		open-iscsi
-Version:	2.0
-Release:	0.%{subver}.%{rel}
+Version:	%{ver}.%{subver}
+Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://kernel.org/pub/linux/kernel/people/mnc/open-iscsi/releases/%{name}-%{version}-%{subver}.tar.gz
-# Source0-md5:	b4df94f08c241352bb964043b3e44779
+Source0:	http://www.open-iscsi.org/bits/%{name}-%{ver}-%{subver}.tar.gz
+# Source0-md5:	8b8316d7c9469149a6cc6234478347f7
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-devices.init
@@ -56,7 +56,7 @@ informacji o protokole iSCSI znajduje się w standardach IETF na
 <http://www.ietf.org/>.
 
 %prep
-%setup -q -n %{name}-%{version}-%{subver}
+%setup -q -n %{name}-%{ver}-%{subver}
 %patch0 -p1
 
 %if %{with dynamic}
@@ -67,7 +67,7 @@ sed -i -e 's/-static //' usr/Makefile
 cd utils/open-isns
 %configure \
 	--with-slp \
-	--with-security
+	--without-security
 %{__make}
 cd ../..
 for i in utils/sysdeps utils/fwparam_ibft usr utils; do
diff --git a/open-iscsi-build.patch b/open-iscsi-build.patch
index 193ec86..c044a81 100644
--- a/open-iscsi-build.patch
+++ b/open-iscsi-build.patch
@@ -2,16 +2,16 @@
 +++ oiscsi/usr/Makefile	2010-11-10 14:26:59.085995691 +0100
 @@ -53,13 +53,13 @@
  
- iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
+ iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
  	iscsid.o session_mgmt.o discoveryd.o
--	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-+	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto -lslp
+-	$(CC) $(CFLAGS) $^ -o $@  -L../utils/open-isns -lisns
++	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lslp
  
  iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o
--	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-+	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto -lslp
+-	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns
++	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lslp
  
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
+ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
  		iscsistart.o statics.o
 -	$(CC) $(CFLAGS) -static $^ -o $@
 +	$(CC) $(CFLAGS) -static $^ -o $@ -lslp
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/open-iscsi.git/commitdiff/73d24d5e829ad5cd1b399f95fc288cb320b17a65