[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. debian/2.0.872+git0.6676a1cf-2-9-g3a80a5c

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit ca4174414731be4404c0ef0398f892324da43155
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Wed May 9 13:59:06 2012 +0530

    Delete old obsolete patches

diff --git a/debian/patches/disable-isns-security.patch b/debian/patches/disable-isns-security.patch
deleted file mode 100644
index 9b1ad21..0000000
--- a/debian/patches/disable-isns-security.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit ab3f6ad7328308d43bdeb3cc761b1048fe0e4805
-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.
-
-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
-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
- 
- 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: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- 		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 \
diff --git a/debian/patches/iscsi-dont-build-with-ssl.patch b/debian/patches/iscsi-dont-build-with-ssl.patch
deleted file mode 100644
index 924f8a4..0000000
--- a/debian/patches/iscsi-dont-build-with-ssl.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Don't build isns with openssl
-
-Tmp hack to not use openssl.
-
-diff --git a/utils/open-isns/db-policy.c b/utils/open-isns/db-policy.c
-index 7f09cba..a85a436 100644
---- a/utils/open-isns/db-policy.c
-+++ b/utils/open-isns/db-policy.c
-@@ -7,8 +7,10 @@
- #include <sys/stat.h>
- #include <string.h>
- #include <unistd.h>
-+#ifdef WITH_SECURITY
- #include <openssl/pem.h>
- #include <openssl/err.h>
-+#endif
- #include "isns.h"
- #include "security.h"
- #include "objects.h"
-diff --git a/utils/open-isns/security.h b/utils/open-isns/security.h
-index 9ba0f0d..4b928ff 100644
---- a/utils/open-isns/security.h
-+++ b/utils/open-isns/security.h
-@@ -6,11 +6,16 @@
- 
- #ifndef ISNS_SECURITY_H
- #define ISNS_SECURITY_H
--
--#include <openssl/evp.h>
- #include "buffer.h"
- #include "util.h"
- 
-+
-+#ifdef WITH_SECURITY
-+#include <openssl/evp.h>
-+#else
-+#define EVP_PKEY void
-+#endif
-+
- /*
-  * Security context
-  */
-diff --git a/utils/open-isns/util.h b/utils/open-isns/util.h
-index bd6b979..deecb24 100644
---- a/utils/open-isns/util.h
-+++ b/utils/open-isns/util.h
-@@ -9,6 +9,7 @@
- 
- #include <sys/types.h>
- #include <stdint.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include <stddef.h>
- #include <string.h>	// for strdup

-- 
Debian Open-iSCSI Packaging