Merge branch 'master' of ssh://gparabola/srv/git/abslibre

14 files changed, 12 insertions, 28 deletions

diff --git a/libre/grub2/05_archtheme b/libre/grub2/05_archtheme
index 4d1b6fb20..4d1b6fb20 100644..100755
--- a/libre/grub2/05_archtheme
+++ b/libre/grub2/05_archtheme
diff --git a/libre/grub2/20_memtest86+ b/libre/grub2/20_memtest86+
index 1d3096f6b..1d3096f6b 100644..100755
--- a/libre/grub2/20_memtest86+
+++ b/libre/grub2/20_memtest86+
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index a5051900f..5b1769f95 100644..100755
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -1,19 +1,17 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
-_grub_bzr_rev="4232"
-_pkgver="2.00~beta4"
+_pkgver="2.00~rc1"
 
 _grub_lua_ver=24
-_grub_gpxe_ver=12
 _grub_ntldr_ver=21
 _grub_915_ver=9
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
-pkgver=2.00beta4
-pkgrel=1
+pkgver=2.00rc1
+pkgrel=1.1
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -24,30 +22,26 @@ makedepends=('rsync' 'xz' 'bdf-unifont' 'python' 'autogen' 'texinfo'
 # source=("ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz"
 source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz
         "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
         "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
         "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz"
         'parabola_grub_mkconfig_fixes.patch'
         'grub.default'
         'grub.cfg'
-        '20_memtest86+'
-        'grub-install.fix')
+        '20_memtest86+')
 
 noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-           "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
            "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
            "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
 
-sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11'
+sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13'
           '89290031b974780c6df76893836d2477d4add895'
-          'b04994c005910b4bf123f034b30109d5c8d6fd86'
           'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
           'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
           '31aa740fc225b3f3ed4917843038f9e8658a71be'
-          '348b148d5183825f31a3d24a7ebf2d6a709f4e6a'
+          '9a81f8bebcbee3d300315a29266ce7a5c9e5881c'
           '9735043d518e16f147f64ef283eceb2549fed860'
-          'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
-          '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7')
+          'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
+
 _build_grub2-common_and_bios() {
 
 	## copy the source for building the common/bios package
@@ -58,10 +52,6 @@ _build_grub2-common_and_bios() {
 	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
 	echo
 
-	## upstream grub-install fix 
-	## http://lists.gnu.org/archive/html/help-grub/2012-04/msg00096.html
-	patch -Np0 -i "${srcdir}/grub-install.fix"
-	
 	## add the grub-extra sources
 	export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/"
 	install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras"
@@ -69,9 +59,6 @@ _build_grub2-common_and_bios() {
 	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
 		-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
 
-	bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
-
 	bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \
 		-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
 
@@ -130,9 +117,6 @@ _build_grub2-efi-i386() {
 	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
 		-C "${srcdir}/grub_efi-${_pkgver}/grub-extras"
 
-	bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \
-		-C "${srcdir}/grub_efi-${_pkgver}/grub-extras"
-
 	## Requires python2
 	# sed 's|python |python2 |g' -i "${srcdir}/grub_efi-${_pkgver}/autogen.sh"
 
@@ -204,7 +188,7 @@ package_grub2-common() {
 	options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
 
 	cd "${srcdir}/grub_bios-${_pkgver}"
-	make DESTDIR="${pkgdir}/" install
+	make bashcompletiondir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}/" install
 
 	## install extra /etc/grub.d/ files
 	install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+"
diff --git a/libre/grub2/fix_stack_pointer_handling_16_relocator.patch b/libre/grub2/fix_stack_pointer_handling_16_relocator.patch
index edc0ef502..edc0ef502 100644..100755
--- a/libre/grub2/fix_stack_pointer_handling_16_relocator.patch
+++ b/libre/grub2/fix_stack_pointer_handling_16_relocator.patch
diff --git a/libre/grub2/grub-install.fix b/libre/grub2/grub-install.fix
index 29e74bd44..29e74bd44 100644..100755
--- a/libre/grub2/grub-install.fix
+++ b/libre/grub2/grub-install.fix
diff --git a/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch b/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
index e1de26859..e1de26859 100644..100755
--- a/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
+++ b/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
diff --git a/libre/grub2/grub.cfg b/libre/grub2/grub.cfg
index 6e60c70c4..6e60c70c4 100644..100755
--- a/libre/grub2/grub.cfg
+++ b/libre/grub2/grub.cfg
diff --git a/libre/grub2/grub.default b/libre/grub2/grub.default
index 4ab37bbfc..d0c959059 100644..100755
--- a/libre/grub2/grub.default
+++ b/libre/grub2/grub.default
@@ -34,8 +34,8 @@ GRUB_DISABLE_RECOVERY=true
 
 # Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
 # modes only.  Entries specified as foreground/background.
-#GRUB_COLOR_NORMAL="light-blue/black"
-#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
+GRUB_COLOR_NORMAL="magenta/black"
+GRUB_COLOR_HIGHLIGHT="white/magenta"
 
 # Uncomment one of them for the gfx desired, a image background or a gfxtheme
 #GRUB_BACKGROUND="/path/to/wallpaper"
diff --git a/libre/grub2/grub2.install b/libre/grub2/grub2.install
index 000533553..000533553 100644..100755
--- a/libre/grub2/grub2.install
+++ b/libre/grub2/grub2.install
diff --git a/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch b/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
index 0e396b210..0e396b210 100644..100755
--- a/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
+++ b/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
diff --git a/libre/grub2/grub2_bzr_export.sh b/libre/grub2/grub2_bzr_export.sh
index f40588f82..f40588f82 100644..100755
--- a/libre/grub2/grub2_bzr_export.sh
+++ b/libre/grub2/grub2_bzr_export.sh
diff --git a/libre/grub2/grub_extras_lua_args_fix.patch b/libre/grub2/grub_extras_lua_args_fix.patch
index 5cb317ce3..5cb317ce3 100644..100755
--- a/libre/grub2/grub_extras_lua_args_fix.patch
+++ b/libre/grub2/grub_extras_lua_args_fix.patch
diff --git a/libre/grub2/parabola-mkconfig.patch b/libre/grub2/parabola-mkconfig.patch
index 7c18a4cc2..7c18a4cc2 100644..100755
--- a/libre/grub2/parabola-mkconfig.patch
+++ b/libre/grub2/parabola-mkconfig.patch
diff --git a/libre/grub2/parabola_grub_mkconfig_fixes.patch b/libre/grub2/parabola_grub_mkconfig_fixes.patch
index 19022aec6..19022aec6 100644..100755
--- a/libre/grub2/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub2/parabola_grub_mkconfig_fixes.patch