[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-101-g2616afb

[Mike Christie]

The following commit has been merged in the upstream-mnc branch:
commit cc425fd44b24d9fda74395951570460fc919d076
Author: Mike Christie <mchristi at redhat.com>
Date:   Mon Jan 31 20:31:32 2011 -0600

    iscsi tools: disable isns dsa code
    
    For discovery we do not use the isns dsa code but
    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
 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 4d5ab50..e2e517b 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -54,10 +54,10 @@ all: $(PROGRAMS)
 
 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
 
 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
 
 iscsistart: $(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 \

-- 
Debian Open-iSCSI Packaging