rpms/yaboot/F-12 yaboot-1.3.14-ipv6.patch, 1.2, 1.3 yaboot.spec, 1.79, 1.80

[Roman Rakus]

Author: rrakus

Update of /cvs/pkgs/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32757

Modified Files:
	yaboot-1.3.14-ipv6.patch yaboot.spec 
Log Message:
Updated ipv6 patch to match .gitpatches

yaboot-1.3.14-ipv6.patch:
 include/file.h |    5 +++++
 include/prom.h |    1 +
 second/file.c  |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 second/fs_of.c |    8 ++++++--
 4 files changed, 64 insertions(+), 3 deletions(-)

Index: yaboot-1.3.14-ipv6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot-1.3.14-ipv6.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- yaboot-1.3.14-ipv6.patch	12 Jan 2010 12:09:15 -0000	1.2
+++ yaboot-1.3.14-ipv6.patch	12 Feb 2010 07:11:50 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up yaboot-1.3.14/include/file.h.ipv6 yaboot-1.3.14/include/file.h
---- yaboot-1.3.14/include/file.h.ipv6	2010-01-12 12:24:04.000000000 +0100
-+++ yaboot-1.3.14/include/file.h	2010-01-12 12:24:04.000000000 +0100
+--- yaboot-1.3.14/include/file.h.ipv6	2010-02-12 07:57:43.000000000 +0100
++++ yaboot-1.3.14/include/file.h	2010-02-12 07:57:43.000000000 +0100
 @@ -46,6 +46,11 @@ struct boot_fspec_t {
  	char*	bootp_retries;	/* Bootp retries */
  	char*	tftp_retries;	/* TFTP retries */
@@ -14,19 +14,19 @@ diff -up yaboot-1.3.14/include/file.h.ip
  
  struct boot_file_t {
 diff -up yaboot-1.3.14/include/prom.h.ipv6 yaboot-1.3.14/include/prom.h
---- yaboot-1.3.14/include/prom.h.ipv6	2007-08-17 16:29:26.000000000 +0200
-+++ yaboot-1.3.14/include/prom.h	2010-01-12 12:25:38.000000000 +0100
-@@ -37,6 +37,7 @@ typedef void *phandle;
- #define PROM_INVALID_HANDLE	((prom_handle)-1UL)
- #define BOOTDEVSZ               (2048) /* iscsi args can be in excess of 1040 bytes */
- #define TOK_ISCSI               "iscsi"
-+#define TOK_IPV6                "ipv6"
+--- yaboot-1.3.14/include/prom.h.ipv6	2010-02-12 07:57:42.000000000 +0100
++++ yaboot-1.3.14/include/prom.h	2010-02-12 08:01:12.000000000 +0100
+@@ -40,6 +40,7 @@ typedef void *phandle;
+ #define PROM_CLAIM_MAX_ADDR	0x8000000
+ #define BOOTLASTSZ		1024
+ #define FW_NBR_REBOOTSZ		4
++#define	TOK_IPV6		"ipv6"
  
  struct prom_args;
  typedef int (*prom_entry)(struct prom_args *);
 diff -up yaboot-1.3.14/second/file.c.ipv6 yaboot-1.3.14/second/file.c
---- yaboot-1.3.14/second/file.c.ipv6	2010-01-12 12:24:04.000000000 +0100
-+++ yaboot-1.3.14/second/file.c	2010-01-12 12:24:04.000000000 +0100
+--- yaboot-1.3.14/second/file.c.ipv6	2010-02-12 07:57:43.000000000 +0100
++++ yaboot-1.3.14/second/file.c	2010-02-12 07:57:43.000000000 +0100
 @@ -193,6 +193,50 @@ extract_netinfo_args(struct boot_fspec_t
  }
  
@@ -104,9 +104,9 @@ diff -up yaboot-1.3.14/second/file.c.ipv
       return ret;
  }
 diff -up yaboot-1.3.14/second/fs_of.c.ipv6 yaboot-1.3.14/second/fs_of.c
---- yaboot-1.3.14/second/fs_of.c.ipv6	2010-01-12 12:24:04.000000000 +0100
-+++ yaboot-1.3.14/second/fs_of.c	2010-01-12 12:24:04.000000000 +0100
-@@ -149,14 +149,18 @@ of_net_open(struct boot_file_t* file,
+--- yaboot-1.3.14/second/fs_of.c.ipv6	2010-02-12 07:57:43.000000000 +0100
++++ yaboot-1.3.14/second/fs_of.c	2010-02-12 07:57:43.000000000 +0100
+@@ -148,14 +148,18 @@ of_net_open(struct boot_file_t* file,
  		    *p = '\\';
       }
  


Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- yaboot.spec	9 Feb 2010 03:12:02 -0000	1.79
+++ yaboot.spec	12 Feb 2010 07:11:50 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers
 Name: yaboot
 Version: 1.3.14
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Fri Feb 12 2010 Roman Rakus <rrakus at redhat.com> 1.3.14-27
+- Updated ipv6 patch to match .gitpatches
+
 * Mon Feb 08 2010 Tony Breeds <tony at bakeyournoodle.com - 1.3.14-26
 - Update to include various changes from git that have been Fedora since .14
   was added.