[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 89b2a6a60215f3b5c37f5125193a1d6cf28b7453
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Thu Aug 25 12:27:28 2011 +0530

    Add patch to disable ssl
    
    Thanks: Mike Christie

diff --git a/debian/patches/iscsi-dont-build-with-ssl.patch b/debian/patches/iscsi-dont-build-with-ssl.patch
new file mode 100644
index 0000000..924f8a4
--- /dev/null
+++ b/debian/patches/iscsi-dont-build-with-ssl.patch
@@ -0,0 +1,54 @@
+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
diff --git a/debian/patches/series b/debian/patches/series
index b1d76c0..2ecb61b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+iscsi-dont-build-with-ssl.patch
 disable-isns.patch
 004_make-iscsistart-a-dynamic-binary.patch

-- 
Debian Open-iSCSI Packaging