rpms/iscsi-initiator-utils/F-9 .cvsignore, 1.16, 1.17 iscsi-initiator-utils-print-ibft-net-info.patch, 1.1, 1.2 iscsi-initiator-utils.spec, 1.34, 1.35 sources, 1.16, 1.17

[Mike Christie]

Author: michaelc

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3583

Modified Files:
	.cvsignore iscsi-initiator-utils-print-ibft-net-info.patch 
	iscsi-initiator-utils.spec sources 
Log Message:
Rebase to upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	1 Jul 2008 02:51:30 -0000	1.16
+++ .cvsignore	25 Nov 2008 18:21:04 -0000	1.17
@@ -11,3 +11,4 @@
 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

iscsi-initiator-utils-print-ibft-net-info.patch:

Index: iscsi-initiator-utils-print-ibft-net-info.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/iscsi-initiator-utils-print-ibft-net-info.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iscsi-initiator-utils-print-ibft-net-info.patch	6 Apr 2008 06:44:04 -0000	1.1
+++ iscsi-initiator-utils-print-ibft-net-info.patch	25 Nov 2008 18:21:04 -0000	1.2
@@ -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 @@
  };
  
  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 @@
 - */
 -static void dump_mac(struct boot_context *context)
 -{
--	int i;
--
 -	if (!strlen(context->mac))
 -		return;
 -
@@ -67,7 +65,7 @@
  }
  
  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 @@
 +	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>


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/iscsi-initiator-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- iscsi-initiator-utils.spec	1 Jul 2008 02:51:30 -0000	1.34
+++ iscsi-initiator-utils.spec	25 Nov 2008 18:21:04 -0000	1.35
@@ -1,8 +1,8 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.870
-Release: 0.0%{?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
 Patch0: iscsi-initiator-utils-update-initscripts-and-docs.patch
@@ -27,7 +27,7 @@
 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
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Tue Nov  25 2008 Mike Christie <mchrsiti at redhat.com> 6.2.0.870-1.0
+- Rebase to upstream
+
 * Mon Jun 30 2008 Mike Christie <mchristie at redhat.com> - 6.2.0.870
 - Rebase to open-iscsi-2-870
 - 453282 Handle sysfs changes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	1 Jul 2008 02:51:30 -0000	1.16
+++ sources	25 Nov 2008 18:21:04 -0000	1.17
@@ -1 +1 @@
-2740f55611d3ea59a21ec08b25853c55  open-iscsi-2.0-870-rc1.tar.gz
+3b7e273ad2696899df2b8e5622fdeb2c  open-iscsi-2.0-870.1.tar.gz