diff options
47 files changed, 922 insertions, 125 deletions
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index b3851c4b6..5041a2d79 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.11.2 +pkgver=1.12.0 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://aria2.sourceforge.net/' license=('GPL') depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") -sha1sums=('db4761fa311e6d1f9526d1ee25461c2db84750ff') +sha1sums=('5bc6f07f84f6ad1d0e222d2b5c78cd3118e1a569') build() { cd aria2-${pkgver} diff --git a/community/cabextract/PKGBUILD b/community/cabextract/PKGBUILD index 1c2eaa51c..70ec10920 100644 --- a/community/cabextract/PKGBUILD +++ b/community/cabextract/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 34168 2010-12-04 02:18:42Z andrea $ -# Maintainer: -# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# $Id: PKGBUILD 50767 2011-06-30 19:23:26Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=cabextract -pkgver=1.3 +pkgver=1.4 pkgrel=1 pkgdesc="A program to extract Microsoft cabinet (.CAB) files" arch=('i686' 'x86_64') @@ -11,7 +10,7 @@ license=('GPL') url="http://www.cabextract.org.uk/" depends=('glibc') source=("http://www.cabextract.org.uk/${pkgname}-${pkgver}.tar.gz") -md5sums=('cb9a4a38470d2a71a0275968e7eb64d3') +md5sums=('79f41f568cf1a3ac105e0687e8bfb7c0') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -24,5 +23,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 274a492fa..844e2fd2c 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: Christian Himpel <chressie at gmail dot com> pkgname=go -pkgver=r57.1 -pkgrel=3 +pkgver=r58 +pkgrel=1 epoch=1 pkgdesc='Google Go compiler and tools (release version)' arch=('i686' 'x86_64') diff --git a/community/gprolog/PKGBUILD b/community/gprolog/PKGBUILD index 9a4b32558..62b4f92ae 100644 --- a/community/gprolog/PKGBUILD +++ b/community/gprolog/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 18237 2010-06-01 19:57:36Z spupykin $ +# $Id: PKGBUILD 50772 2011-06-30 21:54:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributer: Jason Chu <jchu@xentac.net> pkgname=gprolog -pkgver=1.3.1 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc="GNU Prolog" arch=('i686' 'x86_64') url="http://www.gprolog.org/" -depends=(glibc) +depends=('glibc') license=('GPL') source=(ftp://ftp.gnu.org/gnu/gprolog/gprolog-$pkgver.tar.gz) -md5sums=('cbae19c31e17bcfca4b57fe35ec4aba2') +md5sums=('9d4fc311b7f6e37e524a5e7ccd0b6c28') build() { cd "$srcdir/gprolog-$pkgver/src" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 + make +} + +package() { + cd "$srcdir/gprolog-$pkgver/src" make install \ INSTALL_DIR="$pkgdir"/usr/share/gprolog \ LINKS_DIR="$pkgdir"/usr/bin \ @@ -25,14 +29,14 @@ build() { HTML_DIR="$pkgdir"/usr/share/gprolog/doc/Html \ EXAMPLES_DIR="$pkgdir"/usr/share/gprolog \ sysconfdir="$pkgdir"/etc \ - localstatedir="$pkgdir"/var || return 1 + localstatedir="$pkgdir"/var cd "$pkgdir"/usr/bin rm * - ln -s /usr/share/gprolog/bin/fd2c && \ - ln -s /usr/share/gprolog/bin/gplc && \ - ln -s /usr/share/gprolog/bin/gprolog && \ - ln -s /usr/share/gprolog/bin/hexgplc && \ - ln -s /usr/share/gprolog/bin/ma2asm && \ - ln -s /usr/share/gprolog/bin/pl2wam && \ + ln -s /usr/share/gprolog/bin/fd2c + ln -s /usr/share/gprolog/bin/gplc + ln -s /usr/share/gprolog/bin/gprolog + ln -s /usr/share/gprolog/bin/hexgplc + ln -s /usr/share/gprolog/bin/ma2asm + ln -s /usr/share/gprolog/bin/pl2wam ln -s /usr/share/gprolog/bin/wam2ma } diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index 8823ba609..006da2999 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50301 2011-06-28 07:26:18Z stativ $ +# $Id: PKGBUILD 50748 2011-06-30 10:59:10Z icelaya $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> @@ -6,8 +6,8 @@ pkgname=luxrender pkgver=0.8 _pkgver=45d3e13eb94c _luxblend=9cb3fcee0be8 -_blender=2.57 -pkgrel=4 +_blender=2.58 +pkgrel=6 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') url="http://www.luxrender.net/" @@ -15,13 +15,13 @@ license=('GPL') depends=('boost-libs' 'freeimage' 'openexr') optdepends=('blender: Blender exporter' 'qt: Qt GUI') makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python') -source=(http://src.luxrender.net/lux/archive/$_pkgver.tar.bz2 \ - http://src.luxrender.net/luxblend25/archive/$_luxblend.tar.bz2) -md5sums=('ad8d2ede00aa244cad884d9696ff5fbb' - '29c34f97791db3af1b827d9e9a1b3d79') +source=(http://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2 \ + http://ftp.archlinux.org/other/community/luxrender/luxblend-"$pkgver".tar.bz2) +md5sums=('0f2d856385db72131f51e44a7ee527fa' + '0c3c8d9efba76133f8c687b5dd2bca8a') build() { - cd "$srcdir"/lux-$_pkgver + cd "$srcdir"/luxrender-lux-$_pkgver sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt @@ -36,7 +36,7 @@ build() { } package() { - cd "$srcdir"/lux-$_pkgver + cd "$srcdir"/luxrender-lux-$_pkgver make DESTDIR="$pkgdir" install # fix library path on x86_64 @@ -44,9 +44,9 @@ package() { # install blender exporter install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons - cp -a "$srcdir"/luxblend25-$_luxblend/src/luxrender \ + cp -a "$srcdir"/luxrender-luxblend25-$_luxblend/src/luxrender \ "$pkgdir"/usr/share/blender/$_blender/scripts/addons - cp -a "$srcdir"/lux-$_pkgver/pylux.so "$pkgdir"/usr/share/blender/$_blender/scripts/addons/luxrender/ + cp -a "$srcdir"/luxrender-lux-$_pkgver/pylux.so "$pkgdir"/usr/share/blender/$_blender/scripts/addons/luxrender/ } # vim:set ts=2 sw=2 et: diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index 527e8f95c..f708e5d61 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=mathomatic -pkgver=15.6.1 +pkgver=15.6.2 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'bash: for running a test script' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('78d5eec8b64cbb3b00162f616f6a477c') +md5sums=('96b64d056c6ab3c72338ff7566b6b11e') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index e641c24a1..da32ebb86 100644 --- a/community/mingw32-gcc/PKGBUILD +++ b/community/mingw32-gcc/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 45471 2011-04-22 05:36:00Z spupykin $ +# $Id: PKGBUILD 50734 2011-06-30 10:31:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> pkgname=mingw32-gcc pkgver=4.5.2 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64) pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" -depends=(mingw32-runtime mingw32-binutils mingw32-w32api libmpc elfutils gmp) -replaces=(mingw32-gcc-base) -provides=(mingw32-gcc-base) +depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api' + 'libmpc' 'elfutils' 'gmp') +replaces=('mingw32-gcc-base') +provides=('mingw32-gcc-base') options=(!strip) url="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/" license=(GPL LGPL) @@ -35,12 +36,15 @@ build() --host=$CHOST \ --build=$CHOST \ --prefix=/usr \ + --libexecdir=/usr/lib \ + --with-bugurl=https://bugs.archlinux.org/ \ --enable-languages=c,c++ \ --enable-shared \ --enable-sjlj-exceptions \ --enable-hash-synchronization \ --disable-nls \ - --disable-libssp + --disable-libssp \ + --enable-libgomp make make install DESTDIR=$pkgdir @@ -51,22 +55,6 @@ build() msg "libstdc++" make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install -# msg "libgomp" -# mkdir -p i486-mingw32/libgomp -# cd i486-mingw32/libgomp -# [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \ -# --target=i486-mingw32 \ -# --host=$CHOST \ -# --build=$CHOST \ -# --prefix=/usr \ -# --enable-languages=c,c++ \ -# --enable-shared \ -# --enable-sjlj-exceptions \ -# --enable-hash-synchronization \ -# --disable-nls \ -# --disable-libssp -# make -j1 DESTDIR=$pkgdir all install - msg "fixes" mkdir -p $pkgdir/usr/i486-mingw32/bin/ mv $pkgdir/usr/bin/*.dll $pkgdir/usr/i486-mingw32/bin/ @@ -79,6 +67,6 @@ build() usr/share/gcc-$pkgver/python strip usr/bin/* - strip usr/libexec/gcc/i486-mingw32/$pkgver/{cc1*,collect2} + strip usr/lib/gcc/i486-mingw32/$pkgver/{cc1*,collect2} i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a } diff --git a/community/mingw32-pthreads/PKGBUILD b/community/mingw32-pthreads/PKGBUILD new file mode 100644 index 000000000..842a8352a --- /dev/null +++ b/community/mingw32-pthreads/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 50731 2011-06-30 10:05:09Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Marcel Schneider marcelATcoopmastersDOTde + +pkgname=mingw32-pthreads +pkgver=2.8.0 +_pkgver=2-8-0 +pkgrel=2 +arch=(i686 x86_64) +pkgdesc="The POSIX 1003.1-2001 standard for writing multithreaded applications." +license=(LGPL) +makedepends=('mingw32-gcc-base' 'mingw32-runtime' 'mingw32-w32api') +url="http://sourceware.org/pthreads-win32/" +options=(!strip) +source=(ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-$_pkgver-release.tar.gz) +md5sums=('6d30c693233b1464ef8983fedd8ccb22') + +build() { + cd $srcdir/pthreads-w32-$_pkgver-release + make CROSS=i486-mingw32- clean GC +} + +package() { + cd $srcdir/pthreads-w32-$_pkgver-release + mkdir $pkgdir/usr + mkdir $pkgdir/usr/i486-mingw32 + mkdir $pkgdir/usr/i486-mingw32/include + mkdir $pkgdir/usr/i486-mingw32/lib + install $srcdir/pthreads-w32-$_pkgver-release/pthread.h $pkgdir/usr/i486-mingw32/include/pthread.h + install $srcdir/pthreads-w32-$_pkgver-release/sched.h $pkgdir/usr/i486-mingw32/include/sched.h + install $srcdir/pthreads-w32-$_pkgver-release/semaphore.h $pkgdir/usr/i486-mingw32/include/semaphore.h + install $srcdir/pthreads-w32-$_pkgver-release/libpthreadGC2.a $pkgdir/usr/i486-mingw32/lib/libpthread.a + install $srcdir/pthreads-w32-$_pkgver-release/pthreadGC2.dll $pkgdir/usr/i486-mingw32/lib/ +} diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD index 27c62ea86..c23ea5ef3 100644 --- a/community/parcellite/PKGBUILD +++ b/community/parcellite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 42044 2011-03-12 11:31:17Z spupykin $ +# $Id: PKGBUILD 50742 2011-06-30 10:48:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=parcellite -pkgver=1.0.1 +pkgver=1.0.2rc2 pkgrel=1 pkgdesc="Lightweight GTK+ clipboard manager" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL3') depends=('gtk2') makedepends=('intltool') source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz) -md5sums=('b2f1de2a424996c0eb2ff3a728a12cfc') +md5sums=('c1ade542f9b5e836af18773171e70e95') build() { cd "$srcdir/parcellite-$pkgver" diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD index c24491033..88a0a5139 100644 --- a/community/sxiv/PKGBUILD +++ b/community/sxiv/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de> pkgname=sxiv -pkgver=0.8.1 -pkgrel=3 +pkgver=0.8.2 +pkgrel=1 pkgdesc='simple x image viewer' arch=('i686' 'x86_64') license=('GPL2') @@ -13,7 +13,7 @@ depends=('libx11' 'xproto' 'imlib2') source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz" 'sxiv.desktop' 'config.h') -md5sums=('23006a1900690d46c0ff126c76cdbd02' +md5sums=('6948b4c02f9458c4160c6e458228b85f' '1dda85ff6bed4de337f8fb303075ed11' '8018e9f2f63b155098428be9dbaf8b5c') diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 81ba44c7d..91ad6c41f 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127014 2011-06-09 16:03:48Z giovanni $ +# $Id: PKGBUILD 129995 2011-06-30 18:10:17Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10576 +pkgver=10587 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('1a1f01d356b3d2d5c01004018ffa79c6') +md5sums=('94228cf3fa58178a84c24658a06022bd') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index f9afbad70..c0e07269b 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 128038 2011-06-21 06:55:54Z bisson $ +# $Id: PKGBUILD 129963 2011-06-30 17:15:51Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=2.5.2 +pkgver=2.5.3 pkgrel=1 pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality' arch=('i686' 'x86_64') @@ -12,21 +12,21 @@ url='http://audacious-media-player.org/' license=('GPL3') depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('unzip: zipped skins support') -source=("http://distfiles.atheme.org/$pkgname-$pkgver.tar.gz") -sha1sums=('48b2662d1513959479ae561465b41df08369a689') +source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") +sha1sums=('b40f140ebeb5d767bd865945b7eb5527c265beb7') provides=('audacious-player') replaces=('audacious-player') install=install build() { - cd "$srcdir/$pkgname-$pkgver" - [[ $CARCH == x86_64 ]] && extraopts='' || extraopts='--disable-sse2' - ./configure --prefix=/usr $extraopts + cd "${srcdir}/${pkgname}-${pkgver}" + [[ ${CARCH} == x86_64 ]] && extraopts='' || extraopts='--disable-sse2' + ./configure --prefix=/usr ${extraopts} make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD index d2af71f19..170c43a4c 100644 --- a/extra/jack/PKGBUILD +++ b/extra/jack/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 129477 2011-06-28 06:24:10Z schiv $ +# $Id: PKGBUILD 130010 2011-06-30 20:37:27Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=jack _longname=jack-audio-connection-kit -pkgver=0.121.1 +pkgver=0.121.2 pkgrel=1 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ provides=("$_longname=$pkgver") replaces=("$_longname") changelog=$pkgname.changelog source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz") -md5sums=('a51005bfd6e993af8517e19e823cf3c6') +md5sums=('06c080349455afd4d217d6a8f9393e01') build() { cd "$srcdir/$_longname-$pkgver" diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD index 2367625e5..9b49bb4b4 100644 --- a/extra/libebml/PKGBUILD +++ b/extra/libebml/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 108561 2011-02-01 17:18:01Z giovanni $ +# $Id: PKGBUILD 129933 2011-06-30 13:52:37Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: 03/08/04 <lefungus@altern.org> pkgname=libebml -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="Extensible Binary Meta Language library" arch=('i686' 'x86_64') url="http://dl.matroska.org/downloads/libebml/" license=('LGPL') depends=('gcc-libs') -source=("${url}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('26fbaa556bb497c1134d33b84ab34443') +source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('13c5a10e260e703d3a7f003fdc995183') build() { cd "${srcdir}/${pkgname}-${pkgver}/make/linux" - make || return 1 + + make } package() { cd "${srcdir}/${pkgname}-${pkgver}/make/linux" - make prefix="${pkgdir}/usr" install || return 1 + + make prefix="${pkgdir}/usr" install } diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD index 4a3aa43b3..656c4f3d5 100644 --- a/extra/libmatroska/PKGBUILD +++ b/extra/libmatroska/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 108572 2011-02-01 18:22:49Z giovanni $ +# $Id: PKGBUILD 129938 2011-06-30 14:07:10Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor 03/08/04 <lefungus@altern.org> pkgname=libmatroska -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="Matroska library" arch=('i686' 'x86_64') url="http://dl.matroska.org/downloads/libmatroska/" license=('LGPL') depends=('libebml') -source=("${url}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('21e5ee3e2573f0ae99db195348bdfb98') +source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('a4f967f9ade56d5181714f3199ffa241') build() { - cd "${srcdir}/${pkgname}-${pkgver}/make/linux" - make sharedlib || return 1 + cd "${srcdir}/${pkgname}-${pkgver}/make/linux" + + make sharedlib } package() { - cd "${srcdir}/${pkgname}-${pkgver}/make/linux" - make prefix="${pkgdir}/usr" install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}/make/linux" + + make prefix="${pkgdir}/usr" install } diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 072ef473a..299cd11c8 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 116022 2011-03-22 15:58:44Z giovanni $ +# $Id: PKGBUILD 129953 2011-06-30 15:40:13Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.03.14 +pkgver=2011.06.16 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('ff65b2c598e970b4b6c8219a1811de00') +md5sums=('9895e723ee9fe87422f120dc646875d5') build() { cd ${srcdir}/live diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 873c8ad07..bec2671d7 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127788 2011-06-18 10:58:55Z giovanni $ +# $Id: PKGBUILD 129948 2011-06-30 15:26:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=mkvtoolnix pkgver=4.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/mtools/PKGBUILD b/extra/mtools/PKGBUILD index 4db0f42fe..482676066 100644 --- a/extra/mtools/PKGBUILD +++ b/extra/mtools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120053 2011-04-18 22:34:00Z giovanni $ +# $Id: PKGBUILD 130005 2011-06-30 19:10:40Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=mtools -pkgver=4.0.16 +pkgver=4.0.17 pkgrel=1 pkgdesc="A collection of utilities to access MS-DOS disks" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('libx11: required by floppyd' backup=('etc/mtools.conf') install=mtools.install source=("http://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2") -md5sums=('e9b07f35272210f407012abaf5d1b9b5') +md5sums=('15571c615d8f75f5f6d294272f80c7fa') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,12 +26,12 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --sysconfdir=/etc - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make -j 1 DESTDIR="${pkgdir}" install || return 1 - install -Dm644 mtools.conf "${pkgdir}/etc/mtools.conf" || return 1 + make -j 1 DESTDIR="${pkgdir}" install + install -Dm644 mtools.conf "${pkgdir}/etc/mtools.conf" } diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 510afc089..5d73e1d73 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127700 2011-06-17 17:59:14Z andrea $ +# $Id: PKGBUILD 130000 2011-06-30 19:02:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> @@ -6,15 +6,20 @@ pkgbase=sip pkgname=('sip' 'python2-sip') pkgver=4.12.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') -source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('d0f1fa60494db04b4d115d4c2d92f79e') +source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz" + 'fix-regression.patch') +md5sums=('d0f1fa60494db04b4d115d4c2d92f79e' + '598ffc65ebaf1c0e8855a352b02c43e7') build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-regression.patch + cd "${srcdir}" cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/sip/fix-regression.patch b/extra/sip/fix-regression.patch new file mode 100644 index 000000000..d4dc794ad --- /dev/null +++ b/extra/sip/fix-regression.patch @@ -0,0 +1,26 @@ + +# HG changeset patch +# User Phil Thompson <phil@riverbankcomputing.com> +# Date 1308852953 -3600 +# Node ID f9f4b161c94021c117e995eccba945d4dd3d0ed4 +# Parent df42f6bf92c8cd12dd7cc5a30231728a4c23ead4 +Fixed a regression introduced in the recent sipIsPyMethod() changes in the +handling of special methods implemented by object (eg. __lt__). + +diff -r df42f6bf92c8 -r f9f4b161c940 siplib/siplib.c.in +--- a/siplib/siplib.c.in Thu Jun 23 17:24:41 2011 +0100 ++++ b/siplib/siplib.c.in Thu Jun 23 19:15:53 2011 +0100 +@@ -7604,9 +7604,10 @@ + #endif + + /* +- * Check any possible reimplementation is not the wrapped C++ method. ++ * Check any possible reimplementation is not the wrapped C++ method or ++ * a default special method implementation.. + */ +- if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type) ++ if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type && Py_TYPE(cls_attr) != &PyWrapperDescr_Type) + { + reimp = cls_attr; + break; + diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD index f90d2f1fa..b20dd6422 100644 --- a/extra/telepathy-salut/PKGBUILD +++ b/extra/telepathy-salut/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 94337 2010-10-06 16:43:18Z ibiru $ +# $Id: PKGBUILD 129928 2011-06-30 10:52:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> pkgname=telepathy-salut -pkgver=0.4.0 +pkgver=0.5.0 pkgrel=1 pkgdesc="A link-local XMPP connection manager for Telepathy" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" groups=('telepathy') license=('LGPL') -depends=('telepathy-glib>=0.12.0' 'avahi' 'libsoup') -makedepends=('libxslt' 'python2') +depends=('telepathy-glib' 'avahi' 'libsoup') +makedepends=('libxslt' 'python2' 'xmldiff') install=telepathy-salut.install source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('95f0cf9681912104474b0f4c4d00807f') +md5sums=('0642bd33d5d5e8e50087ace1faa769cd') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ - --libexecdir=/usr/lib/telepathy + --libexecdir=/usr/lib/telepathy \ + --disable-plugins --disable-Werror \ + --with-tls=openssl make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 29391315a..5e27ee382 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124261 2011-05-18 07:05:56Z ibiru $ +# $Id: PKGBUILD 129943 2011-06-30 15:04:13Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.31 +pkgver=2.32 pkgrel=1 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" @@ -11,7 +11,7 @@ license=('MIT') makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'qt' 'libevent' 'libcanberra' 'dbus-glib') source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.bz2 transmissiond transmissiond.conf) -md5sums=('2785016d74bbecf842cef04883e56400' +md5sums=('cac5d0e07b92e563b34b61de5a6235c7' '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') build() { diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index c861b3ac6..43d28f429 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 129407 2011-06-27 11:36:20Z stephane $ +# $Id: PKGBUILD 129958 2011-06-30 16:26:39Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.10 -pkgrel=5 +pkgrel=6 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -45,7 +45,7 @@ build() { sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c # FS#24872 - patch -Np1 -i ../vlc-1.1.10-libavformat.patch + patch -Np1 -i ${srcdir}/vlc-1.1.10-libavformat.patch ./configure --prefix=/usr \ --disable-rpath \ diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD new file mode 100644 index 000000000..a0c1b154d --- /dev/null +++ b/libre/audacity-libre/PKGBUILD @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Joseph Yaworski <jy@dervormund.info> + +pkgname=audacity-libre +pkgver=1.3.13 +pkgrel=1 +pkgdesc="A program that lets you manipulate digital audio waveforms, libre" +arch=('i686' 'x86_64') +url="http://audacity.sourceforge.net/" +license=('GPL') +depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme' + 'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch') +makedepends=('zip') +options=('!makeflags') +install=audacity-libre.install +source=(http://repo.parabolagnulinux.org/other/${pkgname}-minsrc-${pkgver}-beta.tar.bz2 + remove-unfree-nyquist.patch + audacity-libre.install) +provides=("audacity=$pkgver") +replaces=('audacity') +conflicts=('audacity') + +# source PKGBUILD; mksource +mksource() { + wget http://audacity.googlecode.com/files/audacity-minsrc-${pkgver}-beta.tar.bz2 -O - | \ + tar -jxvf - + + pushd audacity-src-${pkgver}-beta/ + rm -rfv {,lib-src/lib}nyquist + find -iname '*nyquist*' -print0 | xargs -0 \ + rm -rfv + patch -Np0 -i ../remove-unfree-nyquist.patch || return 1 + popd + + mv audacity-src-${pkgver}-beta/ ${pkgname}-src-${pkgver}-beta/ + tar -cjf ${pkgname}-minsrc-${pkgver}-beta.tar.bz2 ${pkgname}-src-${pkgver}-beta/ +} + +build() { + cd "${srcdir}/${pkgname}-src-${pkgver}-beta" + WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \ + --with-portaudio --with-libsamplerate \ + --without-libresample --with-libmad \ + --with-id3tag --with-libflac \ + --with-vorbis --with-libexpat \ + --with-libsndfile --with-soundtouch \ + --enable-unicode --without-taglib \ + --disable-nyquist #unfree + make +} + +package() { + cd "${srcdir}/${pkgname}-src-${pkgver}-beta" + make DESTDIR="${pkgdir}" install +} +md5sums=('0dca3e9b337ff1357b0580bd6de4e3b1' + '7c49dbe048d1f0f1706fd84bbea2fee4' + 'd1942ad63ff1ef27cae2531ee914d5c8') diff --git a/libre/audacity-libre/audacity-libre.install b/libre/audacity-libre/audacity-libre.install new file mode 100644 index 000000000..028c9f62a --- /dev/null +++ b/libre/audacity-libre/audacity-libre.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/libre/audacity-libre/remove-unfree-nyquist.patch b/libre/audacity-libre/remove-unfree-nyquist.patch new file mode 100644 index 000000000..b2f9f31e3 --- /dev/null +++ b/libre/audacity-libre/remove-unfree-nyquist.patch @@ -0,0 +1,24 @@ +--- Makefile.in.orig 2011-07-01 13:27:11.000000000 -0300 ++++ Makefile.in 2011-07-01 13:27:39.000000000 -0300 +@@ -41,12 +41,6 @@ install: audacity $(EXTRAINSTALLTARGETS) + $(INSTALL) -m 644 help/audacity.1.gz \ + $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz + +- # install nyquist +- $(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist +- $(INSTALL) -m 644 nyquist/*.lsp nyquist/nyquist-plot.txt $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist +- $(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist/rawwaves +- $(INSTALL) -m 644 nyquist/rawwaves/*.raw $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist/rawwaves +- + # install plug-ins + $(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins + $(INSTALL) -m 644 plug-ins/*.ny $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins +@@ -103,8 +97,6 @@ uninstall: $(EXTRAUNINSTALLTARGETS) + rm -rf $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME) + # remove man page + rm -rf $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz +- # remove nyquist +- rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist + # remove plug-ins + rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins + # remove locales diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD new file mode 100644 index 000000000..a2a11ec9e --- /dev/null +++ b/testing/cryptsetup/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 129976 2011-06-30 17:57:50Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +pkgname=cryptsetup +pkgver=1.3.1 +pkgrel=2 +pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" +arch=(i686 x86_64) +license=('GPL') +url="http://code.google.com/p/cryptsetup/" +groups=('base') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') +conflicts=('mkinitcpio<0.7') +options=('!libtool' '!emptydirs') +source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 + encrypt_hook + encrypt_install) +sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' + 'b8269d358363eb8d67d1ffa1469068e454a89154636283bcc3edc6486b7fff4e' + 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') + +build() { + cd $srcdir/$pkgname-${pkgver} + ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib + make +} + +package() { + cd $srcdir/$pkgname-${pkgver} + make DESTDIR=$pkgdir install + # install hook + install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt + install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt + # Fix pkgconfig location + install -d -m755 $pkgdir/usr/lib + mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib/ +} diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook new file mode 100644 index 000000000..54aaa2236 --- /dev/null +++ b/testing/cryptsetup/encrypt_hook @@ -0,0 +1,132 @@ +# vim: set ft=sh: +# TODO this one needs some work to work with lots of different +# encryption schemes +run_hook () +{ + /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + fi + [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" + + # Get keyfile if specified + ckeyfile="/crypto_keyfile.bin" + if [ "x${cryptkey}" != "x" ]; then + ckdev="$(echo "${cryptkey}" | cut -d: -f1)" + ckarg1="$(echo "${cryptkey}" | cut -d: -f2)" + ckarg2="$(echo "${cryptkey}" | cut -d: -f3)" + if poll_device "${ckdev}" ${rootdelay}; then + case ${ckarg1} in + *[!0-9]*) + # Use a file on the device + # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path + mkdir /ckey + mount -r -t ${ckarg1} ${ckdev} /ckey + dd if=/ckey/${ckarg2} of=${ckeyfile} >/dev/null 2>&1 + umount /ckey + ;; + *) + # Read raw data from the block device + # ckarg1 is numeric: ckarg1=offset, ckarg2=length + dd if=${ckdev} of=${ckeyfile} bs=1 skip=${ckarg1} count=${ckarg2} >/dev/null 2>&1 + ;; + esac + fi + [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." + fi + + if [ -n "${cryptdevice}" ]; then + DEPRECATED_CRYPT=0 + cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" + cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" + else + DEPRECATED_CRYPT=1 + cryptdev="${root}" + cryptname="root" + fi + + warn_deprecated() { + echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" + echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." + } + + if poll_device "${cryptdev}" ${rootdelay}; then + if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + dopassphrase=1 + # If keyfile exists, try to use that + if [ -f ${ckeyfile} ]; then + if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then + dopassphrase=0 + else + echo "Invalid keyfile. Reverting to passphrase." + fi + fi + # Ask for a passphrase + if [ ${dopassphrase} -gt 0 ]; then + echo "" + echo "A password is required to access the ${cryptname} volume:" + + #loop until we get a real password + while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do + sleep 2; + done + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + elif [ -n "${crypto}" ]; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + msg "Non-LUKS encrypted device found..." + if [ $# -ne 5 ]; then + err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Non-LUKS decryption not attempted..." + return 1 + fi + exe="/sbin/cryptsetup create ${cryptname} ${cryptdev}" + tmp=$(echo "${crypto}" | cut -d: -f1) + [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f2) + [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f3) + [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f4) + [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f5) + [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\"" + if [ -f ${ckeyfile} ]; then + exe="${exe} --key-file ${ckeyfile}" + else + exe="${exe} --verify-passphrase" + echo "" + echo "A password is required to access the ${cryptname} volume:" + fi + eval "${exe} ${CSQUIET}" + + if [ $? -ne 0 ]; then + err "Non-LUKS device decryption failed. verify format: " + err " crypto=hash:cipher:keysize:offset:skip" + exit 1 + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + else + err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." + fi + fi + rm -f ${ckeyfile} + fi +} diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install new file mode 100644 index 000000000..13174ec06 --- /dev/null +++ b/testing/cryptsetup/encrypt_install @@ -0,0 +1,26 @@ +# vim: set ft=sh: + +build() +{ + if [ -z "${CRYPTO_MODULES}" ]; then + MODULES=" dm-crypt $(all_modules "/crypto/") " + else + MODULES=" dm-crypt ${CRYPTO_MODULES} " + fi + FILES="" + SCRIPT="encrypt" + [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" + [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" + add_binary "/sbin/dmsetup" + add_file "/lib/udev/rules.d/10-dm.rules" + add_file "/lib/udev/rules.d/13-dm-disk.rules" + add_file "/lib/udev/rules.d/95-dm-notify.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" +} + +help () +{ +cat<<HELPEOF + This hook allows for an encrypted root device. +HELPEOF +} diff --git a/testing/dmraid/PKGBUILD b/testing/dmraid/PKGBUILD new file mode 100644 index 000000000..5af91a2ec --- /dev/null +++ b/testing/dmraid/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 129977 2011-06-30 18:03:08Z thomas $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +#Contributor: Urs Wolfer <uwolfer @ fwo.ch> + +pkgname=dmraid +pkgver=1.0.0.rc16.3 +pkgrel=2 +pkgdesc="Device mapper RAID interface" +url="http://people.redhat.com/~heinzm/sw/dmraid/" +conflicts=('mkinitcpio<0.7') +depends=('device-mapper>=2.0.54') +arch=('i686' 'x86_64') +license=('GPL') +source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 + http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2 + dmraid_install + dmraid_hook) +install=dmraid.install +md5sums=('819338fcef98e8e25819f0516722beeb' + 'bf6c61a11dbbb40d5152835075c9f438' + '2a1ef82fb32f065ee560dceef736475e') + +build() { + cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname + ./configure --enable-led --enable-intel_led + make +} + +package() { + cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname + make DESTDIR="$pkgdir" prefix=/ libdir=/lib mandir=/usr/share/man includedir=/usr/include install + mkdir -p "$pkgdir"/var/lock/dmraid + chmod 1777 "$pkgdir"/var/lock/ + install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/lib/initcpio/install/dmraid + install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/lib/initcpio/hooks/dmraid + # fix permissions + chmod 644 "$pkgdir"/lib/libdmraid.a + chmod 644 "$pkgdir"/usr/include/dmraid/* +} diff --git a/testing/dmraid/dmraid.install b/testing/dmraid/dmraid.install new file mode 100644 index 000000000..64899e785 --- /dev/null +++ b/testing/dmraid/dmraid.install @@ -0,0 +1,14 @@ +post_upgrade() { + if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then + # important upgrade notice + echo ">>>" + echo ">>> IMPORTANT DMRAID UPGRADE NOTICE" + echo ">>> -------------------------------" + echo ">>> Version 1.0.0.rc15 and greater introduce a new name scheme:" + echo ">>> You need to add an additional 'p' in front of your number." + echo ">>> e.g. <yourname><number> --> <yourname>p<number>" + echo ">>> firsthd1 --> firsthdp1" + echo ">>> Please change your bootloader and fstab accordingly." + echo ">>>" + fi +} diff --git a/testing/dmraid/dmraid_hook b/testing/dmraid/dmraid_hook new file mode 100644 index 000000000..6219a718a --- /dev/null +++ b/testing/dmraid/dmraid_hook @@ -0,0 +1,19 @@ +# vim: set ft=sh: +run_hook () +{ + /sbin/modprobe -q dm-mod >/dev/null 2>&1 + /sbin/modprobe -q dm-mirror >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + fi + msg ":: Activating dmraid arrays..." + # prevent any event monitoring calls with -I + if [ "${quiet}" = "y" ]; then + /sbin/dmraid -ay -I -Z >/dev/null + else + /sbin/dmraid -ay -I -Z + fi + fi +} diff --git a/testing/dmraid/dmraid_install b/testing/dmraid/dmraid_install new file mode 100644 index 000000000..eeb9e0893 --- /dev/null +++ b/testing/dmraid/dmraid_install @@ -0,0 +1,19 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" dm-mod dm-mirror " + BINARIES="/sbin/dmraid /sbin/dmsetup" + FILES="" + SCRIPT="dmraid" + add_file "/lib/udev/rules.d/10-dm.rules" + add_file "/lib/udev/rules.d/13-dm-disk.rules" + add_file "/lib/udev/rules.d/95-dm-notify.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for a dmraid root device. +HELPEOF +} diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD new file mode 100644 index 000000000..6dc3dcc01 --- /dev/null +++ b/testing/krb5/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 129991 2011-06-30 18:09:30Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=krb5 +pkgver=1.9.1 +pkgrel=2 +pkgdesc="The Kerberos network authentication system" +arch=('i686' 'x86_64') +url="http://web.mit.edu/kerberos/" +license=('custom') +depends=('e2fsprogs' 'libldap' 'keyutils') +makedepends=('perl') +provides=('heimdal') +replaces=('heimdal') +conflicts=('heimdal') +backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar + krb5-kadmind + krb5-kdc) +sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' + '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' + '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393') +options=('!emptydirs') + +build() { + tar zxvf ${pkgname}-${pkgver}.tar.gz + cd "${srcdir}/${pkgname}-${pkgver}/src" + + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" + export CPPFLAGS+=" -I/usr/include/et" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --localstatedir=/var/lib \ + --enable-shared \ + --with-system-et \ + --with-system-ss \ + --disable-rpath \ + --without-tcl \ + --enable-dns-for-realm \ + --with-ldap + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/src" + make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install + + # Sample KDC config file + install -dm 755 "${pkgdir}"/var/lib/krb5kdc + install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf + + # Default configuration file + install -dm 755 "${pkgdir}"/etc + install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf + + install -dm 755 "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d + + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind new file mode 100644 index 000000000..04df0dcff --- /dev/null +++ b/testing/krb5/krb5-kadmind @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kadmind` +case "$1" in + start) + stat_busy "Starting Kerberos Admin Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kadmind + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kadmind + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Admin Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kadmind + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc new file mode 100644 index 000000000..05a03411e --- /dev/null +++ b/testing/krb5/krb5-kdc @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/krb5kdc` +case "$1" in + start) + stat_busy "Starting Kerberos Authentication" + if [ -z "$PID" ]; then + /usr/sbin/krb5kdc + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kdc + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Authentication" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kdc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules new file mode 100644 index 000000000..d2c167324 --- /dev/null +++ b/testing/lvm2/11-dm-initramfs.rules @@ -0,0 +1,3 @@ +# needed with new udev/mkinitcpio and as implemented in dracut: +# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> +SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff new file mode 100644 index 000000000..e75499e8e --- /dev/null +++ b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff @@ -0,0 +1,17 @@ +Do not issue an error message when unable to remove .cache on read-only fs. +=================================================================== +RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v +retrieving revision 1.49 +retrieving revision 1.50 +diff -u -r1.49 -r1.50 +--- LVM2/lib/filters/filter-persistent.c 2011/04/22 12:05:33 1.49 ++++ LVM2/lib/filters/filter-persistent.c 2011/05/12 12:42:48 1.50 +@@ -108,7 +108,7 @@ + log_very_verbose("Obtaining device list from " + "udev. Removing obolete %s.", + pf->file); +- if (unlink(pf->file) < 0) ++ if (unlink(pf->file) < 0 && errno != EROFS) + log_sys_error("unlink", pf->file); + } + return 1; diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD new file mode 100644 index 000000000..0e13adba9 --- /dev/null +++ b/testing/lvm2/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 129975 2011-06-30 17:54:05Z thomas $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgbase=lvm2 +pkgname=('lvm2' 'device-mapper') +pkgver=2.02.85 +_pkgverlvm=${pkgver} +pkgrel=3 +arch=('i686' 'x86_64') +url="http://sourceware.org/lvm2/" +license=('GPL2' 'LGPL2.1') +groups=('base') +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz + lvm2_install + lvm2_hook + Be-quiet-on-removing-cache-on-read-only-fs.diff + 11-dm-initramfs.rules) +md5sums=('91785ca438e5ce679dd3a386b183d552' + 'dcb82506d732cc7b10159a89b579dba8' + '8d613b84a175cd85f752a75198e40e15' + '6db89da27928d2415a8e26cd0a842712' + '69e40679cd8b3658bfc619e48baae125') +sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' + '7f108b2f2056eb050fc898bf5190ecf9145aed8a' + 'a0e0513c2efb183006e57e595d93ce18be297928' + '6d7dd04be291d7537235704c816a701fd5beacc0' + 'f6a554eea9557c3c236df2943bb6e7e723945c41') + +build() { + cd "${srcdir}/LVM2.${_pkgverlvm}" + sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh + patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff + unset LDFLAGS + ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + --includedir=/usr/include --with-usrlibdir=/usr/lib \ + --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ + --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules + make +} + +package_device-mapper() { + pkgdesc="Device mapper userspace library and tools" + url="http://sourceware.org/dm/" + depends=('glibc' 'udev') + + cd "${srcdir}/LVM2.${_pkgverlvm}" + make DESTDIR="${pkgdir}" install_device-mapper + # extra udev rule for device-mapper in initramfs + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" +} + +package_lvm2() { + pkgdesc="Logical Volume Manager 2 utilities" + depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') + conflicts=('lvm' 'mkinitcpio<0.7') + backup=('etc/lvm/lvm.conf') + options=('!makeflags') + + cd "${srcdir}/LVM2.${_pkgverlvm}" + make DESTDIR="${pkgdir}" install_lvm2 + # install applib + cd liblvm + make DESTDIR="${pkgdir}" install + cd .. + # /etc directories + install -d "${pkgdir}"/etc/lvm/{archive,backup} + # mkinitcpio hook + install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" + install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" +} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook new file mode 100644 index 000000000..874b91d06 --- /dev/null +++ b/testing/lvm2/lvm2_hook @@ -0,0 +1,25 @@ +# vim:set ft=sh: +run_hook () +{ + /sbin/modprobe -q dm-mod >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + fi + + # If the lvmwait= parameter has been specified on the command line + # wait for the device(s) before trying to activate the volume group(s) + if [ -n "${lvmwait}" ]; then + for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do + poll_device ${pvdev} ${rootdelay} + done + fi + + [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" + + msg "Activating logical volumes..." + [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit + eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET + fi +} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install new file mode 100644 index 000000000..94175b523 --- /dev/null +++ b/testing/lvm2/lvm2_install @@ -0,0 +1,29 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" dm-mod dm-snapshot dm-mirror" + BINARIES="" + FILES="" + SCRIPT="lvm2" + + add_binary "/sbin/lvm" + add_binary "/sbin/dmsetup" + add_file "/lib/udev/rules.d/10-dm.rules" + add_file "/lib/udev/rules.d/13-dm-disk.rules" + add_file "/lib/udev/rules.d/95-dm-notify.rules" + add_file "/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for an LVM2 root device. + + The optional lvmwait= parameter followed by a comma-separated + list of device names can be given on the command line. + It will cause the hook to wait until all given devices exist + before trying to scan and activate any volume groups. +HELPEOF +} diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD index 3da2fec8d..0f9d96fc8 100644 --- a/testing/mdadm/PKGBUILD +++ b/testing/mdadm/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 127622 2011-06-17 07:48:12Z tpowa $ +# $Id: PKGBUILD 129978 2011-06-30 18:05:23Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/" groups=('base') -conflicts=('mkinitcpio<0.5.99') +conflicts=('mkinitcpio<0.7') depends=('glibc') backup=('etc/mdadm.conf') source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 @@ -23,7 +23,7 @@ replaces=('raidtools') md5sums=('12ee2fbf3beddb60601fb7a4c4905651' '6df172c8f77b280018cf87eb3d313f29' '00cbed931db4f15b6ce49e3e7d433966' - '53f58d4a8f6e23c452d67007186262e3' + '4bb000166fb13e82ceaa2422fdfaac7e' '36f7cc564ed3267888d90208e0eb7adc' '4ad87b74a4bc9a34621280abe0e0c3e4') diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install index 59f4bc67b..f351cb292 100644 --- a/testing/mdadm/mdadm_install +++ b/testing/mdadm/mdadm_install @@ -1,6 +1,6 @@ # vim: set ft=sh: -install () +build() { MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " BINARIES="" diff --git a/testing/v86d/PKGBUILD b/testing/v86d/PKGBUILD new file mode 100644 index 000000000..5e3bb7af1 --- /dev/null +++ b/testing/v86d/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 129979 2011-06-30 18:07:08Z thomas $ +# Maintainer: Thomas Baechler <thomas@archlinux.org> + +pkgname=v86d +pkgver=0.1.10 +pkgrel=2 +pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" +arch=('i686' 'x86_64') +url="http://dev.gentoo.org/~spock/projects/uvesafb/" +license=('GPL2') +depends=('glibc') +conflicts=('mkinitcpio<0.7') +backup=('etc/modprobe.d/uvesafb.conf') +options=('!makeflags') +source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2 + v86d + v86d_hook + modprobe.uvesafb) +md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' + '2748ca01397e5c4435f87692f7d042a8' + '813958b8f6c75a7063e4858f31509694' + '2d7cc8dc6a41916a13869212d0191147') + +build() { + cd "$srcdir/v86d-$pkgver" + ./configure --with-x86emu + # we only need /usr/include/video/uvesafb.h + make KDIR=/usr +} + +package() { + cd "$srcdir/v86d-$pkgver" + make DESTDIR="$pkgdir" install + + install -D -m644 "$srcdir/v86d" "$pkgdir/lib/initcpio/install/v86d" + install -D -m644 "$srcdir/v86d_hook" "$pkgdir/lib/initcpio/hooks/v86d" + install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/etc/modprobe.d/uvesafb.conf" +} diff --git a/testing/v86d/modprobe.uvesafb b/testing/v86d/modprobe.uvesafb new file mode 100644 index 000000000..5e46e1088 --- /dev/null +++ b/testing/v86d/modprobe.uvesafb @@ -0,0 +1,10 @@ +# +# This file sets the parameters for uvesafb module. +# The following format should be used: +# options uvesafb mode=<xres>x<yres>[-<bpp>][@<refresh>] scroll=<ywrap|ypan|redraw> ... +# +# For more details see: +# http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/fb/uvesafb.txt +# + +options uvesafb mode_option=1024x768-32 scroll=ywrap diff --git a/testing/v86d/v86d b/testing/v86d/v86d new file mode 100644 index 000000000..2065b8e64 --- /dev/null +++ b/testing/v86d/v86d @@ -0,0 +1,12 @@ +build() { + add_binary "/sbin/v86d" + add_file "/etc/modprobe.d/uvesafb.conf" + MODULES="uvesafb" + SCRIPT="v86d" +} + +help() { + echo "This hook sets up v86d, the userspace helper for uvesafb." +} + +# vim: set ft=sh ts=4 sw=4 expandtab: diff --git a/testing/v86d/v86d_hook b/testing/v86d/v86d_hook new file mode 100644 index 000000000..e5dff01c1 --- /dev/null +++ b/testing/v86d/v86d_hook @@ -0,0 +1,4 @@ +run_hook() +{ + /sbin/modprobe uvesafb +}
\ No newline at end of file |