rpms/grub/devel grub-0.97-bz553741-sha2.patch, 1.1, 1.2 grub.spec, 1.114, 1.115

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30422

Modified Files:
	grub-0.97-bz553741-sha2.patch grub.spec 
Log Message:
* Tue Mar 09 2010 Peter Jones <pjones at redhat.com> - 0.97-65
- Add sha256 support to grub's password options (mitr)
  Resolves: rhbz#553741


grub-0.97-bz553741-sha2.patch:
 configure.in         |    4 
 docs/Makefile.am     |    9 
 docs/grub-crypt.8    |   39 ++
 docs/grub.texi       |   55 ++-
 stage2/Makefile.am   |   12 
 stage2/builtins.c    |   31 +
 stage2/char_io.c     |   20 +
 stage2/sha256crypt.c |  723 ++++++++++++++++++++++++++++++++++++++++++++++
 stage2/sha512crypt.c |  795 +++++++++++++++++++++++++++++++++++++++++++++++++++
 stage2/shared.h      |    6 
 util/Makefile.am     |    4 
 util/grub-crypt.in   |   80 +++++
 12 files changed, 1747 insertions(+), 31 deletions(-)

Index: grub-0.97-bz553741-sha2.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-0.97-bz553741-sha2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- grub-0.97-bz553741-sha2.patch	9 Mar 2010 22:20:52 -0000	1.1
+++ grub-0.97-bz553741-sha2.patch	9 Mar 2010 22:32:49 -0000	1.2
@@ -1962,12 +1962,23 @@ diff -urN --exclude '*~' grub/util/grub-
 +
 +if __name__ == '__main__':
 +    main()
-diff -urN --exclude '*~' grub/util/Makefile.am grub-0.97/util/Makefile.am
---- grub/util/Makefile.am	2010-01-12 12:44:23.679524866 +0100
-+++ grub-0.97/util/Makefile.am	2010-01-12 18:47:56.200780472 +0100
-@@ -17,3 +17,5 @@
- sbin_SCRIPTS = grub-md5-crypt grub-terminfo
+diff -urpN grub-0.97/util/Makefile.am.sha2 grub-0.97/util/Makefile.am
+--- grub-0.97/util/Makefile.am.sha2	2010-03-09 17:29:26.000000000 -0500
++++ grub-0.97/util/Makefile.am	2010-03-09 17:29:41.000000000 -0500
+@@ -1,7 +1,7 @@
+ if !PLATFORM_EFI
+ 
+ bin_PROGRAMS = mbchk
+-sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo
++sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo grub-crypt
+ noinst_SCRIPTS = grub-image mkbimage
+ 
+ EXTRA_DIST = mkbimage
+@@ -14,6 +14,6 @@ mbchk_LDADD = ../lib/libcommon.a
+ 
+ else
+ 
+-sbin_SCRIPTS = grub-md5-crypt grub-terminfo
++sbin_SCRIPTS = grub-md5-crypt grub-terminfo grub-crypt
  
  endif
-+
-+bin_SCRIPTS = grub-crypt


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- grub.spec	9 Mar 2010 22:20:54 -0000	1.114
+++ grub.spec	9 Mar 2010 22:32:50 -0000	1.115
@@ -143,6 +143,7 @@ fi
 /sbin/grub-install
 /sbin/grub-terminfo
 /sbin/grub-md5-crypt
+/sbin/grub-crypt
 %{_bindir}/mbchk
 %{_infodir}/grub*
 %{_infodir}/multiboot*