diff options
35 files changed, 1208 insertions, 109 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 65e10d605..9a71587e4 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59984 2011-12-02 22:33:05Z giovanni $ +# $Id: PKGBUILD 60299 2011-12-09 17:18:34Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.29 +pkgver=0.8.30 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') @@ -18,10 +18,10 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' makedepends=('python2-pycountry') optdepends=('ipython: to use calibre-debug') install=calibre.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('e51c2b889e0bdfc217000ebba93af8a7' +md5sums=('0af59b942b6184ce7b9c4247555b68dd' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index db3a22678..ec1bda143 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56333 2011-10-05 18:51:32Z ibiru $ +# $Id: PKGBUILD 60311 2011-12-10 09:50:50Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=gnome-commander -pkgver=1.2.8.14 +pkgver=1.2.8.15 pkgrel=1 pkgdesc="A graphical two-pane filemanager for Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -15,10 +15,10 @@ makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool') options=(!libtool) install=gnome-commander.install source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz) -sha256sums=('3519ff0a6e0b287e9cc700df41c61f4bf29110ad16545a4e2f9445ed9a17df08') +sha256sums=('d2feecf215db3e0faeb873c559087c2ad9af0a5aac26e2b1b32b28be939da37f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" # python2 fix for file in doc/*/gnome-commander.xml; do @@ -32,11 +32,11 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - mkdir -p "${pkgdir}"/usr/share/gconf/schemas - gconf-merge-schema "${pkgdir}"/usr/share/gconf/schemas/${pkgname}.schemas \ - --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -rf "${pkgdir}"/etc/gconf/schemas/ + mkdir -p "$pkgdir"/usr/share/gconf/schemas + gconf-merge-schema "$pkgdir"/usr/share/gconf/schemas/$pkgname.schemas \ + --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas + rm -rf "$pkgdir"/etc/gconf/schemas/ } diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD index 8c67cf230..47dca2027 100644 --- a/community/nautilus-actions/PKGBUILD +++ b/community/nautilus-actions/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56331 2011-10-05 18:42:40Z ibiru $ +# $Id: PKGBUILD 60313 2011-12-10 09:56:53Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tor Krill <tor@krill.nu> pkgname=nautilus-actions -pkgver=3.1.4 +pkgver=3.1.5 pkgrel=1 pkgdesc="Configures programs to be launched when files are selected in Nautilus" arch=('i686' 'x86_64' 'mips64el') @@ -15,20 +15,20 @@ makedepends=('intltool' 'gnome-doc-utils') install=nautilus-actions.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.1/$pkgname-$pkgver.tar.xz) -sha256sums=('071013f1037a2c22875e4c9a5efa6f28a1626965b4d5c8aa4576f319427cd0e3') +sha256sums=('dc6b7522d04e1ed1505d6cb2e3be7888ffbac3f094ba6204da81a19c92cb230a') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/nautilus-actions make } package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install - mkdir -p ${pkgdir}/usr/share/gconf/schemas - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain nautilus-actions \ - ${pkgdir}/etc/gconf/schemas/*.schemas - rm -rf ${pkgdir}/etc/gconf/schemas/ + cd $srcdir/$pkgname-$pkgver + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install + mkdir -p $pkgdir/usr/share/gconf/schemas + gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas --domain nautilus-actions \ + $pkgdir/etc/gconf/schemas/*.schemas + rm -rf $pkgdir/etc/gconf/schemas/ } diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index 557d160aa..09df8c6d1 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 43285 2011-03-24 13:35:27Z bisson $ +# $Id: PKGBUILD 60316 2011-12-10 11:25:09Z bisson $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=nsd -pkgver=3.2.8 +pkgver=3.2.9 pkgrel=1 pkgdesc='Authoritative only, high performance and simple DNS server' -arch=('i686' 'x86_64' 'mips64el') url='http://www.nlnetlabs.nl/nsd/' license=('BSD') depends=('openssl') makedepends=('flex') -source=("http://www.nlnetlabs.nl/downloads/nsd/nsd-$pkgver.tar.gz") -sha1sums=('e8db690a09f53152f0dca6e4fbfabcc89003fced') +arch=('i686' 'x86_64' 'mips64el') +source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('66e17e5801e94da1a21f0f2a4dd7a4ab4ffe0dd9') -install=nsd.install +install=install build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/ --exec-prefix=/usr --datarootdir=/usr/share make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -d "$pkgdir"/{etc/rc.d,usr/share/{doc,licenses}/"$pkgname"} + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}"/{etc/rc.d,usr/share/{doc,licenses}/"${pkgname}"} rm doc/differences.pdf - install -m644 doc/* "$pkgdir"/usr/share/doc/"$pkgname" - ln -s ../../doc/"$pkgname"/LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE - ln -s ../../usr/sbin/nsdc "$pkgdir"/etc/rc.d/nsd + install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}" + ln -s ../../doc/"${pkgname}"/LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE + ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd } diff --git a/community/nsd/install b/community/nsd/install new file mode 100644 index 000000000..d90c83521 --- /dev/null +++ b/community/nsd/install @@ -0,0 +1,19 @@ +post_install() { + getent group nsd &>/dev/null || groupadd -r nsd >/dev/null + getent passwd nsd &>/dev/null || useradd -r -g nsd -d /dev/null -s /bin/false -c nsd nsd >/dev/null + chown nsd:nsd /var/db/nsd + chmod 700 /var/db/nsd + install -o nsd -d /var/run/nsd +} + +post_upgrade() { + [[ `vercmp $2 3.2.9` -lt 0 ]] && cat <<\EOF +==> The database format was updated; please run `nsdc rebuild`. +EOF +} + +post_remove() { + getent passwd nsd &>/dev/null && userdel nsd >/dev/null + getent group nsd &>/dev/null && groupdel nsd >/dev/null + true +} diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 299e07aa5..25bdc0312 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 59902 2011-12-02 11:04:21Z andrea $ -# Maintainer: +# $Id: PKGBUILD 60320 2011-12-10 12:45:52Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> - pkgname=python-pymongo pkgver=1.9b1 -pkgrel=2 +pkgrel=3 pkgdesc="Python driver for MongoDB" +arch=('x86_64' 'i686' 'mips64el') license=("APACHE") -url="http://pypi.python.org/pypi/pymongo/" -arch=('i686' 'x86_64' 'mips64el') +url="http://pypi.python.org/pypi/pymongo3/" depends=('python') makedepends=('python-distribute') -source=(http://pypi.python.org/packages/source/p/pymongo3/pymongo3-$pkgver.tar.gz) -md5sums=('6c65dcad8674f37ffc8bc3d6e1fd4155') +source=("http://pypi.python.org/packages/source/p/pymongo3/pymongo3-$pkgver.tar.gz") +sha256sums=('dcabaaca2f0067e648c2b081a70564b832de981495ff953597c1e451a7fcac20') package() { - cd $srcdir/pymongo3-$pkgver - LANG=en_US.UTF8 python setup.py install --root=$pkgdir --optimize=1 + cd "$srcdir/pymongo3-$pkgver" + + LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1 } + +# vim:set ts=2 sw=2 et: diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD new file mode 100644 index 000000000..254303c85 --- /dev/null +++ b/community/r8168-lts/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> + +pkgname=r8168-lts +_pkgname=r8168 +pkgver=8.027.00 +pkgrel=2 +pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts" +url="http://www.realtek.com.tw" +license=("GPL") +arch=('i686' 'x86_64') +depends=('glibc' "kernel26-lts>=2.6.32" "kernel26-lts<2.6.33") +makedepends=("kernel26-lts-headers>=2.6.32" "kernel26-lts-headers<2.6.33") +source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) +install=$pkgname.install + +_extramodules=extramodules-2.6.32-lts +_kernver="$(cat /lib/modules/$_extramodules/version || true)" + +build() { + cd "$srcdir/$_pkgname-$pkgver" + make -C /lib/modules/$_kernver/build SUBDIRS="$srcdir/$_pkgname-$pkgver/src" EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" modules +} + +package() { + cd "$srcdir/$_pkgname-$pkgver/src" + install -D -m644 $_pkgname.ko "$pkgdir/lib/modules/$_extramodules/$_pkgname.ko" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; +} + +md5sums=('98155ce1ad5c248eeb7a93c9954d8344') +sha256sums=('5bc3b44bd69a05e45ab13be727256a95adf18a658f726141283046b397dc22e2') diff --git a/community/r8168-lts/r8168-lts.install b/community/r8168-lts/r8168-lts.install new file mode 100644 index 000000000..fd4f92f63 --- /dev/null +++ b/community/r8168-lts/r8168-lts.install @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-2.6.32-lts' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies + echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:' + echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`' +} +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index ddc548bbc..9eb17fc59 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142223 2011-11-06 13:03:25Z stephane $ +# $Id: PKGBUILD 144896 2011-12-09 11:55:57Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.9.2 -pkgrel=1.1 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -18,12 +18,14 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-sig krb5-kadmind krb5-kdc krb5-kpropd - krb5-1.9.1-config-script.patch) + krb5-1.9.1-config-script.patch + krb5-1.9.1-2011-007.patch) sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' '7f402078fa65bb9ff1beb6cbbbb017450df78560' - '7342410760cf44bfa01bb99bb4c49e12496cb46f') + '7342410760cf44bfa01bb99bb4c49e12496cb46f' + 'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7') options=('!emptydirs') build() { @@ -37,10 +39,15 @@ build() { # by libkrb5, unless do_deps is set to 1, which indicates that the caller # wants the whole list. # - # Patch from upstream : + # Patch from upstream : # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch + # Apply upstream patch to fix a null pointer dereference when processing TGS requests + # CVE-2011-1530 + # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt + patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch + # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 diff --git a/core/krb5/krb5-1.9.1-2011-007.patch b/core/krb5/krb5-1.9.1-2011-007.patch new file mode 100644 index 000000000..336a4ad31 --- /dev/null +++ b/core/krb5/krb5-1.9.1-2011-007.patch @@ -0,0 +1,40 @@ +diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in +index f46cad3..102fbaa 100644 +--- a/src/kdc/Makefile.in ++++ b/src/kdc/Makefile.in +@@ -67,6 +67,7 @@ check-unix:: rtest + + check-pytests:: + $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS) ++ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS) + + install:: + $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc +diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c +index c169c54..840a2ef 100644 +--- a/src/kdc/do_tgs_req.c ++++ b/src/kdc/do_tgs_req.c +@@ -243,7 +243,8 @@ tgt_again: + if (!tgs_1 || !data_eq(*server_1, *tgs_1)) { + errcode = find_alternate_tgs(request, &server); + firstpass = 0; +- goto tgt_again; ++ if (errcode == 0) ++ goto tgt_again; + } + } + status = "UNKNOWN_SERVER"; +diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py +new file mode 100644 +index 0000000..1760bcd +--- /dev/null ++++ b/src/kdc/t_emptytgt.py +@@ -0,0 +1,8 @@ ++#!/usr/bin/python ++from k5test import * ++ ++realm = K5Realm(start_kadmind=False, create_host=False) ++output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1) ++if 'not found in Kerberos database' not in output: ++ fail('TGT lookup for empty realm failed in unexpected way') ++success('Empty tgt lookup.') diff --git a/extra/babl/PKGBUILD b/extra/babl/PKGBUILD index 98005f9d9..45f2d5cef 100644 --- a/extra/babl/PKGBUILD +++ b/extra/babl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108536 2011-02-01 06:59:18Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 144898 2011-12-09 11:56:58Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=babl -pkgver=0.1.4 +pkgver=0.1.6 pkgrel=1 pkgdesc="Dynamic, any to any, pixel format conversion library" arch=('i686' 'x86_64' 'mips64el') @@ -11,14 +11,19 @@ license=('LGPL3') depends=('glibc') options=('!libtool' '!makeflags') source=(ftp://ftp.gimp.org/pub/babl/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1deaf8188b200b10d98a343a7e712b2b') -sha1sums=('9f7186e5d968a4c9d81a63b20836b163f56df616') +sha1sums=('3178ec9f988efe895d00e2d432ad9b6ec10211e9') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 121bfc29e..98c08a84e 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143496 2011-11-25 03:20:54Z bisson $ +# $Id: PKGBUILD 144921 2011-12-10 11:25:45Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.1.0 +pkgver=2.5.2 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('9ab09afece8d94faacdcadb150f87c0337108857' +sha1sums=('2d4eddf52fd7a7d6c936afb3c42b12dfc86aed01' '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc') install=install diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 1b80a60be..14c922a82 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142878 2011-11-17 18:34:36Z ibiru $ +# $Id: PKGBUILD 144900 2011-12-09 12:16:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.2.3 +pkgver=3.2.5 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9db009de74874846edadc0f4a7dc0127a4272cff4348a13544c611cc3696b751') +sha256sums=('0cec1916b4ba878531d32163767a8d39b72eea8d6893103238c82d3a27127c81') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 808942a8a..93a8cbd50 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142624 2011-11-12 17:15:18Z ibiru $ +# $Id: PKGBUILD 144902 2011-12-09 12:21:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gegl -pkgver=0.1.6 -pkgrel=2 +pkgver=0.1.8 +pkgrel=1 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.gegl.org/" @@ -15,19 +15,21 @@ optdepends=('openexr: for using the openexr plugin' \ 'librsvg: for using the svg plugin' \ 'jasper: for using the jasper plugin') options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \ - 0.1.6-ffmpeg.patch) -sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d' - 'd62d4987f1c0fc256f5968271fc65cce0cc4c195') +source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('3d4d902580f5c5122b01b5188b6b5da03089ecac') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch" ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make } +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make check +#} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 6c9daaaa4..95d13fa3f 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141116 2011-10-24 10:42:39Z heftig $ +# $Id: PKGBUILD 144927 2011-12-10 21:25:05Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.1.17 -pkgrel=3 +pkgver=0.1.18 +pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') @@ -23,14 +23,11 @@ optdepends=('gupnp-av: uPnP plugin' 'libtracker-sparql: Tracker plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a') +sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # support tracker 0.12, already fixed in git master. - sed -i 's/sparql-0.11/sparql-0.12/g' configure - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ --enable-shoutcast make diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD index 9d2d331f3..b1b19646b 100644 --- a/extra/grilo/PKGBUILD +++ b/extra/grilo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139336 2011-10-01 18:58:47Z ibiru $ +# $Id: PKGBUILD 144926 2011-12-10 21:23:58Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=grilo -pkgver=0.1.17 -pkgrel=2 +pkgver=0.1.18 +pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" arch=(mips64el) @@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f88406b1737bdf0dc38c3acda418983084afe62ddc09fefd14a95f42ec727eaf') +sha256sums=('dc5bc1ea74ed3d47c4ec2d94886234346671509bdc63ce181f98824e7178ae83') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index 26f7397c1..bb30981e5 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Martin Striz <ms@poruba.net> pkgname=irqbalance -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ backup=(etc/conf.d/irqbalance) source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz irqbalance.conf.d irqbalance.rc.d) -md5sums=('58e1c9c164b12d797b500634a73938b4' +md5sums=('6f246481d6295bcb9a79751c03207c96' '336c1ee99818f9ecda1687e34c69fd6b' 'fb82fc5d267d39110baf720d81282a7c') diff --git a/extra/kdevelop-pg-qt/PKGBUILD b/extra/kdevelop-pg-qt/PKGBUILD index 94e797734..bfb042d6a 100644 --- a/extra/kdevelop-pg-qt/PKGBUILD +++ b/extra/kdevelop-pg-qt/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 118371 2011-04-06 12:38:22Z andrea $ +# $Id: PKGBUILD 144905 2011-12-09 16:07:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-pg-qt pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="KDevelop Parser Generator, a LL(1) parser generator used by KDevelop language plugins" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdevelop.org/" license=('GPL') -depends=('kdelibs') +depends=('kdevelop') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") sha1sums=('b5bcb46a490bfb6a2d04c48cb28e0c77cdde183f') diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 15c62994a..ec440bca1 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141675 2011-11-02 06:41:48Z andyrtr $ +# $Id: PKGBUILD 144919 2011-12-10 10:45:30Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.27 +pkgver=2.4.28 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -13,16 +13,26 @@ options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch - COPYING) -md5sums=('0fba4f42735cd3d24dd7a8cde0023fbd' + COPYING + git_fixes.diff + #missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538 + rbo.h list.h) +md5sums=('6488f64119c6439fa4038e9cd7b30b67' 'c722c8406507b7e3a8da7a3030d1d9cf' - 'ba65e71c481b94ef0fb6c23c7f21ffa1') + 'ba65e71c481b94ef0fb6c23c7f21ffa1' + '671b87f9670e709e54a19cd292c6330d' + '073846ea43fb4d6130062c1897d92e40' + 'ce867d3331862c2b87d1a37461b42dbe') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" + + # add a missing file in the release tarball + patch -Np1 -i ${srcdir}/git_fixes.diff + cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/ -# libtoolize --force + #libtoolize --force autoreconf --force --install ./configure --prefix=/usr \ --enable-udev \ diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff new file mode 100644 index 000000000..5ebcb606a --- /dev/null +++ b/extra/libdrm/git_fixes.diff @@ -0,0 +1,19 @@ +From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 05 Dec 2011 21:24:48 +0000 +Subject: test/radeon: add missing files for dist + +--- +diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am +index 021ca72..1775669 100644 +--- a/tests/radeon/Makefile.am ++++ b/tests/radeon/Makefile.am +@@ -9,4 +9,6 @@ noinst_PROGRAMS = \ + + radeon_ttm_SOURCES = \ + rbo.c \ ++ rbo.h \ ++ list.h \ + radeon_ttm.c +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libdrm/list.h b/extra/libdrm/list.h new file mode 100644 index 000000000..305c903e1 --- /dev/null +++ b/extra/libdrm/list.h @@ -0,0 +1,137 @@ +/* + * + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + */ + +/** + * \file + * List macros heavily inspired by the Linux kernel + * list handling. No list looping yet. + * + * Is not threadsafe, so common operations need to + * be protected using an external mutex. + */ +#ifndef _U_DOUBLE_LIST_H_ +#define _U_DOUBLE_LIST_H_ + +#include <stddef.h> + +struct list_head +{ + struct list_head *prev; + struct list_head *next; +}; + +static void list_inithead(struct list_head *item) +{ + item->prev = item; + item->next = item; +} + +static void list_add(struct list_head *item, struct list_head *list) +{ + item->prev = list; + item->next = list->next; + list->next->prev = item; + list->next = item; +} + +static void list_addtail(struct list_head *item, struct list_head *list) +{ + item->next = list; + item->prev = list->prev; + list->prev->next = item; + list->prev = item; +} + +static void list_replace(struct list_head *from, struct list_head *to) +{ + to->prev = from->prev; + to->next = from->next; + from->next->prev = to; + from->prev->next = to; +} + +static void list_del(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; +} + +static void list_delinit(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; + item->next = item; + item->prev = item; +} + +#define LIST_INITHEAD(__item) list_inithead(__item) +#define LIST_ADD(__item, __list) list_add(__item, __list) +#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list) +#define LIST_REPLACE(__from, __to) list_replace(__from, __to) +#define LIST_DEL(__item) list_del(__item) +#define LIST_DELINIT(__item) list_delinit(__item) + +#define LIST_ENTRY(__type, __item, __field) \ + ((__type *)(((char *)(__item)) - offsetof(__type, __field))) + +#define LIST_IS_EMPTY(__list) \ + ((__list)->next == (__list)) + +#ifndef container_of +#define container_of(ptr, sample, member) \ + (void *)((char *)(ptr) \ + - ((char *)&(sample)->member - (char *)(sample))) +#endif + +#define LIST_FOR_EACH_ENTRY(pos, head, member) \ + for (pos = container_of((head)->next, pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member) \ + for (pos = container_of((head)->next, pos, member), \ + storage = container_of(pos->member.next, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.next, storage, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member) \ + for (pos = container_of((head)->prev, pos, member), \ + storage = container_of(pos->member.prev, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.prev, storage, member)) + +#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.prev, pos, member)) + +#endif /*_U_DOUBLE_LIST_H_*/ diff --git a/extra/libdrm/rbo.h b/extra/libdrm/rbo.h new file mode 100644 index 000000000..c25c73a4c --- /dev/null +++ b/extra/libdrm/rbo.h @@ -0,0 +1,50 @@ +/* + * Copyright © 2011 Red Hat + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Authors: + * Jerome Glisse <j.glisse@gmail.com> + */ +#ifndef RBO_H +#define RBO_H + +#include "list.h" + +struct rbo { + struct list_head list; + int fd; + unsigned refcount; + unsigned mapcount; + unsigned handle; + unsigned size; + unsigned alignment; + void *data; +}; + +struct rbo *rbo(int fd, unsigned handle, unsigned size, + unsigned alignment, void *ptr); +int rbo_map(struct rbo *bo); +void rbo_unmap(struct rbo *bo); +struct rbo *rbo_incref(struct rbo *bo); +struct rbo *rbo_decref(struct rbo *bo); +int rbo_wait(struct rbo *bo); + +#endif diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 4be16689a..5caa18d63 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143260 2011-11-24 07:38:10Z andrea $ +# $Id: PKGBUILD 144910 2011-12-09 17:20:57Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.18 +pkgver=5.5.19 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,7 +15,7 @@ options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('38b65815249f3bcacf3b0ee85171c486' +md5sums=('a78cf450974e9202bd43674860349b5a' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 41eef8858..47f3f81a7 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141476 2011-10-30 16:50:53Z foutrelis $ +# $Id: PKGBUILD 144934 2011-12-10 23:19:27Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.0 -pkgrel=3 +pkgver=2.10.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') @@ -18,7 +18,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 nm09-more.patch) -sha256sums=('f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd' +sha256sums=('2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8' '7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e') build() { @@ -32,6 +32,9 @@ build() { sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} + # Pidgin doesn't explicitly link to libm + LDFLAGS+=' -Wl,--copy-dt-needed-entries' + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/putty/PKGBUILD b/extra/putty/PKGBUILD index addb040dc..c8fe95255 100644 --- a/extra/putty/PKGBUILD +++ b/extra/putty/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 131725 2011-07-14 01:51:53Z eric $ +# $Id: PKGBUILD 144938 2011-12-11 04:46:16Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=putty -pkgver=0.61 +pkgver=0.62 pkgrel=1 pkgdesc="A terminal integrated SSH/Telnet client" arch=('i686' 'x86_64' 'mips64el') url="http://www.chiark.greenend.org.uk/~sgtatham/putty/" license=('MIT') depends=('gtk2') -source=(http://the.earth.li/~sgtatham/putty/${pkgver}/${pkgname}-${pkgver}.tar.gz) -md5sums=('db0e37f6b82ea62f0ace87927d29b2a4') -sha1sums=('cbb82fd392142e3455e859ca8bc7b1e61b246204') +source=(http://the.earth.li/~sgtatham/putty/${pkgver}/${pkgname}-${pkgver}.tar.gz + putty-${pkgver}.tar.gz.sig::http://the.earth.li/~sgtatham/putty/latest/putty-${pkgver}.tar.gz.DSA) +sha1sums=('5898438614117ee7e3704fc3f30a3c4bf2041380' + '128cded001647e3b47494dbfb1eeb70cbed49a7c') build() { cd "${srcdir}/${pkgname}-${pkgver}/unix" diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index d5df7b1c8..1b06de270 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142894 2011-11-17 18:35:07Z ibiru $ +# $Id: PKGBUILD 144929 2011-12-10 21:36:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') license=('GPL') @@ -19,7 +19,7 @@ install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) sha256sums=('25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9' - '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') + '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/seahorse/seahorse-ssh-askpass.sh b/extra/seahorse/seahorse-ssh-askpass.sh index 44281ac2b..04f79d8f2 100644 --- a/extra/seahorse/seahorse-ssh-askpass.sh +++ b/extra/seahorse/seahorse-ssh-askpass.sh @@ -1,3 +1,3 @@ -if [ -z "$SSH_ASKPASS" ]; then +if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass fi diff --git a/multilib/jack2-multilib/40-hpet-permissions.rules b/multilib/jack2-multilib/40-hpet-permissions.rules new file mode 100644 index 000000000..7af3780f9 --- /dev/null +++ b/multilib/jack2-multilib/40-hpet-permissions.rules @@ -0,0 +1,2 @@ +KERNEL=="rtc0", GROUP="audio" +KERNEL=="hpet", GROUP="audio" diff --git a/multilib/jack2-multilib/99-audio.conf b/multilib/jack2-multilib/99-audio.conf new file mode 100644 index 000000000..eb76ef920 --- /dev/null +++ b/multilib/jack2-multilib/99-audio.conf @@ -0,0 +1,2 @@ +@audio - rtprio 99 +@audio - memlock unlimited diff --git a/multilib/jack2-multilib/PKGBUILD b/multilib/jack2-multilib/PKGBUILD new file mode 100644 index 000000000..7c61a3571 --- /dev/null +++ b/multilib/jack2-multilib/PKGBUILD @@ -0,0 +1,142 @@ +# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: SpepS <dreamspepser at yahoo dot it> + +# This one is in response to a need for an equivalent to lib32-jack for +# jack2. A lib32-jack2 would require much patching and invading the pure +# jack2 package, and what's more, the buildsystem provides a flag just to +# build a hybrid jack2 in full. As such, we have opted to provide multilib +# users with a replacement package instead of the usual lib32 add-on. +# +# See http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html + +pkgbase=jack2-multilib +pkgname=('jack2-multilib' 'jack2-dbus-multilib') +#pkgname= # single build (overrides split) +_tarname=jack +pkgver=1.9.7 +pkgrel=1 +arch=('x86_64') +url="http://jackaudio.org/" +backup=(etc/security/limits.d/99-audio.conf) +license=('GPL') +makedepends=('python2' 'libffado' 'libsamplerate' 'celt' + 'doxygen' 'gcc-multilib' 'lib32-dbus-core') +source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2" + '99-audio.conf' + '40-hpet-permissions.rules') +md5sums=('9759670feecbd43eeccf1c0f743ec199' + 'ae65b7c9ebe0fff6c918ba9d97ae342d' + '471aad533ff56c5d3cbbf65ce32cadef') + +_pyfix() { + sed -i 's:bin/env python:bin/env python2:' \ + "$pkgdir/usr/bin/jack_control" +} + +_wafconf() { + python2 waf configure --prefix=/usr \ + --alsa \ + --firewire \ + --mixed \ + --doxygen $@ +} + +_isbuild() { + printf "%s\n" ${pkgname[@]} | grep -qx $1 +} + +_mklinks() { + ln -s /usr/lib32/libjack.so.0.1.0 "$pkgdir/usr/lib32/libjack.so.0" + ln -s /usr/lib32/libjack.so.0 "$pkgdir/usr/lib32/libjack.so" +} + +build() { + cd "$srcdir" + + # fix doxygen building + sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript + + # we may do 2 different builds + cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver + + # mixed dbus/classic build + if _isbuild jack2-multilib; then + cd $_tarname-$pkgver + msg2 "Running Mixed D-Bus/Classic build" + _wafconf --classic --dbus + python2 waf build $MAKEFLAGS + cd .. + fi + + # dbus-ONLY build + if _isbuild jack2-dbus-multilib; then + cd $_tarname-dbus-$pkgver + msg2 "Running D-Bus-only build" + _wafconf --dbus + python2 waf build $MAKEFLAGS + cd .. + fi +} + +package_jack2-multilib() { + ! _isbuild jack2-multilib && return 0 + + pkgdesc="The next-generation JACK with SMP support & mixed mode" + depends=('libsamplerate' 'gcc-libs-multilib') + optdepends=('libffado: FireWire support' + 'celt: NetJACK2 driver' + 'lib32-dbus-core: jackdbus' + 'python2: jack_control') + conflicts=('jack' 'jack2' 'lib32-jack') + provides=('jack' 'jack2' 'lib32-jack' 'jackmp' + 'jackdmp' 'jackdbus' 'lib32-jack2') + + cd "$srcdir/$_tarname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + # fix for major python transition + _pyfix + + # configure realtime access/scheduling + # see https://bugs.archlinux.org/task/26343 + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + + # should be done by upstream + # see http://trac.jackaudio.org/ticket/200 + _mklinks +} + +package_jack2-dbus-multilib() { + ! _isbuild jack2-dbus-multilib && return 0 + + pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)" + depends=('libsamplerate' 'lib32-dbus-core') + optdepends=('libffado: FireWire support' + 'celt: NetJACK2 driver' + 'python2: jack_control') + conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib') + provides=('jack' 'jack2' 'lib32-jack' 'jack2-multilib' + 'jackmp' 'jackdmp' 'jackdbus' 'lib32-jack2') + + cd "$srcdir/$_tarname-dbus-$pkgver" + + python2 waf install --destdir="$pkgdir" + + _pyfix + + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + + _mklinks +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/syslinux/PKGBUILD b/testing/syslinux/PKGBUILD new file mode 100644 index 000000000..277bf3bf6 --- /dev/null +++ b/testing/syslinux/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 144912 2011-12-10 00:40:44Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=syslinux +pkgver=4.05 +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" +url="http://syslinux.zytor.com/" +license=('GPL2') +depends=('perl' 'glibc') +optdepends=('perl-passwd-md5: For md5pass' + 'perl-digest-sha1: For sha1pass' + 'mtools: For mkdiskimage and syslinux' + ) +makedepends=('nasm') +backup=('boot/syslinux/syslinux.cfg') +install=syslinux.install +source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2 + syslinux-dont-build-dos-windows-targets.patch + syslinux.cfg + syslinux-install_update) +md5sums=('82299242418385da1274c9479a778cb2' + '1528c376e43f0eaccaa80d8ad1bc13b4' + '4dc27d8ab3802f8e50f3dda28168ce6d' + 'b5b4953c0a5a01cd16441402f6321765') + +build() { + # Do not try to build syslinux with our default LDFLAGS, it will fail + unset LDFLAGS + 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 FHS manpage path + sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk + make +} + +package() { + cd "$srcdir"/$pkgname-${pkgver} + make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install + + # Install the default configuration + install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg + # Install the installation and update script + # This script is maintained at git://gist.github.com/772138.git + install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update +} diff --git a/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch b/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch new file mode 100644 index 000000000..2b86ab828 --- /dev/null +++ b/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch @@ -0,0 +1,12 @@ +diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile +--- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200 ++++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200 +@@ -54,7 +54,7 @@ + # files that depend only on the B phase, but may have to be regenerated + # for "make installer". + BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ +- diag libinstaller dos win32 win64 dosutil ++ libinstaller + ITARGET = + IOBJECTS = $(ITARGET) \ + utils/gethostip utils/isohybrid utils/mkdiskimage \ diff --git a/testing/syslinux/syslinux-install_update b/testing/syslinux/syslinux-install_update new file mode 100644 index 000000000..f7cd123e1 --- /dev/null +++ b/testing/syslinux/syslinux-install_update @@ -0,0 +1,459 @@ +#!/bin/bash +# +# Sylinux Installer / Updater Scripts +# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +#----------------- +# Exit Codes: +# 1 - get_boot_device or other function failed +# 2 - install/update failed +# 3 - set_active failed +# 4 - install_mbr failed +# +shopt -s nullglob + +libpath="/usr/lib/syslinux" +bootpath="/boot/syslinux" +extlinux="/sbin/extlinux" + +autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE +com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com) +pciids_file=/usr/share/hwdata/pci.ids + +## Helper functions ## +# Taken from libui-sh +# $1 needle +# $2 set (array) haystack +check_is_in() { + local needle="$1" element + shift + for element; do + [[ $element = $needle ]] && return 0 + done + return 1 +} + +# return true when blockdevice is an md raid, otherwise return a unset value +# get all devices that are part of raid device $1 +device_is_raid() { + [[ $1 && -f /proc/mdstat ]] || return 1 + local devmajor=$(stat -c %t "$1") + (( devmajor == 9 )) +} + +mdraid_all_slaves() { + local slave slaves + for slave in /sys/class/block/${1##*/}/slaves/*; do + source "$slave/uevent" + slaves="$slaves/dev/$DEVNAME " + unset DEVNAME + done + echo $slaves +} + +# Check /sys/block to see if device is partitioned +# If we have a partitioned block device (sda1) /sys/block/sda1/dev will not exist +# However, if we have an unpartitioned block device (sda) /sys/block/sda/dev will exist +dev_is_part() { + # $1 - blockdevice + local dev=$1 + + # If block device uevent file should be found + # If a partition is passed in path shouldn't exist + if [[ $dev = *cciss* ]]; then + [[ -f /sys/block/cciss\!${dev##*/}/dev ]] && return 1 + elif [[ $dev = *ida* ]]; then + [[ -f /sys/block/ida\!${dev##*/}/dev ]] && return 1 + else + [[ -f /sys/block/${dev##*/}/dev ]] && return 1 + fi + + return 0 +} + +# If EFI PART is present in the first 8 bytes then it must be a GPT disk +device_is_gpt() { + local partsig=$(dd if="$1" skip=64 bs=8 count=1 2>/dev/null) + [[ $partsig = "EFI PART" ]] +} + +clear_gpt_attr2() { + # $1 - Block Device, no partitions + local disk=$1 + + # Special Exception for cciss controllers + if [[ $disk = *cciss* ]]; then + for part in /dev/cciss/${disk##*/}*p*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + # Smart 2 Controllers + elif [[ $disk = *ida* ]]; then + for part in /dev/ida/${disk##*/}*p*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + else + for part in /sys/block/${disk##*/}/${disk##*/}*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + fi + return 0 +} + +usage() { +cat << EOF +usage: $0 options + +This script will install or upgrade Syslinux + +OPTIONS: + -h Show this message + -i Install Syslinux + -u Update Syslinux + -a Set Boot flag on boot partiton + -m Install Syslinux MBR + -s Updates Syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists + + 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) +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" + echo "Is boot mounted? Is Syslinux installed?" + exit 1 + fi + + syslinux_fs=(ext2 ext3 ext4 btrfs vfat) + + # Use DATA from findmnt see rc.sysint for more info + if [[ -f /proc/self/mountinfo ]]; then + read rootdev rootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/") + read bootdev bootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/boot") + else + echo "Could not find /proc/self/mountinfo" + echo "Are you running a kernel greater than 2.6.24?" + exit 1 + fi + + if [[ $bootfs ]]; then + if ! check_is_in "$bootfs" "${syslinux_fs[@]}"; then + echo "/boot file system is not supported by Syslinux" + exit 1 + fi + boot="boot" + bootpart="$bootdev" + elif [[ $rootfs ]]; then + if ! check_is_in "$rootfs" "${syslinux_fs[@]}"; then + echo "/ (root) file system is not supported by Syslinux" + exit 1 + fi + boot="root" + bootpart="$rootdev" + else + echo "Could not find filesystem on / (root) or /boot." + exit 1 + fi +} + +# We store the partition table type either gpt or mbr in var ptb +# In rare cases a user could have one raid disk using mbr and another using gpt +# In such cases we accept that the output may be incomplete + +# Calls get_ptb() for $bootpart or for all device in RAID +declare -A bootdevs +get_boot_devices() { + if device_is_raid "$bootpart"; then + slaves=$(mdraid_all_slaves "$bootpart") + + for slave in ${slaves[@]}; do + local disk="${slave%%[[:digit:]]*}" + device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" + bootdevs[$slave]="$ptb" + done + else + local disk="${bootpart%%[[:digit:]]*}" + device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" + bootdevs[$bootpart]="$ptb" + fi +} + +# Function Assumes the boot partition should be marked as active +# All other partitions should not have the boot flag set +set_active() { + # If any bootdev is a block device without partitions bail + # we want to set the boot flag on partitioned disk + for dev in "${!bootdevs[@]}"; do + dev_is_part $dev || { echo "$dev - is a block device. Aborting set_active!"; return 1; } + done + + # Clear BIOS Bootable Legacy Attribute for GPT drives + # In rare cases where a RAID device has slaves on the same block device + # Attribute 2 will be cleared for each partition multiple times + for dev in "${!bootdevs[@]}"; do + local ptb="${bootdevs[$dev]}" + if [[ "$ptb" = GPT ]]; then + local disk="${dev%%[[:digit:]]*}" #ex: /dev/sda + clear_gpt_attr2 "$disk" + fi + done + + # Set the boot flag on bootdevs (generated from get_boot_devices) + for part in "${!bootdevs[@]}"; do + local ptb="${bootdevs[$part]}" + local partnum="${part##*[[:alpha:]]}" + case "$part" in + *[[:digit:]]p[[:digit:]]*) + local disk="${part%%p$partnum}" # get everything before p1 + ;; + *) + local disk="${part%%[[:digit:]]*}" + ;; + esac + + if [[ "$ptb" = MBR ]]; then + if sfdisk "$disk" -A "$partnum" &>/dev/null; then + echo "Boot Flag Set - $part" + else + echo "FAILED to Set the boot flag on $part" + exit 3 + fi + elif [[ "$ptb" = GPT ]]; then + if sgdisk "$disk" --attributes="$partnum":set:2 &>/dev/null; then + echo "Attribute Legacy Bios Bootable Set - $part" + else + echo "FAILED to set attribute Legacy BIOS Bootable on $part" + exit 3 + fi + fi + done + return 0 +} + +install_mbr() { + # If any bootdev is a block device without partitions bail + # we want to install the mbr to a partitioned disk + for dev in "${!bootdevs[@]}"; do + dev_is_part "$dev" || { echo "$dev - is a block device. Aborting MBR install"; return 1; } + done + + for part in "${!bootdevs[@]}"; do + local partnum="${part##*[[:alpha:]]}" + case "$part" in + *[[:digit:]]p[[:digit:]]*) + local disk="${part%%p$partnum}" # get everything before p1 + ;; + *) + local disk="${part%%[[:digit:]]*}" + ;; + esac + local ptb="${bootdevs[$part]}" + + # We want to install to the root of the block device + # If the device is a partition - ABORT! + dev_is_part "$disk" && \ + { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} + + if [[ "$ptb" = MBR ]]; then + mbrfile="$libpath/mbr.bin" + elif [[ "$ptb" = GPT ]]; then + mbrfile="$libpath/gptmbr.bin" + fi + + if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then + echo "Installed MBR ($mbrfile) to $disk" + else + echo "Error Installing MBR ($mbrfile) to $disk" + exit 4 + fi + done + return 0 +} + +_install() { + # Copy files to /boot + for file in "${com32_files[@]}"; do + # Symlink files even if links exist + if [[ "$boot" = root ]]; then + ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$libpath/$file" "$bootpath/$file" + fi + done + + # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS + if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then + if [[ "$boot" = root ]]; then + ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + fi + fi + + if device_is_raid "$bootpart"; then + echo "Detected RAID on /boot - installing Syslinux with --raid" + "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + else + "$extlinux" --install "$bootpath" > /dev/null 2>&1 + fi + + if (( $? )); then + echo "Syslinux install failed" + exit 2 + else + echo "Syslinux install successful" + fi + + touch "$CHROOT/$autoupdate_file" +} + +update() { + # Update any com and c32 files in /boot + if [[ "$boot" = boot ]]; then + for file in "$bootpath"/*.{c32,com}; do + file=$(basename "$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 + + if device_is_raid $bootpart; then + echo "Detected RAID on /boot - installing Syslinux with --raid" + "$extlinux" --update "$bootpath" -r &> /dev/null + else + "$extlinux" --update "$bootpath" &> /dev/null + fi + + if (($?)); then + echo "Syslinux update failed" + exit 2 + else + echo "Syslinux update successful" + fi +} + +# Make sure only root can run our script +if (( $(id -u) != 0 )); then + echo "This script must be run as root" 1>&2 + exit 1 +fi + +if (( $# == 0 )); then + usage + exit 1 +fi + +while getopts "c:uihmas" opt; do + case $opt in + c) + CHROOT=$(readlink -e "$OPTARG") + if [[ -z $CHROOT ]]; then + echo "error: chroot path ``$OPTARG does not exist"; + exit 1 + fi + ;; + h) + usage + exit 0 + ;; + i) + INSTALL="True" + ;; + u) + UPDATE="True" + ;; + m) + MBR="True" + ;; + a) + SET_ACTIVE="True" + ;; + s) + # If AUTOUPDATE_FILE does not exist exit the script + if [[ -f $autoupdate_file ]]; then + UPDATE="True" + else + exit 0 + fi + ;; + *) + usage + exit 1 + ;; + esac +done + +# Display Usage Information if both Install and Update are passed +if [[ $INSTALL && $UPDATE ]]; then + usage + exit 1 +fi + +# If a chroot dir is path set variables to reflect chroot +if [[ "$CHROOT" ]]; then + libpath="$CHROOT$libpath" + bootpath="$CHROOT$bootpath" + extlinux="$CHROOT$extlinux" +fi + +# Exit if no /boot path exists +if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bootpath is empty!" + echo "Is /boot mounted?" + exit 1 +fi + +# Get the boot device if any of these options are passed +if [[ $INSTALL || $UPDATE || $SET_ACTIVE || $MBR ]]; then + getBoot +fi + +# Install or Update +if [[ $INSTALL ]]; then + _install || exit +elif [[ $UPDATE ]]; then + update || exit +fi + + +# SET_ACTIVE and MBR +if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then + get_boot_devices + + if [[ $SET_ACTIVE ]]; then + set_active || exit + fi + + if [[ $MBR ]]; then + install_mbr || exit + fi +fi + +exit 0 + +# vim: set et sw=4: diff --git a/testing/syslinux/syslinux.cfg b/testing/syslinux/syslinux.cfg new file mode 100644 index 000000000..02127d21d --- /dev/null +++ b/testing/syslinux/syslinux.cfg @@ -0,0 +1,79 @@ +# Config file for Syslinux - +# /boot/syslinux/syslinux.cfg +# +# Comboot modules: +# * menu.c32 - provides a text menu +# * vesamenu.c32 - provides a graphical menu +# * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders +# * hdt.c32 - hardware detection tool +# * reboot.c32 - reboots the system +# * poweroff.com - shutdown the system +# +# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux. +# If /usr and /boot are on the same file system, symlink the files instead +# of copying them. +# +# If you do not use a menu, a 'boot:' prompt will be shown and the system +# will boot automatically after 5 seconds. +# +# Please review the wiki: https://wiki.archlinux.org/index.php/Syslinux +# The wiki provides further configuration examples + +DEFAULT arch +PROMPT 0 # Change to 1 if you do not want to use a menu +TIMEOUT 50 +# You can create syslinux keymaps with the keytab-lilo tool +#KBDMAP de.ktl + +# Menu Configuration +# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux +UI menu.c32 +#UI vesamenu.c32 + +# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu +MENU TITLE Arch Linux +#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 + +# boot sections follow +# +# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line. +# +#-* + +LABEL arch + MENU LABEL Arch Linux + LINUX ../vmlinuz-linux + APPEND root=/dev/sda3 ro + INITRD ../initramfs-linux.img + +LABEL archfallback + MENU LABEL Arch Linux Fallback + LINUX ../vmlinuz-linux + APPEND root=/dev/sda3 ro + INITRD ../initramfs-linux-fallback.img + +#LABEL windows +# MENU LABEL Windows +# COM32 chain.c32 +# APPEND hd0 1 + +LABEL hdt + MENU LABEL HDT (Hardware Detection Tool) + COM32 hdt.c32 + +LABEL reboot + MENU LABEL Reboot + COM32 reboot.c32 + +LABEL off + MENU LABEL Power Off + COMBOOT poweroff.com diff --git a/testing/syslinux/syslinux.install b/testing/syslinux/syslinux.install new file mode 100644 index 000000000..0dc0ece36 --- /dev/null +++ b/testing/syslinux/syslinux.install @@ -0,0 +1,13 @@ +post_install() { + echo "==> If you want to use syslinux as your bootloader" + echo "==> edit /boot/syslinux/syslinux.cfg and run" + echo "==> # /usr/sbin/syslinux-install_update -i -a -m" + echo "==> to install it." +} + +post_upgrade() { + # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists + /usr/sbin/syslinux-install_update -s +} + +# vim:set ts=2 sw=2 et: |