Commit graph

2354 commits

Author SHA1 Message Date
Carles Pina i Estany
fbc5e89710 Syncs with trunk 2009-11-19 21:18:38 +00:00
Robert Millan
cd4f42b0c1 2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
Patch from Joe Auricchio <jauricchio@gmail.com>
        * commands/minicmd.c (grub_mini_cmd_clear): New function.
        (GRUB_MOD_INIT(minicmd)): Register grub_mini_cmd_clear().
        (GRUB_MOD_FINI(minicmd)): Unregister grub_mini_cmd_clear().
2009-11-19 10:39:14 +00:00
Felix Zielcke
393c783d02 2009-11-19 Felix Zielcke <fzielcke@z-51.de>
* Makefile.in (install-local): Add a missing backslash.
2009-11-19 10:07:35 +01:00
Felix Zielcke
b2f1e32746 2009-11-19 Felix Zielcke <fzielcke@z-51.de>
* include/grub/x86_64/io.h: New file.
2009-11-19 09:33:56 +01:00
Robert Millan
f577f7a09d 2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
* conf/i386-pc.rmk (grub_setup_SOURCES): Add `gnulib/progname.c'.
        * util/i386/pc/grub-setup.c: Include `<grub/i18n.h>'.
        Include `"progname.h"'.
        (main): Initialize gettext.
        * util/i386/pc/grub-setup.c: Gettexttize.
        * util/i386/pc/grub-mkimage.c: Likewise.

        * Makefile.in (po/*.po): Redefine as ...
        ($(foreach lang, $(LINGUAS), po/$(lang).po)): ... this.

        * po/POTFILES: Add `util/i386/pc/grub-setup.c'.
2009-11-18 23:20:22 +00:00
Robert Millan
6323f70508 Document util/mkisofs/mkisofs.h change properly in previous ChangeLog entry ... 2009-11-18 23:11:03 +00:00
Robert Millan
c37943b642 Forgot to commit ChangeLog... 2009-11-18 23:07:24 +00:00
Robert Millan
700d59cded 2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
* conf/common.rmk (grub_mkisofs_SOURCES): Add `gnulib/progname.c'.
        * util/mkisofs/mkisofs.c: Include `"progname.h"'.
        (program_name): Remove.
        (main): Initialize gettext support.

        * util/mkisofs/eltorito.c: Gettexttize.
        * util/mkisofs/joliet.c: Likewise.
        * util/mkisofs/mkisofs.c: Likewise.
        * util/mkisofs/mkisofs.h: Likewise.
        * util/mkisofs/multi.c: Likewise.
        * util/mkisofs/rock.c: Likewise.
        * util/mkisofs/tree.c: Likewise.
        * util/mkisofs/write.c: Likewise.

        * po/POTFILES: Update with new files.
2009-11-18 23:05:59 +00:00
Robert Millan
5ce77c6e7e 2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
* util/mkisofs/eltorito.c: Fix minor mistake in license text.
        * util/mkisofs/iso9660.h: Likewise.
        * util/mkisofs/joliet.c: Likewise.
        * util/mkisofs/mkisofs.c: Likewise.
        * util/mkisofs/mkisofs.h: Likewise.
        * util/mkisofs/rock.c: Likewise.
        * util/mkisofs/tree.c: Likewise.
        * util/mkisofs/write.c: Likewise.

        * util/mkisofs/eltorito.c (rcsid): Remove.
        * util/mkisofs/hash.c: Likewise.
        * util/mkisofs/joliet.c: Likewise.
        * util/mkisofs/name.c: Likewise.
        * util/mkisofs/rock.c: Likewise.
        * util/mkisofs/tree.c: Likewise.
        * util/mkisofs/write.c: Likewise.
2009-11-18 22:59:40 +00:00
Robert Millan
1dabbc77cf 2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
* util/mkisofs/match.c: Rewrite from scratch, using a linked list
        instead of static allocation.
        * util/mkisofs/match.h: Likewise.
2009-11-18 22:49:59 +00:00
Robert Millan
633877cbb1 2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
* po/POTFILES-shell: New file.  List `util/grub.d/10_kfreebsd.in'
        and `util/grub.d/10_linux.in'. 
        * Makefile.in (po/$(PACKAGE).pot): Process `po/POTFILES-shell' for
        translatable Shell files.
2009-11-18 21:03:09 +00:00
Robert Millan
af1c0c85a7 2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
* Makefile.in ($(srcdir)/aclocal.m4): New target.
2009-11-18 20:57:57 +00:00
Robert Millan
769ae37bfd Merge my gettext branch (gettext support in build system for GRUB utilities) 2009-11-17 20:23:06 +00:00
Robert Millan
16a9760933 Complete ChangeLog. 2009-11-17 11:55:04 +00:00
Robert Millan
37fb845ba6 2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
* INSTALL: Document Automake is needed for bootstrap.
        * po/ca.po: Fix PO-Revision-Date and Language-Team fields.
        * util/grub.d/10_kfreebsd.in (bindir): New variable.
        Add gettext initialization.
        (kfreebsd_entry): Make menuentry output translatable.
2009-11-17 11:44:43 +00:00
Robert Millan
5dd39a2f3b Use proper path for gettext.sh and export TEXTDOMAINDIR. 2009-11-17 11:32:05 +00:00
Robert Millan
8c37c91f99 2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
* Makefile.in (XGETTEXT, MSGMERGE, MSGFMT, LINGUAS): New variables.
        (po/$(PACKAGE).pot): Replace `xgettext' with `$(XGETTEXT)'.
        (po/*.po): Replace `msgmerge' with `$(MSGMERGE)'.
        (po/%.mo): Replace `msgfmt' with `$(MSGFMT)'.
        * po/LINGUAS: New file.
2009-11-17 11:20:39 +00:00
Robert Millan
02c0a6ad1d Merge libgcrypt branch.
2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>

        * import_gcry.py: New file (written by Vladimir with minor
        adjustments).
        * autogen.sh: Use import_gcry.py to auto-generate GRUB-ified
        ciphers.
        * INSTALL: Document that Python is required for bootstrap.

2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>

        Import ciphers from libgcrypt 1.4.4.

         * lib/libgcrypt/cipher/ChangeLog
         * lib/libgcrypt/cipher/ac.c
         * lib/libgcrypt/cipher/arcfour.c
         * lib/libgcrypt/cipher/bithelp.h
         * lib/libgcrypt/cipher/blowfish.c
         * lib/libgcrypt/cipher/camellia-glue.c
         * lib/libgcrypt/cipher/camellia.c
         * lib/libgcrypt/cipher/camellia.h
         * lib/libgcrypt/cipher/cast5.c
         * lib/libgcrypt/cipher/cipher.c
         * lib/libgcrypt/cipher/crc.c
         * lib/libgcrypt/cipher/des.c
         * lib/libgcrypt/cipher/dsa.c
         * lib/libgcrypt/cipher/ecc.c
         * lib/libgcrypt/cipher/elgamal.c
         * lib/libgcrypt/cipher/hash-common.c
         * lib/libgcrypt/cipher/hash-common.h
         * lib/libgcrypt/cipher/hmac-tests.c
         * lib/libgcrypt/cipher/md.c
         * lib/libgcrypt/cipher/md4.c
         * lib/libgcrypt/cipher/md5.c
         * lib/libgcrypt/cipher/primegen.c
         * lib/libgcrypt/cipher/pubkey.c
         * lib/libgcrypt/cipher/rfc2268.c
         * lib/libgcrypt/cipher/rijndael-tables.h
         * lib/libgcrypt/cipher/rijndael.c
         * lib/libgcrypt/cipher/rmd.h
         * lib/libgcrypt/cipher/rmd160.c
         * lib/libgcrypt/cipher/rsa.c
         * lib/libgcrypt/cipher/seed.c
         * lib/libgcrypt/cipher/serpent.c
         * lib/libgcrypt/cipher/sha1.c
         * lib/libgcrypt/cipher/sha256.c
         * lib/libgcrypt/cipher/sha512.c
         * lib/libgcrypt/cipher/tiger.c
         * lib/libgcrypt/cipher/twofish.c
         * lib/libgcrypt/cipher/whirlpool.c
2009-11-17 11:03:00 +00:00
Robert Millan
8d20dcfc71 * INSTALL: Document that Python is required for bootstrap. 2009-11-17 10:57:26 +00:00
Robert Millan
336262f829 2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
* configure.ac: Call AM_GNU_GETTEXT() (defines localedir, among
        other things).
        * Makefile.in (CPPFLAGS): Add `-DLOCALEDIR=\"$(localedir)\"'.
        * util/i386/pc/grub-mkimage.c (main): Issue setlocale() and
        bindtextdomain() calls for gettext initialization.
2009-11-17 10:47:22 +00:00
Robert Millan
1608391625 Reorganize. 2009-11-17 10:43:26 +00:00
Robert Millan
548643e528 * gnulib/progname.c: New file (imported from Gnulib).
* gnulib/progname.h: Likewise.
        * conf/i386-pc.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.
        * util/i386/pc/grub-mkimage.c: Include `"progname.h"'.
        (usage): Replace `progname' with `program_name'.
        (main): Use set_program_name() for program name initialization.
2009-11-17 10:40:43 +00:00
Robert Millan
ab502ec59d * conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib'
from here ...
        * Makefile.in (CPPFLAGS): ... to here.
2009-11-17 10:31:08 +00:00
Robert Millan
ca221b0770 Add ChangeLog entries. 2009-11-17 10:27:29 +00:00
Robert Millan
0ef45b9398 Integrate import_gcry.py in autogen.sh. 2009-11-17 10:22:54 +00:00
Robert Millan
59917f8496 Merge import_gcry.py from Vladimir's crypto branch. 2009-11-17 10:21:01 +00:00
Robert Millan
9a90f817a0 Move i18n declarations to their own file. 2009-11-17 09:52:08 +00:00
Robert Millan
bfaae3cdd4 Import ciphers from libgcrypt 1.4.4. 2009-11-16 20:59:10 +00:00
Robert Millan
a1085f18c5 Gettextify. 2009-11-16 20:19:42 +00:00
Robert Millan
5f4db17d00 Add aclocal.m4, po/*.mo and po/grub.pot. 2009-11-16 20:12:53 +00:00
Robert Millan
f5e9dadb58 Use PACKAGE instead of hardcoding "grub". 2009-11-16 20:03:14 +00:00
Robert Millan
49a38e7696 sed Makefile.in -e "s/messages.pot/\$(PACKAGE).pot/g" -i 2009-11-16 19:36:12 +00:00
Robert Millan
fc22844e83 2009-11-16 Robert Millan <rmh.grub@aybabtu.com>
* aclocal.m4: Move from here ...
        * acinclude.m4: ... to here.
        * autogen.sh: Add call to `aclocal'.
        * configure.ac: Add AM_INIT_AUTOMAKE() after AC_INIT() call.
2009-11-16 19:31:29 +00:00
Felix Zielcke
814f5e9698 Use real function name in ChangeLog entry for r1837 2009-11-16 19:54:23 +01:00
Robert Millan
af2f93ac47 2009-11-16 Robert Millan <rmh.grub@aybabtu.com>
Fix build for systems without error().

        * gnulib/error.c: New file (imported from Gnulib).
        * gnulib/error.h: Likewise.
        * conf/common.rmk (grub_mkisofs_SOURCES): Add `gnulib/error.c'.
        * util/mkisofs/mkisofs.c (program_name): Remove `static' qualifier
        (this variable is now used by error()).
2009-11-16 18:49:44 +00:00
Felix Zielcke
73fb3dd5f0 2009-11-16 Felix Zielcke <fzielcke@z-51.de>
* util/mkisofs/name.c (FDECL3): Use isascii macro instead of
	relying that char is signed.
2009-11-16 19:47:10 +01:00
Vladimir 'phcoder' Serbinenko
a691ca3348 2009-11-16 Vladimir Serbinenko <phcoder@gmail.com>
* fs/i386/pc/pxe.c (grub_pxefs_open): Correctly handle PXE choosing
	blocksize different from specified.
	(grub_pxefs_read): Likewise.
2009-11-16 19:13:02 +01:00
Felix Zielcke
2af8f0f4fc 2009-11-16 Felix Zielcke <fzielcke@z-51.de>
Enable ata.mod on x86_64-efi, i386-efi and i386-ieee1275.

	* disk/ata.c (grub_ata_dumpinfo): Add a cast.
	(grub_ata_readwrite): Likewise.  Update 2 format strings.
	(grub_atapi_read): Likewise.

	* conf/i386-coreboot.rmk (pkglib_MODULES): Move `ata.mod' from here ...
	* conf/i386.rmk (pkglib_MODULES): ... to here ...
	* conf/x86_64-efi.rmk (pkglib_MODULES): ... and here.
	* conf/i386-coreboot.rmk (ata_mod_SOURCES, ata_mod_CFLAGS)
	(ata_mod_LDFLAGS): Move from here ...
	* conf/i386.rmk: ... to here ...
	* conf/x86_64-efi.rmk: ... and here.
	* conf/i386-pc.rmk (pkglib_MODULES): Remove `ata.mod'
	(ata_mod_SOURCES, ata_mod_CFLAGS, ata_mod_LDFLAGS): Remove.
2009-11-16 16:01:15 +01:00
Vladimir 'phcoder' Serbinenko
5edd456216 Remove leftover kern/crypto.c 2009-11-16 14:33:44 +01:00
Vladimir 'phcoder' Serbinenko
0e3c54a5c5 PBKDF2 passwords available 2009-11-24 02:36:21 +01:00
Robert Millan
83bdecaf2a 2009-11-16 Robert Millan <rmh.grub@aybabtu.com>
Relicense multiboot.h, with RMS' blessing.

        * include/multiboot.h: Change to X11 license.
2009-11-15 23:22:45 +00:00
Robert Millan
ed101e8122 Initial support for gettext in build system. 2009-11-15 23:11:01 +00:00
Vladimir 'phcoder' Serbinenko
53eb42a6fa Compilation error fixed 2009-11-15 23:42:11 +01:00
Vladimir 'phcoder' Serbinenko
228734ab02 MAX_PASSLEN based authentication 2009-11-15 23:36:42 +01:00
Vladimir 'phcoder' Serbinenko
10e53efaee crypto_memcmp 2009-11-15 23:31:27 +01:00
Vladimir 'phcoder' Serbinenko
6e7d9194d1 Add HMAC and PBKDF2 2009-11-24 02:32:29 +01:00
Robert Millan
fd6fd3d770 2009-11-15 Robert Millan <rmh.grub@aybabtu.com>
Support --version in grub-mkisofs.

        * util/mkisofs/mkisofs.c (rcsid): Remove variable.
        (OPTION_VERSION): New macro.
        (ld_options): Recognize --version.
        (usage): Move `program_name' from here ...
        (program_name): ... to here.  Add `static' qualifier.
        (main): Recognize `OPTION_VERSION'.
2009-11-15 14:02:33 +00:00
Felix Zielcke
16a88c491c 2009-11-15 Felix Zielcke <fzielcke@z-51.de>
* Makefile.in (TARGET_CPPFLAGS): Replace `-isystem=$(srcdir)/include'
	with `-nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)'.
2009-11-15 13:41:25 +01:00
Vladimir 'phcoder' Serbinenko
5978187394 merge with experimental 2009-11-15 00:38:03 +01:00
Colin D Bennet
c51a5caeab 2009-11-14 Colin D Bennet <colin@gibibit.com>
2009-11-14  Vladimir Serbinenko  <phcoder@gmail.com>

	Support for gfxterm in a window.

	* include/grub/gfxterm.h: New file.
	* include/grub/video.h (struct grub_video_rect): New declaration.
	(grub_video_rect_t): Likewise.
	* term/gfxterm.c (struct grub_gfxterm_window): New type.
	(refcount): New variable.
	(render_target): Likewise.
	(window): Likewise.
	(repaint_callback): Likewise.
	(grub_virtual_screen_setup): Use 'render_target'.
	(init_window): New function.
	(grub_gfxterm_init_window): Likewise.
	(grub_gfxterm_init): Check reference counter.
	Use init_window.
	(destroy_window): New function.
	(grub_gfxterm_destroy_window): Likewise.
	(grub_gfxterm_fini): Check reference counter.
	Use destroy_window.
	(redraw_screen_rect): Restore viewport.
	Use 'render_target' and 'window'.
	Call 'repaint_callback'.
	(write_char): Use 'render_target'.
	(draw_cursor): Likewise.
	(scroll_up): Restore viewport.
	Use 'render_target' and 'window'.
	Call 'repaint_callback'.
	(grub_gfxterm_cls): Likewise.
	(grub_gfxterm_refresh): Use 'window'.
	(grub_gfxterm_set_repaint_callback): New function.
	(grub_gfxterm_background_image_cmd): Use 'window'.
	(grub_gfxterm_get_term): New function.
	(GRUB_MOD_INIT(term_gfxterm)): Set 'refcount' to 0.

	Also-By: Vladimir Serbinenko <phcoder@gmail.com>
2009-11-15 00:03:03 +01:00