[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. debian/2.0.871.3-6-11-gd70e88a
Ritesh Raj Sarraf
rrs at researchut.com
Thu Aug 25 13:03:24 UTC 2011
The following commit has been merged in the master branch:
commit ddb81e4c387b9e325d4513e7cc4cc2e53525fb51
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date: Mon Aug 22 20:19:13 2011 +0530
Drop patches, merged upstream
debian/patches/001_manpages_fixes.patch
debian/patches/002_bianry_spelling_error_fix.patch
debian/patches/003_Fix-CVE-2009-1297.patch
diff --git a/debian/patches/001_manpages_fixes.patch b/debian/patches/001_manpages_fixes.patch
deleted file mode 100644
index d64de99..0000000
--- a/debian/patches/001_manpages_fixes.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-Man pages typo fixes
-Index: open-iscsi-guido/doc/iscsi_discovery.8
-===================================================================
---- open-iscsi-guido.orig/doc/iscsi_discovery.8 2010-01-30 12:02:46.179903346 +0530
-+++ open-iscsi-guido/doc/iscsi_discovery.8 2010-01-30 12:02:49.323883715 +0530
-@@ -13,9 +13,9 @@
- .SH DESCRIPTION
- Perform send-targets discovery to the specified IP. If a discovery record
- is generated, try to login to the portal using the preferred transport
--(-t flag specifies the requested transport type, TCP is the default).
-+(\-t flag specifies the requested transport type, TCP is the default).
- If login using a certain transport succeeds, mark the portal for automatic
--login (unless -m flag is used), and disconnect (unless -l flag is used).
-+login (unless \-m flag is used), and disconnect (unless \-l flag is used).
-
- For iSCSI discovery to work, open-iscsi services must be running. i.e. iscsid
- should be up, and the iSCSI modules loaded. This is best accomplished by the
-@@ -35,7 +35,7 @@
- .BI [-f]
- force specific transport -
- disable the fallback to tcp (default is fallback enabled).
--force the transport specified by the argument of the -t flag.
-+force the transport specified by the argument of the \-t flag.
-
- .TP
- .BI [-m]
-Index: open-iscsi-guido/doc/iscsiadm.8
-===================================================================
---- open-iscsi-guido.orig/doc/iscsiadm.8 2010-01-30 12:02:46.251887347 +0530
-+++ open-iscsi-guido/doc/iscsiadm.8 2010-01-30 12:03:29.103890536 +0530
-@@ -2,21 +2,21 @@
- .SH NAME
- iscsiadm \- open-iscsi administration utility
- .SH SYNOPSIS
--\fBiscsiadm\fR -m discovery [ -hV ] [ -d debug_level ] [ -P printlevel ] [ -I iface -t type -p ip:port [ -l ] ] |
--[ -o operation ] [ -n name ] [ -v value ]
-+\fBiscsiadm\fR \-m discovery [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I iface \-t type \-p ip:port [ \-l ] ] |
-+[ \-o operation ] [ \-n name ] [ \-v value ]
-
--\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 ] ]
-+\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 ] ]
-
--\fBiscsiadm\fR -m session [ -hV ] [ -d debug_level ] [ -P printlevel ] [ -r sessionid | sysfsdir [ -R ] [ -u | -s ] ]
-+\fBiscsiadm\fR \-m session [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-r sessionid | sysfsdir [ \-R ] [ \-u | \-s ] ]
-
--\fBiscsiadm\fR -m iface [ -hV ] [ -d debug_level ] [ -P printlevel ] [ -I ifacename ] [ [ -o operation ] [ -n name ] [ -v value ] ]
-+\fBiscsiadm\fR \-m iface [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I ifacename ] [ [ \-o operation ] [ \-n name ] [ \-v value ] ]
-
--\fBiscsiadm\fR -m fw [-l]
-+\fBiscsiadm\fR \-m fw [\-l]
-
--\fBiscsiadm\fR -m host [ -P printlevel ] [ -H hostno ]
-+\fBiscsiadm\fR \-m host [ \-P printlevel ] [ \-H hostno ]
-
--\fBiscsiadm\fR -k priority
-+\fBiscsiadm\fR \-k priority
-
- .SH "DESCRIPTION"
- The iscsiadm utility is a command-line tool allowing discovery and login
-@@ -28,7 +28,7 @@
- term node to refer to a portal on a target.
-
- For session mode, a session id (sid) is used. The sid of a session can be
--found by running iscsiadm -m session -P 1. The session id and sysfs
-+found by running iscsiadm \-m session \-P 1. The session id and sysfs
- path are not currently persistent and is partially determined by when the
- session is setup.
-
-@@ -70,10 +70,10 @@
- others -- cxgb3i, bnx2i and iser, which does not bind the session to a specific card, but will bind the session to the cxgb3i, bnx2i or iser transport. These
- are experimental and the use is not supported as a stable interface yet.
-
--In discovery mode multiple interfaces can be specific by passing in multiple
---I/--interface instances. For example,
-+In discovery mode multiple interfaces can be specified by passing in multiple
-+\-I/\-\-interface instances. For example,
-
--"iscsiadm -m discovery -t st -p mytarget -I iface0 -I iface2"
-+"iscsiadm \-m discovery \-t st \-p mytarget \-I iface0 \-I iface2"
-
- Will direct iscsiadm to setup the node db to create records which will create
- sessions though the two intefaces passed in.
-@@ -151,7 +151,7 @@
- This option is only valid for discovery, or for node operations with
- the \fInew\fR operator.
- .IP
--This should be used along with --target in node mode, to specify what the open-iscsi docs refer to as a node or node record. Note: open-iscsi's use of the word node, does not match the iSCSI RFC's iSCSI Node term.
-+This should be used along with \-\-target in node mode, to specify what the open-iscsi docs refer to as a node or node record. Note: open-iscsi's use of the word node, does not match the iSCSI RFC's iSCSI Node term.
-
- .TP
- \fB\-P\fR, \fB\-\-print=\fIprintlevel\fR
-@@ -163,12 +163,12 @@
- \fB\-T\fR, \fB\-\-targetname=\fItargetname\fR
- Use target \fItargetname\fR.
- .IP
--This should be used along with --portal in node mode, to specify what the open-iscsi docs refer to as a node or node record. Note: open-iscsi's use of the word node, does not match the iSCSI RFC's iSCSI Node term.
-+This should be used along with \-\-portal in node mode, to specify what the open-iscsi docs refer to as a node or node record. Note: open-iscsi's use of the word node, does not match the iSCSI RFC's iSCSI Node term.
-
- .TP
- \fB\-r\fR, \fB\-\-sid=\fIsid | sysfsdir\fR
- Use session ID \fIsid\fR. The sid of a session can be found from running
--iscsiadm in session mode with the --info argument.
-+iscsiadm in session mode with the \-\-info argument.
-
- Instead of sid, a sysfs path containing the session can be used. For example using one of the following: /sys/devices/platform/hostH/sessionS/targetH:B:I/H:B:I:L, /sys/devices/platform/hostH/sessionS/targetH:B:I, or /sys/devices/platform/hostH/sessionS, for the sysfsdir argument would result in the session with sid S to be used.
- .IP
-@@ -264,7 +264,7 @@
-
- Performing fw discovery will print the portals, like with other discovery
- methods. To see other settings like CHAP values and initiator settings,
--like you would in node mode, run "iscsiadm -m fw".
-+like you would in node mode, run "iscsiadm \-m fw".
-
- fw support in open-iscsi is experimental. The settings and iscsiadm
- syntax and output format may change.
-@@ -284,32 +284,32 @@
- Discover targets at a given IP address:
-
- .ft R
-- iscsiadm --mode discovery --type sendtargets --portal 192.168.1.10
-+ iscsiadm \-\-mode discovery \-\-type sendtargets \-\-portal 192.168.1.10
- .nf
-
- Login, must use a node record id found by the discovery:
-
- .ft R
-- iscsiadm --mode node --targetname iqn.2001-05.com.doe:test --portal 192.168.1.1:3260 --login
-+ iscsiadm \-\-mode node \-\-targetname iqn.2001-05.com.doe:test \-\-portal 192.168.1.1:3260 \-\-login
- .nf
-
- Logout:
-
- .ft R
-- iscsiadm --mode node --targetname iqn.2001-05.com.doe:test --portal 192.168.1.1:3260 --logout
-+ iscsiadm \-\-mode node \-\-targetname iqn.2001-05.com.doe:test \-\-portal 192.168.1.1:3260 \-\-logout
- .nf
-
- List node records:
-
- .ft R
-- iscsiadm --mode node
-+ iscsiadm \-\-mode node
-
- .nf
-
- Display all data for a given node record:
-
- .ft R
-- iscsiadm --mode node --targetname iqn.2001-05.com.doe:test --portal 192.168.1.1:3260
-+ iscsiadm \-\-mode node \-\-targetname iqn.2001-05.com.doe:test \-\-portal 192.168.1.1:3260
-
- .SH FILES
- .TP
diff --git a/debian/patches/002_bianry_spelling_error_fix.patch b/debian/patches/002_bianry_spelling_error_fix.patch
deleted file mode 100644
index c212eaf..0000000
--- a/debian/patches/002_bianry_spelling_error_fix.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Fix many spelling errors in source code
-Index: open-iscsi/usr/initiator.c
-===================================================================
---- open-iscsi.orig/usr/initiator.c 2010-06-08 19:18:13.349024756 +0530
-+++ open-iscsi/usr/initiator.c 2010-06-08 19:20:20.529023429 +0530
-@@ -1719,7 +1719,7 @@
- case STATE_LOGGED_IN:
- case STATE_IN_LOGOUT:
- case STATE_LOGOUT_REQUESTED:
-- /* read incomming PDU */
-+ /* read incoming PDU */
- if (!iscsi_io_recv_pdu(conn, &hdr, ISCSI_DIGEST_NONE,
- conn->data, ISCSI_DEF_MAX_RECV_SEG_LEN,
- ISCSI_DIGEST_NONE, 0)) {
-@@ -1743,12 +1743,12 @@
- break;
- case STATE_XPT_WAIT:
- iscsi_conn_context_put(conn_context);
-- log_debug(1, "ignoring incomming PDU in XPT_WAIT. "
-+ log_debug(1, "ignoring incoming PDU in XPT_WAIT. "
- "let connection re-establish or fail");
- break;
- case STATE_CLEANUP_WAIT:
- iscsi_conn_context_put(conn_context);
-- log_debug(1, "ignoring incomming PDU in XPT_WAIT. "
-+ log_debug(1, "ignoring incoming PDU in XPT_WAIT. "
- "let connection cleanup");
- break;
- default:
-Index: open-iscsi/usr/initiator.h
-===================================================================
---- open-iscsi.orig/usr/initiator.h 2010-06-08 19:18:13.337024686 +0530
-+++ open-iscsi/usr/initiator.h 2010-06-08 19:20:20.529023429 +0530
-@@ -143,7 +143,7 @@
- int socket_fd;
- /* address being used for normal session connection */
- struct sockaddr_storage saddr;
-- /* address recieved during login */
-+ /* address received during login */
- struct sockaddr_storage failback_saddr;
- int tcp_window_size;
- int type_of_service;
-Index: open-iscsi/usr/netlink.c
-===================================================================
---- open-iscsi.orig/usr/netlink.c 2010-06-08 19:18:13.325023569 +0530
-+++ open-iscsi/usr/netlink.c 2010-06-08 19:21:03.585028877 +0530
-@@ -282,7 +282,7 @@
- }
- if (ev->iferror == -ENOSYS)
- /* not fatal so let caller handle log */
-- log_debug(1, "Recieved iferror %d: %s",
-+ log_debug(1, "Received iferror %d: %s",
- ev->iferror,
- strerror(ev->iferror));
- else if (ev->iferror < 0)
-@@ -831,7 +831,7 @@
- ev.u.ep_disconnect.ep_handle = conn->transport_ep_handle;
-
- if ((rc = __kipc_call(&ev, sizeof(ev))) < 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
-Index: open-iscsi/usr/auth.c
-===================================================================
---- open-iscsi.orig/usr/auth.c 2010-06-08 19:20:30.221523630 +0530
-+++ open-iscsi/usr/auth.c 2010-06-08 19:20:41.337024197 +0530
-@@ -2007,7 +2007,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/003_Fix-CVE-2009-1297.patch b/debian/patches/003_Fix-CVE-2009-1297.patch
deleted file mode 100644
index 7073b09..0000000
--- a/debian/patches/003_Fix-CVE-2009-1297.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 4bfddee45439bd5c671d23a7f60edd6f9e3b63b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 23 Jan 2010 17:54:19 +0100
-Subject: [PATCH 01/43] Fix CVE-2009-1297
-
-Thanks: Colin Watson for the patch
-Closes: #547011
----
- utils/iscsi_discovery | 10 ++++------
- 1 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/utils/iscsi_discovery b/utils/iscsi_discovery
-index 9f1e7cf..4091688 100755
---- a/utils/iscsi_discovery
-+++ b/utils/iscsi_discovery
-@@ -104,24 +104,22 @@ discover()
-
- connected=0
- discovered=0
-- df=/tmp/discovered.$$
-
- dbg "starting discovery to $ip"
-- iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df}
-- while read portal target
-+ disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})"
-+ echo "${disc}" | while read portal target
- do
- portal=${portal%,*}
- select_transport
-- done < ${df}
-+ done
-
-- discovered=$(cat ${df} | wc -l)
-+ discovered=$(echo "${disc}" | wc -l)
- if [ ${discovered} = 0 ]; then
- echo "failed to discover targets at ${ip}"
- exit 2
- else
- echo "discovered ${discovered} targets at ${ip}"
- fi
-- /bin/rm -f ${df}
- }
-
- try_login()
---
-1.7.0
-
diff --git a/debian/patches/series b/debian/patches/series
index c533ccb..a660fd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-001_manpages_fixes.patch
-002_bianry_spelling_error_fix.patch
-003_Fix-CVE-2009-1297.patch
004_make-iscsistart-a-dynamic-binary.patch
--
Debian Open-iSCSI Packaging
More information about the Pkg-iscsi-maintainers
mailing list