[Pkg-iscsi-maintainers] [open-iscsi] 04/18: Refresh Patches

Ritesh Raj Sarraf rrs at alioth.debian.org
Tue Nov 5 16:22:11 UTC 2013


This is an automated email from the git hooks/post-receive script.

rrs pushed a commit to branch master
in repository open-iscsi.

commit 727e5c77d920753827759b9a2180bb80abf5275d
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Tue Nov 5 20:57:16 2013 +0530

    Refresh Patches
---
 ..._spelling-errors-and-manpage-hyphen-fixes.patch |   33 +++++++-------------
 .../02_make-iscsistart-a-dynamic-binary.patch      |    6 ++--
 debian/patches/03_hardened-build-flags.patch       |   10 +++---
 debian/patches/04_fix_iscsi_path.patch             |    4 +--
 4 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/debian/patches/01_spelling-errors-and-manpage-hyphen-fixes.patch b/debian/patches/01_spelling-errors-and-manpage-hyphen-fixes.patch
index c5003c5..f927f3b 100644
--- a/debian/patches/01_spelling-errors-and-manpage-hyphen-fixes.patch
+++ b/debian/patches/01_spelling-errors-and-manpage-hyphen-fixes.patch
@@ -1,8 +1,8 @@
 spelling error fixes
 Index: open-iscsi/doc/iscsiadm.8
 ===================================================================
---- open-iscsi.orig/doc/iscsiadm.8	2012-04-07 20:49:15.044826780 +0530
-+++ open-iscsi/doc/iscsiadm.8	2012-04-07 20:52:31.133799130 +0530
+--- open-iscsi.orig/doc/iscsiadm.8	2013-11-05 20:55:06.529420366 +0530
++++ open-iscsi/doc/iscsiadm.8	2013-11-05 20:55:06.525420366 +0530
 @@ -2,10 +2,10 @@
  .SH NAME
  iscsiadm \- open-iscsi administration utility
@@ -16,25 +16,16 @@ Index: open-iscsi/doc/iscsiadm.8
  
  \fBiscsiadm\fR \-m node [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-L all,manual,automatic ] [ \-U all,manual,automatic ] [ \-S ] [ [ \-T targetname \-p ip:port \-I iface ] [ \-l | \-u | \-R | \-s] ]
  [ [ \-o operation ]  [ \-n name ] [ \-v value ] [ \-p ip:port ] ]
-@@ -16,7 +16,7 @@
- 
- \fBiscsiadm\fR \-m fw [\-l]
- 
--\fBiscsiadm\fR \-m host [ \-P printlevel ] [ \-H hostno|MAC ] [ -C chap [ -o operation ] [ -v chap_tbl_idx ] ]
-+\fBiscsiadm\fR \-m host [ \-P printlevel ] [ \-H hostno|MAC ] [ \-C chap [ \-o operation ] [ \-v chap_tbl_idx ] ]
- 
- \fBiscsiadm\fR \-k priority
- 
-@@ -64,7 +64,7 @@
+@@ -70,7 +70,7 @@
  
  Currently iscsiadm support ping as submode for iface. For example,
  
 -iscsiadm -m iface -I ifacename -C ping -a ipaddr -b packetsize -c count -i interval
 +iscsiadm \-m iface \-I ifacename \-C ping \-a ipaddr \-b packetsize \-c count \-i interval
  
- .TP
- \fB\-d\fR, \fB\-\-debug=\fIdebug_level\fP
-@@ -113,7 +113,7 @@
+ For host, it supports chap and flashnode as submodes. For example,
+ 
+@@ -125,7 +125,7 @@
  In discovery mode multiple interfaces can be specified by passing in multiple
  \-I/\-\-interface instances. For example,
  
@@ -45,8 +36,8 @@ Index: open-iscsi/doc/iscsiadm.8
  sessions though the two intefaces passed in.
 Index: open-iscsi/usr/auth.c
 ===================================================================
---- open-iscsi.orig/usr/auth.c	2012-04-07 20:49:15.044826780 +0530
-+++ open-iscsi/usr/auth.c	2012-04-07 20:49:21.232857456 +0530
+--- open-iscsi.orig/usr/auth.c	2013-11-05 20:55:06.529420366 +0530
++++ open-iscsi/usr/auth.c	2013-11-05 20:55:06.525420366 +0530
 @@ -2002,7 +2002,7 @@
  		"AuthMethod negotiation failed",
  		"AuthMethod negotiated to none",
@@ -58,8 +49,8 @@ Index: open-iscsi/usr/auth.c
  		"CHAP identifier bad",
 Index: open-iscsi/usr/initiator_common.c
 ===================================================================
---- open-iscsi.orig/usr/initiator_common.c	2012-04-07 19:36:03.303049315 +0530
-+++ open-iscsi/usr/initiator_common.c	2012-04-07 20:49:51.281006449 +0530
+--- open-iscsi.orig/usr/initiator_common.c	2013-11-05 20:55:06.529420366 +0530
++++ open-iscsi/usr/initiator_common.c	2013-11-05 20:55:06.525420366 +0530
 @@ -77,7 +77,7 @@
  	if (auth_cfg->username_in[0] || auth_cfg->password_in_length) {
  		/* sanity check the config */
@@ -71,8 +62,8 @@ Index: open-iscsi/usr/initiator_common.c
  			return EINVAL;
 Index: open-iscsi/usr/netlink.c
 ===================================================================
---- open-iscsi.orig/usr/netlink.c	2012-04-07 19:36:31.791190562 +0530
-+++ open-iscsi/usr/netlink.c	2012-04-07 20:50:28.697191996 +0530
+--- open-iscsi.orig/usr/netlink.c	2013-11-05 20:55:06.529420366 +0530
++++ open-iscsi/usr/netlink.c	2013-11-05 20:55:06.525420366 +0530
 @@ -935,7 +935,7 @@
  	iov[1].iov_len = sizeof(ev);
  	rc = __kipc_call(iov, 2);
diff --git a/debian/patches/02_make-iscsistart-a-dynamic-binary.patch b/debian/patches/02_make-iscsistart-a-dynamic-binary.patch
index 6f64feb..ccf9e03 100644
--- a/debian/patches/02_make-iscsistart-a-dynamic-binary.patch
+++ b/debian/patches/02_make-iscsistart-a-dynamic-binary.patch
@@ -9,9 +9,9 @@ Subject: [PATCH 32/43] make iscsistart a dynamic binary
 
 Index: open-iscsi/usr/Makefile
 ===================================================================
---- open-iscsi.orig/usr/Makefile	2012-04-07 19:36:03.299049291 +0530
-+++ open-iscsi/usr/Makefile	2012-04-07 19:39:32.276085546 +0530
-@@ -61,7 +61,7 @@
+--- open-iscsi.orig/usr/Makefile	2013-11-05 20:56:35.089418806 +0530
++++ open-iscsi/usr/Makefile	2013-11-05 20:56:35.089418806 +0530
+@@ -62,7 +62,7 @@
  
  iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
  		iscsistart.o statics.o
diff --git a/debian/patches/03_hardened-build-flags.patch b/debian/patches/03_hardened-build-flags.patch
index 505be8d..103a955 100644
--- a/debian/patches/03_hardened-build-flags.patch
+++ b/debian/patches/03_hardened-build-flags.patch
@@ -1,8 +1,8 @@
 hardened build flags - wheezy release goal
 Index: open-iscsi/usr/Makefile
 ===================================================================
---- open-iscsi.orig/usr/Makefile	2012-04-07 19:58:23.341694200 +0530
-+++ open-iscsi/usr/Makefile	2012-04-07 20:00:41.622379886 +0530
+--- open-iscsi.orig/usr/Makefile	2013-11-05 20:56:40.013418719 +0530
++++ open-iscsi/usr/Makefile	2013-11-05 20:56:40.009418719 +0530
 @@ -28,7 +28,7 @@
  endif
  endif
@@ -12,7 +12,7 @@ Index: open-iscsi/usr/Makefile
  WARNFLAGS ?= -Wall -Wstrict-prototypes
  CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../include -I. -I../utils/open-isns \
  				-D$(OSNAME) $(IPC_CFLAGS)
-@@ -54,14 +54,14 @@
+@@ -55,14 +55,14 @@
  
  iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
  	iscsid.o session_mgmt.o discoveryd.o
@@ -32,8 +32,8 @@ Index: open-iscsi/usr/Makefile
  
 Index: open-iscsi/utils/Makefile
 ===================================================================
---- open-iscsi.orig/utils/Makefile	2012-04-07 19:54:51.056641535 +0530
-+++ open-iscsi/utils/Makefile	2012-04-07 20:01:57.138754352 +0530
+--- open-iscsi.orig/utils/Makefile	2013-11-05 20:56:40.013418719 +0530
++++ open-iscsi/utils/Makefile	2013-11-05 20:56:40.009418719 +0530
 @@ -1,12 +1,12 @@
  # This Makefile will work only with GNU make.
  
diff --git a/debian/patches/04_fix_iscsi_path.patch b/debian/patches/04_fix_iscsi_path.patch
index d1620a7..7c395e0 100644
--- a/debian/patches/04_fix_iscsi_path.patch
+++ b/debian/patches/04_fix_iscsi_path.patch
@@ -1,8 +1,8 @@
 Fix path for iscsid as we ship it in /usr/sbin
 Index: open-iscsi/etc/iscsid.conf
 ===================================================================
---- open-iscsi.orig/etc/iscsid.conf	2012-04-07 20:18:02.891543275 +0530
-+++ open-iscsi/etc/iscsid.conf	2012-04-24 09:36:41.058624577 +0530
+--- open-iscsi.orig/etc/iscsid.conf	2013-11-05 20:56:42.941418667 +0530
++++ open-iscsi/etc/iscsid.conf	2013-11-05 20:56:42.941418667 +0530
 @@ -20,7 +20,7 @@
  # iscsid.startup = /etc/rc.d/init.d/iscsid force-start
  # 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-iscsi/open-iscsi.git



More information about the Pkg-iscsi-maintainers mailing list