[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. debian/2.0.871.3-6-11-gd70e88a

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit d70e88a470f83dc194bb35eccb6a74de79dd032f
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Thu Aug 25 18:21:37 2011 +0530

    Refresh patch

diff --git a/debian/patches/disable-isns-security.patch b/debian/patches/disable-isns-security.patch
index b182263..9b1ad21 100644
--- a/debian/patches/disable-isns-security.patch
+++ b/debian/patches/disable-isns-security.patch
@@ -8,46 +8,45 @@ Date:   Mon Jan 31 20:31:32 2011 -0600
     still build against libcrypto. This disables the code
     until we add support.
 
-diff --git a/Makefile b/Makefile
-index db460eb..3bd9e48 100644
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@ IFACEFILES = etc/iface.example
+Index: open-iscsi/Makefile
+===================================================================
+--- open-iscsi.orig/Makefile	2011-08-25 18:03:58.000000000 +0530
++++ open-iscsi/Makefile	2011-08-25 18:19:07.731118189 +0530
+@@ -27,7 +27,7 @@
  all: user kernel
  
  user: ;
--       cd utils/open-isns; ./configure; $(MAKE)
-+       cd utils/open-isns; ./configure --with-security=no; $(MAKE)
-        $(MAKE) -C utils/sysdeps
-        $(MAKE) -C utils/fwparam_ibft
-        $(MAKE) -C usr
-diff --git a/usr/Makefile b/usr/Makefile
-index e9d6bd1..9de5632 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -53,10 +53,10 @@ all: $(PROGRAMS)
+-	cd utils/open-isns; ./configure; $(MAKE)
++	cd utils/open-isns; ./configure --with-security=no; $(MAKE)
+ 	$(MAKE) -C utils/sysdeps
+ 	$(MAKE) -C utils/fwparam_ibft
+ 	$(MAKE) -C usr
+Index: open-iscsi/usr/Makefile
+===================================================================
+--- open-iscsi.orig/usr/Makefile	2011-08-25 18:03:58.000000000 +0530
++++ open-iscsi/usr/Makefile	2011-08-25 18:19:57.956066006 +0530
+@@ -53,10 +53,10 @@
  
  iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(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
+ 	iscsid.o session_mgmt.o discoveryd.o
+-	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
++	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns
  
  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
+-	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
++	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns
  
  iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
-                iscsistart.o statics.o
-diff --git a/utils/open-isns/Makefile.in b/utils/open-isns/Makefile.in
-index 744fe8b..a27199c 100644
---- a/utils/open-isns/Makefile.in
-+++ b/utils/open-isns/Makefile.in
-@@ -32,7 +32,6 @@ LIBOBJS       = server.o \
-          security.o \
-          authblock.o \
-          policy.o \
--         pki.o \
-          register.o \
-          query.o \
-          getnext.o \
-
+ 		iscsistart.o statics.o
+Index: open-iscsi/utils/open-isns/Makefile.in
+===================================================================
+--- open-iscsi.orig/utils/open-isns/Makefile.in	2011-08-25 18:03:58.000000000 +0530
++++ open-iscsi/utils/open-isns/Makefile.in	2011-08-25 18:20:41.808892460 +0530
+@@ -32,7 +32,6 @@
+ 	  security.o \
+ 	  authblock.o \
+ 	  policy.o \
+-	  pki.o \
+ 	  register.o \
+ 	  query.o \
+ 	  getnext.o \

-- 
Debian Open-iSCSI Packaging