diff options
| author | root <root@rshg054.dnsready.net> | 2012-08-16 00:02:36 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-08-16 00:02:36 +0000 |
| commit | 0fc1870f2eadde8cb06004be1cbe8d1a4333aa69 (patch) | |
| tree | 09ae142c72b3ef3bba14bcd0fbd982446585d894 | |
| parent | 8f1eb849d6de0031d4d91fb6d8780828b1ba924b (diff) | |
Thu Aug 16 00:02:36 UTC 2012
98 files changed, 1691 insertions, 411 deletions
diff --git a/community-testing/arm-elf-gcc-base/PKGBUILD b/community-testing/arm-elf-gcc-base/PKGBUILD new file mode 100644 index 000000000..4946b78ae --- /dev/null +++ b/community-testing/arm-elf-gcc-base/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 75111 2012-08-14 08:27:41Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=arm-elf-gcc-base +pkgver=4.7.0 +pkgrel=2 +pkgdesc="The GNU Compiler Collection" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +url="http://gcc.gnu.org" +depends=('arm-elf-binutils' 'libmpc' 'libelf') +options=(!libtool !emptydirs zipman docs !strip) +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) +md5sums=('2a0f1d99fda235c29d40b561f81d9a77') + +build() { + cd $srcdir/gcc-$pkgver + + export CFLAGS="-O2 -pipe" + export CXXFLAGS="-O2 -pipe" + + rm -rf build + mkdir build + cd build + + ../configure --prefix=/usr \ + --target=arm-elf \ + --enable-obsolete \ + --host=$CHOST \ + --build=$CHOST \ + --enable-shared --disable-nls --enable-languages=c --enable-multilib \ + --with-local-prefix=/usr/lib/arm-elf \ + --with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \ + --enable-softfloat \ + --with-float=soft \ + --with-newlib \ + --with-sysroot=/usr/$CHOST/arm-elf + + make all-gcc all-target-libgcc +} + +package() { + cd $srcdir/gcc-$pkgver/build + + export CFLAGS="-O2 -pipe" + export CXXFLAGS="-O2 -pipe" + + make DESTDIR=$pkgdir install-gcc install-target-libgcc + + rm -f $pkgdir/usr/share/man/man7/fsf-funding.7* + rm -f $pkgdir/usr/share/man/man7/gfdl.7* + rm -f $pkgdir/usr/share/man/man7/gpl.7* + rm -rf $pkgdir/usr/share/info + + cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/ + rm -rf $pkgdir/usr/libexec + + # strip it manually + strip $pkgdir/usr/bin/* 2>/dev/null || true + find $pkgdir/usr/lib -type f -exec arm-elf-strip --strip-debug --strip-unneeded {} \; 2>/dev/null || true +} diff --git a/community-testing/avr-gcc/PKGBUILD b/community-testing/avr-gcc/PKGBUILD new file mode 100644 index 000000000..8e0e7cf79 --- /dev/null +++ b/community-testing/avr-gcc/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 75112 2012-08-14 08:28:11Z allan $ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> +# Contributor: danst0 <danst0@west.de> + +# Build order: avr-binutils -> avr-gcc -> avr-libc + +pkgname=avr-gcc +_pkgname=gcc +pkgver=4.7.1 +pkgrel=2 +pkgdesc="The GNU AVR Compiler Collection" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'custom') +url="http://gcc.gnu.org/" +depends=('avr-binutils>=2.22-3' 'cloog' 'ppl' 'gcc-libs>=4.7.0' 'libmpc') +provides=("gcc-avr=$pkgver") +replaces=('gcc-avr') +options=('!libtool' '!emptydirs' '!libtool' '!strip') +source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2) + +_basedir=${srcdir}/${_pkgname}-${pkgver} + +build() { + # default CFLAGS lead to issues later on when configure + # calls avr-gcc with -march set. + export CFLAGS="-O2 -pipe" + export CXXFLAGS="-O2 -pipe" + + cd ${_basedir} + + # Do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + + echo ${pkgver} > gcc/BASE-VER + + cd ${srcdir} + mkdir gcc-build && cd gcc-build + + ${_basedir}/configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-languages=c,c++ \ + --disable-libssp \ + --disable-nls \ + --target=avr \ + --with-as=/usr/bin/avr-as \ + --with-ld=/usr/bin/avr-ld \ + --with-gnu-as \ + --with-gnu-ld + + make +} + +package() { + cd ${srcdir}/gcc-build + + make -j1 DESTDIR=${pkgdir} install + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION + + rm -rf ${pkgdir}/usr/share/man/man7 + rm -rf ${pkgdir}/usr/share/info +} + +md5sums=('933e6f15f51c031060af64a9e14149ff') diff --git a/community-testing/evas_generic_loaders-svn/PKGBUILD b/community-testing/evas_generic_loaders-svn/PKGBUILD index 73305f49d..fa635d97f 100644 --- a/community-testing/evas_generic_loaders-svn/PKGBUILD +++ b/community-testing/evas_generic_loaders-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72911 2012-06-24 19:23:41Z foutrelis $ +# $Id: PKGBUILD 75177 2012-08-14 20:07:40Z dreisner $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas_generic_loaders-svn -pkgver=72171 +pkgver=75109 pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') @@ -15,7 +15,6 @@ makedepends=('subversion') conflicts=('evas_generic_loaders') provides=('evas_generic_loaders') options=('!libtool' '!emptydirs') -md5sums=() _svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas_generic_loaders" _svnmod="evas_generic_loaders" @@ -49,5 +48,4 @@ package() { "$pkgdir/usr/share/licenses/$pkgname/COPYING" rm -r "$srcdir/$_svnmod-build" - } diff --git a/community-testing/gambas2/PKGBUILD b/community-testing/gambas2/PKGBUILD index 4fa7a1821..0c75e0d4d 100644 --- a/community-testing/gambas2/PKGBUILD +++ b/community-testing/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72912 2012-06-24 19:23:54Z foutrelis $ +# $Id: PKGBUILD 75178 2012-08-14 20:07:53Z dreisner $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -12,7 +12,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=2 +pkgrel=6 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" @@ -40,7 +40,8 @@ source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 md5sums=('b59072b6f57b681d586cc84c02333690' '9dda03a1bbfb7e7ba8b6a4ae91b6752b' '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b') + 'ab5667175c4945282d2f40a35d0e9e5b' + '5eb70afe712c0f8667a700df4d9a6735') _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" _buildgbcomp() { @@ -88,7 +89,7 @@ package_gambas2-meta() { 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' @@ -101,6 +102,8 @@ package_gambas2-meta() { package_gambas2-runtime() { depends=('libffi' 'xdg-utils') pkgdesc="Gambas2 runtime environment" + provides=('gambas2-gb-gui') + conflicts=('gambas2-gb-gui') install=gambas2-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -116,8 +119,16 @@ package_gambas2-runtime() { ${pkgdir}/usr/lib/gambas2 ln -s gbx2 ${pkgdir}/usr/bin/gbr2 ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + rm ${pkgdir}/usr/lib/gambas2/gb.{qt.*,so*,la} + rm ${pkgdir}/usr/share/gambas2/info/gb.qt* + ## needed for postinst with xdg-utils install -d -m755 ${pkgdir}/usr/share/gambas2/mime install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \ @@ -192,7 +203,7 @@ package_gambas2-examples() { 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' 'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' @@ -200,7 +211,6 @@ package_gambas2-examples() { 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgdesc="Gambas2 examples" -# arch=('any') cd ${srcdir}/${pkgbase}-${pkgver} make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install @@ -212,7 +222,6 @@ package_gambas2-examples() { package_gambas2-help() { depends=() pkgdesc="Gambas2 help files" -# arch=('any') cd ${srcdir}/${pkgbase}-${pkgver}/help make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install @@ -225,7 +234,6 @@ package_gambas2-script() { depends=('gambas2-devel') pkgdesc="Gambas2 scripter and server programs support" install=gambas2-script.install -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -259,7 +267,6 @@ package_gambas2-script() { package_gambas2-gb-chart() { depends=('gambas2-gb-form') pkgdesc="Gambas2 chart component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -332,7 +339,6 @@ package_gambas2-gb-db-firebird() { package_gambas2-gb-db-form() { depends=('gambas2-gb-db' 'gambas2-gb-form') pkgdesc="Gambas2 database form component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -426,9 +432,8 @@ package_gambas2-gb-desktop() { } package_gambas2-gb-form() { - depends=('gambas2-gb-gui') + depends=('gambas2-runtime') pkgdesc="Gambas2 form component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -456,7 +461,6 @@ package_gambas2-gb-form() { package_gambas2-gb-form-dialog() { depends=('gambas2-gb-form') pkgdesc="Gambas2 form dialog component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -485,7 +489,6 @@ package_gambas2-gb-form-dialog() { package_gambas2-gb-form-mdi() { depends=('gambas2-gb-form') pkgdesc="Gambas2 form MDI component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -576,31 +579,6 @@ package_gambas2-gb-gtk-svg() { ## } -package_gambas2-gb-gui() { - depends=('gambas2-gb-qt' 'gambas2-gb-gtk') - pkgdesc="Gambas2 automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - package_gambas2-gb-image() { depends=('gambas2-runtime') pkgdesc="Gambas2 image processing component" @@ -612,7 +590,6 @@ package_gambas2-gb-image() { package_gambas2-gb-info() { depends=('gambas2-runtime') pkgdesc="Gambas2 info component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -773,7 +750,6 @@ package_gambas2-gb-qt-kde-html() { package_gambas2-gb-report() { depends=('gambas2-runtime' 'gambas2-gb-form') pkgdesc="Gambas2 report component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -820,7 +796,6 @@ package_gambas2-gb-sdl-sound() { package_gambas2-gb-settings() { depends=('gambas2-runtime') pkgdesc="Gambas2 settings management component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -857,7 +832,6 @@ package_gambas2-gb-vb() { package_gambas2-gb-web() { depends=('gambas2-runtime') pkgdesc="Gambas2 CGI component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -947,8 +921,3 @@ package_gambas2-gb-xml-xslt() { rm -rf ${pkgdir}/usr/bin ## } -md5sums=('b59072b6f57b681d586cc84c02333690' - '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b' - '5eb70afe712c0f8667a700df4d9a6735') diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD index 4a990ca65..9a993cc01 100644 --- a/community-testing/gambas3/PKGBUILD +++ b/community-testing/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74513 2012-07-29 21:15:40Z ebelanger $ +# $Id: PKGBUILD 75179 2012-08-14 20:08:01Z dreisner $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.2.1 -pkgrel=3 +pkgrel=5 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -48,6 +48,7 @@ package_gambas3-runtime() { pkgdesc="Runtime environment" conflicts=('gambas3-gb-gui') replaces=('gambas3-gb-gui') + provides=("gambas3-gb-gui=${pkgver}") install=gambas3-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc diff --git a/community-testing/libextractor/PKGBUILD b/community-testing/libextractor/PKGBUILD index 23cc9ccf9..98df3d66d 100644 --- a/community-testing/libextractor/PKGBUILD +++ b/community-testing/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74731 2012-08-02 15:23:53Z andrea $ +# $Id: PKGBUILD 75180 2012-08-14 20:08:07Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor pkgver=0.6.3 -pkgrel=6 +pkgrel=7 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64") license=('GPL') diff --git a/community-testing/mingw32-gcc/PKGBUILD b/community-testing/mingw32-gcc/PKGBUILD new file mode 100644 index 000000000..f20bf03b5 --- /dev/null +++ b/community-testing/mingw32-gcc/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 75113 2012-08-14 08:28:16Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Ondrej Jirman <megous@megous.com> + +pkgname=mingw32-gcc +pkgver=4.7.0 +pkgrel=2 +_uprel=1 +arch=(i686 x86_64) +pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" +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/Base/gcc/Version4/" +license=(GPL LGPL) +source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma + gcc-1-mingw-float.patch) +md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d' + '2407123c35c0aa92ee5ffc27decca9a7') + +build() +{ + [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 + + patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch + + mkdir -p $srcdir/build + cd $srcdir/build + + unset CFLAGS CXXFLAGS + + chmod ugo+x $srcdir/gcc-$pkgver/configure + chmod ugo+x $srcdir/gcc-$pkgver/move-if-change + + msg "gcc" + [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \ + --target=i486-mingw32 \ + --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 \ + --enable-libgomp + + make + make install DESTDIR=$pkgdir + + msg "libgcc" + make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install + + msg "libstdc++" + make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install + + msg "fixes" + cd $pkgdir/usr/i486-mingw32/lib + mkdir -p $pkgdir/usr/i486-mingw32/bin/ + for i in `ls -1 *.dll`; do + ln -s ../lib/$i $pkgdir/usr/i486-mingw32/bin/$i + done + + cd $pkgdir + rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ + usr/{include,lib/libiberty.a} \ + usr/share/{info,man} \ + usr/share/gcc-$pkgver/python + + strip usr/bin/* + strip usr/lib/gcc/i486-mingw32/$pkgver/{cc1*,collect2} + i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a +} diff --git a/community-testing/mingw32-gcc/gcc-1-mingw-float.patch b/community-testing/mingw32-gcc/gcc-1-mingw-float.patch new file mode 100644 index 000000000..365949ad7 --- /dev/null +++ b/community-testing/mingw32-gcc/gcc-1-mingw-float.patch @@ -0,0 +1,18 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html +http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 + +diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h +--- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 ++++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 +@@ -275,3 +275,7 @@ + #endif /* __STDC_WANT_DEC_FP__ */ + + #endif /* _FLOAT_H___ */ ++ ++#ifdef __MINGW32__ ++#include_next<float.h> ++#endif diff --git a/community-testing/pdf2djvu/PKGBUILD b/community-testing/pdf2djvu/PKGBUILD index e3f409a75..3d3f77fb7 100644 --- a/community-testing/pdf2djvu/PKGBUILD +++ b/community-testing/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72915 2012-06-24 19:24:11Z foutrelis $ +# $Id: PKGBUILD 75181 2012-08-14 20:08:10Z dreisner $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.13 -pkgrel=2 +pkgrel=4 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" @@ -12,6 +12,7 @@ license=('GPL') depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick') makedepends=('pstreams' 'python2-nose' 'ttf-liberation') source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") +md5sums=('b5327c5949057711a8250dffb6ccfd2d') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -30,4 +31,3 @@ check() { sed -i 's/nosetests/nosetests2/' tests/Makefile make test } -md5sums=('b5327c5949057711a8250dffb6ccfd2d') diff --git a/community-testing/sage-mathematics/PKGBUILD b/community-testing/sage-mathematics/PKGBUILD index 24300f2e9..b6483c6e0 100644 --- a/community-testing/sage-mathematics/PKGBUILD +++ b/community-testing/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74291 2012-07-23 15:07:41Z dwallace $ +# $Id: PKGBUILD 75170 2012-08-14 16:00:21Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,8 +7,8 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.1 -pkgrel=3 +pkgver=5.2 +pkgrel=2 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' arch=('i686' 'x86_64') @@ -35,9 +35,6 @@ build() { # fix build errors unset LDFLAGS - # don't build GCC - export SAGE_INSTALL_GCC='no' - # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') export MAKE="make -j${SAGE_BUILD_THREADS}" @@ -99,5 +96,5 @@ package() { } # vim :set ts=2 sw=2 et: -md5sums=('fa612f36387218d07b84f76995914c93' +md5sums=('59f55ec8cdd1ca595c56cc72620b3576' 'dc391f12b7d17dd37326343ec0e99bbd') diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index c2a04b08d..af6c8219e 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=72689 +pkgver=75192 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64') diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index fef5f7723..e7e1f549b 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72779 2012-06-22 09:56:44Z rvanharen $ +# $Id: PKGBUILD 75145 2012-08-14 09:52:54Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=72689 +pkgver=75235 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ groups=('e17-svn') url="http://www.enlightenment.org" license=('BSD') depends=('e_dbus-svn' 'edje-svn' 'efreet-svn' 'alsa-lib' 'pm-utils' - 'pam' 'eeze-svn') + 'pam' 'eeze-svn' 'eio-svn') makedepends=('svn') conflicts=('e') provides=('e' 'notification-daemon') diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index f2a30efa6..86ead8b4b 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72771 2012-06-22 09:49:33Z rvanharen $ +# $Id: PKGBUILD 75143 2012-08-14 09:52:21Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e_dbus-svn -pkgver=71548 +pkgver=75202 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index 36e1a0414..b73325c5e 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72757 2012-06-22 09:44:19Z rvanharen $ +# $Id: PKGBUILD 75125 2012-08-14 09:47:15Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=72684 +pkgver=75234 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64') @@ -52,6 +52,6 @@ package(){ install -Dm644 $srcdir/$_svnmod-build/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING - rm -r $startdir/src/$_svnmod-build + rm -r $srcdir/$_svnmod-build } diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 02be1ac81..4964731af 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72764 2012-06-22 09:46:56Z rvanharen $ +# $Id: PKGBUILD 75134 2012-08-14 09:50:05Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=72679 +pkgver=75185 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index 4c608ae63..c6094788c 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72752 2012-06-22 09:42:01Z rvanharen $ +# $Id: PKGBUILD 75120 2012-08-14 09:45:53Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet-svn -pkgver=72253 +pkgver=75190 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index 9c81f9ef7..bd796e077 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72760 2012-06-22 09:45:39Z rvanharen $ +# $Id: PKGBUILD 75130 2012-08-14 09:48:59Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: bluebugs pkgname=eeze-svn -pkgver=72008 +pkgver=75095 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index 80e331e9d..eec885072 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72769 2012-06-22 09:48:52Z rvanharen $ +# $Id: PKGBUILD 75141 2012-08-14 09:51:39Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=efreet-svn -pkgver=72387 +pkgver=75107 pkgrel=1 pkgdesc="freedesktop.org specifications for e17" arch=('i686' 'x86_64') diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 2cf580267..1a4304165 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72750 2012-06-22 09:41:17Z rvanharen $ +# $Id: PKGBUILD 75118 2012-08-14 09:45:09Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=72252 +pkgver=75110 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64') diff --git a/community/eio-svn/PKGBUILD b/community/eio-svn/PKGBUILD index 6992dc2aa..0a0b06cf8 100644 --- a/community/eio-svn/PKGBUILD +++ b/community/eio-svn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 72758 2012-06-22 09:44:59Z rvanharen $ +# $Id: PKGBUILD 75128 2012-08-14 09:48:06Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=eio-svn -pkgver=72607 +pkgver=75111 pkgrel=1 pkgdesc="Async IO library" arch=('i686' 'x86_64') diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index 007146064..e15b840f1 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72775 2012-06-22 09:50:54Z rvanharen $ +# $Id: PKGBUILD 75150 2012-08-14 09:56:14Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=72678 +pkgver=75227 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64') diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index bd5d741a0..4e0705a80 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72762 2012-06-22 09:46:18Z rvanharen $ +# $Id: PKGBUILD 75132 2012-08-14 09:49:39Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo-svn -pkgver=72112 +pkgver=75095 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64') diff --git a/community/emotion-svn/PKGBUILD b/community/emotion-svn/PKGBUILD index 4f39fda91..c9d82c17f 100644 --- a/community/emotion-svn/PKGBUILD +++ b/community/emotion-svn/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=emotion-svn -pkgver=72440 +pkgver=75111 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64') diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD index bfbf91875..b188c7381 100755 --- a/community/emprint-svn/PKGBUILD +++ b/community/emprint-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72773 2012-06-22 09:50:16Z rvanharen $ +# $Id: PKGBUILD 75148 2012-08-14 09:55:49Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=emprint-svn -pkgver=67364 +pkgver=74533 pkgrel=1 pkgdesc="screenshot module for e17" arch=('i686' 'x86_64') diff --git a/community/ethumb-svn/PKGBUILD b/community/ethumb-svn/PKGBUILD index e8f8fb347..0f2a67fa5 100644 --- a/community/ethumb-svn/PKGBUILD +++ b/community/ethumb-svn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 72767 2012-06-22 09:48:11Z rvanharen $ +# $Id: PKGBUILD 75153 2012-08-14 09:58:33Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=ethumb-svn -pkgver=72603 +pkgver=75111 pkgrel=1 pkgdesc="Thumbnailing library" arch=('i686' 'x86_64') diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index ddcedd489..983835cba 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72754 2012-06-22 09:42:43Z rvanharen $ +# $Id: PKGBUILD 75159 2012-08-14 10:07:10Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=72604 +pkgver=75236 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ groups=('e17-libs-svn' 'e17-svn') url="http://www.enlightenment.org" license=('BSD') depends=('giflib' 'librsvg' 'eet-svn' 'cairo' 'libjpeg' 'libxrender' 'mesa' - 'fribidi' 'fontconfig') + 'fribidi' 'fontconfig' 'evas_generic_loaders-svn') makedepends=('subversion') conflicts=('evas') provides=('evas') diff --git a/community/evas_generic_loaders-svn/PKGBUILD b/community/evas_generic_loaders-svn/PKGBUILD index 402a429f5..1eda842a0 100644 --- a/community/evas_generic_loaders-svn/PKGBUILD +++ b/community/evas_generic_loaders-svn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72970 2012-06-25 18:51:00Z foutrelis $ +# $Id: PKGBUILD 75123 2012-08-14 09:46:37Z rvanharen $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas_generic_loaders-svn -pkgver=72171 -pkgrel=2 +pkgver=75109 +pkgrel=1 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') groups=('e17-libs-svn' 'e17-svn') diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index 7f7b7b0f1..123c4a0df 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74779 2012-08-04 01:16:35Z seblu $ +# $Id: PKGBUILD 75108 2012-08-14 06:07:46Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived -pkgver=1.2.4 +pkgver=1.2.5 pkgrel=1 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.rc' 'keepalived.service' 'keepalived.conf') -md5sums=('86d39fb62be4e2eef4417af4298dec48' +md5sums=('fce2b998cb3c81a4eb8eb960b1d8413f' '0d7ea6296bce403a5d24be305a0a9d73' '7a327df915700dcd45a049d099c9c42b' '9c8142da8730ad27a345587dea83ced7') diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD index ee0685944..82746a2ca 100644 --- a/community/polipo/PKGBUILD +++ b/community/polipo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74295 2012-07-23 16:25:48Z ttopper $ +# $Id: PKGBUILD 75176 2012-08-14 19:38:14Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Jelle van der Waa <jelle vdwaa nl> # Contributor: Thomas Holmquist <thomas@vorget.com> @@ -7,7 +7,7 @@ pkgname=polipo pkgver=1.0.4.1 -pkgrel=6 +pkgrel=7 pkgdesc="A small and fast caching web proxy." arch=('i686' 'x86_64') url="http://www.pps.jussieu.fr/~jch/software/polipo/" @@ -21,7 +21,7 @@ md5sums=('bfc5c85289519658280e093a270d6703' 'bac0e1a871964c931eb5f7a369b3243c' '7406aad26807fb3a4e5f7b01ecb97a59' '685aa0c6070dee11c701932d23afcc6a' - '109d0e8c15d669281ff14f8991ad0ed8') + 'e96b164de3488afc7ab28b2edbe90fd1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/polipo/polipo.service b/community/polipo/polipo.service index a1bdd9aa2..057d1c3c2 100644 --- a/community/polipo/polipo.service +++ b/community/polipo/polipo.service @@ -2,9 +2,10 @@ Description=Polipo Proxy Server [Service] -ExecStart=/usr/bin/polipo +Type=oneshot +ExecStart=/usr/bin/polipo daemonise=true logFile="/var/log/polipo.log" User=nobody -ExecReload=/bin/kill -USR1 $MAINPID +RemainAfterExit=yes [Install] WantedBy=multi-user.target diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index de8409cf7..ae4015e87 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 73458 2012-07-08 00:12:47Z seblu $ +# $Id: PKGBUILD 75110 2012-08-14 07:14:59Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') -pkgver=0.5.1 +pkgver=0.6.0 pkgrel=1 arch=('i686' 'x86_64') url='http://code.google.com/p/psutil/' license=('custom: BSD') makedepends=('python' 'python-distribute' 'python2' 'python2-distribute') source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") -sha1sums=('e4276dd11b5f03c4397490736f6c6445a7e64798') +sha1sums=('67d3292c39af79c1e43b7fce84d7ff51a1b79d8e') build() { cd psutil-$pkgver diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 1d9767fd2..12806c948 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70396 2012-05-05 14:23:49Z arodseth $ +# $Id: PKGBUILD 75168 2012-08-14 11:22:21Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -7,18 +7,19 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=1.1.3 -pkgrel=2 +pkgver=1.1.4 +pkgrel=1 arch=('x86_64' 'i686') url="http://ruby-gnome2.sourceforge.jp/" license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('ed7cbe7a51e73b815d83321e0359d62f98d1c1504845e112c57cb8ebc6f6e70b') +sha256sums=('31c5da239bd1cb25daca026e453106f29503195c445d73a9cf1aceb22379d100') build() { cd "$srcdir/ruby-gtk2-$pkgver" - LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --topdir="$pkgdir" --vendor + LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango \ + --topdir="$pkgdir" --vendor make } @@ -56,7 +57,8 @@ package_ruby-glib2() { package_ruby-gtk2() { pkgdesc="Ruby bindings for gtk2" - depends=('gtk2' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver") + depends=('gtk2' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" + "ruby-gdkpixbuf2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gtk2" make DESTDIR="$pkgdir" install diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index eb02f0ce2..83e351a94 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Dale Blount <dale@archlinux.org> pkgname=synergy -pkgver=1.4.6 +pkgver=1.4.10 pkgrel=1 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" @@ -12,7 +12,8 @@ depends=('gcc-libs' 'libxtst' 'libxinerama' ) license=('GPL2') makedepends=('libxt' 'cmake') # used by configure to test for libx11... backup=('etc/synergy.conf') -source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "${pkgname}s.rc" ) +source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "${pkgname}s.rc" "synergys.socket" "synergys.service") + build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" @@ -24,7 +25,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}-Source/bin" -# make DESTDIR="$pkgdir" install # doesn't work atm + #make DESTDIR="$pkgdir" install # doesn't work atm # install binary install -d "$pkgdir/usr/bin/" @@ -35,6 +36,13 @@ package() { install -d "${pkgdir}/etc/rc.d" install -Dm644 $srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example "${pkgdir}/etc" install -Dm755 $srcdir/${pkgname}s.rc "${pkgdir}/etc/rc.d/${pkgname}s" + + # Install systemd service and socket + install -d "$pkgdir/usr/lib/systemd/system" + install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/" + install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/" } -md5sums=('3e1ecc4fcbfe6b130ac0c86c674f6db3' - '8f8c01add9bf6e3ae9f37a36ca6345b6') +md5sums=('18aee04a7e232e4d821f46ff24da3364' + '8f8c01add9bf6e3ae9f37a36ca6345b6' + '58f48336836d6faf3d5eecbe4155b77e' + 'b95e4b83d8a19c0bd81a15280078fcd5') diff --git a/community/synergy/synergys.service b/community/synergy/synergys.service new file mode 100644 index 000000000..56c1ac061 --- /dev/null +++ b/community/synergy/synergys.service @@ -0,0 +1,10 @@ +[Unit] +Description=Synergy Server Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/synergys --config /etc/synergy.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/synergy/synergys.socket b/community/synergy/synergys.socket new file mode 100644 index 000000000..dda1537ca --- /dev/null +++ b/community/synergy/synergys.socket @@ -0,0 +1,9 @@ +[Unit] +Conflicts=synergys.service + +[Socket] +ListenStream=24800 +Accept=false + +[Install] +WantedBy=sockets.target diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 156f43113..27c7591c2 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164359 2012-07-31 19:25:50Z tomegun $ +# $Id: PKGBUILD 165243 2012-08-14 08:44:57Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -17,7 +17,7 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 build() { cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt make } diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index ce8ac114e..427609e39 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 155703 2012-04-05 10:02:36Z ronald $ +# $Id: PKGBUILD 165283 2012-08-14 20:43:47Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.5.6 +pkgver=5.6.0 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" -url="http://roy.marples.name/dhcpcd/" +url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64') license=('BSD') groups=('base') @@ -15,9 +15,10 @@ depends=('glibc' 'sh') backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d') -sha1sums=('7f9ca207bce051252c0acb6a6cae3de22babcb20' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0') + 'dhcpcd.conf.d' 'dhcpcd.service') +sha1sums=('28ad6931393420a72da307ee173466a9e00cd952' + 'b67b9ce6a2faaca75fea356966a16be2283b7db0' + '3d0542eab1b89a88d56ca427128228ac72c40d1f') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -48,4 +49,7 @@ package() { # Set Options in /etc/dhcpcd.conf echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall + + # install systemd files + install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service } diff --git a/core/dhcpcd/dhcpcd.service b/core/dhcpcd/dhcpcd.service new file mode 100644 index 000000000..25a1923ac --- /dev/null +++ b/core/dhcpcd/dhcpcd.service @@ -0,0 +1,13 @@ +[Unit] +Description=dhcpcd on %I +Wants=network.target +Before=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpcd-%I.pid +ExecStart=/sbin/dhcpcd -A -q -w %I +ExecStop=/sbin/dhcpcd -k %I + +[Install] +Alias=multi-user.target.wants/dhcpcd@eth0.service diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index 96afe85d7..ddf46799b 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162199 2012-06-23 12:13:06Z ronald $ +# $Id: PKGBUILD 165284 2012-08-14 20:43:58Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.42.4 +pkgver=1.42.5 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('944002c1f8f1f87e7d2d53263346b001962bc1f9' +sha1sums=('41bc6d247238eac65864193e6de941956da493cb' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index cc6e506e1..e8cc3b315 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164210 2012-07-27 14:54:09Z ibiru $ +# $Id: PKGBUILD 165282 2012-08-14 20:43:06Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.14 -pkgrel=3 +pkgver=1.4.15 +pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') @@ -24,12 +24,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-raw.rules empty-security.rules 0503-extension_cppflags.patch - iptables-1.4.12-fixresore.patch iptables.service ip6tables.service iptables-flush) backup=(etc/conf.d/iptables) -sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' +sha1sums=('56ab3b143af2ad443c9652db3a38ef8869cd2207' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -41,7 +40,6 @@ sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' '44626980a52e49f345a0b1e1ca03060f3a35763c' - '7c018d48445ae41c0b9f345747e54b94cb0997b3' '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') @@ -54,11 +52,6 @@ build() { patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch - # Fix scope issue exposed by gcc 4.7 (patch by fryasu) - # http://bugzilla.netfilter.org/show_bug.cgi?id=774 - # (This will most likely be fixed in iptables 1.4.15) - patch -Np1 -i ${srcdir}/iptables-1.4.12-fixresore.patch - ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ diff --git a/core/net-tools/Makefile.patch b/core/net-tools/Makefile.patch new file mode 100644 index 000000000..aaacd6b78 --- /dev/null +++ b/core/net-tools/Makefile.patch @@ -0,0 +1,17 @@ +--- Makefile.old 2012-08-07 22:07:58.235437087 +0200 ++++ Makefile 2012-08-07 22:10:21.192104345 +0200 +@@ -239,12 +239,12 @@ + install -m 0755 -d ${BASEDIR}/bin + install -m 0755 arp ${BASEDIR}/sbin + install -m 0755 hostname ${BASEDIR}/bin +- install -m 0755 ifconfig ${BASEDIR}/bin ++ install -m 0755 ifconfig ${BASEDIR}/sbin + install -m 0755 nameif ${BASEDIR}/sbin + install -m 0755 netstat ${BASEDIR}/bin + install -m 0755 plipconfig $(BASEDIR)/sbin + install -m 0755 rarp ${BASEDIR}/sbin +- install -m 0755 route ${BASEDIR}/bin ++ install -m 0755 route ${BASEDIR}/sbin + install -m 0755 slattach $(BASEDIR)/sbin + ifeq ($(HAVE_IP_TOOLS),1) + install -m 0755 ipmaddr $(BASEDIR)/sbin diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index 605620a09..3bd848408 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,37 +1,33 @@ -# $Id: PKGBUILD 142384 2011-11-08 22:05:28Z ronald $ +# $Id: PKGBUILD 165285 2012-08-14 20:44:40Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=net-tools -pkgver=1.60.20110819cvs -pkgrel=3 +pkgver=1.60.20120804git +pkgrel=2 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64) license=('GPL2') -url="http://www.tazenda.demon.co.uk/phil/net-tools" +url="http://net-tools.sourceforge.net/" depends=('glibc') # http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 -# use cvs checkout instead -source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2 - net-tools-1.60-miiioctl.patch - net-tools-1.60-nameif_strncpy.patch) +# use git checkout instead +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz + Makefile.patch) options=(!makeflags) install=net-tools.install -sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf' - '654a96bc6575efb4a2e04b49de45d448d240eb6e' - '7888000d8fe867e58b5b00fe2bcf6c3041d716b4') - +sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82' + '4191ca56dc01d6aebe26c36c7cc060c638d5ebca') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../net-tools-1.60-miiioctl.patch - patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np0 -i ${srcdir}/Makefile.patch yes "" | make } package() { - cd $srcdir/$pkgname-$pkgver - make BASEDIR=$pkgdir update + cd ${srcdir}/${pkgname}-${pkgver} + make BASEDIR=${pkgdir} update # the following is provided by yp-tools rm "${pkgdir}"/bin/{nis,yp}domainname diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 63a4c1566..bbeb27b28 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 163143 2012-07-08 09:30:39Z ibiru $ +# $Id: PKGBUILD 165272 2012-08-14 19:57:06Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.5.0 -pkgrel=5 +pkgver=2.6.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org" @@ -21,25 +21,12 @@ optdepends=("libgpod: support for Apple iPod audio devices" "ifuse: support for Apple iPod Touch and iPhone" "libmygpo-qt: gpodder.net Internet Service") install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - "toolbarfix.patch" - "amarok-2.5.0-ffmpeg-fixes.patch" - "contextviewfix.patch") -sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2' - 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f' - '61193ccc48e9f99b4856eef27fe7a4aaf465feec' - 'a95e3bfb177adacc268552ae479dd88b70f5f9e1') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('2cfcdabb67436418ba0012075ba105bbb630b48d') build() { cd "${srcdir}" - patch -Np0 -i "${srcdir}"/toolbarfix.patch - patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch - - pushd ${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}"/contextviewfix.patch # FS#30448 - popd - mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 7702bec15..cf2632c83 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 165181 2012-08-12 16:18:01Z andyrtr $ +# $Id: PKGBUILD 165274 2012-08-14 20:33:11Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.6.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" -makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' +makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-no-export-ssllibs.patch @@ -123,7 +123,7 @@ backup=(etc/cups/cupsd.conf etc/logrotate.d/cups etc/pam.d/cups etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme') +depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme') optdepends=('xdg-utils: xdg .desktop file support') cd ${srcdir}/${pkgbase}-${pkgver} diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index d2818346e..2326056f7 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156774 2012-04-23 09:05:18Z ibiru $ +# $Id: PKGBUILD 165244 2012-08-14 15:06:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.26.1 +pkgver=2.26.2 pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64') @@ -13,10 +13,10 @@ makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba') +sha256sums=('3555521050e30e2fa090bfe650910c14649b6ab0acb35a5a7eaf90fe694f1403') build() { - cd "gdk-pixbuf-$pkgver" + cd gdk-pixbuf-$pkgver ./configure --prefix=/usr \ --without-libjasper \ @@ -26,7 +26,7 @@ build() { } package() { - cd "gdk-pixbuf-$pkgver" + cd gdk-pixbuf-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD index 1e3544bfd..5f294fe1a 100644 --- a/extra/libcap-ng/PKGBUILD +++ b/extra/libcap-ng/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139367 2011-10-01 18:59:37Z ibiru $ +# $Id: PKGBUILD 165245 2012-08-14 15:06:17Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=libcap-ng -pkgver=0.6.6 +pkgver=0.7 pkgrel=1 pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap" arch=('i686' 'x86_64') @@ -12,17 +12,17 @@ license=('GPL2' 'LGPL2.1') depends=('glibc') options=('!libtool') source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('eb71f967cecb44b4342baac98ef8cb0f') +md5sums=('85c14a2442a3721383a1e2284e254846') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr --enable-static=no --with-python=no make } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 48333609c..dcf1819f0 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162833 2012-07-01 07:57:51Z andyrtr $ +# $Id: PKGBUILD 165281 2012-08-14 20:41:57Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.37 +pkgver=2.4.38 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -15,7 +15,7 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) -sha256sums=('e4ea39a901d4a8e59064f10f413bb037dad7790f7c16a5986e7cc1453b36488f' +sha256sums=('3e5a2f318edaf1eef41e7e6c85aa9596d6f9f8b083ec4d7d6710ffbb8921e7e9' 'f7a587357ea29cab9c06a4889f09e30d63eae76e9b9654666c53020d15ea52d7' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD index 2529987dd..3ac3a9866 100644 --- a/extra/libotr/PKGBUILD +++ b/extra/libotr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149079 2012-02-05 16:55:15Z bisson $ +# $Id: PKGBUILD 165291 2012-08-14 23:10:37Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Bug <Bug2000@gmail.com> pkgname=libotr -pkgver=3.2.0 -pkgrel=3 +pkgver=3.2.1 +pkgrel=1 pkgdesc='Off-the-Record Messaging Library and Toolkit' url='http://www.cypherpunks.ca/otr/' license=('GPL' 'LGPL') @@ -13,7 +13,7 @@ arch=('i686' 'x86_64') depends=('libgcrypt') options=('!libtool') source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz") -sha1sums=('e5e10b8ddaf59b0ada6046d156d0431cd2790db9') +sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD index 70e0833a2..241d2d0bd 100644 --- a/extra/openslp/PKGBUILD +++ b/extra/openslp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150461 2012-02-18 00:02:24Z allan $ +# $Id: PKGBUILD 165260 2012-08-14 16:48:24Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=openslp pkgver=1.2.1 -pkgrel=4 +pkgrel=5 pkgdesc="Open-source implementation of Service Location Protocol" arch=('i686' 'x86_64') url="http://www.openslp.org" @@ -11,12 +11,19 @@ license=('BSD') depends=('bash' 'openssl') backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd) -md5sums=('ff9999d1b44017281dd00ed2c4d32330' '4f6889a5944894b8be2c01404a9566d2') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd + #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae + openslp.service) +md5sums=('ff9999d1b44017281dd00ed2c4d32330' + '4f6889a5944894b8be2c01404a9566d2' + '296dc3c8f75e7a1823fcb9dd97ea0971') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --disable-static \ + --enable-slpv1 \ + --enable-slpv2-security # service would fail to start without this make } @@ -25,4 +32,5 @@ package() { make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE install -D -m755 $srcdir/rc.slpd ${pkgdir}/etc/rc.d/slpd + install -D -m644 $srcdir/openslp.service ${pkgdir}/usr/lib/systemd/system/openslp.service } diff --git a/extra/openslp/openslp.service b/extra/openslp/openslp.service new file mode 100644 index 000000000..e17eb3b1d --- /dev/null +++ b/extra/openslp/openslp.service @@ -0,0 +1,11 @@ +[Unit] +Description=Service Location Protocol +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=network.target diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index 639a27964..b90323aa1 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154982 2012-04-01 07:46:19Z ibiru $ +# $Id: PKGBUILD 165246 2012-08-14 15:06:21Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=p11-kit -pkgver=0.12 +pkgver=0.13 pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64) @@ -11,17 +11,17 @@ license=('BSD') depends=(glibc) options=(!libtool) source=($url/releases/$pkgname-$pkgver.tar.gz) -md5sums=('66baf7ddde982d1b7294d3bd63be7446') +md5sums=('3892bc07ff54b1b391aad4628911801d') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --with-module-path=/usr/lib/pkcs11 make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD index 2c4ea7099..bb96b719b 100644 --- a/extra/speech-dispatcher/PKGBUILD +++ b/extra/speech-dispatcher/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 150548 2012-02-18 12:43:30Z pierre $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 165252 2012-08-14 16:20:06Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Steve Holmes <steve.holmes88@gmail.com> # Contributor: Alexander Jenisch <nt@divzero.at> # Contributor: Chris Brannon <cmbrannon@cox.net> @@ -7,7 +8,7 @@ pkgname=speech-dispatcher pkgver=0.7.1 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') pkgdesc="High-level device independent layer for speech synthesis interface" url="http://www.freebsoft.org/speechd" @@ -36,9 +37,10 @@ backup=(etc/speech-dispatcher/clients/gnome-speech.conf etc/speech-dispatcher/speechd.conf) install="${pkgname}.install" source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz" - 'speechd.sh') + 'speechd.sh' 'speech-dispatcherd.service') md5sums=('ccfc30ac006673d36b4223eb760ed696' - '858293f464b83f03f3b6bb796291c71d') + '858293f464b83f03f3b6bb796291c71d' + 'd26f52e2e95a30eaa83560f0e63faca5') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -54,6 +56,8 @@ package() { make DESTDIR=${pkgdir} install install -Dm755 ${srcdir}/speechd.sh ${pkgdir}/etc/rc.d/speechd + install -d "${pkgdir}/usr/lib/systemd/system/" + install -m644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/" install -d ${pkgdir}/var/log/speech-dispatcher # Fix spd-conf to use python 2.7 diff --git a/extra/speech-dispatcher/speech-dispatcher.install b/extra/speech-dispatcher/speech-dispatcher.install index 17e273bed..93f4f9363 100644 --- a/extra/speech-dispatcher/speech-dispatcher.install +++ b/extra/speech-dispatcher/speech-dispatcher.install @@ -1,4 +1,4 @@ -info_dir=/usr/share/info +info_dir=usr/share/info info_files=('speech-dispatcher.info' 'speech-dispatcher-cs.info' 'ssip.info' diff --git a/extra/speech-dispatcher/speech-dispatcherd.service b/extra/speech-dispatcher/speech-dispatcherd.service new file mode 100644 index 000000000..ce21c5650 --- /dev/null +++ b/extra/speech-dispatcher/speech-dispatcherd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Speech-Dispatcher an high-level device independent layer for speech synthesis. +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/bin/speech-dispatcher -d + +[Install] +WantedBy=multi-user.target diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 8ff469795..c38ea4a3a 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160577 2012-06-02 10:29:00Z bluewind $ +# $Id: PKGBUILD 165293 2012-08-15 00:13:54Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.7.5 -pkgrel=2 +pkgrel=3 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('APACHE') @@ -19,12 +19,21 @@ url="http://subversion.apache.org/" provides=('svn') options=('!makeflags' '!libtool' '!emptydirs') source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve svn svnserve.conf subversion.rpath.fix.patch) + svnserve + svn + svnserve.conf + svnserve.tmpfiles + svnserve.service + subversion-1.7.5-kwallet-gcc47.patch + subversion.rpath.fix.patch) sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1' 'b267cba19b4f56360657a5bf5b231950e027a45a' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' + '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' + '9f6790d842cf3e0228b007483a43e39a42724068' + 'aa0d01e606de2ebc5eed9c533d218d37a217c50c' '3d1e28408a9abb42af2e531adc0d01ce21acfad6') build() { @@ -34,6 +43,8 @@ build() { patch -p0 -i ../subversion.rpath.fix.patch sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py + patch -Np1 -i ../subversion-1.7.5-kwallet-gcc47.patch + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ --with-zlib=/usr --with-neon=/usr --with-apxs \ --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ @@ -60,15 +71,24 @@ package() { swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ install install-swig-py install-swig-pl install-javahl # install-swig-rb - install -d "${pkgdir}"/usr/share/subversion + install -dm755 "${pkgdir}"/usr/share/subversion cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist rm -r "${pkgdir}"/usr/lib/perl5/core_perl + ## svnserve ... + + # ... iniscript/xinetd install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn + + # ... systemd + install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service + install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf + + # ... common config install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve install -Dm 644 tools/client-side/bash_completion \ diff --git a/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch new file mode 100644 index 000000000..a571c3c3c --- /dev/null +++ b/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch @@ -0,0 +1,56 @@ +diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp +--- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500 ++++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400 +@@ -60,6 +60,9 @@ + /* KWallet simple provider, puts passwords in KWallet */ + /*-----------------------------------------------------------------------*/ + ++static int q_argc = 1; ++static char q_argv0[] = "svn"; // Build non-const char * from string constant ++static char *q_argv[] = { q_argv0 }; + + static const char * + get_application_name(apr_hash_t *parameters, +@@ -175,6 +178,10 @@ + "kwallet-initialized", + APR_HASH_KEY_STRING, + NULL); ++ apr_hash_set(parameters, ++ "kwallet-wallet", ++ APR_HASH_KEY_STRING, ++ NULL); + } + return APR_SUCCESS; + } +@@ -203,12 +210,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), +@@ -273,12 +279,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), diff --git a/extra/subversion/svnserve.service b/extra/subversion/svnserve.service new file mode 100644 index 000000000..d8a8e10c1 --- /dev/null +++ b/extra/subversion/svnserve.service @@ -0,0 +1,11 @@ +[Unit] +Description=Subversion protocol daemon +After=syslog.target network.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/svnserve +ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS + +[Install] +WantedBy=multi-user.target diff --git a/extra/subversion/svnserve.tmpfiles b/extra/subversion/svnserve.tmpfiles new file mode 100644 index 000000000..e8487d373 --- /dev/null +++ b/extra/subversion/svnserve.tmpfiles @@ -0,0 +1 @@ +D /run/svnserve 0700 root root - diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 4f7f1b42d..89e9a668e 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149976 2012-02-11 23:31:36Z allan $ +# $Id: PKGBUILD 165295 2012-08-15 00:30:47Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade @@ -6,7 +6,7 @@ pkgname=varnish pkgver=3.0.2 -pkgrel=5 +pkgrel=6 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64') url="http://www.varnish-cache.org/" @@ -18,13 +18,17 @@ install=$pkgname.install options=('!libtool') source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" "$pkgname.conf.d" - "rc.$pkgname") + "rc.$pkgname" + varnish-vcl-reload + varnish.service) md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a' 'edd1237d097d72173d9772754335890c' - '8366f51568c0bbb3d3891aa0cc724369') + '40b4c83b3ad225ed2f4bd7e677fe41a2' + '56be884f43b8b4c900a073d9282f124a' + '45cc1fd57aa2ffc22d6af62f9eedc842') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ @@ -35,11 +39,18 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - make DESTDIR="$pkgdir" install + # reload helper + install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin" - install -D -m755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname" - install -D -m644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname" - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # sysvinit + install -Dm755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname" + install -Dm644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname" + + # systemd + install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service" + + # license + install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish index 2841665e5..352f07dbd 100644 --- a/extra/varnish/rc.varnish +++ b/extra/varnish/rc.varnish @@ -4,27 +4,6 @@ . /etc/rc.d/functions . /etc/conf.d/varnish -reload_vcl() { - local activecfg newcfg - - if [[ -z $VARNISH_CFG ]]; then - printf '==> ERROR: VARNISH_CFG is undefined in /etc/conf.d/varnish!\n' - return 1 - fi - - activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }') - if [[ -z $activecfg ]]; then - printf '==> ERROR: No active VCL found!\n' - return 1 - fi - - printf -v newcfg 'vcl-%(%s)T' -1 - - varnishadm "vcl.load $newcfg $VARNISH_CFG" && - varnishadm "vcl.use $newcfg" && - varnishadm "vcl.discard $activecfg" || return 1 -} - pidfile=/run/varnish.pid if [[ -r $pidfile ]]; then read -r PID < "$pidfile" @@ -62,10 +41,9 @@ case $1 in $0 start ;; reload) - stat_busy "Recompiling and Reloading VCL" - reload_vcl && stat_done || stat_fail + status "Recompiling and Reloading VCL" varnish-vcl-reload $VARNISH_CFG ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|reload}" ;; esac diff --git a/extra/varnish/varnish-vcl-reload b/extra/varnish/varnish-vcl-reload new file mode 100644 index 000000000..aaac385c4 --- /dev/null +++ b/extra/varnish/varnish-vcl-reload @@ -0,0 +1,21 @@ +#!/bin/sh + +cfg=${1:-/etc/varnish/default.vcl} + +if [ ! -e "$cfg" ]; then + printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2 + exit 1 +fi + +activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }') +if [ -z "$activecfg" ]; then + printf 'ERROR: No active VCL found!\n' >&2 + exit 1 +fi + +newcfg=$(date +'vcl-%s') +printf 'INFO: using new config %s\n' "$cfg" + +varnishadm "vcl.load $newcfg $cfg" && +varnishadm "vcl.use $newcfg" && +varnishadm "vcl.discard $activecfg" diff --git a/extra/varnish/varnish.service b/extra/varnish/varnish.service new file mode 100644 index 000000000..c8bb6c6e1 --- /dev/null +++ b/extra/varnish/varnish.service @@ -0,0 +1,10 @@ +[Unit] +Description=Web Application Accelerator +After=network.target + +[Service] +ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -b localhost:8080 -T localhost:6082 -s malloc,64M -u nobody -g nobody -F +ExecReload=/usr/bin/varnish-vcl-reload + +[Install] +WantedBy=multi-user.target diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD index fd49db451..91885eae6 100644 --- a/extra/x11vnc/PKGBUILD +++ b/extra/x11vnc/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 137979 2011-09-13 20:01:54Z bisson $ +# $Id: PKGBUILD 165299 2012-08-15 01:45:56Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=x11vnc pkgver=0.9.13 -pkgrel=1 +pkgrel=2 pkgdesc='VNC server for real X displays' -arch=('i686' 'x86_64') url='http://www.karlrunge.com/x11vnc/' +arch=('i686' 'x86_64') license=('GPL2') -depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') +depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') optdepends=('tk: for GUI support') backup=('etc/conf.d/x11vnc') source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'conf.d' - 'rc.d') + 'service' + 'conf.d' + 'rc.d') sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa' + '53e1ed7f84518a699a29607a03bee2321f9f9624' '11011cce06511e9ba61672a1c80bb63a3a187539' '477892cf0f0020043444b7493c80684762ded506') @@ -28,9 +30,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - + install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/x11vnc" + install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/x11vnc" rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver - - install -D -m 755 "${srcdir}/rc.d" "${pkgdir}/etc/rc.d/x11vnc" - install -D -m 644 "${srcdir}/conf.d" "${pkgdir}/etc/conf.d/x11vnc" } diff --git a/extra/x11vnc/service b/extra/x11vnc/service new file mode 100644 index 000000000..0ccc2fea0 --- /dev/null +++ b/extra/x11vnc/service @@ -0,0 +1,7 @@ +[Unit] +Description=VNC Server for X11 +Requires=graphical.target +After=graphical.target + +[Service] +ExecStart=/usr/bin/x11vnc diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD index adcc23cf0..77edc6ddb 100644 --- a/multilib-testing/binutils-multilib/PKGBUILD +++ b/multilib-testing/binutils-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73235 2012-07-04 01:11:59Z heftig $ +# $Id: PKGBUILD 75114 2012-08-14 08:29:19Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,7 +6,7 @@ pkgname=binutils-multilib pkgver=2.22 -pkgrel=8 +pkgrel=10 _date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" arch=('x86_64') @@ -28,6 +28,7 @@ build() { mkdir binutils-build && cd binutils-build ${srcdir}/binutils/configure --prefix=/usr \ + --with-lib-path=/usr/lib:/usr/local/lib \ --enable-ld=default --enable-gold \ --enable-plugins --enable-threads \ --enable-shared \ diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD index 85f73ad1b..9c6ae58d6 100644 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ b/multilib-testing/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73236 2012-07-04 01:12:10Z heftig $ +# $Id: PKGBUILD 75115 2012-08-14 08:29:30Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,9 +8,9 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.7.1 -pkgrel=4 -#_snapshot=4.7-20120505 -_libstdcppmanver=20120605 # Note: check source directory name when updating this +pkgrel=6 +_snapshot=4.7-20120721 +_libstdcppmanver=20120725 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -19,19 +19,17 @@ makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'lib32-glibc>=2.16') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64-multilib.patch - gcc-4.7.1-libada-pic.patch - gcc-4.7.1-libgo-write.patch - gcc-4.7.1-libgo-mksysinfo.patch) -md5sums=('933e6f15f51c031060af64a9e14149ff' - '767c62f9a047c4434f2345decf1d0819' + gcc-4.7.1-libada-pic.patch + gcc-4.7.1-libgo-write.patch) +md5sums=('a1a53fda426bc6809cede8e85bbaf2a3' + '79c4381f983b71868c02da3379e1e8a2' 'ec24c32d3d1030c2bc8cb2ad2d1dc629' '2acbc9d35cc9d72329dc71d6b1f162ef' - 'df82dd175ac566c8a6d46b11ac21f14c' - '8e847244dba042d0aa3297713edaf70c') + 'df82dd175ac566c8a6d46b11ac21f14c') if [ -n "${_snapshot}" ]; then @@ -57,9 +55,6 @@ build() { # bug to file... patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch - # http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html - patch -p0 -i ${srcdir}/gcc-4.7.1-libgo-mksysinfo.patch - echo ${pkgver} > gcc/BASE-VER cd ${srcdir} @@ -82,7 +77,7 @@ build() { --with-linker-hash-style=gnu \ --enable-multilib --disable-libssp \ --disable-build-with-cxx --disable-build-poststage1-with-cxx \ - --enable-checking=release --with-fpmath=sse + --enable-checking=release make } @@ -194,9 +189,7 @@ package_gcc-multilib() rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 rm $pkgdir/usr/share/man/man3/ffi* - # many packages require these symlinks - #install -dm755 ${pkgdir}/lib - #ln -s /usr/bin/cpp ${pkgdir}/lib/cpp + # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc # POSIX conformance launcher scripts for c89 and c99 diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index 69c1a2c63..1f71aade3 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73419 2012-07-07 13:03:07Z allan $ +# $Id: PKGBUILD 75116 2012-08-14 08:29:36Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.16.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNU C Library for multilib" arch=('x86_64') url="http://www.gnu.org/software/libc" @@ -19,11 +19,13 @@ options=('!strip' '!emptydirs') source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig} glibc-2.15-fix-res_query-assert.patch glibc-2.15-revert-c5a0802a.patch + glibc-2.16-rpcgen-cpp-path.patch lib32-glibc.conf) md5sums=('80b181b02ab249524ec92822c0174cf7' '2a1221a15575820751c325ef4d2fbb90' '31f415b41197d85d3bbee3d1eecd06a3' '0a0383d50d63f1c02919fe9943b82014' + 'ea6a43915474e8276e9361eed6a01280' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -37,6 +39,10 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=552960 patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch + # prevent need for /lib/cpp symlink + # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a + patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch + cd ${srcdir} mkdir glibc-build cd glibc-build diff --git a/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch b/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch new file mode 100644 index 000000000..822b57294 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch @@ -0,0 +1,68 @@ +diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c +index 06d951a..2103b10 100644 +--- a/sunrpc/rpc_main.c ++++ b/sunrpc/rpc_main.c +@@ -75,12 +75,9 @@ struct commandline + + static const char *cmdname; + +-#define SVR4_CPP "/usr/ccs/lib/cpp" +-#define SUNOS_CPP "/lib/cpp" +- + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "/lib/cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -327,23 +324,17 @@ find_cpp (void) + { + struct stat buf; + +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } ++ if (stat (CPP, &buf) == 0) ++ return; ++ ++ if (cppDefined) /* user specified cpp but it does not exist */ ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ crash (); + } ++ ++ /* fall back to system CPP */ ++ CPP = "cpp"; + } + + /* +@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define) + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); +- perror ("execv"); ++ execvp (arglist[0], (char **) arglist); ++ if (errno == ENOENT) ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ exit (1); ++ } ++ perror ("execvp"); + exit (1); + case -1: + perror ("fork"); diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD index 0804c5a02..334350114 100644 --- a/testing/binutils/PKGBUILD +++ b/testing/binutils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163227 2012-07-11 12:24:16Z allan $ +# $Id: PKGBUILD 165241 2012-08-14 08:30:05Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.22 -pkgrel=9 +pkgrel=10 _date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') diff --git a/testing/calligra/PKGBUILD b/testing/calligra/PKGBUILD index 82b6bd1b4..eeea15975 100644 --- a/testing/calligra/PKGBUILD +++ b/testing/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164673 2012-08-02 15:21:08Z andrea $ +# $Id: PKGBUILD 165275 2012-08-14 20:37:23Z andyrtr $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -13,7 +13,6 @@ pkgname=('calligra-filters' 'calligra-tools' 'calligra-karbon' 'calligra-kexi' - 'calligra-kounavail' 'calligra-plan' 'calligra-stage' 'calligra-krita' @@ -22,22 +21,21 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.4.3 -pkgrel=3 +pkgver=2.5.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' 'kdepimlibs' 'libpqxx' 'freetds' 'xbase' 'kdegraphics-okular' 'gsl' 'kdeedu-marble' - 'libwpd' 'libwpg' 'pstoedit' 'glew' + 'libwps' 'libwpg' 'pstoedit' 'glew' 'fftw' 'opengtl' 'lcms2' 'libkdcraw') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('469d639f17e3d6a186baabd899147e39') +md5sums=('bea9b5e9d95691caaba385ef5522a60d') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ @@ -51,7 +49,8 @@ build() { package_calligra-filters() { pkgdesc="Filters for the Calligra office suite" - optdepends=('libwpg: Corel WordPerfect Graphics image importer') + optdepends=('libwpg: Corel WordPerfect Graphics image importer' + 'libwps: Microsoft Works file word processor format import') conflicts=('koffice-filters') replaces=('koffice-filters') install=calligra-filters.install @@ -162,16 +161,6 @@ package_calligra-kexi() { make DESTDIR="${pkgdir}" install } -package_calligra-kounavail() { - pkgdesc="Unavailable Calligra Document" - depends=('calligra-libs') - conflicts=('koffice-kounavail') - replaces=('koffice-kounavail') - - cd "${srcdir}"/build/kounavail - make DESTDIR="${pkgdir}" install -} - package_calligra-plan() { pkgdesc="Calligra Project Management Component" depends=('calligra-words') diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD index 721cbafd6..f26b1d7ca 100644 --- a/testing/gcc/PKGBUILD +++ b/testing/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162941 2012-07-04 01:13:02Z allan $ +# $Id: PKGBUILD 165238 2012-08-14 08:29:48Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,9 +6,9 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.7.1 -pkgrel=4 -#_snapshot=4.7-20120505 -_libstdcppmanver=20120605 # Note: check source directory name when updating this +pkgrel=6 +_snapshot=4.7-20120721 +_libstdcppmanver=20120725 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -16,19 +16,17 @@ url="http://gcc.gnu.org" makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-4.7.1-libada-pic.patch - gcc-4.7.1-libgo-write.patch - gcc-4.7.1-libgo-mksysinfo.patch) -md5sums=('933e6f15f51c031060af64a9e14149ff' - '767c62f9a047c4434f2345decf1d0819' + gcc-4.7.1-libgo-write.patch) +md5sums=('a1a53fda426bc6809cede8e85bbaf2a3' + '79c4381f983b71868c02da3379e1e8a2' 'ced48436c1b3c981d721a829f1094de1' '2acbc9d35cc9d72329dc71d6b1f162ef' - 'df82dd175ac566c8a6d46b11ac21f14c' - '8e847244dba042d0aa3297713edaf70c') + 'df82dd175ac566c8a6d46b11ac21f14c') if [ -n "${_snapshot}" ]; then @@ -56,9 +54,6 @@ build() { # bug to file... patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch - # http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html - patch -p0 -i ${srcdir}/gcc-4.7.1-libgo-mksysinfo.patch - echo ${pkgver} > gcc/BASE-VER cd ${srcdir} @@ -157,9 +152,7 @@ package_gcc() rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 rm $pkgdir/usr/share/man/man3/ffi* - # many packages require these symlinks - #install -dm755 ${pkgdir}/lib - #ln -s /usr/bin/cpp ${pkgdir}/lib/cpp + # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc # POSIX conformance launcher scripts for c89 and c99 diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD index b00f3039a..6dc93f31e 100644 --- a/testing/glibc/PKGBUILD +++ b/testing/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163115 2012-07-07 11:31:50Z allan $ +# $Id: PKGBUILD 165242 2012-08-14 08:31:14Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,13 +6,13 @@ pkgname=glibc pkgver=2.16.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.4' 'tzdata') +depends=('linux-api-headers>=3.5' 'tzdata') makedepends=('gcc>=4.7') backup=(etc/gai.conf etc/locale.gen @@ -22,6 +22,7 @@ install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} glibc-2.15-fix-res_query-assert.patch glibc-2.15-revert-c5a0802a.patch + glibc-2.16-rpcgen-cpp-path.patch nscd.rcd nscd.service nscd.tmpfiles @@ -31,6 +32,7 @@ md5sums=('80b181b02ab249524ec92822c0174cf7' '2a1221a15575820751c325ef4d2fbb90' '31f415b41197d85d3bbee3d1eecd06a3' '0a0383d50d63f1c02919fe9943b82014' + 'ea6a43915474e8276e9361eed6a01280' '589d79041aa767a5179eaa4e2737dd3f' 'ad8a9af15ab7eeaa23dc7ee85024af9f' 'bccbe5619e75cf1d97312ec3681c605c' @@ -48,6 +50,10 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=552960 patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch + # prevent need for /lib/cpp symlink + # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a + patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch + cd ${srcdir} mkdir glibc-build cd glibc-build diff --git a/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch b/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch new file mode 100644 index 000000000..822b57294 --- /dev/null +++ b/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch @@ -0,0 +1,68 @@ +diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c +index 06d951a..2103b10 100644 +--- a/sunrpc/rpc_main.c ++++ b/sunrpc/rpc_main.c +@@ -75,12 +75,9 @@ struct commandline + + static const char *cmdname; + +-#define SVR4_CPP "/usr/ccs/lib/cpp" +-#define SUNOS_CPP "/lib/cpp" +- + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "/lib/cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -327,23 +324,17 @@ find_cpp (void) + { + struct stat buf; + +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } ++ if (stat (CPP, &buf) == 0) ++ return; ++ ++ if (cppDefined) /* user specified cpp but it does not exist */ ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ crash (); + } ++ ++ /* fall back to system CPP */ ++ CPP = "cpp"; + } + + /* +@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define) + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); +- perror ("execv"); ++ execvp (arglist[0], (char **) arglist); ++ if (errno == ENOENT) ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ exit (1); ++ } ++ perror ("execvp"); + exit (1); + case -1: + perror ("fork"); diff --git a/testing/inkscape/PKGBUILD b/testing/inkscape/PKGBUILD index 25fbcbc71..786c9fb10 100644 --- a/testing/inkscape/PKGBUILD +++ b/testing/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162293 2012-06-24 19:24:47Z foutrelis $ +# $Id: PKGBUILD 165277 2012-08-14 20:37:37Z andyrtr $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.3.1 -pkgrel=4 +pkgrel=5 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD index d6c682a5d..425808741 100644 --- a/testing/iproute2/PKGBUILD +++ b/testing/iproute2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164765 2012-08-04 18:56:16Z ronald $ +# $Id: PKGBUILD 165268 2012-08-14 18:56:21Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=3.5.0 +pkgver=3.5.1 pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz iproute2-fhs.patch) -sha1sums=('a78f6bbbb21a1932315baf7be2f3f1d6e6c5ed62' +sha1sums=('461f3e97d84264a597176de3ba94633114959df5' '35b8cf2dc94b73eccad427235c07596146cd6f6c') build() { diff --git a/testing/libmpc/PKGBUILD b/testing/libmpc/PKGBUILD new file mode 100644 index 000000000..0c358f943 --- /dev/null +++ b/testing/libmpc/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 165240 2012-08-14 08:30:00Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=libmpc +pkgver=1.0 +pkgrel=1 +pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" +arch=('i686' 'x86_64') +url="http://www.multiprecision.org/" +license=('LGPL') +depends=('mpfr>=3.0.0') +options=('!libtool') +install=libmpc.install +source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz) +md5sums=('13370ceb2e266c5eeb2f7e78c24b7858') + +build() { + cd "${srcdir}/mpc-${pkgver}" + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/mpc-${pkgver}" + make check +} + +package() { + cd "${srcdir}/mpc-${pkgver}" + make DESTDIR="${pkgdir}" install + mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info +} diff --git a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch new file mode 100644 index 000000000..3bf324728 --- /dev/null +++ b/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch @@ -0,0 +1,63 @@ +--- trunk/configure.ac 2011/02/21 12:18:31 932 ++++ trunk/configure.ac 2011/02/21 16:41:09 936 +@@ -33,7 +33,7 @@ + AC_CANONICAL_HOST + AC_CONFIG_MACRO_DIR([m4]) + +-dnl Extra arguments to configure ++# Extra arguments to configure + AC_ARG_WITH([mpfr_include], + [AC_HELP_STRING([--with-mpfr-include=DIR], + [MPFR include directory])], +@@ -85,18 +85,19 @@ + ) + + +-dnl Setup CC and CFLAGS ++# Setup CC and CFLAGS ++AC_PROG_CC ++AC_LANG(C) + +-dnl Check for user specification of CC or CFLAGS ++# Set up LibTool ++AC_PROG_LIBTOOL ++ ++# Check for user specification of CC or CFLAGS + if test -n "$CFLAGS" || test -n "$CC" ; then + user_redefine_cc=yes + fi + +-# Check for programs +-AC_PROG_CC +-AC_LANG(C) +- +-dnl Check GMP Header ++# Check GMP Header + AC_MSG_CHECKING(for gmp.h) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include "gmp.h" +@@ -105,22 +106,19 @@ + AC_MSG_ERROR([gmp.h can't be found, or is unusable.]) + ]) + +-dnl Check for GMP CFLAGS in gmp.h ++# Check for GMP CFLAGS in gmp.h + if test -z "$user_redefine_cc" ; then + MPC_GMP_CC_CFLAGS + fi + + +-dnl Configs for Windows DLLs ++# Configs for Windows DLLs + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + MPC_WINDOWS + esac + + +-dnl Finally set up LibTool +-AC_PROG_LIBTOOL +- + # Checks for header files. + AC_HEADER_STDC + AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h]) diff --git a/testing/libmpc/libmpc.install b/testing/libmpc/libmpc.install new file mode 100644 index 000000000..b0718c745 --- /dev/null +++ b/testing/libmpc/libmpc.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(libmpc.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD index 721433d35..f20d39b58 100644 --- a/testing/libreoffice/PKGBUILD +++ b/testing/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162294 2012-06-24 19:25:15Z foutrelis $ +# $Id: PKGBUILD 165278 2012-08-14 20:38:05Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,16 +21,18 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' - 'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built -_LOver=3.5.4.2 -pkgver=3.5.4 + 'libreoffice-extension-scripting-python' + 'libreoffice-extension-wiki-publisher' + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built +_LOver=3.5.5.3 +pkgver=3.5.5 pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.1' 'kdelibs' 'gconf' 'cppunit' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' # 'boost' + 'apache-ant' 'gperf' 'poppler>=0.20.3' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' #'saxon' - currently broken @@ -49,8 +51,8 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" _additional_source_url="http://dev-www.libreoffice.org/src" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 -# ${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 + ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + ${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -81,9 +83,9 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 fix_broken_hebrew_wordwrapping.diff libreoffice-common.sh libreoffice-common.csh) -noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 -# 90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 +noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip @@ -110,11 +112,12 @@ noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('61afc900785dd7d071b96d9ab0af46f3' - 'd2e7414a60eacafef45fbc4bc1a8ccb3' - '545d1608da2cc736be5c8bf941adbbfb' +md5sums=('ccb80344ae1ac546b3a6b6d85f3ae26a' + '09153713133bddc49af99bd76129e929' + 'c2e66522b8adf0b3fb5789e295129ba9' '18f577b374d60b3c760a3a3350407632' - '2fa6028324347860e684e75310818d43' + 'f02578f5218f217a9f20e9c30e119c6a' + 'a9a1db27688bad49418667b434d29c1f' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -218,6 +221,8 @@ build() { --enable-odk\ --enable-ext-scripting-beanshell \ --enable-ext-scripting-javascript \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ --disable-ext-mysql-connector \ --with-system-mysql \ --enable-librsvg=system \ @@ -246,7 +251,7 @@ build() { --without-system-mozilla \ --without-system-mozilla-headers \ --with-ant-home="/usr/share/java/apache-ant"\ - --with-system-boost\ + --without-system-boost\ --with-system-cairo\ --with-system-libs\ --with-system-mythes\ @@ -259,20 +264,8 @@ build() { --with-java-target-version=1.5 \ $EXTRAOPTS -# --disable-ext-lightproof \ - - -#--with-install-dirname="${pkgbase}" -# --enable-cairo\ -# --with-system-libtextcat \ -# --with-external-libtextcat-data \ #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool -#--with-servlet-api-jar=JARFILE -# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 -# --with-system-saxon\ -# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ - touch src.downloaded #./download make @@ -352,7 +345,7 @@ package_libreoffice-common() { } package_libreoffice-base() { - pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." + pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." install=libreoffice-base.install depends=('libreoffice-common' 'hsqldb-java') optdepends=('libreoffice-postgresql-connector') @@ -515,7 +508,7 @@ package_libreoffice-kde4() { } package_libreoffice-math() { - pkgdesc="Equation Editor Applicationfor LibreOffice." + pkgdesc="Equation Editor Application for LibreOffice." depends=('libreoffice-common') optdepends=() backup=() @@ -586,7 +579,7 @@ package_libreoffice-sdk-doc() { } package_libreoffice-writer() { - pkgdesc="Word Processor Applicationfor LibreOffice." + pkgdesc="Word Processor Application for LibreOffice." install=libreoffice-writer.install depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') @@ -701,3 +694,25 @@ package_libreoffice-extension-scripting-python() { install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python } + +package_libreoffice-extension-wiki-publisher() { + + pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher +} + +package_libreoffice-extension-nlpsolver() { + + pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver +} diff --git a/testing/libreoffice/PKGBUILD.36 b/testing/libreoffice/PKGBUILD.36 index 6a3d0fe0d..71ee72c1c 100644 --- a/testing/libreoffice/PKGBUILD.36 +++ b/testing/libreoffice/PKGBUILD.36 @@ -21,18 +21,20 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' - 'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built -_LOver=3.6.0.0.beta2 -pkgver=3.6.0beta2 + 'libreoffice-extension-scripting-python' + 'libreoffice-extension-wiki-publisher' + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built +_LOver=3.6.0.4 +pkgver=3.6.0 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' + 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' #'saxon' - currently broken # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" @@ -44,14 +46,14 @@ makedepends=( # makedepends # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors -#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://dev-www.libreoffice.org/src" _additional_source_url2="http://dev-www.libreoffice.org/extern" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz - ${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 + ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + ${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -76,14 +78,14 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 - ${_additional_source_url}/ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz + ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll buildfix.diff libreoffice-common.sh libreoffice-common.csh) -noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 +noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip @@ -91,7 +93,7 @@ noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 - ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz + 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -111,12 +113,12 @@ noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('97183afb02576d5542a1eda3f29f9517' - '3368bc1adfa9e7d6d6f3ce2cee9e164e' - '7191e46a3f48ad7a7d5a21e985790e6a' +md5sums=('67cf97e86c75363238a371f64ef5f606' + '8422b0c4c797abeefed3ee4490586dd2' + '6cc8fa86be8c657ba23434c6c8d99416' '18f577b374d60b3c760a3a3350407632' - '48d647fbd8ef8889e5a7f422c1bfda94' - '90010e213dd25648e70f0cc12f8fed55' + 'f02578f5218f217a9f20e9c30e119c6a' + 'a9a1db27688bad49418667b434d29c1f' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -141,7 +143,7 @@ md5sums=('97183afb02576d5542a1eda3f29f9517' 'ba2930200c9f019c2d93a8c88c651a0f' '0ff7d225d087793c8c2c680d77aac3e7' '6097739c841f671cb21332b9cc593ae7' - 'ce31ac7b92cb5e66459f67213bbb6168' + '0d2dcdfbf28d6208751b33057f5361f0' 'ce5a1def34578b75959ac31210f031f6' '185d60944ea767075d27247c3162b3bc' '234e91ac65945ce1ab1e3839780e90f7' @@ -180,12 +182,12 @@ build() { # python2 fix export PYTHON=python2 - autoconf -f + #autoconf -f # non-SMP test build - export MAKEFLAGS="-j1" + #export MAKEFLAGS="-j1" #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ -# touch autogen.lastrun + ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ @@ -210,6 +212,8 @@ build() { --enable-odk\ --enable-ext-scripting-beanshell \ --enable-ext-scripting-javascript \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ --disable-ext-mysql-connector \ --with-system-mysql \ --enable-librsvg=system \ @@ -240,31 +244,20 @@ build() { --without-system-mozilla \ --without-system-mozilla-headers \ --with-ant-home="/usr/share/apache-ant"\ - --with-system-boost\ + --without-system-boost\ --with-system-cairo\ --with-system-libs\ --with-system-mythes\ --with-system-headers\ --with-system-hsqldb \ --with-alloc=system\ - --without-system-clucene\ + --with-system-clucene\ + --without-system-servlet-api \ --with-java-target-version=1.5 \ $EXTRAOPTS -# --disable-ext-lightproof \ - - -#--with-install-dirname="${pkgbase}" -# --enable-cairo\ -# --with-system-libtextcat \ -# --with-external-libtextcat-data \ #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool -#--with-servlet-api-jar=JARFILE -# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 -# --with-system-saxon\ -# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ - touch src.downloaded #./download make @@ -349,7 +342,7 @@ package_libreoffice-common() { } package_libreoffice-base() { - pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." + pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." install=libreoffice-base.install depends=('libreoffice-common' 'hsqldb-java') optdepends=('libreoffice-postgresql-connector') @@ -512,7 +505,7 @@ package_libreoffice-kde4() { } package_libreoffice-math() { - pkgdesc="Equation Editor Applicationfor LibreOffice." + pkgdesc="Equation Editor Application for LibreOffice." depends=('libreoffice-common') optdepends=() backup=() @@ -583,7 +576,7 @@ package_libreoffice-sdk-doc() { } package_libreoffice-writer() { - pkgdesc="Word Processor Applicationfor LibreOffice." + pkgdesc="Word Processor Application for LibreOffice." install=libreoffice-writer.install depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') @@ -698,3 +691,25 @@ package_libreoffice-extension-scripting-python() { install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python } + +package_libreoffice-extension-wiki-publisher() { + + pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher +} + +package_libreoffice-extension-nlpsolver() { + + pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver +} diff --git a/testing/mysql/PKGBUILD b/testing/mysql/PKGBUILD new file mode 100644 index 000000000..37a1225e0 --- /dev/null +++ b/testing/mysql/PKGBUILD @@ -0,0 +1,133 @@ +# $Id: PKGBUILD 165266 2012-08-14 18:43:18Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgbase=mysql +pkgname=('libmysqlclient' 'mysql-clients' 'mysql') +pkgver=5.5.27 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL') +url="https://www.mysql.com/products/community/" +makedepends=('cmake' 'openssl' 'zlib') +options=('!libtool') +source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" + 'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service') +md5sums=('82baf46acfced6eef072e9d8a479c86e' + 'e7eb2faeab755cbb2fe03542bf328da9' + '1c949c0dbea5206af0db14942d9927b6' + 'f772d69f43f6563c6e5434e988612b00' + '2fa6e456964d4ff5e6d4f9ff0126aed6' + 'a0e1460c276a50a9666c331de83271f2') + +build() { + mkdir build + cd build + + # CFLAGS/CXXFLAGS as suggested upstream + + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ + -DDEFAULT_CHARSET=utf8 \ + -DDEFAULT_COLLATION=utf8_general_ci \ + -DENABLED_LOCAL_INFILE=ON \ + -DINSTALL_INFODIR=share/mysql/docs \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_DOCREADMEDIR=share/mysql \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_DOCDIR=share/mysql/docs \ + -DINSTALL_SHAREDIR=share/mysql \ + -DWITH_READLINE=ON \ + -DWITH_ZLIB=system \ + -DWITH_SSL=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ + -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ + -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ + -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" + + make +} + +package_libmysqlclient(){ + pkgdesc="MySQL client libraries" + depends=('openssl') + + cd build + for dir in include libmysql libmysqld libservices; do + make -C ${dir} DESTDIR="${pkgdir}" install + done + + install -d "${pkgdir}"/usr/bin + install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ + install -d "${pkgdir}"/usr/share/man/man1 + for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + done +} + +package_mysql-clients(){ + pkgdesc="MySQL client tools" + depends=('libmysqlclient') + + cd build + make -C client DESTDIR="${pkgdir}" install + + # install man pages + install -d "${pkgdir}"/usr/share/man/man1 + for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + done + + # provided by mysql + rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} +} + +package_mysql(){ + pkgdesc="A fast SQL database server" + backup=('etc/mysql/my.cnf') + install=mysql.install + depends=('mysql-clients' 'systemd-tools') + options=('emptydirs') + + cd build + make DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf + install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld + install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post + install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/etc/tmpfiles.d/mysqld.conf + install -d "${pkgdir}"/usr/lib/systemd/system + install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/ + + # provided by libmysqlclient + rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} + rm "${pkgdir}"/usr/lib/libmysql* + rm -r "${pkgdir}"/usr/include/ + rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + + # provided by mysql-clients + rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} + rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + + # not needed + rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench} + rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 + + install -dm700 "${pkgdir}"/var/lib/mysql +} diff --git a/testing/mysql/my.cnf b/testing/mysql/my.cnf new file mode 100644 index 000000000..9a41b4fc3 --- /dev/null +++ b/testing/mysql/my.cnf @@ -0,0 +1,145 @@ +# MySQL config file for medium systems. +# +# This is for a system with little memory (32M - 64M) where MySQL plays +# an important part, or systems up to 128M where MySQL is used together with +# other programs (such as a web server) +# +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html +# +# In this file, you can use all long options that a program supports. +# If you want to know which options a program supports, run the program +# with the "--help" option. + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here follows entries for some specific programs + +# The MySQL server +[mysqld] +port = 3306 +socket = /var/run/mysqld/mysqld.sock +datadir = /var/lib/mysql +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 1M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +# Don't listen on a TCP/IP port at all. This can be a security enhancement, +# if all processes that need to connect to mysqld run on the same host. +# All interaction with mysqld must be made via Unix sockets or named pipes. +# Note that using this option without enabling named pipes on Windows +# (via the "enable-named-pipe" option) will render mysqld useless! +# +skip-networking + +# Replication Master Server (default) +# binary logging is required for replication +log-bin=mysql-bin + +# binary logging format - mixed recommended +binlog_format=mixed + +# required unique id between 1 and 2^32 - 1 +# defaults to 1 if master-host is not set +# but will not function as a master if omitted +server-id = 1 + +# Replication Slave (comment out master section to use this) +# +# To configure this host as a replication slave, you can choose between +# two methods : +# +# 1) Use the CHANGE MASTER TO command (fully described in our manual) - +# the syntax is: +# +# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, +# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; +# +# where you replace <host>, <user>, <password> by quoted strings and +# <port> by the master's port number (3306 by default). +# +# Example: +# +# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, +# MASTER_USER='joe', MASTER_PASSWORD='secret'; +# +# OR +# +# 2) Set the variables below. However, in case you choose this method, then +# start replication for the first time (even unsuccessfully, for example +# if you mistyped the password in master-password and the slave fails to +# connect), the slave will create a master.info file, and any later +# change in this file to the variables' values below will be ignored and +# overridden by the content of the master.info file, unless you shutdown +# the slave server, delete master.info and restart the slaver server. +# For that reason, you may want to leave the lines below untouched +# (commented) and instead use CHANGE MASTER TO (see above) +# +# required unique id between 2 and 2^32 - 1 +# (and different from the master) +# defaults to 2 if master-host is set +# but will not function as a slave if omitted +#server-id = 2 +# +# The replication master for this slave - required +#master-host = <hostname> +# +# The username the slave will use for authentication when connecting +# to the master - required +#master-user = <username> +# +# The password the slave will authenticate with when connecting to +# the master - required +#master-password = <password> +# +# The port the master is listening on. +# optional - defaults to 3306 +#master-port = <port> +# +# binary logging - not required for slaves, but recommended +#log-bin=mysql-bin + +# Uncomment the following if you are using InnoDB tables +#innodb_data_home_dir = /var/lib/mysql +#innodb_data_file_path = ibdata1:10M:autoextend +#innodb_log_group_home_dir = /var/lib/mysql +# You can set .._buffer_pool_size up to 50 - 80 % +# of RAM but beware of setting memory usage too high +#innodb_buffer_pool_size = 16M +#innodb_additional_mem_pool_size = 2M +# Set .._log_file_size to 25 % of buffer pool size +#innodb_log_file_size = 5M +#innodb_log_buffer_size = 8M +#innodb_flush_log_at_trx_commit = 1 +#innodb_lock_wait_timeout = 50 + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +no-auto-rehash +# Remove the next comment character if you are not familiar with SQL +#safe-updates + +[myisamchk] +key_buffer_size = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/testing/mysql/mysql.install b/testing/mysql/mysql.install new file mode 100644 index 000000000..a98f1a877 --- /dev/null +++ b/testing/mysql/mysql.install @@ -0,0 +1,28 @@ +post_install(){ + groupadd -g 89 mysql &>/dev/null + useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + usr/bin/mysql_install_db --user=mysql --basedir=/usr + chown -R mysql:mysql var/lib/mysql &>/dev/null + + usr/bin/systemd-tmpfiles --create mysqld.conf +} + +post_upgrade(){ + getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + + if [ "$(vercmp $2 5.5)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +} + +post_remove(){ + if getent passwd mysql >/dev/null 2>&1; then + userdel mysql + fi + if getent group mysql >/dev/null 2>&1; then + groupdel mysql + fi +} diff --git a/testing/mysql/mysqld-post.sh b/testing/mysql/mysqld-post.sh new file mode 100755 index 000000000..6747c634c --- /dev/null +++ b/testing/mysql/mysqld-post.sh @@ -0,0 +1,5 @@ +while true; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 +done diff --git a/testing/mysql/mysqld-tmpfile.conf b/testing/mysql/mysqld-tmpfile.conf new file mode 100644 index 000000000..6883dc798 --- /dev/null +++ b/testing/mysql/mysqld-tmpfile.conf @@ -0,0 +1 @@ +d /run/mysqld 0755 mysql mysql - diff --git a/testing/mysql/mysqld.rc b/testing/mysql/mysqld.rc new file mode 100755 index 000000000..4bbddb5a4 --- /dev/null +++ b/testing/mysql/mysqld.rc @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting MySQL Server" + [ ! -d /run/mysqld ] && install -d -g mysql -o mysql /run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping MySQL Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/mysql/mysqld.service b/testing/mysql/mysqld.service new file mode 100644 index 000000000..0175c685b --- /dev/null +++ b/testing/mysql/mysqld.service @@ -0,0 +1,11 @@ +[Unit] +Description=MySQL Server + +[Service] +User=mysql +ExecStart=/usr/bin/mysqld --user=mysql +ExecStartPost=/usr/bin/mysqld-post +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/testing/poppler/PKGBUILD b/testing/poppler/PKGBUILD index a5ef22a42..f70770295 100644 --- a/testing/poppler/PKGBUILD +++ b/testing/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163466 2012-07-12 14:37:16Z andyrtr $ +# $Id: PKGBUILD 165279 2012-08-14 20:38:09Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.2 +pkgver=0.20.3 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('45dd2c16c8c4d1a39e830e45745c4e25' +md5sums=('28c40266f374e1960a7bcead17d39f96' '9dc64c254a31e570507bdd4ad4ba629a') build() { diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD new file mode 100644 index 000000000..4bfa43e3d --- /dev/null +++ b/testing/proftpd/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 165249 2012-08-14 16:09:40Z andrea $ +# Maintainer: +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=proftpd +pkgver=1.3.4b +pkgrel=2 +epoch=1 +pkgdesc="A high-performance, scalable FTP server" +arch=('i686' 'x86_64') +url="http://www.proftpd.org" +license=('GPL') +depends=('libmysqlclient' 'postgresql-libs') +backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') +source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc} + 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service') +md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2' + 'e5b9bd78029a15f82994efcb7ed2e9fb' + 'c439a0a1dbc21b604d8382da87aa021b' + 'ddb09eb13131becdf0e081eef413116b' + '71d5932b0461c318ed68c2c0c2660736' + '2c446f531948c8cc0a1e0fae28f8dfda') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --disable-pam \ + --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ + --sysconfdir=/etc \ + --localstatedir=/run/proftpd \ + --enable-ctrls \ + --enable-ipv6 \ + --with-includes=/usr/include/mysql:/usr/include/postgresql \ + --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ + --enable-nls \ + --with-systemd + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" + + install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" + install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" + install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" + install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" + + install -d "${pkgdir}/usr/lib/systemd/system/" + install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/" +} diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd new file mode 100755 index 000000000..9ea1d47fc --- /dev/null +++ b/testing/proftpd/proftpd @@ -0,0 +1,41 @@ +#!/bin/bash + +# source application-specific settings +PROFTPD_ARGS= +[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting ProFTPd Server" + /usr/sbin/proftpd ${PROFTPD_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon proftpd + stat_done + fi + ;; + stop) + stat_busy "Stopping ProFTPd Server" + [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /run/proftpd/proftpd.pid + rm_daemon proftpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d new file mode 100644 index 000000000..1a5a8a201 --- /dev/null +++ b/testing/proftpd/proftpd.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to proftpd +# +PROFTPD_ARGS="" diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate new file mode 100644 index 000000000..7b6d7a87b --- /dev/null +++ b/testing/proftpd/proftpd.logrotate @@ -0,0 +1,5 @@ +/var/log/xferlog { + postrotate + /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/proftpd/proftpd.service b/testing/proftpd/proftpd.service new file mode 100644 index 000000000..c202a2fdf --- /dev/null +++ b/testing/proftpd/proftpd.service @@ -0,0 +1,14 @@ +[Unit] +Description = ProFTPD FTP Server +After = network.target nss-lookup.target local-fs.target remote-fs.target + +[Service] +Type = forking +PIDFile = /run/proftpd/proftpd.pid +Environment = PROFTPD_ARGS= +EnvironmentFile = -/etc/conf.d/proftpd +ExecStart = /usr/sbin/proftpd $PROFTPD_ARGS +ExecReload = /bin/kill -HUP $MAINPID + +[Install] +WantedBy = multi-user.target diff --git a/testing/rfkill/PKGBUILD b/testing/rfkill/PKGBUILD new file mode 100644 index 000000000..2d03e6dbb --- /dev/null +++ b/testing/rfkill/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 165297 2012-08-15 01:17:54Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Thomas Bächler <thomas@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=rfkill +pkgver=0.4 +pkgrel=5 +pkgdesc='Tool for enabling and disabling wireless devices' +url='http://linuxwireless.org/en/users/Documentation/rfkill' +license=('custom') +arch=('i686' 'x86_64') +source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'rules.d' + 'service' + 'conf.d' + 'rc.d') +sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b' + '6390eaa793b473098aaa11b13c5254d611a4c13a' + 'cadc563f967c5ac680e7cdfd764718b412201f8a' + 'd969fe927a9fb2926af43a311a7c1fa126fe59a9' + '380af0b002f51543557306ed68a27f0059fd5a6f') + +backup=('etc/conf.d/rfkill') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/rfkill.service" + install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill" + install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill" +} diff --git a/testing/rfkill/conf.d b/testing/rfkill/conf.d new file mode 100644 index 000000000..4483da26c --- /dev/null +++ b/testing/rfkill/conf.d @@ -0,0 +1,20 @@ +# +# /etc/conf.d/rfkill +# Configuration for the rfkill startup script +# + +# List of devices to block on startup (space-separated) +RFKILL_BLOCK="" + +# List of devices to unblock on startup (space-separated) +RFKILL_UNBLOCK="all" + +# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ... +# See "rfkill list" for available devices +# Examples: +# +# Block all bluetooth devices: +# RFKILL_BLOCK="bluetooth" +# +# Unblock the phy0 wifi device and all wwan devices: +# RFKILL_UNBLOCK="phy0 wwan" diff --git a/testing/rfkill/rc.d b/testing/rfkill/rc.d new file mode 100755 index 000000000..ce90ee150 --- /dev/null +++ b/testing/rfkill/rc.d @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/rfkill + +case "$1" in + start) + for device in ${RFKILL_BLOCK}; do + stat_busy "Blocking rfkill device: ${device}" + /usr/sbin/rfkill block ${device} + if [ $? -eq 0 ]; then + stat_done + else + stat_fail + fi + done + for device in ${RFKILL_UNBLOCK}; do + stat_busy "Unblocking rfkill device: ${device}" + /usr/sbin/rfkill unblock ${device} + if [ $? -eq 0 ]; then + stat_done + else + stat_fail + fi + done + ;; + stop) + ;; + restart) + $0 start + ;; + *) + echo "usage: $0 {start}" + exit 1 + ;; +esac +exit 0 diff --git a/testing/rfkill/rules.d b/testing/rfkill/rules.d new file mode 100644 index 000000000..bc98a3bef --- /dev/null +++ b/testing/rfkill/rules.d @@ -0,0 +1 @@ +KERNEL=="rfkill", GROUP="rfkill", MODE="0664" diff --git a/testing/rfkill/service b/testing/rfkill/service new file mode 100644 index 000000000..decd5b6fc --- /dev/null +++ b/testing/rfkill/service @@ -0,0 +1,11 @@ +[Unit] +Description=RFKill-Block Selected Devices + +[Service] +Type=oneshot +ExecStart=/usr/sbin/rfkill block 9999 +ExecStop=/usr/sbin/rfkill unblock all +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target |