diff --git a/.cvsignore b/.cvsignore
index f435351..0219b4d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -11,3 +11,4 @@ open-iscsi-2.0-865.2.tar.gz
open-iscsi-2.0-865.13.tar.gz
open-iscsi-2.0-868-test1.tar.gz
open-iscsi-2.0-870-rc1.tar.gz
+open-iscsi-2.0-870.1.tar.gz
diff --git a/iscsi-initiator-utils-only-root-use.patch b/iscsi-initiator-utils-only-root-use.patch
index c68ea51..b442ba0 100644
--- a/iscsi-initiator-utils-only-root-use.patch
+++ b/iscsi-initiator-utils-only-root-use.patch
@@ -1,19 +1,3 @@
-diff -up open-iscsi-2.0-870-rc1/usr/idbm.c.error open-iscsi-2.0-870-rc1/usr/idbm.c
---- open-iscsi-2.0-870-rc1/usr/idbm.c.error 2008-09-30 10:09:40.000000000 +0200
-+++ open-iscsi-2.0-870-rc1/usr/idbm.c 2008-09-30 10:20:43.000000000 +0200
-@@ -850,6 +850,12 @@ int idbm_lock(void)
- if (ret == 0)
- break;
-
-+ if (errno != EEXIST) {
-+ log_error("Could not lock discovery DB: %s: %s",
-+ LOCK_WRITE_FILE, strerror(errno));
-+ exit(-1);
-+ }
-+
- usleep(10000);
- }
-
diff -up open-iscsi-2.0-870-rc1/usr/iscsiadm.c.error open-iscsi-2.0-870-rc1/usr/iscsiadm.c
--- open-iscsi-2.0-870-rc1/usr/iscsiadm.c.error 2008-09-30 10:20:15.000000000 +0200
+++ open-iscsi-2.0-870-rc1/usr/iscsiadm.c 2008-09-30 10:20:15.000000000 +0200
@@ -22,7 +6,7 @@ diff -up open-iscsi-2.0-870-rc1/usr/iscsiadm.c.error open-iscsi-2.0-870-rc1/usr/
usage(0);
+ if (getuid()) {
-+ log_error("must be run as root");
++ log_error("Must be run as root.");
+ rc = -1;
+ goto free_ifaces;
+ }
diff --git a/iscsi-initiator-utils-print-ibft-net-info.patch b/iscsi-initiator-utils-print-ibft-net-info.patch
index f871dd7..1285602 100644
--- a/iscsi-initiator-utils-print-ibft-net-info.patch
+++ b/iscsi-initiator-utils-print-ibft-net-info.patch
@@ -1,6 +1,6 @@
-diff -aurp open-iscsi-2.0-868-test1/include/fw_context.h open-iscsi-2.0-868-test1.work/include/fw_context.h
---- open-iscsi-2.0-868-test1/include/fw_context.h 2008-03-25 03:37:26.000000000 -0500
-+++ open-iscsi-2.0-868-test1.work/include/fw_context.h 2008-03-25 03:37:37.000000000 -0500
+diff -aurp open-iscsi-2.0-870.1/include/fw_context.h open-iscsi-2.0-870.1.work/include/fw_context.h
+--- open-iscsi-2.0-870.1/include/fw_context.h 2008-11-22 11:06:46.000000000 -0600
++++ open-iscsi-2.0-870.1.work/include/fw_context.h 2008-11-25 11:31:09.000000000 -0600
@@ -23,21 +23,30 @@
struct boot_context {
@@ -34,10 +34,10 @@ diff -aurp open-iscsi-2.0-868-test1/include/fw_context.h open-iscsi-2.0-868-test
};
extern int fw_get_entry(struct boot_context *context, const char *filepath);
-diff -aurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/fw_entry.c
---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c 2008-03-25 03:37:26.000000000 -0500
-+++ open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/fw_entry.c 2008-03-25 03:37:37.000000000 -0500
-@@ -34,24 +34,13 @@ int fw_get_entry(struct boot_context *co
+diff -aurp open-iscsi-2.0-870.1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-870.1.work/utils/fwparam_ibft/fw_entry.c
+--- open-iscsi-2.0-870.1/utils/fwparam_ibft/fw_entry.c 2008-11-25 11:34:56.000000000 -0600
++++ open-iscsi-2.0-870.1.work/utils/fwparam_ibft/fw_entry.c 2008-11-25 11:34:25.000000000 -0600
+@@ -34,22 +34,13 @@ int fw_get_entry(struct boot_context *co
return ret;
}
@@ -46,8 +46,6 @@ diff -aurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0
- */
-static void dump_mac(struct boot_context *context)
-{
-- int i;
--
- if (!strlen(context->mac))
- return;
-
@@ -67,7 +65,7 @@ diff -aurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0
}
static void dump_target(struct boot_context *context)
-@@ -75,11 +64,44 @@ static void dump_target(struct boot_cont
+@@ -73,11 +64,44 @@ static void dump_target(struct boot_cont
if (strlen(context->chap_password_in))
printf("node.session.auth.password_in = %s\n",
context->chap_password_in);
@@ -113,9 +111,9 @@ diff -aurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0
+ dump_network(context);
dump_target(context);
}
-diff -aurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c
---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-03-25 03:37:26.000000000 -0500
-+++ open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-03-25 04:08:10.000000000 -0500
+diff -aurp open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-870.1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c
+--- open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-11-25 11:34:56.000000000 -0600
++++ open-iscsi-2.0-870.1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-11-25 11:31:09.000000000 -0600
@@ -24,11 +24,15 @@
#include <unistd.h>
#include <fcntl.h>
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 3fcc4c9..874650c 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -1,8 +1,8 @@
Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils
Version: 6.2.0.870
-Release: 0.2.rc1%{?dist}
-Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870-rc1.tar.gz
+Release: 1.0%{?dist}
+Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870.1.tar.gz
Source1: iscsid.init
Source2: iscsidevs.init
Source3: 04-iscsi
@@ -30,7 +30,7 @@ for distributed disk access using SCSI commands sent over Internet
Protocol networks.
%prep
-%setup -q -n open-iscsi-2.0-870-rc1
+%setup -q -n open-iscsi-2.0-870.1
%patch0 -p1 -b .update-initscripts-and-docs
%patch1 -p1 -b .use-var-for-config
%patch2 -p1 -b .use-red-hat-for-name
@@ -117,6 +117,9 @@ fi
%changelog
+* Tue Nov 25 2008 Mike Christie <mchrsiti@redhat.com> 6.2.0.870-1.0
+- Rebase to upstream
+
* Thu Nov 6 2008 Hans de Goede <hdegoede@redhat.com> 6.2.0.870-0.2.rc1
- Add force-start iscsid initscript option and use that in "patch to make
iscsiadm start iscsid when needed" so that iscsid will actual be started
diff --git a/sources b/sources
index 321a21c..4d9c3cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2740f55611d3ea59a21ec08b25853c55 open-iscsi-2.0-870-rc1.tar.gz
+3b7e273ad2696899df2b8e5622fdeb2c open-iscsi-2.0-870.1.tar.gz