[yaboot] Update to new upstream release yaboot-1.3.17
Tony Breeds
tbreeds at fedoraproject.org
Tue Oct 18 05:20:21 UTC 2011
commit a55381a68365b6547961508b774d9e01ada47b0f
Author: Tony Breeds <tony at bakeyournoodle.com>
Date: Tue Oct 18 16:19:58 2011 +1100
Update to new upstream release yaboot-1.3.17
Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>
.gitignore | 3 +-
sources | 3 +-
yaboot-1.3.13-pegasos-claim.patch | 25 +-
yaboot-1.3.13-pegasos-ext2.patch | 18 +-
yaboot-1.3.13-pegasos-serial.patch | 18 +-
yaboot-1.3.14-256-RMA.patch | 99 ---
yaboot-1.3.14-better_netboot.patch | 726 --------------------
yaboot-1.3.14-better_netboot2.patch | 325 ---------
yaboot-1.3.14-dhcp_truncate.patch | 17 -
yaboot-1.3.14-dont_of_open_native_partitions.patch | 15 -
yaboot-1.3.14-ipv6.patch | 129 ----
yaboot-1.3.14-iscsi.patch | 55 --
yaboot-1.3.14-move_kernel.patch | 118 ----
yaboot-1.3.14-netinfo.patch | 66 --
yaboot-1.3.14-prom_getchars.patch | 95 ---
yaboot-1.3.16-args-cas.patch | 32 -
yaboot-1.3.16-memalign.patch | 65 --
yaboot-1.3.16-no-strict-aliasing.patch | 11 -
yaboot-1.3.16-powervm.patch | 40 --
yaboot-1.3.3-man.patch | 44 +-
yaboot-ppc64.patch | 14 -
yaboot-sha2.patch | 86 ++--
yaboot.spec | 90 +--
23 files changed, 117 insertions(+), 1977 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ee86d42..455757c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-yaboot-1.3.14.tar.gz
+/yaboot-1.3.17.tar.gz
+yaboot-1.3.17
diff --git a/sources b/sources
index 2f23db7..1eeefcf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-dd346812667ab3818248c9784fe8e38e yaboot-1.3.14.tar.gz
-dd8f436cf23d562c8a9f6ff513e1f435 yaboot-1.3.16.tar.gz
+f599f52d1887a86fd798252d2946f635 yaboot-1.3.17.tar.gz
diff --git a/yaboot-1.3.13-pegasos-claim.patch b/yaboot-1.3.13-pegasos-claim.patch
index eff5571..5b5b2a4 100644
--- a/yaboot-1.3.13-pegasos-claim.patch
+++ b/yaboot-1.3.13-pegasos-claim.patch
@@ -1,15 +1,14 @@
---- yaboot-1.3.13/second/prom.c~ 2003-11-04 09:13:17.000000000 +0000
-+++ yaboot-1.3.13/second/prom.c 2005-07-29 13:19:35.000000000 +0100
-@@ -547,7 +547,11 @@ prom_sleep (int seconds)
- void *
- prom_claim (void *virt, unsigned int size, unsigned int align)
- {
-- return call_prom ("claim", 3, 1, virt, size, align);
-+ void *ret = call_prom ("claim", 3, 1, virt, size, align);
+--- yaboot-1.3.17/second/prom.c.orig 2011-10-18 12:41:46.924310275 +1100
++++ yaboot-1.3.17/second/prom.c 2011-10-18 12:43:17.202121228 +1100
+@@ -622,6 +622,11 @@
+ void *ret;
+
+ ret = call_prom ("claim", 3, 1, virt, size, align);
++
+ /* Pegasos II SmartFirmware returns zero for failure, usefully */
+ if (virt && !ret)
-+ ret = (void *)-1;
-+ return ret;
- }
-
- void
++ ret = (void *)-1;
++
+ if (ret == (void *)-1)
+ prom_printf("ERROR: claim of 0x%x at 0x%x failed\n", size, (int)virt);
+ else
diff --git a/yaboot-1.3.13-pegasos-ext2.patch b/yaboot-1.3.13-pegasos-ext2.patch
index 2792f21..8408881 100644
--- a/yaboot-1.3.13-pegasos-ext2.patch
+++ b/yaboot-1.3.13-pegasos-ext2.patch
@@ -1,15 +1,15 @@
---- yaboot-1.3.13/ybin/ybin.ext2 2005-07-29 13:22:40.000000000 +0100
-+++ yaboot-1.3.13/ybin/ybin 2005-07-29 13:23:01.000000000 +0100
-@@ -75,6 +75,8 @@ fi
- usemount=no
- if (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'CHRP IBM') ; then
+--- yaboot-1.3.17/ybin/ybin.orig 2011-10-18 12:33:25.000000000 +1100
++++ yaboot-1.3.17/ybin/ybin 2011-10-18 12:46:28.621720442 +1100
+@@ -77,6 +77,8 @@
+ fstype=raw
+ elif (cat /proc/cpuinfo 2> /dev/null | grep ^platform | grep -q 'PowerNV') ; then
fstype=raw
+elif (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'Pegasos') ; then
+ fstype=ext2
else
fstype=hfs
fi
-@@ -277,13 +279,13 @@ checkconf()
+@@ -281,13 +283,13 @@
fi
case "$fstype" in
@@ -26,7 +26,7 @@
fi
local CONFERR=1
;;
-@@ -942,12 +944,16 @@ util_install()
+@@ -950,12 +952,16 @@
## used by mnt_install so mntpoint= can be supported in a cleaner way.
mnt()
{
@@ -45,7 +45,7 @@
if [ -e "$TMP/bootstrap.$$" ] ; then
echo 1>&2 "$PRG: $TMP/bootstrap.$$ exists, aborting."
return 1
-@@ -966,7 +972,7 @@ mnt()
+@@ -974,7 +980,7 @@
fi
[ "$VERBOSE" = 1 ] && echo "$PRG: Mounting $boot..."
@@ -54,7 +54,7 @@
if [ $? != 0 ] ; then
echo 1>&2 "$PRG: An error occured mounting $boot"
return 1
-@@ -1252,6 +1258,25 @@ mkoffs()
+@@ -1261,6 +1267,25 @@
fi
return 0
;;
diff --git a/yaboot-1.3.13-pegasos-serial.patch b/yaboot-1.3.13-pegasos-serial.patch
index 8341e12..fe6f358 100644
--- a/yaboot-1.3.13-pegasos-serial.patch
+++ b/yaboot-1.3.13-pegasos-serial.patch
@@ -1,14 +1,14 @@
---- yaboot-1.3.13/second/prom.c~ 2005-08-10 14:53:10.000000000 +0100
-+++ yaboot-1.3.13/second/prom.c 2005-08-10 15:07:16.000000000 +0100
-@@ -368,10 +368,8 @@ prom_getchar ()
- char c[4];
+--- yaboot-1.3.17/second/prom.c.orig 2011-10-18 12:48:11.388505271 +1100
++++ yaboot-1.3.17/second/prom.c 2011-10-18 12:49:36.553326950 +1100
+@@ -395,10 +395,8 @@
+ char c;
int a;
-- while ((a = (int)call_prom ("read", 3, 1, prom_stdin, c, 4)) == 0)
-+ while ((a = (int)call_prom ("read", 3, 1, prom_stdin, c, 4)) <= 0)
+- while ((a = (int)call_prom ("read", 3, 1, prom_stdin, &c, 1)) == 0)
++ while ((a = (int)call_prom ("read", 3, 1, prom_stdin, &c, 1)) <= 0)
;
- if (a == -1)
- prom_abort ("EOF on console\n");
- if (a == 3 && c[0] == '\e' && c[1] == '[')
- return 0x100 | c[2];
- return c[0];
+ return c;
+ }
+
diff --git a/yaboot-1.3.3-man.patch b/yaboot-1.3.3-man.patch
index 24557e9..c444761 100644
--- a/yaboot-1.3.3-man.patch
+++ b/yaboot-1.3.3-man.patch
@@ -1,7 +1,7 @@
-diff -urN -X CVS man/mkofboot.8 man.deb/mkofboot.8
---- man/mkofboot.8 Thu May 24 04:32:54 2001
-+++ man.deb/mkofboot.8 Tue Sep 25 05:38:42 2001
-@@ -94,7 +94,7 @@
+diff -bpurN yaboot-1.3.17.orig/man/mkofboot.8 yaboot-1.3.17/man/mkofboot.8
+--- yaboot-1.3.17.orig/man/mkofboot.8 2011-10-18 12:33:25.000000000 +1100
++++ yaboot-1.3.17/man/mkofboot.8 2011-10-18 14:51:53.540964413 +1100
+@@ -88,7 +88,7 @@ utility. You should only need to define
.TP
.BR \-i ,\ \-\-install\ \fIboot-file
Use \fIboot-file\fR as the primary boot loader executable, instead of
@@ -10,7 +10,7 @@ diff -urN -X CVS man/mkofboot.8 man.deb/mkofboot.8
.TP
.BR \-C ,\ \-\-config\ \fIconfig-file
Use \fIconfig-file\fR as the \fBmkofboot\fR/\fByaboot\fR(8) configuration
-@@ -200,8 +200,8 @@
+@@ -162,8 +162,8 @@ Print out usage information and exit.
Print out the version number and exit.
.SH FILES
.nf
@@ -21,7 +21,7 @@ diff -urN -X CVS man/mkofboot.8 man.deb/mkofboot.8
/etc/yaboot.conf \- boot loader/mkofboot configuration file
.fi
.SH ENVIRONMENT
-@@ -218,7 +218,7 @@
+@@ -179,7 +179,7 @@ it is important that your system use a s
program otherwise \fBmkofboot\fR will be vulnerable to race conditions.
The Debian mktemp is derived from OpenBSD and thus should be secure.
@@ -30,10 +30,10 @@ diff -urN -X CVS man/mkofboot.8 man.deb/mkofboot.8
\fBmkofboot\fR) it is thus critical that it not be writable by anyone
but root. It is also critical that \fI/etc/yaboot.conf\fR not be
writable by anyone but root since a different \fIofboot\fR script could be
-diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5
---- man/yaboot.conf.5 Tue Sep 25 05:20:03 2001
-+++ man.deb/yaboot.conf.5 Tue Sep 25 05:38:42 2001
-@@ -136,7 +136,7 @@
+diff -bpurN yaboot-1.3.17.orig/man/yaboot.conf.5 yaboot-1.3.17/man/yaboot.conf.5
+--- yaboot-1.3.17.orig/man/yaboot.conf.5 2011-10-18 12:33:25.000000000 +1100
++++ yaboot-1.3.17/man/yaboot.conf.5 2011-10-18 14:51:53.541964410 +1100
+@@ -136,7 +136,7 @@ Example:
boot=/dev/hda2
device=hd:
partition=3
@@ -42,7 +42,7 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5
timeout=50
root=/dev/hda3
read-only
-@@ -228,7 +228,7 @@
+@@ -228,7 +228,7 @@ executable so this can be optional. Whe
magicboot script will be executed by OF automatically at boot (instead
of the \fBinstall\fR file.) See man \fBbootstrap\fR(8) for more
information on this. As of ybin 0.22 you should set this to
@@ -51,7 +51,7 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5
loader for yaboot. It is capable of presenting a dual boot menu for
GNU/Linux, MacOS and MacOSX. If dual booting is not required or
configured it will simply load yaboot directly. You must specify this
-@@ -301,7 +301,7 @@
+@@ -307,7 +307,7 @@ You must also have the BSD bootloader
When you define this option you will be presented with a simple menu at
bootup allowing you to hit L to boot GNU/Linux or B to boot BSD (along
with other choices if configured). This will only work if you are
@@ -60,7 +60,7 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5
set to a unix device node (ie \fI/dev/hda11\fR) then ybin will use the
\fBofpath\fR(8) utility to determine the OpenFirmware device path.
.TP
-@@ -310,7 +310,7 @@
+@@ -316,7 +316,7 @@ The OpenFirmware or Unix device path to
partition. When you define this option you will be presented with a
simple menu at bootup allowing you to hit L to boot GNU/Linux or M to
boot MacOS (along with other choices if configured). This will only
@@ -69,7 +69,7 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5
script. When this is set to a unix device node (ie \fI/dev/hda11\fR)
then ybin will use the \fBofpath\fR(8) utility to determine the
OpenFirmware device path.
-@@ -320,7 +320,7 @@
+@@ -326,7 +326,7 @@ The OpenFirmware or unix device path to
When you define this option you will be presented with a simple menu
at bootup allowing you to hit L to boot GNU/Linux or X to boot MacOSX
(along with other choices if configured). This will only work if you
@@ -78,7 +78,7 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5
this is set to a unix device node (ie \fI/dev/hda11\fR) then ybin will
use the \fBofpath\fR(8) utility to determine the OpenFirmware device
path.
-@@ -341,7 +341,7 @@
+@@ -347,7 +347,7 @@ The OpenFirmware or unix device path to
When you define this option you will be presented with a simple menu
at bootup allowing you to hit L to boot GNU/Linux or D to boot Darwin
(along with other choices if configured). This will only work if you
@@ -87,7 +87,7 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5
this is set to a unix device node (ie \fI/dev/hda11\fR) then ybin will
use the \fBofpath\fR(8) utility to determine the OpenFirmware device
path.
-@@ -589,8 +589,8 @@
+@@ -591,8 +591,8 @@ device=hd:
root=/dev/hda3
partition=3
timeout=20
@@ -98,10 +98,10 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5
fgcolor=black
bgcolor=green
default=Linux
-diff -urN -X CVS man/ybin.8 man.deb/ybin.8
---- man/ybin.8 Thu May 24 04:33:16 2001
-+++ man.deb/ybin.8 Tue Sep 25 05:38:42 2001
-@@ -109,7 +109,7 @@
+diff -bpurN yaboot-1.3.17.orig/man/ybin.8 yaboot-1.3.17/man/ybin.8
+--- yaboot-1.3.17.orig/man/ybin.8 2011-10-18 12:33:25.000000000 +1100
++++ yaboot-1.3.17/man/ybin.8 2011-10-18 14:51:53.541964410 +1100
+@@ -103,7 +103,7 @@ You should only need to define this opti
.TP
.BR \-i ,\ \-\-install\ \fIboot-file
Use \fIboot-file\fR as the primary boot loader executable, instead of
@@ -110,7 +110,7 @@ diff -urN -X CVS man/ybin.8 man.deb/ybin.8
.TP
.BR \-C ,\ \-\-config\ \fIconfig-file
Use \fIconfig-file\fR as the \fBybin\fR/\fByaboot\fR(8) configuration
-@@ -214,8 +214,8 @@
+@@ -176,8 +176,8 @@ Print out usage information and exit.
Print out the version number and exit.
.SH FILES
.nf
@@ -121,7 +121,7 @@ diff -urN -X CVS man/ybin.8 man.deb/ybin.8
/etc/yaboot.conf \- boot loader/ybin configuration file
.fi
.SH ENVIRONMENT
-@@ -232,7 +232,7 @@
+@@ -193,7 +193,7 @@ It is important that your system use a s
program, otherwise \fBybin\fR will be vulnerable to race conditions.
The Debian mktemp is derived from OpenBSD and thus should be secure.
diff --git a/yaboot-sha2.patch b/yaboot-sha2.patch
index b70c4ad..a3cb924 100644
--- a/yaboot-sha2.patch
+++ b/yaboot-sha2.patch
@@ -1,7 +1,7 @@
-diff -urN --exclude '*~' yaboot/doc/yaboot-howto.sgml yaboot-1.3.14/doc/yaboot-howto.sgml
---- yaboot/doc/yaboot-howto.sgml 2008-04-15 15:34:48.000000000 +0200
-+++ yaboot-1.3.14/doc/yaboot-howto.sgml 2010-01-13 17:12:26.046808859 +0100
-@@ -487,17 +487,17 @@
+diff -purN yaboot-1.3.17.orig/doc/yaboot-howto.sgml yaboot-1.3.17/doc/yaboot-howto.sgml
+--- yaboot-1.3.17.orig/doc/yaboot-howto.sgml 2011-10-18 15:11:10.000000000 +1100
++++ yaboot-1.3.17/doc/yaboot-howto.sgml 2011-10-18 16:07:39.409445997 +1100
+@@ -487,17 +487,17 @@ password will be required.
<p>
@@ -24,10 +24,10 @@ diff -urN --exclude '*~' yaboot/doc/yaboot-howto.sgml yaboot-1.3.14/doc/yaboot-h
</example>
-diff -urN --exclude '*~' yaboot/etc/yaboot.conf yaboot-1.3.14/etc/yaboot.conf
---- yaboot/etc/yaboot.conf 2010-01-12 22:39:21.593765245 +0100
-+++ yaboot-1.3.14/etc/yaboot.conf 2010-01-13 17:09:25.957808951 +0100
-@@ -53,6 +53,10 @@
+diff -purN yaboot-1.3.17.orig/etc/yaboot.conf yaboot-1.3.17/etc/yaboot.conf
+--- yaboot-1.3.17.orig/etc/yaboot.conf 2011-10-18 16:03:10.731008572 +1100
++++ yaboot-1.3.17/etc/yaboot.conf 2011-10-18 16:07:39.409445997 +1100
+@@ -53,6 +53,10 @@ bgcolor=black
#password=$1$saltstrg$HnJ/gcM3oKhNbnzUPgXTD/
@@ -38,9 +38,9 @@ diff -urN --exclude '*~' yaboot/etc/yaboot.conf yaboot-1.3.14/etc/yaboot.conf
## A password is only required to boot an image specified here if
## parameters are specified on the command line or if the user enters
## an image is not specified in the configuration file at all (ie.
-diff -urN --exclude '*~' yaboot/include/string.h yaboot-1.3.14/include/string.h
---- yaboot/include/string.h 2008-04-15 15:34:48.000000000 +0200
-+++ yaboot-1.3.14/include/string.h 2010-01-13 14:18:51.293809297 +0100
+diff -purN yaboot-1.3.17.orig/include/string.h yaboot-1.3.17/include/string.h
+--- yaboot-1.3.17.orig/include/string.h 2011-10-18 15:11:10.000000000 +1100
++++ yaboot-1.3.17/include/string.h 2011-10-18 16:07:39.410445994 +1100
@@ -7,6 +7,7 @@
extern char * ___strtok;
extern char * strcpy(char *,const char *);
@@ -49,10 +49,10 @@ diff -urN --exclude '*~' yaboot/include/string.h yaboot-1.3.14/include/string.h
extern char * strcat(char *, const char *);
extern char * strncat(char *, const char *, size_t);
extern char * strchr(const char *,int);
-diff -urN --exclude '*~' yaboot/include/yaboot.h yaboot-1.3.14/include/yaboot.h
---- yaboot/include/yaboot.h 2008-04-15 15:34:48.000000000 +0200
-+++ yaboot-1.3.14/include/yaboot.h 2010-01-12 22:43:37.092766857 +0100
-@@ -59,4 +59,7 @@
+diff -purN yaboot-1.3.17.orig/include/yaboot.h yaboot-1.3.17/include/yaboot.h
+--- yaboot-1.3.17.orig/include/yaboot.h 2011-10-18 15:11:10.000000000 +1100
++++ yaboot-1.3.17/include/yaboot.h 2011-10-18 16:07:39.410445994 +1100
+@@ -58,4 +58,7 @@ extern char bootdevice[];
extern char *bootpath;
extern int bootpartition;
@@ -60,9 +60,9 @@ diff -urN --exclude '*~' yaboot/include/yaboot.h yaboot-1.3.14/include/yaboot.h
+extern char *sha512_crypt (const char *key, const char *salt);
+
#endif
-diff -urN --exclude '*~' yaboot/lib/stpncpy.c yaboot-1.3.14/lib/stpncpy.c
---- yaboot/lib/stpncpy.c 1970-01-01 01:00:00.000000000 +0100
-+++ yaboot-1.3.14/lib/stpncpy.c 2010-01-13 14:55:22.663809519 +0100
+diff -purN yaboot-1.3.17.orig/lib/stpncpy.c yaboot-1.3.17/lib/stpncpy.c
+--- yaboot-1.3.17.orig/lib/stpncpy.c 1970-01-01 10:00:00.000000000 +1000
++++ yaboot-1.3.17/lib/stpncpy.c 2011-10-18 16:07:39.411445992 +1100
@@ -0,0 +1,21 @@
+#include "string.h"
+
@@ -85,23 +85,21 @@ diff -urN --exclude '*~' yaboot/lib/stpncpy.c yaboot-1.3.14/lib/stpncpy.c
+ res = dest;
+ return res;
+}
-diff -urN --exclude '*~' yaboot/Makefile yaboot-1.3.14/Makefile
---- yaboot/Makefile 2010-01-12 22:39:21.669786352 +0100
-+++ yaboot-1.3.14/Makefile 2010-01-13 14:20:28.214809232 +0100
-@@ -85,7 +85,8 @@
- OBJS = second/crt0.o second/yaboot.o second/cache.o second/prom.o second/file.o \
+diff -purN yaboot-1.3.17.orig/Makefile yaboot-1.3.17/Makefile
+--- yaboot-1.3.17.orig/Makefile 2011-10-18 16:03:10.746008540 +1100
++++ yaboot-1.3.17/Makefile 2011-10-18 16:08:30.787338414 +1100
+@@ -88,6 +88,7 @@ OBJS = second/crt0.o second/yaboot.o sec
second/partition.o second/fs.o second/cfg.o second/setjmp.o second/cmdline.o \
- second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \
-- lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
-+ second/sha256crypt.o second/sha512crypt.o \
-+ lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/stpncpy.o lib/strstr.o
+ second/fs_of.o second/fs_ext2.o second/fs_iso.o second/fs_swap.o \
+ second/iso_util.o \
++ second/sha256crypt.o second/sha512crypt.o lib/stpncpy.o \
+ lib/nonstd.o \
+ lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
- ifeq ($(USE_MD5_PASSWORDS),y)
- OBJS += second/md5.o
-diff -urN --exclude '*~' yaboot/man/yaboot.conf.5 yaboot-1.3.14/man/yaboot.conf.5
---- yaboot/man/yaboot.conf.5 2010-01-12 22:39:21.565767002 +0100
-+++ yaboot-1.3.14/man/yaboot.conf.5 2010-01-13 17:10:00.334808308 +0100
-@@ -258,8 +258,9 @@
+diff -purN yaboot-1.3.17.orig/man/yaboot.conf.5 yaboot-1.3.17/man/yaboot.conf.5
+--- yaboot-1.3.17.orig/man/yaboot.conf.5 2011-10-18 16:03:10.725008585 +1100
++++ yaboot-1.3.17/man/yaboot.conf.5 2011-10-18 16:07:39.412445990 +1100
+@@ -258,8 +258,9 @@ first 2000 bytes of this file will be re
.TP
.BI "password=" password
Protect booting by a password. The password is given in either
@@ -113,9 +111,9 @@ diff -urN --exclude '*~' yaboot/man/yaboot.conf.5 yaboot-1.3.14/man/yaboot.conf.
configuration file should be only readable by the superuser and the
password should differ if possible from other passwords on the system.
See
-diff -urN --exclude '*~' yaboot/second/sha256crypt.c yaboot-1.3.14/second/sha256crypt.c
---- yaboot/second/sha256crypt.c 1970-01-01 01:00:00.000000000 +0100
-+++ yaboot-1.3.14/second/sha256crypt.c 2010-01-13 16:56:46.453807903 +0100
+diff -purN yaboot-1.3.17.orig/second/sha256crypt.c yaboot-1.3.17/second/sha256crypt.c
+--- yaboot-1.3.17.orig/second/sha256crypt.c 1970-01-01 10:00:00.000000000 +1000
++++ yaboot-1.3.17/second/sha256crypt.c 2011-10-18 16:07:39.413445987 +1100
@@ -0,0 +1,735 @@
+/* SHA256-based Unix crypt implementation.
+ Released into the Public Domain by Ulrich Drepper <drepper at redhat.com>.
@@ -852,9 +850,9 @@ diff -urN --exclude '*~' yaboot/second/sha256crypt.c yaboot-1.3.14/second/sha256
+ return result;
+}
+#endif
-diff -urN --exclude '*~' yaboot/second/sha512crypt.c yaboot-1.3.14/second/sha512crypt.c
---- yaboot/second/sha512crypt.c 1970-01-01 01:00:00.000000000 +0100
-+++ yaboot-1.3.14/second/sha512crypt.c 2010-01-13 16:56:43.390807820 +0100
+diff -purN yaboot-1.3.17.orig/second/sha512crypt.c yaboot-1.3.17/second/sha512crypt.c
+--- yaboot-1.3.17.orig/second/sha512crypt.c 1970-01-01 10:00:00.000000000 +1000
++++ yaboot-1.3.17/second/sha512crypt.c 2011-10-18 16:07:39.415445982 +1100
@@ -0,0 +1,804 @@
+/* SHA512-based Unix crypt implementation.
+ Released into the Public Domain by Ulrich Drepper <drepper at redhat.com>.
@@ -1660,12 +1658,12 @@ diff -urN --exclude '*~' yaboot/second/sha512crypt.c yaboot-1.3.14/second/sha512
+ return result;
+}
+#endif
-diff -urN --exclude '*~' yaboot/second/yaboot.c yaboot-1.3.14/second/yaboot.c
---- yaboot/second/yaboot.c 2010-01-12 22:39:21.670784810 +0100
-+++ yaboot-1.3.14/second/yaboot.c 2010-01-13 17:07:06.972808719 +0100
-@@ -634,13 +634,17 @@
+diff -purN yaboot-1.3.17.orig/second/yaboot.c yaboot-1.3.17/second/yaboot.c
+--- yaboot-1.3.17.orig/second/yaboot.c 2011-10-18 15:11:10.000000000 +1100
++++ yaboot-1.3.17/second/yaboot.c 2011-10-18 16:07:39.417445978 +1100
+@@ -608,13 +608,17 @@ void check_password(char *str)
if (!strncmp (password, "$1$", 3)) {
- if (!check_md5_password(passwdbuff, password))
+ if (!check_md5_password((unsigned char*)passwdbuff, (unsigned char*)password))
return;
+ } else
+#endif /* USE_MD5_PASSWORDS */
diff --git a/yaboot.spec b/yaboot.spec
index d9315c2..c31e3c9 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.16
-Release: 7%{?dist}
+Version: 1.3.17
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -19,49 +19,11 @@ Patch17: yaboot-1.3.13-pegasos-claim.patch
Patch18: yaboot-1.3.13-pegasos-ext2.patch
Patch21: yaboot-1.3.13-pegasos-serial.patch
Patch22: yaboot-1.3.13-allow-deep-mntpoint.patch
-Patch27: yaboot-ppc64.patch
Patch28: yaboot-1.3.13-dontwritehome.patch
-Patch33: yaboot-1.3.14-better_netboot.patch
-
-# ipv6 support
-Patch36: yaboot-1.3.14-ipv6.patch
-
-# Do not open LINUX_NATIVE parttions with OF, as badness happens
-Patch37: yaboot-1.3.14-dont_of_open_native_partitions.patch
-
-# Try #2 at better netboot now with DHCP parseing
-Patch38: yaboot-1.3.14-better_netboot2.patch
-
-# When netbooting, move the kernel onto the load buffer, sure it's a hack
-Patch39: yaboot-1.3.14-move_kernel.patch
# Don't use insecure MD5, use SHA-2
Patch40: yaboot-sha2.patch
-# Solves the situation, when there is no netinfo packet
-Patch41: yaboot-1.3.14-netinfo.patch
-
-# Better ISCSI boot
-Patch42: yaboot-1.3.14-iscsi.patch
-
-# prom_getchar eats characters
-Patch43: yaboot-1.3.14-prom_getchars.patch
-
-# Allows yaboot to allocate up to 256MB of memory
-Patch44: yaboot-1.3.14-256-RMA.patch
-
-# Create dummy instance of posix_memalign for e3fsprogs
-Patch45: yaboot-1.3.16-memalign.patch
-
-# Truncate memcpy() in extract_vendor_options()
-# https://bugzilla.redhat.com/show_bug.cgi?id=729684
-Patch46: yaboot-1.3.14-dhcp_truncate.patch
-Patch47: yaboot-1.3.16-no-strict-aliasing.patch
-Patch48: yaboot-1.3.16-powervm.patch
-
-# Yaboot discards parameters after CAS reboot
-Patch49: yaboot-1.3.16-args-cas.patch
-
URL: http://yaboot.ozlabs.org/
BuildRoot: %{_tmppath}/%{name}-root
Obsoletes: ybin
@@ -87,36 +49,21 @@ yaboot can also bootload IBM pSeries machines.
%prep
%setup -q
-%patch1 -p0 -b .man
-%patch2 -p1 -b .ofboot
-%patch3 -p1 -b .rh
-%patch4 -p1 -b .yabootconfig
-%patch6 -p1 -b .proddisc
-%patch7 -p1 -b .ext3
-%patch8 -p1 -b .sbin
-%patch9 -p1 -b .config
-%patch10 -p1 -b .parted
-%patch17 -p1 -b .pegasos
-%patch18 -p1 -b .ext2
-%patch21 -p1 -b .pegasos-serial
-%patch22 -p1 -b .deepmnt
-%patch27 -p1 -b .ppc64
-%patch28 -p1 -b .bootwrite
-%patch33 -p1 -b .netboot
-%patch36 -p1 -b .ipv6
-%patch37 -p1 -b .partitions
-%patch38 -p1 -b .netboot2
-%patch39 -p1 -b .movekernel
-%patch40 -p1 -b .sha2
-%patch41 -p1 -b .netinfo
-%patch42 -p1 -b .iscsi
-%patch43 -p1 -b .prom_getchars
-%patch44 -p1 -b .256-RMA
-%patch45 -p1 -b .posix
-%patch46 -p1 -b .dhcppad
-%patch47 -p1 -b .aliasing
-%patch48 -p1 -b .powervm
-%patch49 -p1 -b .args-cas
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch17 -p1
+%patch18 -p1
+%patch21 -p1
+%patch22 -p1
+%patch28 -p1
+%patch40 -p1
%build
make VERSIONEXTRA='\ (Red Hat %version-%release)' DEBUG=1
@@ -157,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
%changelog
+* Mon Oct 18 2011 Tony Breeds <tony at bakeyournoodle.com> - 1.3.17-1
+- Update to upstream 1.3.18 release
+
* Mon Oct 17 2011 Jiri Skala <jskala at redhat.com> - 1.3.16-7
- fixes #746408 - yaboot discards parameters after CAS reboot
More information about the scm-commits
mailing list