Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bird/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/linux-tools/PKGBUILD
	community/qtcurve-kde4/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cups/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kradio/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libmowgli/PKGBUILD
	extra/llvm/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/pycrypto/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/syslinux/PKGBUILD
	multilib-staging/gcc-multilib/PKGBUILD
	multilib/lib32-libldap/PKGBUILD
	staging/binutils/PKGBUILD
	staging/gcc/PKGBUILD
	staging/glibc/PKGBUILD
	testing/cronie/PKGBUILD
	testing/cryptsetup/PKGBUILD
	testing/krb5/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/net-tools/PKGBUILD
	testing/systemd/PKGBUILD

1 files changed, 20 insertions, 15 deletions

diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index 3fbbafb04..12b89be90 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
+# $Id: PKGBUILD 165001 2012-08-08 15:45:08Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=syslinux
 pkgver=4.05
-pkgrel=4.3
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
 url="http://syslinux.zytor.com/"
@@ -14,7 +13,8 @@ depends=('perl' 'glibc')
 optdepends=('perl-passwd-md5:  For md5pass'
             'perl-digest-sha1: For sha1pass'
             'mtools:           For mkdiskimage and syslinux support'
-           )
+            'gptfdisk:         For GPT support'
+            'util-linux:       For isohybrid')
 makedepends=('nasm')
 backup=('boot/syslinux/syslinux.cfg'
         'boot/syslinux/splash.png')
@@ -23,14 +23,9 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
         syslinux-dont-build-dos-windows-targets.patch
         syslinux.cfg
         syslinux-install_update
-        splash.png
-        fix-undefined-type-umode_t.patch)
-md5sums=('82299242418385da1274c9479a778cb2'
-         '1528c376e43f0eaccaa80d8ad1bc13b4'
-         '8dc2afca3739667e892faf04eb97e7b1'
-         '680750f73dc2e587ac567d057d485813'
-         '0035b6cac6756a384b861eda8d33e4f7'
-         '8674f8a0f480f26b705570d699c78a2c')
+        avoid-using-ext2_fs.patch
+        handle-ctors-dtors-via-init_array-and-fini_array.patch
+        splash.png)
 
 build() {
   # Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -38,8 +33,10 @@ build() {
   cd "$srcdir"/$pkgname-${pkgver}
   # Do not try to build the Windows or DOS installers
   patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch
-  # Fix unknown type name 'umode_t' error
-  patch -p1 -i "$srcdir"/fix-undefined-type-umode_t.patch
+  # fix #30084
+  patch -Np1 -i "$srcdir"/avoid-using-ext2_fs.patch
+  # fix #31065 (booting breaks with gcc 4.7)
+  patch -Np1 -i "$srcdir"/handle-ctors-dtors-via-init_array-and-fini_array.patch
   # Fix FHS manpage path
   sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
   make
@@ -58,4 +55,12 @@ package() {
   install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update
   # move extlinux binary to /usr/sbin
   mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux
+  rmdir "$pkgdir"/sbin
 }
+md5sums=('82299242418385da1274c9479a778cb2'
+         '1528c376e43f0eaccaa80d8ad1bc13b4'
+         '8dc2afca3739667e892faf04eb97e7b1'
+         '680750f73dc2e587ac567d057d485813'
+         '2e2c674a71c0c0bf265d96cfc19ce985'
+         '12a2dbd3fe59230df2f470600dd62dac'
+         '0035b6cac6756a384b861eda8d33e4f7')