From 70282216852888a4329c92d83f1df1fb41eba53e Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@fedoraproject.org>
Date: Oct 05 2007 07:19:45 +0000
Subject: rebase to upstream bugfix release and revert dynamic compile patch as this

    is causing a regression for boot

---

diff --git a/.cvsignore b/.cvsignore
index d837a07..f1c90bc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,5 @@ open-iscsi-6.2.0.695.tar.bz2
 open-iscsi-2.0-754.tar.gz
 open-iscsi-2.0-865.tar.gz
 open-iscsi-2.0-865.2.tar.gz
+open-iscsi-2.0-865.12.tar.gz
+open-iscsi-2.0-865.13.tar.gz
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 4e07f0b..cc6bd7c 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -1,13 +1,12 @@
 Summary: The iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.865
-Release: 0.1%{?dist}
-Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-865.2.tar.gz
+Release: 0.2%{?dist}
+Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-865.13.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
 Patch0: iscsi-initiator-utils-update-initscripts-and-docs.patch
 Patch1: iscsi-initiator-utils-use-var-for-config.patch
-Patch2: iscsi-initiator-utils-compile-iscsistart-dyn.patch
 
 Group: System Environment/Daemons
 License: GPL
@@ -24,10 +23,9 @@ for distributed disk access using SCSI commands sent over Internet
 Protocol networks.
 
 %prep
-%setup -q -n open-iscsi-2.0-865.2
+%setup -q -n open-iscsi-2.0-865.13
 %patch0 -p1 -b .update-initscripts-and-docs
 %patch1 -p1 -b .use-var-for-config
-%patch2 -p1 -b .compile-iscsistart-dyn
 
 %build
 make OPTFLAGS="%{optflags}" -C usr
@@ -91,6 +89,12 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Fri Oct 5 2007 Mike Christie <mchristie@redhat.com> - 6.2.0.865-0.2
+- Rebase upstream.
+- 283801 drop dynamic patch from 225915, because it adds a regression.
+  We do not have the proper password bits in the initrd so we cannot
+  check them.
+
 * Mon Jun 25 2007 Mike Christie <mchristie@redhat.com> - 6.2.0.865-0.1
 - Rebase to upstream stable which has a fix for the logoutall command. This will fix the service iscsi stop command.
 - 225915 Compile iscsistart as dynamic.
diff --git a/sources b/sources
index 4be3715..97449cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd3ae8aee6d25fce5c43e2798412829e  open-iscsi-2.0-865.2.tar.gz
+54d7fd42bb5254482bc68c601c261e65  open-iscsi-2.0-865.13.tar.gz