merged mainline into regexp

diff --cc conf/common.rmk
index 73fb4d0e4bede3d982fa32ba35f67c72ec763ed0,a7536d08e3113b505ca0f650da7c1dc37c88f1f7..b2e5e0247afe774aad7563451223695da0d86336
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -651,7 -786,70 +786,75 @@@ charset_mod_SOURCES = lib/charset.
  charset_mod_CFLAGS = $(COMMON_CFLAGS)
  charset_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
 +pkglib_MODULES += regexp.mod
 +regexp_mod_SOURCES = gnulib/regex.c commands/regexp.c
 +regexp_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-sign-compare -Wno-unused
 +regexp_mod_LDFLAGS = $(COMMON_LDFLAGS)
++
+ pkglib_MODULES += terminal.mod
+ terminal_mod_SOURCES = commands/terminal.c
+ terminal_mod_CFLAGS = $(COMMON_CFLAGS)
+ terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ pkglib_MODULES += crypto.mod
+ crypto_mod_SOURCES = lib/crypto.c
+ crypto_mod_CFLAGS = $(COMMON_CFLAGS)
+ crypto_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ pkglib_MODULES += hashsum.mod
+ hashsum_mod_SOURCES = commands/hashsum.c
+ hashsum_mod_CFLAGS = $(COMMON_CFLAGS)
+ hashsum_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ pkglib_MODULES += pbkdf2.mod
+ pbkdf2_mod_SOURCES = lib/pbkdf2.c
+ pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
+ pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For password_pbkdf2.mod.
+ pkglib_MODULES += password_pbkdf2.mod
+ password_pbkdf2_mod_SOURCES = commands/password_pbkdf2.c
+ password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
+ password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For memdisk.mod.
+ pkglib_MODULES += memdisk.mod
+ memdisk_mod_SOURCES = disk/memdisk.c
+ memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
+ memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For reboot.mod.
+ pkglib_MODULES += reboot.mod
+ reboot_mod_SOURCES = commands/reboot.c
+ reboot_mod_CFLAGS = $(COMMON_CFLAGS)
+ reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For date.mod
+ pkglib_MODULES += date.mod
+ date_mod_SOURCES = commands/date.c
+ date_mod_CFLAGS = $(COMMON_CFLAGS)
+ date_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For datehook.mod
+ pkglib_MODULES += datehook.mod
+ datehook_mod_SOURCES = hook/datehook.c
+ datehook_mod_CFLAGS = $(COMMON_CFLAGS)
+ datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For lsmmap.mod
+ pkglib_MODULES += lsmmap.mod
+ lsmmap_mod_SOURCES = commands/lsmmap.c
+ lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
+ lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For boot.mod.
+ pkglib_MODULES += boot.mod
+ boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
+ boot_mod_CFLAGS = $(COMMON_CFLAGS)
+ boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ bin_UTILITIES += grub-mkpasswd-pbkdf2
+ grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
+ grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
+ 
+ include $(srcdir)/conf/gcry.mk