[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 fcc86710c07ca425c20ef333b65317908d152643
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Mon Aug 22 20:27:02 2011 +0530

    Add patch to disable iSNS
    
    Taken from Fedora
    debian/patches/disable-isns.patch

diff --git a/debian/patches/disable-isns.patch b/debian/patches/disable-isns.patch
new file mode 100644
index 0000000..54f50c1
--- /dev/null
+++ b/debian/patches/disable-isns.patch
@@ -0,0 +1,45 @@
+Index: open-iscsi/usr/Makefile
+===================================================================
+--- open-iscsi.orig/usr/Makefile	2011-08-22 20:25:31.643344958 +0530
++++ open-iscsi/usr/Makefile	2011-08-22 20:26:24.120647120 +0530
+@@ -31,7 +31,7 @@
+ OPTFLAGS ?= -O2 -g
+ WARNFLAGS ?= -Wall -Wstrict-prototypes
+ CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../include -I. -I../utils/open-isns \
+-					-D$(OSNAME) $(IPC_CFLAGS)
++					-D$(OSNAME) $(IPC_CFLAGS) -DISNS_ENABLE
+ PROGRAMS = iscsid iscsiadm iscsistart
+ 
+ # libc compat files
+Index: open-iscsi/usr/discovery.c
+===================================================================
+--- open-iscsi.orig/usr/discovery.c	2011-08-22 20:25:36.695470434 +0530
++++ open-iscsi/usr/discovery.c	2011-08-22 20:26:24.120647120 +0530
+@@ -44,9 +44,11 @@
+ #include "iscsid_req.h"
+ #include "iscsi_util.h"
+ /* libisns includes */
++#ifdef ISNS_ENABLE
+ #include "isns.h"
+ #include "paths.h"
+ #include "message.h"
++#endif
+ 
+ #ifdef SLP_ENABLE
+ #include "iscsi-slp-discovery.h"
+@@ -93,6 +95,7 @@
+ 	return 0;
+ }
+ 
++#ifdef ISNS_ENABLE
+ void discovery_isns_free_servername(void)
+ {
+ 	if (isns_config.ic_server_name)
+@@ -366,6 +369,7 @@
+ 	discovery_isns_free_servername();
+ 	return rc;
+ }
++#endif
+ 
+ int discovery_fw(void *data, struct iface_rec *iface,
+ 		 struct list_head *rec_list)
diff --git a/debian/patches/series b/debian/patches/series
index a660fd3..b1d76c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+disable-isns.patch
 004_make-iscsistart-a-dynamic-binary.patch

-- 
Debian Open-iSCSI Packaging