From b73b0836b917c83d728e96a12deb0610698c2999 Mon Sep 17 00:00:00 2001
From: Clint Savage <herlo1@gmail.com>
Date: Fri, 29 Mar 2013 22:03:42 -0600
Subject: [PATCH] update for gl6.0-updates

---
 yaboot-1.3.14-subnetmask.patch | 21 +++++++++++++++++++++
 yaboot.spec                    | 10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 yaboot-1.3.14-subnetmask.patch

diff --git a/yaboot-1.3.14-subnetmask.patch b/yaboot-1.3.14-subnetmask.patch
new file mode 100644
index 0000000..62c8077
--- /dev/null
+++ b/yaboot-1.3.14-subnetmask.patch
@@ -0,0 +1,21 @@
+Index: yaboot-1.3.14/second/file.c
+===================================================================
+--- yaboot-1.3.14.orig/second/file.c	2010-09-15 11:02:38.000000000 +1000
++++ yaboot-1.3.14/second/file.c	2010-09-15 11:18:36.662902033 +1000
+@@ -172,7 +172,7 @@
+      result->giaddr = is_valid_ip_str(scopy(&str, &args));
+      result->bootp_retries = scopy(&str, &args);
+      result->tftp_retries = scopy(&str, &args);
+-     result->subnetmask = scopy(&str, &args);
++     result->subnetmask = is_valid_ip_str(scopy(&str, &args));
+      if (*args) {
+ 	  result->addl_params = strdup(args);
+ 	  if (!result->addl_params)
+@@ -375,6 +375,7 @@
+      DEBUG_F("giaddr = <%s>\n", result->giaddr);
+      DEBUG_F("bootp_retries = <%s>\n", result->bootp_retries);
+      DEBUG_F("tftp_retries = <%s>\n", result->tftp_retries);
++     DEBUG_F("subnetmask = <%s>\n", result->subnetmask);
+      DEBUG_F("addl_params = <%s>\n", result->addl_params);
+      DEBUG_F("dhcpv6 = <%s>\n", result->dhcpv6);
+      DEBUG_F("blksize = <%s>\n", result->blksize);
diff --git a/yaboot.spec b/yaboot.spec
index d963c32..acb4519 100644
--- a/yaboot.spec
+++ b/yaboot.spec
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers
 Name: yaboot
 Version: 1.3.14
-Release: 35%{?dist}
+Release: 35%{?dist}.1
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -65,6 +65,9 @@ Patch44: yaboot-1.3.14-256-RMA.patch
 # 621598, better memory management
 Patch45: yaboot-1.3.14-memory_management.patch
 
+# 638654, properly boot when gateway != tftp server
+Patch46: yaboot-1.3.14-subnetmask.patch
+
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 ExclusiveArch: ppc
@@ -120,6 +123,7 @@ yaboot can also bootload IBM pSeries machines.
 %patch43 -p1 -b .prom_getchars
 %patch44 -p1 -b .256-RMA
 %patch45 -p1 -b .memory_management
+%patch46 -p1 -b .subnetmask
 
 %build
 iconv -f ISO88592 -t utf-8 -o doc/yaboot-howto.de.try.sgml \
@@ -167,6 +171,10 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Wed Oct 13 2010 Roman Rakus <rrakus@redhat.com> - 1.3.14-35.1
+- Properly load config file while netbooting and gateway != tftp server
+  Resolves: #642694
+
 * Fri Aug 06 2010 Roman Rakus <rrakus@redhat.com> - 1.3.14-35
 - Better memory management
   Resolves: #621598