[iscsi-initiator-utils: 13/109] update devel tree to r595
Chris Leech
cleech at fedoraproject.org
Tue Dec 10 21:20:27 UTC 2013
commit baf08208acd0b4a9fba22d2a785825308dd6f483
Author: mchristi <mchristi at redhat.com>
Date: Mon Jun 5 17:50:57 2006 +0000
update devel tree to r595
.cvsignore | 1 +
iscsi-initiator-utils.spec | 42 ++-
open-iscsi-5.0.5.595-add-iscsi-iname.patch | 470 ++++++++++++++++++++
open-iscsi-5.0.5.595-fc-version.patch | 10 +
open-iscsi-5.0.5.595-rm-reopen-max.patch | 86 ++++
...csi-5.0.5.595-update-initscripts-and-docs.patch | 44 ++
sources | 2 +-
7 files changed, 647 insertions(+), 8 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index ac0f8d2..bb0ff30 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
open-iscsi-5.0.4.446.tar.gz
open-iscsi-5.0.5.476.tar.bz2
+open-iscsi-5.0.5.595.tar.bz2
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 647d318..7f19253 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -1,10 +1,13 @@
Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils
-Version: 5.0.5.476
-Release: 0.1
+Version: 5.0.5.595
+Release: 0
Source0: http://people.redhat.com/mchristi/iscsi/FC5/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
-Patch0: open-iscsi-5.0.4.446-initscript.patch
-Patch1: open-iscsi-5.0.4.446-add-iscsi-iname.patch
+Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
+Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch
+Patch2: open-iscsi-5.0.5.595-rm-reopen-max.patch
+Patch3: open-iscsi-5.0.5.595-fc-version.patch
+
Group: System Environment/Daemons
License: GPL
URL: http://www.open-iscsi.org
@@ -22,8 +25,10 @@ Protocol networks.
%prep
%setup -q -n %{name}-%{version} -c
cd open-iscsi-%{version}
-%patch0 -p1 -b .initscript
+%patch0 -p1 -b .update-initscripts-and-docs
%patch1 -p1 -b .add-iscsi-iname
+%patch2 -p1 -b .rm-reopen-max
+%patch3 -p1 -b .fc-version
%build
cd open-iscsi-%{version}
@@ -38,7 +43,7 @@ mkdir -p $RPM_BUILD_ROOT/sbin
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
mkdir -p $RPM_BUILD_ROOT/var/db/iscsi/
-install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname $RPM_BUILD_ROOT/sbin
+install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/sbin
install -m 644 doc/iscsiadm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
install -m 644 doc/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
install -m 755 etc/initd/initd.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
@@ -48,6 +53,10 @@ install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc
rm -rf $RPM_BUILD_ROOT
%post
+if [ ! -f /etc/initiatorname.iscsi ]; then
+ echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/initiatorname.iscsi
+fi
+
/sbin/chkconfig --add iscsi
%preun
@@ -55,7 +64,6 @@ if [ "$1" = "0" ]; then
/sbin/chkconfig --del iscsi
fi
-
%files
%defattr(-,root,root)
%config /etc/rc.d/init.d/iscsi
@@ -66,6 +74,26 @@ fi
%{_mandir}/*/*
%changelog
+* Tue May 30 2006 Mike Christie <mchristi at redhat.com>
+- rebase package to svn rev 595 to fix several bugs
+ NOTE!!!!!!!! This is not compatible with the older open-iscsi modules
+ and tools. You must upgrade.
+
+* Thu May 18 2006 Mike Christie <mchristi at redhat.com>
+- update package to open-iscsi svn rev 571
+ NOTE!!!!!!!! This is not compatible with the older open-iscsi modules
+ and tools. You must upgrade.
+
+* Fri Apr 7 2006 Mike Christie <mchristi at redhat.com>
+- From Andy Henson <andy at zexia.co.uk>:
+ Autogenerate /etc/initiatorname.iscsi during install if not already present
+- Remove code to autogenerate /etc/initiatorname.iscsi from initscript
+- From dan.y.roche at gmail.com:
+ add touch and rm lock code
+- update README
+- update default iscsid.conf. "cnx" was not supported. The correct
+ id was "conn".
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.0.5.476-0.1
- bump again for double-long bug on ppc(64)
diff --git a/open-iscsi-5.0.5.595-add-iscsi-iname.patch b/open-iscsi-5.0.5.595-add-iscsi-iname.patch
new file mode 100644
index 0000000..8cf83e5
--- /dev/null
+++ b/open-iscsi-5.0.5.595-add-iscsi-iname.patch
@@ -0,0 +1,470 @@
+diff -Naurp open-iscsi/Makefile open-iscsi-5.0.5.595/Makefile
+--- open-iscsi/Makefile 2006-05-30 01:51:42.000000000 -0500
++++ open-iscsi-5.0.5.595/Makefile 2006-05-30 02:29:46.000000000 -0500
+@@ -26,6 +26,7 @@ ETCFILES = etc/iscsid.conf
+ all:
+ $(MAKE) -C usr
+ $(MAKE) -C kernel
++ $(MAKE) -C utils
+ @echo
+ @echo "Compilation complete Output file"
+ @echo "----------------------------------- ----------------"
+@@ -38,6 +39,7 @@ all:
+ @echo Read README file for detailed information.
+
+ clean:
++ $(MAKE) -C utils clean
+ $(MAKE) -C usr clean
+ $(MAKE) -C kernel clean
+
+diff -Naurp open-iscsi/utils/iscsi-iname.c open-iscsi-5.0.5.595/utils/iscsi-iname.c
+--- open-iscsi/utils/iscsi-iname.c 1969-12-31 18:00:00.000000000 -0600
++++ open-iscsi-5.0.5.595/utils/iscsi-iname.c 2006-05-30 02:28:34.000000000 -0500
+@@ -0,0 +1,140 @@
++/*
++ * iSCSI InitiatorName creation utility
++ * Copyright (C) 2001 Cisco Systems, Inc.
++ * maintained by linux-iscsi-devel at lists.sourceforge.net
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ *
++ * $Id: iscsi-iname.c,v 1.1.2.3 2005/03/15 06:33:44 wysochanski Exp $
++ *
++ * iscsi-iname.c - Compute an iSCSI InitiatorName for this host.
++ * Note that to ensure uniqueness, the system time is
++ * a factor. This name must be cached and only regenerated
++ * if there is no cached value.
++ */
++
++#include <stdint.h>
++#include <fcntl.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <sys/utsname.h>
++#include <sys/time.h>
++
++#include "md5.h"
++
++#define RANDOM_NUM_GENERATOR "/dev/urandom"
++
++int
++main(int argc, char *argv[])
++{
++ char iname[256];
++ struct timeval time;
++ struct utsname system_info;
++ long hostid;
++ struct MD5Context context;
++ unsigned char digest[16];
++ unsigned char *bytes = digest;
++ unsigned char entropy[16];
++ int e;
++ int fd;
++ char *prefix;
++
++ /* initialize */
++ memset(iname, 0, sizeof (iname));
++ memset(digest, 0, sizeof (digest));
++ memset(&context, 0, sizeof (context));
++ MD5Init(&context);
++
++ /* take a prefix if given, otherwise use a default. */
++ if (argc > 1 && argv[1]) {
++ prefix = argv[1];
++ if (( strcmp(prefix, "-h") == 0 ) ||
++ ( strcmp(prefix, "--help") == 0 )) {
++ printf("\nDisplays the iSCSI initiator name\n");
++ exit(0);
++ } else if ( strcmp(prefix, "-p") == 0 ) {
++ prefix = argv[2];
++ } else {
++ printf("\nUsage: iscsi-iname [-h | --help | "
++ "-p <prefix>]\n");
++ exit(0);
++ }
++ } else {
++ prefix = "iqn.2005-03.com.max:01";
++ }
++
++ /* try to feed some entropy from the pool to MD5 in order to get
++ * uniqueness properties
++ */
++
++ if ((fd = open(RANDOM_NUM_GENERATOR, O_RDONLY))) {
++ e = read(fd, &entropy, 16);
++ if (e >= 1)
++ MD5Update(&context, (md5byte *)entropy, e);
++ close(fd);
++ }
++
++ /* time the name is created is a factor in order to get
++ * uniqueness properties
++ */
++ if (gettimeofday(&time, NULL) < 0) {
++ perror("error: gettimeofday failed");
++ return 1;
++ }
++ MD5Update(&context, (md5byte *) & time.tv_sec, sizeof (time.tv_sec));
++ MD5Update(&context, (md5byte *) & time.tv_usec, sizeof (time.tv_usec));
++
++ /* hostid */
++ hostid = gethostid();
++ MD5Update(&context, (md5byte *) & hostid, sizeof (hostid));
++
++ /* get the hostname and system name */
++ if (uname(&system_info) < 0) {
++ perror("error: uname failed");
++ return 1;
++ }
++ MD5Update(&context, (md5byte *) system_info.sysname,
++ sizeof (system_info.sysname));
++ MD5Update(&context, (md5byte *) system_info.nodename,
++ sizeof (system_info.nodename));
++ MD5Update(&context, (md5byte *) system_info.release,
++ sizeof (system_info.release));
++ MD5Update(&context, (md5byte *) system_info.version,
++ sizeof (system_info.version));
++ MD5Update(&context, (md5byte *) system_info.machine,
++ sizeof (system_info.machine));
++
++ /* compute the md5 hash of all the bits we just collected */
++ MD5Final(digest, &context);
++
++ /* vary which md5 bytes we pick (though we probably don't need to do
++ * this, since hopefully MD5 produces results such that each byte is as
++ * good as any other).
++ */
++
++ if ((fd = open(RANDOM_NUM_GENERATOR, O_RDONLY))) {
++ if (read(fd, entropy, 1) == 1)
++ bytes = &digest[(entropy[0] % (sizeof(digest) - 6))];
++ close(fd);
++ }
++
++ /* print the prefix followed by 6 bytes of the MD5 hash */
++ sprintf(iname, "%s.%x%x%x%x%x%x", prefix,
++ bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5]);
++
++ iname[sizeof (iname) - 1] = '\0';
++ printf("%s\n", iname);
++ return 0;
++}
+diff -Naurp open-iscsi/utils/Makefile open-iscsi-5.0.5.595/utils/Makefile
+--- open-iscsi/utils/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ open-iscsi-5.0.5.595/utils/Makefile 2006-05-30 02:28:34.000000000 -0500
+@@ -0,0 +1,12 @@
++# This Makefile will work only with GNU make.
++
++CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g
++PROGRAMS = iscsi-iname
++
++all: $(PROGRAMS)
++
++iscsi-iname: md5.o iscsi-iname.o
++ $(CC) $^ $(DBM_LIB) -o $@
++
++clean:
++ rm -f *.o $(PROGRAMS)
+diff -Naurp open-iscsi/utils/md5.c open-iscsi-5.0.5.595/utils/md5.c
+--- open-iscsi/utils/md5.c 1969-12-31 18:00:00.000000000 -0600
++++ open-iscsi-5.0.5.595/utils/md5.c 2006-05-30 02:28:34.000000000 -0500
+@@ -0,0 +1,242 @@
++/*
++ * This code implements the MD5 message-digest algorithm.
++ * The algorithm is due to Ron Rivest. This code was
++ * written by Colin Plumb in 1993, no copyright is claimed.
++ * This code is in the public domain; do with it what you wish.
++ *
++ * Equivalent code is available from RSA Data Security, Inc.
++ * This code has been tested against that, and is equivalent,
++ * except that you don't need to include two pages of legalese
++ * with every copy.
++ *
++ * To compute the message digest of a chunk of bytes, declare an
++ * MD5Context structure, pass it to MD5Init, call MD5Update as
++ * needed on buffers full of bytes, and then call MD5Final, which
++ * will fill a supplied 16-byte array with the digest.
++ *
++ * Changed so as no longer to depend on Colin Plumb's `usual.h' header
++ * definitions; now uses stuff from dpkg's config.h.
++ * - Ian Jackson <ijackson at nyx.cs.du.edu>.
++ * Still in the public domain.
++ */
++
++#include <string.h>
++
++#include "md5.h"
++
++#if (__BYTE_ORDER == __BIG_ENDIAN)
++/*
++ * we can compile this away for little endian since
++ * it does not do anything on those archs
++ */
++void
++byteSwap(uint32_t * buf, unsigned words)
++{
++ md5byte *p = (md5byte *) buf;
++
++ do {
++ *buf++ = (uint32_t) ((unsigned) p[3] << 8 | p[2]) << 16 |
++ ((unsigned) p[1] << 8 | p[0]);
++ p += 4;
++ } while (--words);
++}
++#else
++#define byteSwap(buf,words)
++#endif
++
++/*
++ * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
++ * initialization constants.
++ */
++void
++MD5Init(struct MD5Context *ctx)
++{
++ ctx->buf[0] = 0x67452301;
++ ctx->buf[1] = 0xefcdab89;
++ ctx->buf[2] = 0x98badcfe;
++ ctx->buf[3] = 0x10325476;
++
++ ctx->bytes[0] = 0;
++ ctx->bytes[1] = 0;
++}
++
++/*
++ * Update context to reflect the concatenation of another buffer full
++ * of bytes.
++ */
++void
++MD5Update(struct MD5Context *ctx, md5byte const *buf, unsigned len)
++{
++ uint32_t t;
++
++ /* Update byte count */
++
++ t = ctx->bytes[0];
++ if ((ctx->bytes[0] = t + len) < t)
++ ctx->bytes[1]++; /* Carry from low to high */
++
++ t = 64 - (t & 0x3f); /* Space available in ctx->in (at least 1) */
++ if (t > len) {
++ memcpy((md5byte *) ctx->in + 64 - t, buf, len);
++ return;
++ }
++ /* First chunk is an odd size */
++ memcpy((md5byte *) ctx->in + 64 - t, buf, t);
++ byteSwap(ctx->in, 16);
++ MD5Transform(ctx->buf, ctx->in);
++ buf += t;
++ len -= t;
++
++ /* Process data in 64-byte chunks */
++ while (len >= 64) {
++ memcpy(ctx->in, buf, 64);
++ byteSwap(ctx->in, 16);
++ MD5Transform(ctx->buf, ctx->in);
++ buf += 64;
++ len -= 64;
++ }
++
++ /* Handle any remaining bytes of data. */
++ memcpy(ctx->in, buf, len);
++}
++
++/*
++ * Final wrapup - pad to 64-byte boundary with the bit pattern
++ * 1 0* (64-bit count of bits processed, MSB-first)
++ */
++void
++MD5Final(md5byte digest[16], struct MD5Context *ctx)
++{
++ int count = ctx->bytes[0] & 0x3f; /* Number of bytes in ctx->in */
++ md5byte *p = (md5byte *) ctx->in + count;
++
++ /* Set the first char of padding to 0x80. There is always room. */
++ *p++ = 0x80;
++
++ /* Bytes of padding needed to make 56 bytes (-8..55) */
++ count = 56 - 1 - count;
++
++ if (count < 0) { /* Padding forces an extra block */
++ memset(p, 0, count + 8);
++ byteSwap(ctx->in, 16);
++ MD5Transform(ctx->buf, ctx->in);
++ p = (md5byte *) ctx->in;
++ count = 56;
++ }
++ memset(p, 0, count);
++ byteSwap(ctx->in, 14);
++
++ /* Append length in bits and transform */
++ ctx->in[14] = ctx->bytes[0] << 3;
++ ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29;
++ MD5Transform(ctx->buf, ctx->in);
++
++ byteSwap(ctx->buf, 4);
++ memcpy(digest, ctx->buf, 16);
++ memset(ctx, 0, sizeof (ctx)); /* In case it's sensitive */
++}
++
++#ifndef ASM_MD5
++
++/* The four core functions - F1 is optimized somewhat */
++
++/* #define F1(x, y, z) (x & y | ~x & z) */
++#define F1(x, y, z) (z ^ (x & (y ^ z)))
++#define F2(x, y, z) F1(z, x, y)
++#define F3(x, y, z) (x ^ y ^ z)
++#define F4(x, y, z) (y ^ (x | ~z))
++
++/* This is the central step in the MD5 algorithm. */
++#define MD5STEP(f,w,x,y,z,in,s) \
++ (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
++
++/*
++ * The core of the MD5 algorithm, this alters an existing MD5 hash to
++ * reflect the addition of 16 longwords of new data. MD5Update blocks
++ * the data and converts bytes into longwords for this routine.
++ */
++void
++MD5Transform(uint32_t buf[4], uint32_t const in[16])
++{
++ register uint32_t a, b, c, d;
++
++ a = buf[0];
++ b = buf[1];
++ c = buf[2];
++ d = buf[3];
++
++ MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
++ MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
++ MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
++ MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
++ MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
++ MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
++ MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
++ MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
++ MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
++ MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
++ MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
++ MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
++ MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
++ MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
++ MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
++ MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
++
++ MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
++ MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
++ MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
++ MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
++ MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
++ MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
++ MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
++ MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
++ MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
++ MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
++ MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
++ MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
++ MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
++ MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
++ MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
++ MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
++
++ MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
++ MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
++ MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
++ MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
++ MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
++ MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
++ MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
++ MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
++ MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
++ MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
++ MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
++ MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
++ MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
++ MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
++ MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
++ MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
++
++ MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
++ MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
++ MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
++ MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
++ MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
++ MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
++ MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
++ MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
++ MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
++ MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
++ MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
++ MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
++ MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
++ MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
++ MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
++ MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
++
++ buf[0] += a;
++ buf[1] += b;
++ buf[2] += c;
++ buf[3] += d;
++}
++
++#endif
+diff -Naurp open-iscsi/utils/md5.h open-iscsi-5.0.5.595/utils/md5.h
+--- open-iscsi/utils/md5.h 1969-12-31 18:00:00.000000000 -0600
++++ open-iscsi-5.0.5.595/utils/md5.h 2006-05-30 02:28:34.000000000 -0500
+@@ -0,0 +1,41 @@
++/*
++ * This is the header file for the MD5 message-digest algorithm.
++ * The algorithm is due to Ron Rivest. This code was
++ * written by Colin Plumb in 1993, no copyright is claimed.
++ * This code is in the public domain; do with it what you wish.
++ *
++ * Equivalent code is available from RSA Data Security, Inc.
++ * This code has been tested against that, and is equivalent,
++ * except that you don't need to include two pages of legalese
++ * with every copy.
++ *
++ * To compute the message digest of a chunk of bytes, declare an
++ * MD5Context structure, pass it to MD5Init, call MD5Update as
++ * needed on buffers full of bytes, and then call MD5Final, which
++ * will fill a supplied 16-byte array with the digest.
++ *
++ * Changed so as no longer to depend on Colin Plumb's `usual.h'
++ * header definitions; now uses stuff from dpkg's config.h
++ * - Ian Jackson <ijackson at nyx.cs.du.edu>.
++ * Still in the public domain.
++ */
++
++#ifndef MD5_H
++#define MD5_H
++
++#include <stdint.h>
++
++#define md5byte unsigned char
++
++struct MD5Context {
++ uint32_t buf[4];
++ uint32_t bytes[2];
++ uint32_t in[16];
++};
++
++void MD5Init(struct MD5Context *context);
++void MD5Update(struct MD5Context *context, md5byte const *buf, unsigned len);
++void MD5Final(unsigned char digest[16], struct MD5Context *context);
++void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
++
++#endif /* !MD5_H */
diff --git a/open-iscsi-5.0.5.595-fc-version.patch b/open-iscsi-5.0.5.595-fc-version.patch
new file mode 100644
index 0000000..bd5373c
--- /dev/null
+++ b/open-iscsi-5.0.5.595-fc-version.patch
@@ -0,0 +1,10 @@
+--- open-iscsi/usr/version.h 2006-05-30 01:51:41.000000000 -0500
++++ open-iscsi-5.0.5.595/usr/version.h 2006-05-30 03:01:16.000000000 -0500
+@@ -6,6 +6,6 @@
+ * This may not be the same value as the kernel versions because
+ * some other maintainer could merge a patch without going through us
+ */
+-#define ISCSI_VERSION_STR "1.0-595"
++#define ISCSI_VERSION_STR "1.0-595.0"
+
+ #endif
diff --git a/open-iscsi-5.0.5.595-rm-reopen-max.patch b/open-iscsi-5.0.5.595-rm-reopen-max.patch
new file mode 100644
index 0000000..9ac0758
--- /dev/null
+++ b/open-iscsi-5.0.5.595-rm-reopen-max.patch
@@ -0,0 +1,86 @@
+diff -aurp open-iscsi-5.0.5.595/usr/config.h open-iscsi-5.0.5.574/usr/config.h
+--- open-iscsi-5.0.5.595/usr/config.h 2006-05-30 02:02:29.000000000 -0500
++++ open-iscsi-5.0.5.574/usr/config.h 2006-05-18 22:50:25.000000000 -0500
+@@ -43,7 +43,8 @@
+ #define ISCSI_CONN_MAX 16
+
+ /* database version control */
+-#define IDBM_VERSION 0x05
++/* To maintain backwards compat with earlier DBs we do some tricks */
++#define IDBM_VERSION 0x04
+
+ /* the following structures store the options set in the config file.
+ * a structure is defined for each logically-related group of options.
+@@ -141,7 +142,6 @@ struct iscsi_sendtargets_config {
+ int port;
+ int continuous;
+ int send_async_text;
+- int reopen_max;
+ struct iscsi_auth_config auth;
+ struct iscsi_connection_timeout_config conn_timeo;
+ };
+diff -aurp open-iscsi-5.0.5.595/usr/discovery.c open-iscsi-5.0.5.574/usr/discovery.c
+--- open-iscsi-5.0.5.595/usr/discovery.c 2006-05-30 02:02:29.000000000 -0500
++++ open-iscsi-5.0.5.574/usr/discovery.c 2006-05-18 20:04:12.000000000 -0500
+@@ -644,6 +644,13 @@ soonest_msecs(struct timeval *t1, struct
+ return (m2 < m3) ? m2 : m3;
+ }
+
++/*
++ * tmp hack: open-iscsi does not support DB updates. Upstream has changed
++ * the DB format, so instead of jerking feodora users around we just set
++ * that configurable value to some safe default
++ */
++#define DISC_REOPEN_MAX 5
++
+ static iscsi_session_t *
+ init_new_session(struct iscsi_sendtargets_config *config)
+ {
+@@ -670,7 +677,7 @@ init_new_session(struct iscsi_sendtarget
+ session->conn[0].max_recv_dlength = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
+ session->conn[0].max_xmit_dlength = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
+
+- session->reopen_cnt = config->reopen_max;
++ session->reopen_cnt = DISC_REOPEN_MAX;
+
+ /* OUI and uniqifying number */
+ session->isid[0] = DRIVER_ISID_0;
+@@ -1120,7 +1127,7 @@ reconnect:
+
+ if (--session->reopen_cnt < 0) {
+ log_error("connection login retries (reopen_max) %d exceeded",
+- config->reopen_max);
++ DISC_REOPEN_MAX);
+ return 1;
+ }
+
+diff -aurp open-iscsi-5.0.5.595/usr/idbm.c open-iscsi-5.0.5.574/usr/idbm.c
+--- open-iscsi-5.0.5.595/usr/idbm.c 2006-05-30 02:02:29.000000000 -0500
++++ open-iscsi-5.0.5.574/usr/idbm.c 2006-05-18 20:04:12.000000000 -0500
+@@ -264,8 +264,6 @@ idbm_update_discovery(discovery_rec_t *r
+ __update_rec_int(rec, newrec,
+ u.sendtargets.conn_timeo.login_timeout);
+ __update_rec_int(rec, newrec,
+- u.sendtargets.reopen_max);
+- __update_rec_int(rec, newrec,
+ u.sendtargets.conn_timeo.auth_timeout);
+ __update_rec_int(rec, newrec,
+ u.sendtargets.conn_timeo.active_timeout);
+@@ -659,9 +657,6 @@ idbm_recinfo_discovery(discovery_rec_t *
+ __recinfo_int("discovery.sendtargets.timeo.login_timeout",ri, r,
+ u.sendtargets.conn_timeo.login_timeout,
+ IDBM_SHOW, num);
+- __recinfo_int("discovery.sendtargets.reopen_max",ri, r,
+- u.sendtargets.reopen_max,
+- IDBM_SHOW, num);
+ __recinfo_int("discovery.sendtargets.timeo.auth_timeout", ri, r,
+ u.sendtargets.conn_timeo.auth_timeout,
+ IDBM_SHOW, num);
+@@ -900,7 +895,6 @@ idbm_discovery_setup_defaults(discovery_
+ if (type == DISCOVERY_TYPE_SENDTARGETS) {
+ rec->u.sendtargets.continuous = 0;
+ rec->u.sendtargets.send_async_text = 0;
+- rec->u.sendtargets.reopen_max = 5;
+ rec->u.sendtargets.auth.authmethod = 0;
+ rec->u.sendtargets.auth.password_length = 0;
+ rec->u.sendtargets.auth.password_in_length = 0;
diff --git a/open-iscsi-5.0.5.595-update-initscripts-and-docs.patch b/open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
new file mode 100644
index 0000000..39f20f5
--- /dev/null
+++ b/open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
@@ -0,0 +1,44 @@
+diff -aurp open-iscsi/etc/initd/initd.redhat open-iscsi.work/etc/initd/initd.redhat
+--- open-iscsi/etc/initd/initd.redhat 2006-05-30 01:51:42.000000000 -0500
++++ open-iscsi.work/etc/initd/initd.redhat 2006-05-30 03:57:03.000000000 -0500
+@@ -37,7 +37,7 @@ start_iscsid()
+ TARGETS=`$ISCSIADM -m node 2> /dev/null | sed 's@\[\(.*\)\] .*@\1 at g'`
+ for rec in $TARGETS
+ do
+- STARTUP=`$ISCSIADM -m node -r $rec | grep "node.conn\[0\].startup" | cut -d' ' -f3`
++ STARTUP=`$ISCSIADM -m node -r $rec | grep "node.startup" | cut -d' ' -f3`
+ if [ $STARTUP = "automatic" ]
+ then
+ $ISCSIADM -m node -r $rec -l
+diff -aurp open-iscsi/etc/iscsid.conf open-iscsi.work/etc/iscsid.conf
+--- open-iscsi/etc/iscsid.conf 2006-05-30 01:51:42.000000000 -0500
++++ open-iscsi.work/etc/iscsid.conf 2006-05-30 03:57:10.000000000 -0500
+@@ -3,7 +3,7 @@
+ # Could be located at /etc/iscsid.conf or ~/.iscsid.conf
+ #
+ node.active_cnx = 1
+-node.startup = manual
++node.startup = automatic
+ #node.session.auth.username = dima
+ #node.session.auth.password = aloha
+ node.session.timeo.replacement_timeout = 120
+@@ -19,6 +19,7 @@ node.session.iscsi.MaxConnections = 0
+ node.conn[0].iscsi.HeaderDigest = None
+ node.conn[0].iscsi.DataDigest = None
+ node.conn[0].iscsi.MaxRecvDataSegmentLength = 65536
++node.conn[0].startup = automatic
+ #discovery.sendtargets.auth.authmethod = CHAP
+ #discovery.sendtargets.auth.username = dima
+ #discovery.sendtargets.auth.password = aloha
+diff -aurp open-iscsi/README open-iscsi.work/README
+--- open-iscsi/README 2006-05-30 01:51:42.000000000 -0500
++++ open-iscsi.work/README 2006-05-30 03:57:03.000000000 -0500
+@@ -353,7 +353,7 @@ node discovered in the discovery above:
+ Or to set the "node.conn[0].statup" attribute to "startup" as default for
+ all sessions add the following to the /etc/iscsid.conf:
+
+- node.conn[0].startup = automatic
++ node.startup = automatic
+
+ To login to all the automated nodes, simply restart the iscsi service
+ e.g /etc/init.d/open-iscsi restart
diff --git a/sources b/sources
index e3253a0..c16182e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f2308e910fb953012cdce1373358809 open-iscsi-5.0.5.476.tar.bz2
+0209e5ff0885eee23e3730c6328d8594 open-iscsi-5.0.5.595.tar.bz2
More information about the scm-commits
mailing list