[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. debian/2.0.871.3-6-37-g5567e07
Ritesh Raj Sarraf
rrs at researchut.com
Sat Apr 7 15:43:14 UTC 2012
The following commit has been merged in the master branch:
commit f1a9d2fc906aa5f6157fb0bc850ff2d888806fc0
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date: Sat Apr 7 20:54:48 2012 +0530
linitan fixes for spelling errors and manpage hyphen errors
diff --git a/debian/patches/01_spelling-error-fixes.patch b/debian/patches/01_spelling-error-fixes.patch
deleted file mode 100644
index 129665c..0000000
--- a/debian/patches/01_spelling-error-fixes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-spelling error fixes
-Index: open-iscsi/doc/iscsiadm.8
-===================================================================
---- open-iscsi.orig/doc/iscsiadm.8 2012-04-07 19:36:03.299049291 +0530
-+++ open-iscsi/doc/iscsiadm.8 2012-04-07 19:36:24.351153670 +0530
-@@ -2,10 +2,10 @@
- .SH NAME
- iscsiadm \- open-iscsi administration utility
- .SH SYNOPSIS
--\fBiscsiadm\fR \-m discoverydb [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I iface \-t type \-p ip:port [ \-lD ] ] | [ [ -p ip:port -t type ] \
-+\fBiscsiadm\fR \-m discoverydb [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I iface \-t type \-p ip:port [ \-lD ] ] | [ [ \-p ip:port \-t type ] \
- [ \-o operation ] [ \-n name ] [ \-v value ] [ \-lD ] ]
-
--\fBiscsiadm\fR \-m discovery [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I iface \-t type \-p ip:port [ \-l ] ] | [ [ -p ip:port ] [ \-l | \-D ] ]
-+\fBiscsiadm\fR \-m discovery [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I iface \-t type \-p ip:port [ \-l ] ] | [ [ \-p ip:port ] [ \-l | \-D ] ]
-
- \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 ] ]
-@@ -113,7 +113,7 @@
- In discovery mode multiple interfaces can be specified by passing in multiple
- \-I/\-\-interface instances. For example,
-
--"iscsiadm \-m discoverydb \-t st \-p ip:port \-I iface0 \-I iface2 --discover"
-+"iscsiadm \-m discoverydb \-t st \-p ip:port \-I iface0 \-I iface2 \-\-discover"
-
- Will direct iscsiadm to setup the node db to create records which will create
- sessions though the two intefaces passed in.
-Index: open-iscsi/usr/auth.c
-===================================================================
---- open-iscsi.orig/usr/auth.c 2012-04-07 19:36:03.299049291 +0530
-+++ open-iscsi/usr/auth.c 2012-04-07 19:36:24.351153670 +0530
-@@ -2002,7 +2002,7 @@
- "AuthMethod negotiation failed",
- "AuthMethod negotiated to none",
- "CHAP algorithm negotiation failed",
-- "CHAP challange reflected",
-+ "CHAP challenge reflected",
- "Local password same as remote",
- "Local password not set",
- "CHAP identifier bad",
diff --git a/debian/patches/01_spelling-errors-and-manpage-hyphen-fixes.patch b/debian/patches/01_spelling-errors-and-manpage-hyphen-fixes.patch
new file mode 100644
index 0000000..c5003c5
--- /dev/null
+++ b/debian/patches/01_spelling-errors-and-manpage-hyphen-fixes.patch
@@ -0,0 +1,84 @@
+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
+@@ -2,10 +2,10 @@
+ .SH NAME
+ iscsiadm \- open-iscsi administration utility
+ .SH SYNOPSIS
+-\fBiscsiadm\fR \-m discoverydb [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I iface \-t type \-p ip:port [ \-lD ] ] | [ [ -p ip:port -t type ] \
++\fBiscsiadm\fR \-m discoverydb [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I iface \-t type \-p ip:port [ \-lD ] ] | [ [ \-p ip:port \-t type ] \
+ [ \-o operation ] [ \-n name ] [ \-v value ] [ \-lD ] ]
+
+-\fBiscsiadm\fR \-m discovery [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I iface \-t type \-p ip:port [ \-l ] ] | [ [ -p ip:port ] [ \-l | \-D ] ]
++\fBiscsiadm\fR \-m discovery [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I iface \-t type \-p ip:port [ \-l ] ] | [ [ \-p ip:port ] [ \-l | \-D ] ]
+
+ \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 @@
+
+ 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 @@
+ In discovery mode multiple interfaces can be specified by passing in multiple
+ \-I/\-\-interface instances. For example,
+
+-"iscsiadm \-m discoverydb \-t st \-p ip:port \-I iface0 \-I iface2 --discover"
++"iscsiadm \-m discoverydb \-t st \-p ip:port \-I iface0 \-I iface2 \-\-discover"
+
+ Will direct iscsiadm to setup the node db to create records which will create
+ 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
+@@ -2002,7 +2002,7 @@
+ "AuthMethod negotiation failed",
+ "AuthMethod negotiated to none",
+ "CHAP algorithm negotiation failed",
+- "CHAP challange reflected",
++ "CHAP challenge reflected",
+ "Local password same as remote",
+ "Local password not set",
+ "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
+@@ -77,7 +77,7 @@
+ if (auth_cfg->username_in[0] || auth_cfg->password_in_length) {
+ /* sanity check the config */
+ if (auth_cfg->password_length == 0) {
+- log_warning("CHAP configuratoin has incoming "
++ log_warning("CHAP configuration has incoming "
+ "authentication credentials but has no "
+ "outgoing credentials configured.");
+ 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
+@@ -935,7 +935,7 @@
+ iov[1].iov_len = sizeof(ev);
+ rc = __kipc_call(iov, 2);
+ if (rc < 0) {
+- log_error("connnection %d:%d transport disconnect failed for "
++ log_error("connection %d:%d transport disconnect failed for "
+ "ep %" PRIu64 " with error %d.", conn->session->id,
+ conn->id, conn->transport_ep_handle, rc);
+ } else
diff --git a/debian/patches/series b/debian/patches/series
index d1eb837..6f014b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-01_spelling-error-fixes.patch
+01_spelling-errors-and-manpage-hyphen-fixes.patch
02_make-iscsistart-a-dynamic-binary.patch
03_hardened-build-flags.patch
--
Debian Open-iSCSI Packaging
More information about the Pkg-iscsi-maintainers
mailing list