From 4afc07385539524e7f85fe0d977b90bc6d124cfd Mon Sep 17 00:00:00 2001 From: root Date: Tue, 30 Jul 2013 01:43:30 -0700 Subject: Tue Jul 30 01:43:07 PDT 2013 --- community/bird/PKGBUILD | 8 +- community/dbmail/PKGBUILD | 6 +- community/ekg/PKGBUILD | 5 +- community/gmime24/PKGBUILD | 36 --------- community/guitarix2/PKGBUILD | 5 +- community/openttd/PKGBUILD | 6 +- community/parrot/PKGBUILD | 6 +- community/spice/PKGBUILD | 6 +- community/the_silver_searcher/PKGBUILD | 10 +-- community/zita-convolver/PKGBUILD | 11 ++- community/zita-resampler/PKGBUILD | 13 ++- core/cracklib/PKGBUILD | 8 +- core/dosfstools/PKGBUILD | 6 +- core/libgcrypt/PKGBUILD | 8 +- extra/alsa-utils/PKGBUILD | 9 +-- extra/ilmbase/PKGBUILD | 4 +- extra/libmp3splt/PKGBUILD | 8 +- extra/mp3splt/PKGBUILD | 6 +- extra/openexr/PKGBUILD | 6 +- extra/qtwebkit/PKGBUILD | 4 +- extra/x2goserver/PKGBUILD | 6 +- extra/xf86-video-r128/PKGBUILD | 18 +++-- extra/xf86-video-r128/no-mibstore.patch | 24 ++++++ libre-testing/syslinux/PKGBUILD | 11 ++- libre-testing/syslinux/splash.png | Bin 11984 -> 11947 bytes libre-testing/syslinux/splash.xcf | Bin 0 -> 30757 bytes libre-testing/syslinux/syslinux-install_update | 108 +++++++++++-------------- libre-testing/syslinux/syslinux.cfg | 22 ++--- libre/liferea-libre/PKGBUILD | 17 ++-- libre/syslinux/PKGBUILD | 10 +-- libre/syslinux/splash.png | Bin 11984 -> 11947 bytes libre/syslinux/splash.xcf | Bin 0 -> 30757 bytes libre/syslinux/syslinux.cfg | 22 ++--- 33 files changed, 201 insertions(+), 208 deletions(-) delete mode 100644 community/gmime24/PKGBUILD create mode 100644 extra/xf86-video-r128/no-mibstore.patch create mode 100644 libre-testing/syslinux/splash.xcf create mode 100644 libre/syslinux/splash.xcf diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index 364c7186a..e1c4b66ca 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90843 2013-05-14 17:50:10Z seblu $ +# $Id: PKGBUILD 94704 2013-07-29 09:56:29Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=bird pkgname=('bird' 'bird6') -pkgver=1.3.10 -pkgrel=4 +pkgver=1.3.11 +pkgrel=1 arch=('i686' 'x86_64') url='http://bird.network.cz/' license=('GPL2') @@ -12,7 +12,7 @@ depends=('readline' 'ncurses') source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.service' 'bird6.service') -md5sums=('553c331b32bca9e926519cb2f67d68be' +md5sums=('8ad2eb997fb8251bc5b24cf32619571b' '01360e3b71ff2ed2223e87a3176e0659' 'b895b473cbc98cfd54751f737536eb1e') diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index f32125942..e659652ad 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 94475 2013-07-25 13:27:16Z spupykin $ +# $Id: PKGBUILD 94709 2013-07-29 10:18:38Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sebastian Faltoni pkgname=dbmail pkgver=3.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') -depends=('gmime24' 'libzdb' 'mhash' 'libevent') +depends=('gmime' 'libzdb' 'mhash' 'libevent') makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1' 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git') diff --git a/community/ekg/PKGBUILD b/community/ekg/PKGBUILD index 2c504ff40..484ddb151 100644 --- a/community/ekg/PKGBUILD +++ b/community/ekg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56895 2011-10-16 06:24:00Z bpiotrowski $ +# $Id: PKGBUILD 94723 2013-07-29 16:25:52Z bpiotrowski $ # Contributor: Jaroslaw Swierczynski pkgname=ekg @@ -17,6 +17,9 @@ build() { sed -i 's#gg%s#ekg%s#' src/ekg.c ./configure --prefix=/usr --with-pthread --enable-aspell --with-python make +} + +package() { make DESTDIR=$pkgdir install rm -rf $pkgdir/usr/include $pkgdir/usr/lib } diff --git a/community/gmime24/PKGBUILD b/community/gmime24/PKGBUILD deleted file mode 100644 index a9b8204ff..000000000 --- a/community/gmime24/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 87490 2013-04-01 16:50:15Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer: Jan de Groot -# Contributor: Ben - -pkgname=gmime24 -pkgver=2.4.33 -pkgrel=1 -pkgdesc="Core mime parsing library" -arch=(i686 x86_64) -license=('GPL') -url="http://spruce.sourceforge.net/gmime/" -depends=('glib2' 'zlib') -makedepends=('pkgconfig') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/gmime/2.4/gmime-${pkgver}.tar.xz) -md5sums=('a4dc6e553c0cf3b7d96dfef8ab633163') - -build() { - # get rid of that .wapi errors in fakeroot - export MONO_SHARED_DIR="${srcdir}/weird" - mkdir -p "${MONO_SHARED_DIR}" - - cd ${srcdir}/gmime-${pkgver} - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr \ - --disable-mono \ - --disable-static - make -} - -package() { - cd ${srcdir}/gmime-${pkgver} - make DESTDIR=${pkgdir} install - # These are gmime alternatives for the same shareutils tools - rm -rf ${pkgdir}/usr/bin/uuencode ${pkgdir}/usr/bin/uudecode ${pkgdir}/usr/share -} diff --git a/community/guitarix2/PKGBUILD b/community/guitarix2/PKGBUILD index 178685309..5f4dadb8c 100644 --- a/community/guitarix2/PKGBUILD +++ b/community/guitarix2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94330 2013-07-20 20:04:18Z speps $ +# $Id: PKGBUILD 94628 2013-07-29 00:41:54Z speps $ # Maintainer: speps pkgname=guitarix2 pkgver=0.28.1 -pkgrel=1 +pkgrel=2 pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust" arch=('i686' 'x86_64') url="http://guitarix.sourceforge.net/" @@ -25,7 +25,6 @@ build() { --no-desktop-update \ --no-ldconfig \ --no-faust \ - --optimization \ --shared-lib \ --lib-dev python2 waf build diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index 42eb89827..5c636d2ae 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 92128 2013-06-01 08:22:38Z lcarlier $ +# $Id: PKGBUILD 94719 2013-07-29 13:10:04Z lcarlier $ # Maintainer: Vesa Kaihlavirta pkgname=openttd -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -sha256sums=('f6cb90e0773dc7bdf01161ded03e48661a65c3f1412b192ae954215aaf26eca2') +sha256sums=('f6efc0cd0c4f4315a98844c331acc2e02322d5671ec376b9f0a11795b0eb270b') package() { cd ${pkgname}-${pkgver} diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index c7169a504..e36b3debe 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92115 2013-05-31 16:30:12Z spupykin $ +# $Id: PKGBUILD 94711 2013-07-29 10:19:02Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: mpie pkgname=parrot -pkgver=5.4.0 +pkgver=5.6.0 #_rel=stable _rel=devel pkgrel=1 @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('5f4603d4c4ee8d60826e56f9012d2e99') +md5sums=('7bf098790c5772bb45480abe3e425f3c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/spice/PKGBUILD b/community/spice/PKGBUILD index 7f033c5a5..f409fc994 100644 --- a/community/spice/PKGBUILD +++ b/community/spice/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93446 2013-07-03 13:23:11Z spupykin $ +# $Id: PKGBUILD 94713 2013-07-29 10:19:34Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Patryk Kowalczyk < patryk at kowalczyk dot ws> pkgname=spice -pkgver=0.12.3 +pkgver=0.12.4 pkgrel=1 pkgdesc="SPICE client and server" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') makedepends=(python2 python2-pyparsing qemu mesa) depends=(pixman spice-protocol alsa-utils libxrandr libxinerama libsasl openssl celt0.5.1 libgl glu) source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2) -md5sums=('f33a682892f6793169f20298b2296449') +md5sums=('325b1c42ce24e75de45a75876b73a8bd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD index 3d6293130..cd1d72b87 100644 --- a/community/the_silver_searcher/PKGBUILD +++ b/community/the_silver_searcher/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 85733 2013-03-05 21:38:07Z arodseth $ +# $Id: PKGBUILD 94746 2013-07-29 21:17:53Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Jeff Horelick # Contributor: skydrome pkgname=the_silver_searcher -pkgver=0.14 +pkgver=0.15 pkgrel=1 pkgdesc='Code searching tool similar to Ack, but faster' url='https://github.com/ggreer/the_silver_searcher' license=('Apache') -depends=('pcre' 'zlib') +depends=('pcre' 'zlib' 'xz') arch=('x86_64' 'i686') -source=("https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz") -sha256sums=('9334d6f41685963c41790502fcfd83ed0ac664d94626d9fee44ae5c33c616bb3') +source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz") +sha256sums=('bb05e329148315a9791cfa5cc1f7db4681e44476729971b4b3b7c2845a635748') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/zita-convolver/PKGBUILD b/community/zita-convolver/PKGBUILD index fee89316f..80ac28e5e 100644 --- a/community/zita-convolver/PKGBUILD +++ b/community/zita-convolver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93759 2013-07-10 02:26:55Z speps $ +# $Id: PKGBUILD 94626 2013-07-29 00:15:08Z speps $ # Maintainer : speps # Contributor: Philipp Überbacher # Contributor: Stefan Husmann @@ -6,7 +6,7 @@ pkgname=zita-convolver pkgver=3.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A fast, partitioned convolution engine library." arch=('i686' 'x86_64') url="http://kokkinizita.linuxaudio.org/linuxaudio/" @@ -18,8 +18,11 @@ md5sums=('7e264d0fb0d8ea277cdb4e33d764c68a') prepare() { cd "$srcdir/$pkgname-$pkgver/libs" + # FS#36248 - strip -march=native + sed -i '/native/d' Makefile + # prevent ldconfig call - sed -i 's/ldconfig//' Makefile + sed -i '/ldconfig/d' Makefile } build() { @@ -29,7 +32,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver/libs" - make SUFFIX="" PREFIX=/usr DESTDIR="$pkgdir/" install + make SUFFIX="" PREFIX=/usr DESTDIR="$pkgdir/" install # missing softlink ln -s lib$pkgname.so.$pkgver \ diff --git a/community/zita-resampler/PKGBUILD b/community/zita-resampler/PKGBUILD index f43665891..2aecd92e3 100644 --- a/community/zita-resampler/PKGBUILD +++ b/community/zita-resampler/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93758 2013-07-10 02:26:27Z speps $ +# $Id: PKGBUILD 94623 2013-07-28 23:23:53Z speps $ # Maintainer : speps # Contributor: Philipp Überbacher pkgname=zita-resampler pkgver=1.3.0 -pkgrel=1 -pkgdesc="A C++ library for resampling audio signals." +pkgrel=2 +pkgdesc="A C++ library for resampling audio signals" url="http://kokkinizita.linuxaudio.org/linuxaudio/" arch=('i686' 'x86_64') license=('GPL3') @@ -13,6 +13,13 @@ depends=('gcc-libs' 'libsndfile') source=("${url}downloads/$pkgname-$pkgver.tar.bz2") md5sums=('74c12e2280008f63ac9f2670fe4cf79b') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # FS#36248 - strip march=native + sed -i '/native/d' {libs,apps}/Makefile +} + build() { cd "$srcdir/$pkgname-$pkgver/libs" diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD index d3adf5ee8..f38653328 100644 --- a/core/cracklib/PKGBUILD +++ b/core/cracklib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186294 2013-05-24 07:56:30Z tpowa $ +# $Id: PKGBUILD 191698 2013-07-29 09:44:29Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Federico Quagliata (quaqo) pkgname=cracklib -pkgver=2.8.22 -pkgrel=3 +pkgver=2.9.0 +pkgrel=1 pkgdesc="Password Checking Library" arch=('i686' 'x86_64') license=('GPL') @@ -12,7 +12,7 @@ url="http://sourceforge.net/projects/cracklib" depends=('glibc' 'zlib') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('463177b5c29c7a598c991e12a4898e06') +md5sums=('e0f94ac2138fd33c7e77b19c1e9a9390') build() { cd $srcdir/$pkgname-$pkgver diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD index b73530739..944137a02 100644 --- a/core/dosfstools/PKGBUILD +++ b/core/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188586 2013-06-16 16:11:16Z tpowa $ +# $Id: PKGBUILD 191697 2013-07-29 09:44:27Z tpowa $ # Maintainer: dorphell # Committer: Judd Vinet pkgname=dosfstools -pkgver=3.0.20 +pkgver=3.0.22 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64) @@ -10,7 +10,7 @@ depends=('glibc') source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') -md5sums=('b34dcf1d22bc1074ebdba68799fa3cad' +md5sums=('301f01ca8a734011c0257134bcf475c8' 'SKIP') build() { diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index 7581b9d5f..f3ea1d487 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183276 2013-04-20 14:43:27Z andyrtr $ +# $Id: PKGBUILD 191717 2013-07-29 14:03:23Z andyrtr $ # Maintainer: Andreas Radke pkgname=libgcrypt -pkgver=1.5.2 +pkgver=1.5.3 pkgrel=1 -pkgdesc="a general purpose crypto library based on the code used" +pkgdesc="General purpose cryptographic library based on the code from GnuPG" arch=(i686 x86_64) url="http://www.gnupg.org" license=('LGPL') @@ -14,7 +14,7 @@ install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 ) -sha1sums=('c9998383532ba3e8bcaf690f2f0d65e814b48d2f') +sha1sums=('2c6553cc17f2a1616d512d6870fe95edf6b0e26e') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index e694728a1..0ee6995a3 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186452 2013-05-26 17:55:09Z tpowa $ +# $Id: PKGBUILD 191710 2013-07-29 10:16:55Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=alsa-utils -pkgver=1.0.27.1 -pkgrel=2 +pkgver=1.0.27.2 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -14,7 +14,6 @@ makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 90alsa) -backup=(etc/conf.d/alsa) build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -39,5 +38,5 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('3d81357b997744a139881ef72bc6921a' +md5sums=('b65e9a04181bd7c9db7667a4566f8dc3' '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD index 6d84a4278..2352df7dc 100644 --- a/extra/ilmbase/PKGBUILD +++ b/extra/ilmbase/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski pkgname=ilmbase -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 depends=('gcc-libs') pkgdesc="Base libraries from ILM for OpenEXR" @@ -29,4 +29,4 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('70f1413840c2a228783d1332b8b168e6') +md5sums=('74c0d0d2873960bd0dc1993f8e03f0ae') diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index 318f80c71..97aa07524 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 182921 2013-04-16 07:10:02Z tpowa $ +# $Id: PKGBUILD 191705 2013-07-29 10:07:56Z tpowa $ # Maintainer: Tobias Powalowski pkgname=libmp3splt -pkgver=0.8.2 +pkgver=0.9.0 pkgrel=1 pkgdesc="Library for splitting mp3 and ogg files without decoding" arch=('i686' 'x86_64') url="http://mp3splt.sourceforge.net" license=('GPL') -depends=('libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl') +depends=('flac' 'libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl') makedepends=('libtool') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz") @@ -29,4 +29,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('562b39b6788f8128b7185b83f14ca516') +md5sums=('b9b9677ababf823e0739e5caff68aa86') diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD index 3e2e12a23..adb1447e8 100644 --- a/extra/mp3splt/PKGBUILD +++ b/extra/mp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182919 2013-04-16 07:09:21Z tpowa $ +# $Id: PKGBUILD 191707 2013-07-29 10:14:24Z tpowa $ # Maintainer: Tobias Powalowski pkgname=mp3splt -pkgver=2.5.2 +pkgver=2.6 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Commandline tool for splitting mp3 and ogg files without decoding" @@ -22,4 +22,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('cd8eb9f866dddb934357b7cdefb5a370') +md5sums=('3f149cd0c2842b95551130bd56840f55') diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD index 42666f4d5..c80259191 100644 --- a/extra/openexr/PKGBUILD +++ b/extra/openexr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183294 2013-04-20 16:41:30Z heftig $ +# $Id: PKGBUILD 191714 2013-07-29 10:21:51Z tpowa $ # Maintainer: Tobias Powalowski pkgname=openexr -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="An high dynamic-range image file format library" url="http://www.openexr.com/" @@ -23,4 +23,4 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('0820e1a8665236cb9e728534ebf8df18') +md5sums=('4387e6050d2faa65dd5215618ff2ddce') diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 66e16f740..9aba39b0e 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191221 2013-07-21 19:23:31Z andrea $ +# $Id: PKGBUILD 191650 2013-07-29 07:23:54Z andrea $ # Maintainer: Andrea Scarpino pkgname=qtwebkit @@ -13,7 +13,7 @@ makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') _qtver=4.8.5 source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}" - "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" + "http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-${_qtver}.tar.gz" 'use-python2.patch' 'qwebview.patch') sha1sums=('adf66bc92b0c3e41791a419c6b776d0167acaa7c' diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index f7f71ec38..7df63d7c0 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191627 2013-07-28 09:09:44Z andyrtr $ +# $Id: PKGBUILD 191716 2013-07-29 13:47:21Z andyrtr $ # Maintainer: AndyRTR # Contributor: Gerhard Brauer @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.5 +pkgver=4.0.1.6 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('2bcd0f96d38951f96c08a5d92c21aa41' +md5sums=('61f2248fb16bc035f92b9588ab19c35e' 'f76081c01e40b6206895d194dc949707') build() { diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD index 2553045d2..882e858d0 100644 --- a/extra/xf86-video-r128/PKGBUILD +++ b/extra/xf86-video-r128/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180209 2013-03-18 16:09:16Z andyrtr $ +# $Id: PKGBUILD 191734 2013-07-29 19:57:36Z jgc $ # Maintainer: Jan de Groot pkgname=xf86-video-r128 pkgver=6.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,17 +14,23 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS optdepends=('r128-dri: DRI1 support from community repo') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + no-mibstore.patch) +sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c' + '6e4cbce4de6ff569f6d30a99f699ca44d4cb28e530e593f61578b4f97c1de13e') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../no-mibstore.patch +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/xf86-video-r128/no-mibstore.patch b/extra/xf86-video-r128/no-mibstore.patch new file mode 100644 index 000000000..b6f18031e --- /dev/null +++ b/extra/xf86-video-r128/no-mibstore.patch @@ -0,0 +1,24 @@ +From 24f28a78fdcd056357f137650ca7f0f01c257d97 Mon Sep 17 00:00:00 2001 +From: Connor Behan +Date: Wed, 19 Dec 2012 18:41:14 +0000 +Subject: Remove call to obsolete miInitializeBackingStore() + +Definition was deleted from Xorg during 1.14 merge window, but has been +a no-op since 1.10 merge window. + +Signed-off-by: Connor Behan +--- +diff --git a/src/r128_driver.c b/src/r128_driver.c +index a062a60..f47c7e3 100644 +--- a/src/r128_driver.c ++++ b/src/r128_driver.c +@@ -2701,7 +2701,6 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL) + R128DGAInit(pScreen); + + /* Backing store setup */ +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Set Silken Mouse */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/libre-testing/syslinux/PKGBUILD b/libre-testing/syslinux/PKGBUILD index cdc3483d5..6e2264257 100644 --- a/libre-testing/syslinux/PKGBUILD +++ b/libre-testing/syslinux/PKGBUILD @@ -5,7 +5,7 @@ pkgname="syslinux" pkgver="6.01" -pkgrel="2" +pkgrel="4" arch=('x86_64' 'i686') 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/" @@ -22,6 +22,10 @@ optdepends=('perl-passwd-md5: For md5pass' 'util-linux: For isohybrid' 'efibootmgr: For EFI support' 'dosfstools: For EFI support') +md5sums=('5fe8959b92255143a334167ca1c395a6' + '2466fa3fe8c2577acb2a7025d7096c91' + '0e7d47e1f791f0c5e7bd40ed5c6d80cc' + 'cb46ca47c6b6323127d908440057d98f') install="${pkgname}.install" @@ -30,11 +34,6 @@ source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgve 'syslinux-install_update' 'splash.png') -sha1sums=('d7bc1b188677f77ac2d7060d25491dc29877a9c4' - 'a0238479aa2ed0bbd91d879d35bf7fce2600830f' - 'b1d915045fe3094f5359df043c53e73a4dc32745' - '1be7066848f2d58d67c63436294de5322ca34318') - _build_syslinux_bios() { rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true diff --git a/libre-testing/syslinux/splash.png b/libre-testing/syslinux/splash.png index f94067681..eac14536b 100644 Binary files a/libre-testing/syslinux/splash.png and b/libre-testing/syslinux/splash.png differ diff --git a/libre-testing/syslinux/splash.xcf b/libre-testing/syslinux/splash.xcf new file mode 100644 index 000000000..c27d04445 Binary files /dev/null and b/libre-testing/syslinux/splash.xcf differ diff --git a/libre-testing/syslinux/syslinux-install_update b/libre-testing/syslinux/syslinux-install_update index c32ccf18a..4dc09696a 100644 --- a/libre-testing/syslinux/syslinux-install_update +++ b/libre-testing/syslinux/syslinux-install_update @@ -1,7 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash # -# Sylinux Installer / Updater Scripts -# Copyright (C) 2011 Matthew Gyurgyik +# Syslinux Installer / Updater Script (for BIOS only) +# Copyright (C) 2013 Matthew Gyurgyik # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -26,13 +26,13 @@ # shopt -s nullglob -libpath="/usr/lib/syslinux/bios" -bootpath="/boot/syslinux" -extlinux="/usr/bin/extlinux" +bios_libpath="/usr/lib/syslinux/bios/" +bios_bootpath="/boot/syslinux/" +EXTLINUX="/usr/bin/extlinux" -core_modules=(ldlinux.c32) -autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE -pciids_file=/usr/share/hwdata/pci.ids +bios_core_modules=(config.c32 chain.c32 ldlinux.c32 libcom32.c32 libgpl.c32 liblua.c32 libmenu.c32 libutil.c32 linux.c32 menu.c32 vesamenu.c32) +bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE" +pciids_file="/usr/share/hwdata/pci.ids" ## Helper functions ## # Taken from libui-sh @@ -120,7 +120,7 @@ usage() { cat << EOF usage: $0 options -This script will install or upgrade Syslinux +This script will install or upgrade Syslinux (for BIOS only) OPTIONS: -h Show this message @@ -133,16 +133,16 @@ OPTIONS: Arguments Required: -c Chroot install (ex: -c /mnt) -Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr) - syslinux-install_update.sh -u (update) +Example Usage: $0 -i -a -m # (install, set boot flag, install mbr) + $0 -u # (update) EOF } # Trys to find the partition that /boot resides on # This will either be on /boot or / (root) getBoot() { - if [[ ! -d "$bootpath" ]]; then - echo "Could not find $bootpath" + if [[ ! -d "$bios_bootpath" ]]; then + echo "Could not find $bios_bootpath" echo "Is boot mounted? Is Syslinux installed?" exit 1 fi @@ -278,9 +278,9 @@ install_mbr() { { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} if [[ "$ptb" = MBR ]]; then - mbrfile="$libpath/mbr.bin" + mbrfile="$bios_libpath/mbr.bin" elif [[ "$ptb" = GPT ]]; then - mbrfile="$libpath/gptmbr.bin" + mbrfile="$bios_libpath/gptmbr.bin" fi if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then @@ -293,79 +293,65 @@ install_mbr() { return 0 } -_install() { +install_modules() { # Copy all com32 files to /boot - for file in "${libpath}"/*.c32; do + for file in "${bios_libpath}"/*.c32; do file=${file##*/} - # Symlink files if /boot resides on the same partition as root + rm "$bios_bootpath/$file" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + # Symlink files if /boot resides on the same partition as root + ln -sf "${bios_libpath#$CHROOT}/$file" "$bios_bootpath/$file" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$libpath/$file" "$bootpath/$file" + cp "$bios_libpath/$file" "$bios_bootpath/$file" fi done # Copy / Symlink pci.ids if pci.ids exists on the FS if [[ -f $pciids_file ]]; then + rm "$bios_bootpath/pci.ids" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + ln -sf "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null fi fi +} + +_install() { + install_modules if device_is_raid "$bootpart"; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + echo "Detected RAID on /boot" + "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --install "$bootpath" > /dev/null 2>&1 + "$EXTLINUX" --install "$bios_bootpath" &> /dev/null fi if (( $? )); then - echo "Syslinux install failed" + echo "Syslinux BIOS install failed" exit 2 else - echo "Syslinux install successful" + echo "Syslinux BIOS install successful" fi - touch "$CHROOT/$autoupdate_file" + touch "$CHROOT/$bios_autoupdate_file" } update() { - # Update c32 files in /boot, if /boot is not on same fs - if [[ "$boot" = boot ]]; then - for file in "$bootpath"/*.c32; do - file=${file##*/} - cp "$libpath/$file" "$bootpath/$file" &> /dev/null - done - if [[ -f "$bootpath/pci.ids" ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null - fi - fi - - # Ensure core modules exist and if not install them - for file in "${core_modules[@]}"; do - if [[ ! -f $bootpath/$file ]]; then - if [[ "$boot" = root ]]; then - ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null - elif [[ "$boot" = boot ]]; then - cp "$libpath/$file" "$bootpath/$file" - fi - fi - done + install_modules if device_is_raid $bootpart; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --update "$bootpath" -r &> /dev/null + echo "Detected RAID on /boot" + "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --update "$bootpath" &> /dev/null + "$EXTLINUX" --update "$bios_bootpath" &> /dev/null fi if (($?)); then - echo "Syslinux update failed" + echo "Syslinux BIOS update failed" exit 2 else - echo "Syslinux update successful" + echo "Syslinux BIOS update successful" fi } @@ -400,7 +386,7 @@ while getopts "c:uihmas" opt; do ;; s) # If AUTOUPDATE_FILE does not exist exit the script - if [[ -f $autoupdate_file ]]; then + if [[ -f $bios_autoupdate_file ]]; then UPDATE="True" else exit 0 @@ -432,14 +418,14 @@ fi # If a chroot dir is path set variables to reflect chroot if [[ "$CHROOT" ]]; then - libpath="$CHROOT$libpath" - bootpath="$CHROOT$bootpath" - extlinux="$CHROOT$extlinux" + bios_libpath="$CHROOT$bios_libpath" + bios_bootpath="$CHROOT$bios_bootpath" + EXTLINUX="$CHROOT$EXTLINUX" fi # Exit if no /boot path exists -if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then - echo "Error: $bootpath is empty!" +if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bios_bootpath is empty!" echo "Is /boot mounted?" exit 1 fi diff --git a/libre-testing/syslinux/syslinux.cfg b/libre-testing/syslinux/syslinux.cfg index 64d6596e3..f88c1a5fe 100644 --- a/libre-testing/syslinux/syslinux.cfg +++ b/libre-testing/syslinux/syslinux.cfg @@ -32,15 +32,15 @@ UI vesamenu.c32 # Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu MENU TITLE Parabola GNU/Linux-libre MENU BACKGROUND splash.png -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std +MENU COLOR border 35;40 #ff777caa #a0000000 std +MENU COLOR title 1;35;40 #ff777caa #a0000000 std +MENU COLOR sel 7;35;47 #e0ffffff #20777caa all +MENU COLOR unsel 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #ff777caa #a0000000 std +MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std +MENU COLOR timeout 1;35;40 #ff777caa #00000000 std +MENU COLOR msg07 35;40 #ff777caa #a0000000 std +MENU COLOR tabmsg 35;40 #ff777caa #00000000 std # boot sections follow # @@ -51,13 +51,13 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std LABEL parabola MENU LABEL Parabola GNU/Linux-libre LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre.img LABEL parabolafallback MENU LABEL Parabola GNU/Linux-libre Fallback LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 6377a9032..a24893a6f 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190022 2013-07-13 02:26:08Z eric $ +# $Id: PKGBUILD 191729 2013-07-29 18:51:12Z eric $ # Maintainer: Eric Bélanger # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva _pkgname=liferea pkgname=liferea-libre -pkgver=1.10.0 +pkgver=1.10.1.a pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') @@ -18,22 +18,25 @@ depends=('webkitgtk' 'libnotify' 'json-glib' 'libpeas' 'python2-gobject' 'gnome-icon-theme' 'desktop-file-utils') makedepends=('intltool') optdepends=('gnome-keyring: for keyring plugin support' - 'libgnome-keyring: for keyring plugin support') + 'libgnome-keyring: for keyring plugin support' + 'gst-plugins-base: for media player plugin support' + 'gst-plugins-good: for media player plugin support' + 'gst-plugins-bad-libre: for media player plugin support') options=('!libtool' '!emptydirs') install=liferea.install -source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver%*.*}a.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('aac8e1dac30361758e3565cfddfd317f9f60b64a' +sha1sums=('c0c8508adb6ccfda46453b6a213c15ab78ad5d2c' '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') build() { - cd liferea-${pkgver} + cd liferea-${pkgver%*.*}a patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile make } package() { - cd liferea-${pkgver} + cd liferea-${pkgver%*.*}a make DESTDIR="${pkgdir}" install } diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index ecee94e9b..4967097b1 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -3,8 +3,8 @@ # Maintainer (Parabola): André Silva pkgname=syslinux -pkgver=4.06 -pkgrel=2 +pkgver=4.07 +pkgrel=1 arch=('i686' 'x86_64') 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/" @@ -24,11 +24,11 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux.cfg syslinux-install_update splash.png) -md5sums=('0384ef35b724615074e77b1fc89d5b47' +md5sums=('9ff6e1b94efab931fb4717b600d88779' '1528c376e43f0eaccaa80d8ad1bc13b4' - '31fe4d80ad74b01e5bc8fccc1d32cccd' + '83649111686c4c58ec05eac324ae711a' '8559fb3daf3afa8688600d8a38118918' - 'befd0e7c38a03442b791f2a530b4dd2d') + 'cb46ca47c6b6323127d908440057d98f') build() { # Do not try to build syslinux with our default LDFLAGS, it will fail diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png index f94067681..eac14536b 100644 Binary files a/libre/syslinux/splash.png and b/libre/syslinux/splash.png differ diff --git a/libre/syslinux/splash.xcf b/libre/syslinux/splash.xcf new file mode 100644 index 000000000..c27d04445 Binary files /dev/null and b/libre/syslinux/splash.xcf differ diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg index cb5afb371..4a0644956 100644 --- a/libre/syslinux/syslinux.cfg +++ b/libre/syslinux/syslinux.cfg @@ -33,15 +33,15 @@ UI vesamenu.c32 # Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu MENU TITLE Parabola GNU/Linux-libre MENU BACKGROUND splash.png -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std +MENU COLOR border 35;40 #ff777caa #a0000000 std +MENU COLOR title 1;35;40 #ff777caa #a0000000 std +MENU COLOR sel 7;35;47 #e0ffffff #20777caa all +MENU COLOR unsel 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #ff777caa #a0000000 std +MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std +MENU COLOR timeout 1;35;40 #ff777caa #00000000 std +MENU COLOR msg07 35;40 #ff777caa #a0000000 std +MENU COLOR tabmsg 35;40 #ff777caa #00000000 std # boot sections follow # @@ -52,13 +52,13 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std LABEL parabola MENU LABEL Parabola GNU/Linux-libre LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre.img LABEL parabolafallback MENU LABEL Parabola GNU/Linux-libre Fallback LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) -- cgit v1.2.3-54-g00ecf