diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-21 16:19:09 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-21 16:19:09 -0300 |
commit | 6cfdf260dd579c730267c9588c695313279d3fab (patch) | |
tree | 059f1f461cbe4a4ea8b8d1296411f7393cfb4de5 /community | |
parent | 6a9002279308864d7a5be176049268c45d87d201 (diff) | |
parent | 1bfe053fe69237a0413f791c7af5515f25264eee (diff) |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Diffstat (limited to 'community')
70 files changed, 718 insertions, 301 deletions
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 66537479d..53ff54a87 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68371 2012-03-23 10:07:50Z seblu $ +# $Id: PKGBUILD 69396 2012-04-15 17:01:41Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=2.0.15 +pkgver=2.0.16 pkgrel=1 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz" 'anything' 'handler.sh' 'acpid.conf.d') -md5sums=('1b1c8775adab6a994a386c45af6b86dc' +md5sums=('d59fc02c9c34f0d5c137495302e2c074' 'd69203a032c4583f9abaafcf21a7ed84' '2d37b98d6e74bab815604b8b48c6cfd4' '615439f4a89716c747907d4fc3c8df75' diff --git a/community/assimp/PKGBUILD b/community/assimp/PKGBUILD new file mode 100644 index 000000000..8dc5bff69 --- /dev/null +++ b/community/assimp/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: jepaan <jepaan at hotmail dot com> + +pkgname=assimp +pkgver=2.0.863 +pkgrel=1 +pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner" +arch=('i686' 'x86_64') +license=('BSD') +makedepends=('cmake' 'boost') +url=('http://assimp.sourceforge.net/index.html') +source=("http://downloads.sourceforge.net/assimp/assimp--${pkgver}-sdk.zip") +md5sums=('9f41662501bd9d9533c4cf03b7c25d5b') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}--${pkgver}-sdk \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/build + + make DESTDIR=$pkgdir install + install -Dm644 ${srcdir}/${pkgname}--${pkgver}-sdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD new file mode 100644 index 000000000..00d2cc85f --- /dev/null +++ b/community/bitcoin/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 69400 2012-04-15 20:25:26Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: shahid <helllamer@gmail.com> + +pkgbase=bitcoin +pkgname=('bitcoin-daemon' 'bitcoin-qt') +pkgver=0.6.0 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.bitcoin.org/" +makedepends=('boost' 'automoc4' 'miniupnpc') +conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git') +replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git') +license=('MIT') +source=("http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}-linux.tar.gz") +sha256sums=('13faa8b7c8c9ce3518ebe31ff2d97920f4feb4f06c1d08455b272fdaaeeb1f97') + +build() { + cd "$srcdir/$pkgbase-$pkgver-linux/src" + + # FIXME GCC 4.7.0 is too strict + echo "QMAKE_CXXFLAGS += $CXXFLAGS -fpermissive" >> bitcoin-qt.pro + + # and make qt gui + qmake + make + + # make bitcoind + make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS -fpermissive" USE_UPNP=1 +} + + +package_bitcoin-qt() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT" + depends=(boost-libs qt miniupnpc) + install=bitcoin-qt.install + + cd "$srcdir/$pkgbase-$pkgver-linux/src" + install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt + install -Dm644 contrib/debian/bitcoin-qt.desktop \ + "$pkgdir"/usr/share/applications/bitcoin.desktop + install -Dm644 share/pixmaps/bitcoin80.xpm \ + "$pkgdir"/usr/share/pixmaps/bitcoin80.xpm + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +package_bitcoin-daemon() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon" + depends=(boost-libs miniupnpc openssl) + + cd "$srcdir/$pkgbase-$pkgver-linux/src" + install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind + install -Dm644 contrib/debian/examples/bitcoin.conf \ + "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf" + install -Dm644 contrib/debian/manpages/bitcoind.1 \ + "$pkgdir"/usr/share/man/man1/bitcoind.1 + install -Dm644 contrib/debian/manpages/bitcoin.conf.5 \ + "$pkgdir"/usr/share/man/man5/bitcoin.conf.5 + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + diff --git a/community/bitcoin/bitcoin-qt.install b/community/bitcoin/bitcoin-qt.install new file mode 100644 index 000000000..f98ba7338 --- /dev/null +++ b/community/bitcoin/bitcoin-qt.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 7cd8d1484..065f39f20 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66360 2012-02-24 00:42:04Z spupykin $ +# $Id: PKGBUILD 69589 2012-04-19 10:16:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> @@ -11,13 +11,16 @@ url="http://www.busybox.net" license=('GPL') makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 + http://git.exherbo.org/arbor.git/plain/packages/sys-apps/busybox/files/linux-headers-fix.patch config) install=busybox.install md5sums=('9c0cae5a0379228e7b55e5b29528df8e' + '853097e2f1477f962d6f268c1b3ebd78' 'edd5c66c974ccc1b0030fd00beaa1b02') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/linux-headers-fix.patch cp $srcdir/config .config # if you want to run menuconfig uncomment the following line: # make menuconfig ; return 1 diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 58d29b681..d72b7df7b 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 68461 2012-03-25 08:30:58Z giovanni $ +# $Id: PKGBUILD 69584 2012-04-19 09:02:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.6 +pkgver=2.0.7 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('06a16582721120ae13fa04c65e3617c0') +md5sums=('aea6396d780d053e798caed5c6a95cac') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index 2c6cde67e..0897f0159 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 65291 2012-02-20 15:31:22Z stephane $ +# $Id: PKGBUILD 69536 2012-04-18 02:12:09Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck -pkgver=1.53 +pkgver=1.54 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('pcre') makedepends=('docbook-xsl') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('e1c8431cab1ef07c725f1556bdb0fc5d3e912c9f') +sha1sums=('f63abbd9bda7179c3ce3a399123bd7fb476e4537') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 36f86cf3b..3da79f488 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 67633 2012-03-13 14:56:32Z spupykin $ +# $Id: PKGBUILD 69418 2012-04-16 09:39:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') depends=('gmime24' 'libzdb' 'mhash' 'libevent') makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1' - 'sqlite3' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') + 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') optdepends=('postgresql-libs: for PostgreSQL storage backend' - 'sqlite3: for SQLite storage backend' + 'sqlite: for SQLite storage backend' 'libmysqlclient: for MySQL storage backend' 'libldap: for LDAP authentication' 'libsieve: for dbmail-sieve') @@ -26,7 +26,7 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail.rc.d) md5sums=('eb32235abffdf967253ee9d004e0e4a9' 'e7f72bc360decdb2475266391ad12329' - '099225611da20ec194c092ac9befc33c') + '6e287912650675011169b2dff42822cc') build() { cd $srcdir/dbmail-${pkgver/_/-}/ diff --git a/community/dbmail/dbmail.rc.d b/community/dbmail/dbmail.rc.d index 92c34e5d2..9286809df 100644 --- a/community/dbmail/dbmail.rc.d +++ b/community/dbmail/dbmail.rc.d @@ -7,9 +7,11 @@ case "$1" in start) + mkdir -p /var/run/dbmail + chown -R nobody:nobody /var/run/dbmail for daemon in $DBMAIL_DAEMONS; do stat_busy "Starting DbMail ${daemon}" - /usr/sbin/${daemon} + /usr/sbin/${daemon} -p /var/run/dbmail/${daemon}.pid if [ $? -gt 0 ]; then stat_fail else @@ -21,7 +23,7 @@ case "$1" in stop) for daemon in $DBMAIL_DAEMONS; do stat_busy "Stopping DbMail ${daemon}" - pid=$(cat /var/run/${daemon}.pid) + pid=$(cat /var/run/dbmail/${daemon}.pid) kill $pid sleep 4 stat_done diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD index a8b359d78..52599dcff 100644 --- a/community/deja-dup/PKGBUILD +++ b/community/deja-dup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 68348 2012-03-22 18:06:16Z bgyorgy $ +# $Id: PKGBUILD 69507 2012-04-17 14:32:37Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=deja-dup -pkgver=22.0 +pkgver=22.1 pkgrel=1 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('nautilus: backup extension') options=('!libtool') install=$pkgname.install source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz) -md5sums=('b8a71a26cdf3c460a9e5104212527d29') +md5sums=('cbf7af6f0392ab9ef355a3aeb74c8a79') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD index 5138954fd..187177a00 100644 --- a/community/desmume/PKGBUILD +++ b/community/desmume/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67526 2012-03-13 10:38:03Z giovanni $ +# $Id: PKGBUILD 69392 2012-04-15 16:03:24Z schuay $ # Maintainer: Jonathan Conder <jonno dot conder at gmail dot com> # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Arkham <arkham at archlinux dot us> @@ -11,27 +11,22 @@ # Contributor: Asher256 <achrafcherti at gmail dot com> pkgname=desmume -pkgver=0.9.7 -pkgrel=4 +pkgver=0.9.8 +pkgrel=1 pkgdesc="Nintendo DS emulator" arch=('i686' 'x86_64') url="http://desmume.org/" license=('GPL') -depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap') +depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap' + 'soundtouch' 'alsa-lib' 'zziplib') makedepends=('intltool') -replaces=('desmume-core' 'desmume-cli' 'desmume-gtk' 'desmume-glade') install=desmume.install -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'desmume-0.9.7-zlib.1.2.6-fix.patch') -sha256sums=('0a0f7ef3cc76ff0bbc6f3df47c3689653617074ea7ffc354e9fa1240c5336523' - 'baaf68be32f09690975d6309af6988c038e708ef322ed7e4b370d87087c7b6ba') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "${srcdir}/desmume-0.9.7-zlib.1.2.6-fix.patch" - ./configure --prefix=/usr \ - --enable-wifi + ./configure --prefix=/usr --enable-wifi make } @@ -40,3 +35,5 @@ package() { make DESTDIR="$pkgdir/" install } + +sha256sums=('f405b44e2d7ab3578d6be91a6546bbaa0afc60b2a8d193e4415fea5c5332d585') diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index a35cb8b85..e8cc28731 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63528 2012-02-05 11:53:40Z ibiru $ +# $Id: PKGBUILD 69446 2012-04-16 11:44:58Z spupykin $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,16 +6,16 @@ pkgname=dia pkgver=0.97.2 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://live.gnome.org/Dia" install=dia.install -depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2') +depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2' 'hicolor-icon-theme') makedepends=('intltool' 'python2' 'docbook-xsl') optdepends=('python2') -options=('!libtool' 'docs') +options=('!libtool' 'docs' '!emptydirs') source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" "dia-overflow-fix.patch") md5sums=('1e1180a513fb567709b09bc19f12105e' @@ -25,6 +25,9 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 + for file in `find -type f -name '*.py'`; do + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" + done sed -i 's#python2\.1#python2 python2.1#' configure # patch -p1 <$srcdir/dia-overflow-fix.patch @@ -44,5 +47,5 @@ package() { make DESTDIR="${pkgdir}" install cd doc make DESTDIR="${pkgdir}" install-html - ln -sf dia/html "${pkgdir}"/usr/share/dia/help + ln -sf ../doc/dia/html "${pkgdir}"/usr/share/dia/help } diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index 567704b27..df38eb4c2 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61824 2012-01-08 18:20:40Z spupykin $ +# $Id: PKGBUILD 69466 2012-04-16 15:09:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -6,18 +6,21 @@ pkgname=dmenu pkgver=4.5 -pkgrel=1 +pkgrel=2 pkgdesc="A generic menu for X" url="http://tools.suckless.org/dmenu/" arch=('i686' 'x86_64' 'mips64el') license=('MIT') -depends=('sh' 'libxinerama') -source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") -md5sums=('9c46169ed703732ec52ed946c27d84b4') +depends=('sh' 'libxinerama' 'libxft' 'freetype2') +source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz" + "http://tools.suckless.org/dmenu/patches/dmenu-$pkgver-xft.diff") +md5sums=('9c46169ed703732ec52ed946c27d84b4' + 'd448ec9120718b0aedbdb338f4fa69ba') build(){ cd $srcdir/$pkgname-$pkgver - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 + patch -p1 <$srcdir/dmenu-$pkgver-xft.diff + make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 XFTINC=-I/usr/include/freetype2 } package() { diff --git a/community/e4rat/PKGBUILD b/community/e4rat/PKGBUILD index aaf86e69f..4055dd567 100644 --- a/community/e4rat/PKGBUILD +++ b/community/e4rat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67597 2012-03-13 13:26:27Z lcarlier $ +# $Id: PKGBUILD 69434 2012-04-16 10:26:17Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: graysky <graysky AT archlinux DOT us> pkgname=e4rat -pkgver=0.2.1 -pkgrel=6 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions." arch=('i686' 'x86_64') url="http://e4rat.sourceforge.net/" @@ -13,14 +13,18 @@ depends=('e2fsprogs' 'util-linux') makedepends=('audit' 'boost' 'cmake') options=(!strip) backup=(etc/e4rat.conf) -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz) -md5sums=('cbb1f3cdd2b8c96b4402028da07b11f2') -sha256sums=('c509f165eff317f80f5d13d7b370514c457df4542ff3b31bee4c26f97ce89769') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz e4rat-static_core.patch) +md5sums=('dada998e857794dc7f76ffc887e04c19' + '9432ac4a8658812828d90b2676e8519f') +sha256sums=('ec40740ac05fb0470edd682232fb6c7be0bb57420b70f6c39d1df234753f3ec9' + '9381d3cee3c24de8b1df9a4c4d626a2d9d20bad695133e3dcecc9f0a8277880a') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i "$srcdir/e4rat-static_core.patch" unset LDFLAGS + sed -i '/stdlib.h/a #include <unistd.h>' src/fiemap.cc cmake -DCMAKE_BUILD_TYPE=Release . make } @@ -31,4 +35,3 @@ package() { make DESTDIR="$pkgdir" install install -dm755 "$pkgdir/var/lib/$pkgname" } - diff --git a/community/e4rat/e4rat-static_core.patch b/community/e4rat/e4rat-static_core.patch new file mode 100644 index 000000000..f9aac8208 --- /dev/null +++ b/community/e4rat/e4rat-static_core.patch @@ -0,0 +1,15 @@ +--- src/CMakeLists.txt.orig 2012-04-16 13:52:10.993586393 +0200 ++++ src/CMakeLists.txt 2012-04-16 13:52:22.503586159 +0200 +@@ -5,11 +5,7 @@ + MESSAGE(FATAL_ERROR "Do not run cmake on subdirectories") + ENDIF() + +-if(CMAKE_SIZEOF_VOID_P MATCHES 4) +- SET(BUILD_CORE_LIBRARY_STATIC 0) +-else(CMAKE_SIZEOF_VOID_P MATCHES 4) +- SET(BUILD_CORE_LIBRARY_STATIC 1) +-endif(CMAKE_SIZEOF_VOID_P MATCHES 4) ++SET(BUILD_CORE_LIBRARY_STATIC 1) + + #TODO permit link dependencies not static + #set(LINK_DEPENDENIES "static") diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD index a6091b4e3..6577de78a 100644 --- a/community/etl/PKGBUILD +++ b/community/etl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65164 2012-02-20 05:28:07Z spupykin $ +# $Id: PKGBUILD 69579 2012-04-19 07:26:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=etl -pkgver=0.04.14 -pkgrel=2 +pkgver=0.04.15 +pkgrel=1 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library" arch=(i686 x86_64 'mips64el') url="http://synfig.org" @@ -14,7 +14,7 @@ conflicts=('synfig-etl') replaces=('synfig-etl') #source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.04.tar.gz) source=(http://downloads.sourceforge.net/project/synfig/ETL/$pkgver/ETL-$pkgver.tar.gz) -md5sums=('7cb91905cbe07af327340aeba2226c06') +md5sums=('aac5038cdb4067100e57fb52337b0cfd') build() { cd $srcdir/ETL-$pkgver diff --git a/community/fwbuilder/PKGBUILD b/community/fwbuilder/PKGBUILD new file mode 100644 index 000000000..ae559607c --- /dev/null +++ b/community/fwbuilder/PKGBUILD @@ -0,0 +1,31 @@ +# $Id +# Maintainer: Kevin Piche <kevin@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=fwbuilder +pkgver=5.1.0.3599 +pkgrel=1 +pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms" +url="http://www.fwbuilder.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libxslt' 'net-snmp' 'qt') +conflicts=('libfwbuilder') +install=fwbuilder.install +source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz" + 'fwbuilder-gcc47.patch') +sha256sums=('452514a1ec0be1416bfca93603e6c89deb91d1a3a19671c64b5a8868a3743daf' + 'd7c602d5b99c6e40403c0b02e34abf15de83802257ca5ce80ad53d486b692f27') + +build() { + cd "${srcdir}/fwbuilder-${pkgver}" + patch -p1 -i "$srcdir/fwbuilder-gcc47.patch" + ./autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/fwbuilder-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/community/fwbuilder/fwbuilder-gcc47.patch b/community/fwbuilder/fwbuilder-gcc47.patch new file mode 100644 index 000000000..59cd64a6f --- /dev/null +++ b/community/fwbuilder/fwbuilder-gcc47.patch @@ -0,0 +1,13 @@ +Only in fwbuilder-5.0.1.3592: patches +Only in fwbuilder-5.0.1.3592: .pc +diff -upr fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h /var/tmp/build-root/home/abuild/rpmbuild/BUILD/fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h +--- fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2011-12-08 02:02:07.000000000 +0100 ++++ /var/tmp/build-root/home/abuild/rpmbuild/BUILD/fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-03-17 22:29:16.317275376 +0100 +@@ -31,6 +31,7 @@ + + #include <time.h> //for time_t definition + #include <pthread.h> ++#include <unistd.h> + + #include <string> + #include <queue> diff --git a/community/fwbuilder/fwbuilder.install b/community/fwbuilder/fwbuilder.install new file mode 100644 index 000000000..45f0c2242 --- /dev/null +++ b/community/fwbuilder/fwbuilder.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 452f0cb2e..dda84c6ff 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68357 2012-03-22 23:04:26Z svenstaro $ +# $Id: PKGBUILD 69414 2012-04-16 00:32:44Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,7 +7,7 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=2.7.4 +pkgver=2.7.5 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr') makedepends=('mesa') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('cf3843ff6b4324a3e8003252f6b20cd0') +md5sums=('b9ef11d08b6283b1b4a274fcf995fd79') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD index 1479b6c64..6606bb974 100644 --- a/community/incron/PKGBUILD +++ b/community/incron/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55563 2011-09-14 10:20:14Z andrea $ +# $Id: PKGBUILD 69436 2012-04-16 10:50:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: scj <scj(at)archlinux(dot)us> pkgname=incron -pkgver=0.5.9 -pkgrel=2 +pkgver=0.5.10 +pkgrel=1 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods" arch=('i686' 'x86_64' 'mips64el') url="http://incron.aiken.cz/" @@ -15,26 +15,27 @@ install=incron.install source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz" 'incron.init') options=('emptydirs') -md5sums=('a285b9e14af7bf9f9524fe051a06255f' +md5sums=('67f8b671db8169edccc8ef11c7d2c8be' '648e1ca1a4b1e624401d9d71aa3756b3') build() { cd "${srcdir}"/$pkgname-$pkgver - - install -D -m 755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond - install -d "${pkgdir}"/usr/share/man "${pkgdir}"/usr/{s,}bin - + sed -i '1,1i#include <unistd.h>' inotify-cxx.cpp icd-main.cpp sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp - make } package() { cd "${srcdir}"/$pkgname-$pkgver + + install -d "${pkgdir}"/usr/share/man "${pkgdir}"/usr/{s,}bin + make PREFIX="${pkgdir}"/usr \ MANPATH="${pkgdir}"/usr/share/man \ USERDATADIR="${pkgdir}"/var/spool/incron \ CFGDIR="${pkgdir}"/etc \ SYSDATADIR="${pkgdir}"/etc/incron.d install + + install -Dm0755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond } diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index ad7fa29f4..0652947d2 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 69505 2012-04-17 12:51:53Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived pkgver=1.2.2 -pkgrel=3 +pkgrel=4 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64') url='http://www.keepalived.org/' @@ -13,10 +13,12 @@ backup=('etc/keepalived/keepalived.conf' 'etc/conf.d/keepalived') depends=('openssl' 'popt' 'libnl1') source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.rc' + 'keepalived.service' 'keepalived.conf' 'ip_vs_moved.patch') md5sums=('f68327ca142616a8463d2d105db122cd' 'baeb62a682c2b59d732cea84bf52cc87' + '7a327df915700dcd45a049d099c9c42b' '9c8142da8730ad27a345587dea83ced7' '87ee19c85adaedd3eb11bea8a5865d47') @@ -37,8 +39,11 @@ package() { mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples" # add initscripts - install -D -m 755 ../$pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" - install -D -m 644 ../$pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" + cd .. + install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + install -D -m 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" } diff --git a/community/keepalived/keepalived.service b/community/keepalived/keepalived.service new file mode 100644 index 000000000..c20f18695 --- /dev/null +++ b/community/keepalived/keepalived.service @@ -0,0 +1,9 @@ +[Unit] +Description=Keepalive Daemon + +[Service] +EnvironmentFile=/etc/conf.d/keepalived +ExecStart=/usr/sbin/keepalived --dont-fork $DAEMON_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/libcryptui/PKGBUILD b/community/libcryptui/PKGBUILD index 3e015cecf..cae4d802c 100644 --- a/community/libcryptui/PKGBUILD +++ b/community/libcryptui/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69329 2012-04-13 22:06:22Z bgyorgy $ +# $Id: PKGBUILD 69509 2012-04-17 14:38:21Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libcryptui -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Library for OpenPGP prompts" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('23e84fd9e733e58bd1640b229cfc35830287628125f0f15604ea6aecd606fac7') +sha256sums=('fad4addf5c5b6588f492a720edce59f925190e4cdf3672984f53b25327f10fd5') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index de9c8c090..51cb23690 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68074 2012-03-17 18:50:38Z spupykin $ +# $Id: PKGBUILD 69442 2012-04-16 11:13:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.54 -pkgrel=1 +pkgver=0.7.56 +pkgrel=2 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64' 'mips64el') url="http://mediainfo.sourceforge.net" @@ -13,11 +13,15 @@ depends=( 'curl' 'libmms' 'libzen') makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 - libmediainfo-0.7.50-libmms.patch) -md5sums=('4d936fc2122ad1199e3185d2d6053715' - '2f4b21cc250f663d52b497dedb963e3b') + libmediainfo-0.7.50-libmms.patch + gcc-4.7.patch) +md5sums=('a41c484fea74d34f8f1b430a4d444a72' + '2f4b21cc250f663d52b497dedb963e3b' + '3221024ca99fb941d8eb5302ae470c6d') build() { + cd $srcdir/MediaInfoLib/ + patch -p1 <$srcdir/gcc-4.7.patch cd $srcdir/MediaInfoLib/Project/GNU/Library sh ./autogen ./configure --prefix=/usr --enable-shared --disable-static --with-libcurl --with-libmms diff --git a/community/libmediainfo/gcc-4.7.patch b/community/libmediainfo/gcc-4.7.patch new file mode 100644 index 000000000..5bdfc53e3 --- /dev/null +++ b/community/libmediainfo/gcc-4.7.patch @@ -0,0 +1,79 @@ +diff -aur MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp MediaInfoLib.patched/Source/MediaInfo/Reader/Reader_libcurl.cpp +--- MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp 2012-04-08 20:25:35.000000000 +0200 ++++ MediaInfoLib.patched/Source/MediaInfo/Reader/Reader_libcurl.cpp 2012-04-13 05:14:46.924995168 +0200 +@@ -249,15 +249,15 @@ + #else
+ libcurl_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ #endif
+ if (!libcurl_Module)
+ {
+diff -aur MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h MediaInfoLib.patched/Source/MediaInfoDLL/MediaInfoDLL.h +--- MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h 2012-04-08 12:08:50.000000000 +0200 ++++ MediaInfoLib.patched/Source/MediaInfoDLL/MediaInfoDLL.h 2012-04-13 05:14:05.481020899 +0200 +@@ -248,24 +248,24 @@ +
+ #ifdef MEDIAINFO_GLIBC
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- if (!g_module_symbol (MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfo_##_Name)) \
++ if (!g_module_symbol (MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfo_##_Name)) \
+ Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- if (!g_module_symbol (MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfoList_##_Name)) \
++ if (!g_module_symbol (MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfoList_##_Name)) \
+ Errors++;
+ #elif defined (_WIN32) || defined (WIN32)
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfo_##_Name==NULL) Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfoList_##_Name==NULL) Errors++;
+ #else
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfo_##_Name==NULL) Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfoList_##_Name==NULL) Errors++;
+ #endif
+
+@@ -317,15 +317,15 @@ + #else
+ MediaInfo_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ #endif
+ if (!MediaInfo_Module)
+ return (size_t)-1;
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 0366a92be..184aa6a1f 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69188 2012-04-10 02:21:11Z spupykin $ +# $Id: PKGBUILD 69468 2012-04-16 15:11:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.11 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -36,15 +36,17 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd-guests.conf.d openbsd-netcat-default.patch unixperms.patch - yajl-2.x.patch) + yajl-2.x.patch + "libvirt-qemu-ssh-user.patch::http://libvirt.org/git/?p=libvirt.git;a=patch;h=4eb1c2560d1ab8bae620788d343e9e7b32ddc066") md5sums=('6e9fab115075a8fd21d9bd0d7e558a52' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - '4091cf082b1b743f5e7af060b3760276' + '8297b1be794a24cc77f66af9380ace59' 'bc2971dacdbac967fc3474e50affc345' 'b0be50eb9dfe4d133decf23b60880f7d' 'db95aecdf2ccf3693fef5821cdcb7eba' - '5745bb8d0b254abb7a3528c66e03b0f9') + '5745bb8d0b254abb7a3528c66e03b0f9' + '40f6ad1d227ae2c41b4a83f7a3165ffb') build() { cd "$srcdir/$pkgname-$pkgver" @@ -62,6 +64,7 @@ build() { # patch -Np1 -i "$srcdir"/unixperms.patch [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch + [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/libvirt-qemu-ssh-user.patch export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d index e07478534..670b5431a 100755 --- a/community/libvirt/libvirtd-guests.rc.d +++ b/community/libvirt/libvirtd-guests.rc.d @@ -15,7 +15,34 @@ libvirt_get_guest_state() # list IDs of running guests libvirt_list() { - virsh $LIBVIRTD_URI list | awk 'NR > 2 {print $2}' + + list=$(virsh $LIBVIRTD_URI list) + + if [ $? -ne 0 ]; then + RETVAL=1 + return 1 + fi + + uuids= + for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do + uuid=$(virsh $LIBVIRTD_UTI dominfo $id | awk '/^UUID:/{print $2}') + if [ -z "$uuid" ]; then + RETVAL=1 + return 1 + fi + uuids="$uuids $uuid" + done + + echo $uuids + +} + +libvirt_domname() +{ + uuid=$1 + name=$(virsh $LIBVIRTD_URI dominfo $uuid | awk 'NR == 2 {$1=""; print}') + + echo $name } # suspend guest by name @@ -57,9 +84,11 @@ libvirt_stop_all() { mkdir -p `dirname $LIBVIRTD_LISTFILE` echo -n >$LIBVIRTD_LISTFILE + for i in `libvirt_list`; do + name=`libvirt_domname $i` if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then - stat_busy "Suspending libvirtd/$i guest" + stat_busy "Suspending libvirtd/$name guest" libvirt_suspend "$i" else stat_busy "Shutting libvirtd/$i guest down" @@ -75,7 +104,8 @@ libvirt_start_all() { if [ -f $LIBVIRTD_LISTFILE ]; then for i in `cat $LIBVIRTD_LISTFILE`; do - stat_busy "Starting/resuming libvirtd/$i guest" + name='libvirt_domname $i' + stat_busy "Starting/resuming libvirtd/$name guest" libvirt_start "$i" [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail done @@ -101,7 +131,7 @@ case "$1" in $0 start ;; *) - echo $"Usage: $0 {start|stop|restart}" - ;; + echo $"Usage: $0 {start|stop|restart}" + ;; esac exit 0 diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index ce3e18720..338660765 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68076 2012-03-17 18:51:40Z spupykin $ +# $Id: PKGBUILD 69420 2012-04-16 09:40:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: hydro <hydro@freenet.de> pkgname=libzen -pkgver=0.4.25 +pkgver=0.4.26 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('f30a139d506170aeeb3bc47d15e10fae') +md5sums=('6509bd3787509f4e62e48a99884db636') build() { cd $srcdir/ZenLib/Project/GNU/Library diff --git a/community/lilyterm/PKGBUILD b/community/lilyterm/PKGBUILD index 527888dcc..e554ed03a 100644 --- a/community/lilyterm/PKGBUILD +++ b/community/lilyterm/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 66757 2012-02-28 08:33:19Z giovanni $ +# $Id: PKGBUILD 69562 2012-04-18 14:35:46Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: TDY <tdy@gmx.com> # Contributor: DonVla <donvla@users.sourceforge.net> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=lilyterm -pkgver=0.9.8 -pkgrel=2 +pkgver=0.9.9 +pkgrel=1 pkgdesc="A light and easy to use libvte based X terminal emulator" arch=('i686' 'x86_64' 'mips64el') url="http://lilyterm.luna.com.tw/index_en.html" @@ -14,11 +14,10 @@ license=('GPL3') depends=('vte') makedepends=('gettext' 'intltool' 'pkgconfig>=0.16') source=(http://lilyterm.luna.com.tw/file/$pkgname-$pkgver.tar.gz) -md5sums=('995f7b4634523bf5e150b529a4bdbf6f') +md5sums=('ae89dca908951ce2fafa60b90c892d1a') build() { cd "$srcdir/lilyterm-$pkgver" - ./autogen.sh ./configure --prefix=/usr \ --sysconfdir=/etc make diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 7a6b8e2d9..d9e379ba4 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68080 2012-03-17 18:53:14Z spupykin $ +# $Id: PKGBUILD 69429 2012-04-16 09:59:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.54 +pkgver=0.7.56 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('c851998158213a6b837048d67e1c2b9a') +md5sums=('fdd41eb501e0936035046a9277c29fa5') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index 8f42bf55b..2012f0f90 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68078 2012-03-17 18:52:26Z spupykin $ +# $Id: PKGBUILD 69427 2012-04-16 09:59:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.54 +pkgver=0.7.56 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('c851998158213a6b837048d67e1c2b9a') +md5sums=('fdd41eb501e0936035046a9277c29fa5') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index de185bc66..22da899e8 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67337 2012-03-09 05:57:19Z bpiotrowski $ +# $Id: PKGBUILD 69383 2012-04-15 05:22:45Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori -pkgver=0.4.4 +pkgver=0.4.5 pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('a6578ebfd237c0f22cce49113b95f70c') +md5sums=('14288197a1e2251b7c0803e1448daa0e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index 6b420707f..6f15eab87 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64114 2012-02-08 23:57:08Z cbrannon $ +# $Id: PKGBUILD 69477 2012-04-16 17:52:09Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=mldonkey -pkgver=3.1.0 -pkgrel=3 +pkgver=3.1.1 +pkgrel=1 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64' 'mips64el') url="http://mldonkey.sourceforge.net/" @@ -18,8 +18,7 @@ backup=('etc/conf.d/mldonkey') install=mldonkey.install source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 mldonkeyd - mldonkey.conf - mldonkey.desktop) + mldonkey.conf) build() { cd "$srcdir/$pkgname-$pkgver" @@ -34,13 +33,12 @@ package() { install -Dm644 "$srcdir/$pkgname-$pkgver/icons/rsvg/type_source_normal.svg" \ "$pkgdir/usr/share/icons/mldonkey.svg" - install -Dm644 "$srcdir/mldonkey.desktop" \ - "$pkgdir/usr/share/applications/mldonkey.desktop" install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey" install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" + install -Dm644 "distrib/mldonkey.desktop" \ + "$pkgdir/usr/share/applications/mldonkey.desktop" } -md5sums=('072726d158ba1e936c554be341e7ceff' +md5sums=('5954ee7cfae18afb2732549fd990e7d6' '9e90003a012cf17b548dcc647961ffa6' - '1f86d92db51c62cded0e6f3833057dee' - '1de3266caa49f82bee73ba891eea12cf') + '1f86d92db51c62cded0e6f3833057dee') diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 7913effef..c93ca71ee 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65327 2012-02-21 01:36:41Z spupykin $ +# $Id: PKGBUILD 69518 2012-04-17 19:42:41Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -8,7 +8,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.7.8 -pkgrel=1 +pkgrel=2 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" @@ -20,7 +20,7 @@ md5sums=('4bdce45d832e065ac4c8c8ca56765e1d') build() { # mlt - cd $srcdir/mlt-$pkgver + cd "$srcdir/mlt-$pkgver" # [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= SSE2=--disable-sse2 @@ -33,7 +33,7 @@ build() { make # mlt python bindings - cd $srcdir/mlt-$pkgver/src/swig/python + cd "$srcdir/mlt-$pkgver/src/swig/python" sed -i 's_path=`which python_path=`which python2_' build sed -i 's_`python -c_`python2 -c_' build sed -i 's#python-config#python2-config#' build @@ -45,16 +45,16 @@ package_mlt() { optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa") conflicts=('mlt++<=0.3.8') - cd $srcdir/mlt-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/mlt-$pkgver" + make DESTDIR="$pkgdir" install } package_mlt-python-bindings() { depends=('python2' 'mlt') - cd $srcdir/mlt-$pkgver/src/swig/python - mkdir -p $pkgdir/usr/lib/python2.7/ - install -m755 mlt.py $pkgdir/usr/lib/python2.7/ - install -m755 _mlt.so $pkgdir/usr/lib/python2.7/ - install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/ + cd "$srcdir/mlt-$pkgver/src/swig/python" + mkdir -p "$pkgdir/usr/lib/python2.7/" + install -m755 mlt.py "$pkgdir/usr/lib/python2.7/" + install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/" + install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/" } diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD index 7c4ef3bc9..d0b4a9644 100644 --- a/community/moreutils/PKGBUILD +++ b/community/moreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67622 2012-03-13 14:24:57Z spupykin $ +# $Id: PKGBUILD 69438 2012-04-16 10:51:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=moreutils -pkgver=0.45 -pkgrel=3 +pkgver=0.46 +pkgrel=1 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" arch=('i686' 'x86_64' 'mips64el') url="http://kitenet.net/~joey/code/moreutils.html" @@ -15,7 +15,7 @@ optdepends=('perl-timedate' 'perl-time-duration' 'perl-ipc-run') options=('!emptydirs' 'zipman') replaces=(moreutils-svn) source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz) -md5sums=('b30306cd7312219551b890fbcbf984c4') +md5sums=('658f9cc6b6dcc0b50dcff714e13b22dc') build() { cd $srcdir/moreutils diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 37a58eecd..824e33225 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69262 2012-04-11 06:53:29Z jconder $ +# $Id: PKGBUILD 69571 2012-04-19 02:21:24Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.25 -pkgrel=1 +pkgrel=3 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -24,6 +24,8 @@ optdepends=('glew: for GPU commercial flagging' 'libxml2: to read blu-ray metadata' 'openssl: for AirTunes (RAOP) support' 'xmltv: to download tv listings') +conflicts=('myththemes' 'mythplugins-mythvideo') +replaces=('myththemes' 'mythplugins-mythvideo') backup=('etc/conf.d/mythbackend') install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" @@ -33,7 +35,7 @@ source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" md5sums=('e49c81de40e279c83dcb1b2aa9a45748' '6090f5f22a8584db80b76cf19869ee41' '62fd98347c56b1d9b795792f83269d25' - '1f72db0586f97a7c3fd3155dfa9a6c6f') + 'ab962d83614cbd0ac11ce3fcc929829d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/mythtv/mythbackend.conf b/community/mythtv/mythbackend.conf index 15a248450..49bbca877 100644 --- a/community/mythtv/mythbackend.conf +++ b/community/mythtv/mythbackend.conf @@ -1,4 +1,3 @@ -#!/bin/bash # # Copyright (c) by the MythTV Development Team. # diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD index d16836288..b5b065b6e 100644 --- a/community/naev/PKGBUILD +++ b/community/naev/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68487 2012-03-26 07:00:35Z svenstaro $ +# $Id: PKGBUILD 69406 2012-04-15 22:34:54Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Johan Rehnberg <cleanrock@gmail.com> pkgname=naev -pkgver=0.5.2 +pkgver=0.5.3 pkgrel=1 pkgdesc='2D action/rpg space game' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL3') depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data') makedepends=('freeglut') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c23a2ca80553a7d1d75497dc6672e61b') +md5sums=('bec719b3daa33ec190d785120a7b0159') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/neatx/PKGBUILD b/community/neatx/PKGBUILD index a67c2df6e..e59f6f61c 100644 --- a/community/neatx/PKGBUILD +++ b/community/neatx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66247 2012-02-23 05:19:47Z spupykin $ +# $Id: PKGBUILD 69462 2012-04-16 14:21:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Nicolas Doualot <packages@slubman.info> pkgname=neatx pkgver=0.3.1 -pkgrel=11 +pkgrel=12 pkgdesc="A free NX server by google" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/neatx/" @@ -24,7 +24,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" patch -i "$srcdir/constants.archlinux.patch" -p2 - ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html + ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html2 make make DESTDIR="$pkgdir/" install chmod 777 "$pkgdir/var/lib/neatx/sessions" diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 95cf51837..cb798bf21 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 61581 2012-01-03 18:29:08Z arodseth $ +# $Id: PKGBUILD 69550 2012-04-18 07:41:47Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> + pkgname=nemiver -pkgver=0.9.1 -pkgrel=2 +pkgver=0.9.2 +pkgrel=1 pkgdesc="C/C++ debugger for GNOME" arch=('x86_64' 'i686') license=('GPL') @@ -12,8 +13,8 @@ depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsetti makedepends=('boost' 'intltool' 'gnome-doc-utils') install=nemiver.install source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") -options=(!libtool !emptydirs) -md5sums=('9c0275e7a2d9f9fb48f279387969281b') +options=('!libtool' '!emptydirs') +sha256sums=('770392965a45d728b798da3c6111c4e7cb55d51f109a78aedead99083f8e2520') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index a6a7b6939..307397266 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,10 +1,18 @@ -# $Id: PKGBUILD 67860 2012-03-15 15:25:27Z spupykin $ +# $Id: PKGBUILD 69421 2012-04-16 09:40:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> +_doc_root=/usr/share/nginx/http +_server_root=/etc/nginx +_conf_path=${_server_root}/conf +_tmp_path=/var/spool/nginx +_log_path=/var/log/nginx +_user=http +_group=http + pkgname=nginx -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') @@ -26,17 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf" "etc/conf.d/nginx") source=("http://nginx.org/download/nginx-$pkgver.tar.gz" 'nginx') -md5sums=('58360774e4875e8fc4c4286448cb54d0' - '0e8032d3ba26c3276e8c7c30588d375f') - -_doc_root=/usr/share/nginx/http -_server_root=/etc/nginx -_conf_path=${_server_root}/conf -_tmp_path=/var/spool/nginx -_log_path=/var/log/nginx -_user=http -_group=http -md5sums=('019844e48c34952253ca26dd6e28c35c' +md5sums=('17da4802209b83d9bebb0f0edd975dfc' '0e8032d3ba26c3276e8c7c30588d375f') build() { @@ -59,6 +57,7 @@ build() { --with-http_gzip_static_module \ --with-ipv6 \ --add-module=/usr/lib/passenger/ext/nginx \ + --conf-path=${_conf_path}/nginx.conf \ --http-scgi-temp-path=${_tmp_path} \ --http-uwsgi-temp-path=${_tmp_path} #--with-http_mp4_module \ @@ -92,7 +91,7 @@ package() { } EOF - sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/$_conf_path/nginx.conf + sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/${_conf_path}/nginx.conf install -d $pkgdir/$_tmp_path diff --git a/community/odt2txt/PKGBUILD b/community/odt2txt/PKGBUILD new file mode 100644 index 000000000..8ff16fba4 --- /dev/null +++ b/community/odt2txt/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 69493 2012-04-17 10:36:52Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Vladimir Chizhov <jagoterr@gmail.com> + +pkgname=odt2txt +pkgver=0.4 +pkgrel=1 +pkgdesc="extracts the text out of OpenDocument Texts" +url="http://stosberg.net/odt2txt/" +license=("GPL2") +arch=('i686' 'x86_64') +depends=('zlib') +source=(http://stosberg.net/odt2txt/$pkgname-$pkgver.tar.gz) +md5sums=('6fe3bd261ce2dde2810244bbe969bbc5') + +build() { + cd $srcdir/$pkgname-$pkgver + make + install -Dm755 odt2txt $pkgdir/usr/bin/odt2txt + install -Dm644 odt2txt.1 $pkgdir/usr/share/man/man1/odt2txt.1 +} diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD index 2c0dcf5c3..ac4f13b38 100644 --- a/community/pound/PKGBUILD +++ b/community/pound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64351 2012-02-11 23:23:24Z allan $ +# $Id: PKGBUILD 69456 2012-04-16 13:52:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=pound pkgver=2.6 -pkgrel=1 +pkgrel=2 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" arch=('i686' 'x86_64' 'mips64el') url="http://www.apsis.ch/pound/index_html" @@ -15,18 +15,14 @@ backup=(etc/pound/pound.cfg) source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz pound.init pound.runit - pound.cfg - pound-2.5-openssl.patch) + pound.cfg) md5sums=('8c913b527332694943c4c67c8f152071' - '4df8548f106fca08323e8e4071beaa43' - '716cc0bf334b594751bece24c7d1df2d' - '8937808acd22c6391ebe4340af8df854' - 'c2c48dc395ffc045f9d35394992292d0') + 'bd3bddb6dc17fdcab824815a4705b055' + '4bd5e2a8d8e707eb900ae88929e00d4c' + '8937808acd22c6391ebe4340af8df854') build() { cd $srcdir/Pound-$pkgver - # Patch to build against OpenSSL 1.0.0 (Thanks Fedora!) -# patch -p1 -i $srcdir/pound-2.5-openssl.patch || return 1 ./configure --prefix=/usr --sysconfdir=/etc/pound make } diff --git a/community/pound/pound.init b/community/pound/pound.init index 369d6626d..b8187c81f 100755 --- a/community/pound/pound.init +++ b/community/pound/pound.init @@ -6,33 +6,33 @@ case "$1" in start) - stat_busy "Starting Pound" - /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid & - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pound - stat_done - fi - ;; + stat_busy "Starting Pound" + /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pound + stat_done + fi + ;; stop) - stat_busy "Stopping Pound" + stat_busy "Stopping Pound" [ -f /var/run/pound.pid ] && kill `cat /var/run/pound.pid` - if [ $? -gt 0 ]; then - stat_fail - else + if [ $? -gt 0 ]; then + stat_fail + else rm -f /var/run/pound.pid - rm_daemon pound - stat_done - fi - ;; + rm_daemon pound + stat_done + fi + ;; restart) - $0 stop + $0 stop sleep 1 - $0 start - ;; + $0 start + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" ;; esac exit 0 diff --git a/community/pound/pound.runit b/community/pound/pound.runit index 2e0be991e..ed59ea046 100755 --- a/community/pound/pound.runit +++ b/community/pound/pound.runit @@ -11,7 +11,7 @@ SVC=pound PID=`pidof $BIN` if [ -z "$PID" ] then - if [ -f /var/run/$SVC.pid ] + if [ -f /var/run/$SVC.pid ] then rm /var/run/$SVC.pid rm_daemon $SVC @@ -21,4 +21,3 @@ then else [ -z $PID ] || exec watchpid $PID fi - diff --git a/community/qtemu/PKGBUILD b/community/qtemu/PKGBUILD index 4e8d21cf4..bc8ea3864 100644 --- a/community/qtemu/PKGBUILD +++ b/community/qtemu/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 65491 2012-02-21 06:36:26Z spupykin $ +# $Id: PKGBUILD 69470 2012-04-16 15:12:06Z spupykin $ # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Previous Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=qtemu pkgver=1.0.5 -pkgrel=4 +pkgrel=5 pkgdesc="Graphical user interface for QEMU written in Qt4" url="http://qtemu.org" license=("GPL") arch=('i686' 'x86_64' 'mips64el') makedepends=('cmake') depends=('qemu' 'qt>=4.1') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('3b93e209dc62e52a1d94c8eb24d0b149') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + http://qtemu.svn.sourceforge.net/viewvc/qtemu/trunk/qtemu/misc/qtemu.desktop) +md5sums=('3b93e209dc62e52a1d94c8eb24d0b149' + 'b323b75384fdb327728d2603979f7202') build() { cd "$srcdir/$pkgname-$pkgver" @@ -21,4 +23,5 @@ build() { make DESTDIR="$pkgdir" install install -d "$pkgdir/usr/bin" ln -s /opt/qtemu/bin/qtemu "$pkgdir/usr/bin/qtemu" + install -Dm0644 $srcdir/qtemu.desktop $pkgdir/usr/share/applications/qtemu.desktop } diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 4a05001dd..d029f6dbe 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67278 2012-03-06 10:44:14Z arodseth $ +# $Id: PKGBUILD 69444 2012-04-16 11:14:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,13 +6,14 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.16.2 -pkgrel=2 +pkgver=1.17.1 +pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" -arch=('x86_64' 'i686' 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://www.lesbonscomptes.com/recoll/" license=('GPL') -depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme') +depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme' 'qtwebkit') +makedepends=('python2') optdepends=('libxslt: for XML based formats (fb2,etc)' 'unzip: for the OpenOffice.org documents' 'xpdf: for pdf' @@ -30,16 +31,21 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('f0f29dff2d82ef8541c51963870f31daf28472f3c8822c81c17c346769b77355') +md5sums=('10726fdb6c35898f6349d475fc4097c8') build() { cd "$srcdir/$pkgname-$pkgver" msg2 "Python2 fix" - for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py,rclwar,rclrar} doc/user/usermanual.html; do + export PYTHON=/usr/bin/python2 + for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py,rclwar,rclrar} \ + doc/user/usermanual.html; do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" done - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' desktop/hotrecoll.py + sed -i 's_python$_python2_' desktop/hotrecoll.py + sed -i 's_python _python2 _' python/recoll/Makefile recollinstall* + + sed -i '1,1i#include <unistd.h>' utils/rclionice.cpp ./configure \ --prefix=/usr \ diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD index 4e5a6c99c..c1369ee0b 100644 --- a/community/remmina/PKGBUILD +++ b/community/remmina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69336 2012-04-14 04:21:10Z lcarlier $ +# $Id: PKGBUILD 69472 2012-04-16 15:12:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=remmina pkgver=1.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="Remmina is a remote desktop client written in GTK+. " arch=(i686 x86_64 'mips64el') url="http://remmina.sourceforge.net/" @@ -11,7 +11,11 @@ license=('GPL') depends=('gtk2' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp' 'libgnome-keyring') makedepends=('intltool' 'pkgconfig' 'cmake' 'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib') -optdepends=('avahi' 'libxkbfile' 'freerdp' 'telepathy-glib') +optdepends=('avahi' + 'libxkbfile' + 'freerdp' + 'telepathy-glib' + 'gnome-keyring') replaces=('remmina-plugins') provides=("grdc" "grdc=$pkgver" 'remmina-plugins') conflicts=("grdc") diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 16d9a181a..2ced64735 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68925 2012-04-06 00:04:01Z dreisner $ +# $Id: PKGBUILD 69475 2012-04-16 15:31:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog @@ -29,7 +29,6 @@ md5sums=('03e237abaa5d47f92c6e655f92f22532' build() { cd ${srcdir}/${pkgname}-${pkgver} - export LDFLAGS="-lestr" ./configure --prefix=/usr \ --enable-mysql \ --enable-pgsql \ @@ -40,6 +39,7 @@ build() { --enable-gnutls \ --enable-inet \ --with-systemdsystemunitdir=/usr/lib/systemd/system + echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile make } package() { diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD index 2f882aa11..297188a87 100644 --- a/community/sslh/PKGBUILD +++ b/community/sslh/PKGBUILD @@ -1,22 +1,24 @@ -# $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 69412 2012-04-15 23:37:55Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> # Contributor: Jason Rodriguez <jason-aur@catloaf.net> pkgname=sslh pkgver=1.10 -pkgrel=5 +pkgrel=6 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer' arch=('i686' 'x86_64' 'mips64el') url='http://www.rutschle.net/tech/sslh.shtml' license=('GPL2') backup=('etc/conf.d/sslh') -source=("http://www.rutschle.net/tech/${pkgname}-${pkgver}.tar.gz" +source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" 'sslh.rc' - 'sslh.conf') + 'sslh.conf' + 'sslh.service') md5sums=('bc34e9a4770d634633e70589c72708cc' - '0680f09267c33205acf16ac6d4adf926' - '808199410bd6ab67421bf3544f805d1a') + 'f64da291e97f1a99c33cb6ebf939b95b' + '808199410bd6ab67421bf3544f805d1a' + 'ee8a4fcfc1f6839f7c93deb6f59f7fd6') build() { cd $pkgname-$pkgver @@ -27,10 +29,17 @@ build() { } package() { - install -D -m 755 sslh.rc "${pkgdir}/etc/rc.d/sslh" - install -D -m 644 sslh.conf "${pkgdir}/etc/conf.d/sslh" + # install initscripts + install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh" + install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh" + # install systemd service + install -Dm 644 sslh.service "$pkgdir/usr/lib/systemd/system/sslh.service" + # manually install to have both ssl-fork and ssl-select cd $pkgname-$pkgver - make PREFIX="$pkgdir/usr" install + install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork" + install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select" + ln -s sslh-fork "$pkgdir/usr/bin/sslh" + install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc index 05b03bc3e..9c31435a0 100644 --- a/community/sslh/sslh.rc +++ b/community/sslh/sslh.rc @@ -5,7 +5,7 @@ . /etc/conf.d/${0##*/} NAME=sslh -DAEMON=/usr/sbin/sslh +DAEMON=/usr/bin/sslh PID=$(pidof -o %PPID $DAEMON) case "$1" in @@ -24,7 +24,7 @@ case "$1" in $0 start exit 0 ;; - *) + *) echo "usage: ${0##*/} {start|stop|restart}" >&2 ;; esac diff --git a/community/sslh/sslh.service b/community/sslh/sslh.service new file mode 100644 index 000000000..7ccad70e9 --- /dev/null +++ b/community/sslh/sslh.service @@ -0,0 +1,9 @@ +[Unit] +Description=SSL/SSH multiplexer + +[Service] +EnvironmentFile=/etc/conf.d/sslh +ExecStart=/usr/bin/sslh --foreground $DAEMON_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index ed5f0c53c..59f678395 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61992 2012-01-13 15:53:58Z lfleischer $ +# $Id: PKGBUILD 69552 2012-04-18 09:36:36Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel pkgver=4.52 -pkgrel=1 +pkgrel=2 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') url="http://www.stunnel.org" @@ -52,8 +52,8 @@ package() { install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" # move systemd service into place - install -dm755 "$pkgdir/lib/systemd/system" - mv "tools/stunnel.service" "$pkgdir/lib/systemd/system/" + install -dm755 "$pkgdir/usr/lib/systemd/system" + mv "tools/stunnel.service" "$pkgdir/usr/lib/systemd/system/" sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 5f1719a73..397fcc26a 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64414 2012-02-13 03:46:16Z spupykin $ +# $Id: PKGBUILD 69581 2012-04-19 07:27:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig -pkgver=0.63.04 +pkgver=0.63.05 pkgrel=1 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64 'mips64el') @@ -18,7 +18,7 @@ options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz build-fix.patch ffmpeg-0.8.patch) -md5sums=('baa0df3a51d101600771e0d45fcc7d22' +md5sums=('8591cf17c26405d68d2cc050a2929292' 'b5568b06fae1a7ee465b5380b1139b83' 'ebf41046097cfd778dee9a9854561dae') diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD index 3f5f85d7e..053d9c098 100644 --- a/community/synfigstudio/PKGBUILD +++ b/community/synfigstudio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64416 2012-02-13 03:47:06Z spupykin $ +# $Id: PKGBUILD 69586 2012-04-19 09:14:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfigstudio -pkgver=0.63.04 +pkgver=0.63.05 pkgrel=1 pkgdesc="Professional vector animation program (GUI)" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi' install=synfigstudio.install options=('!libtool') source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz) -md5sums=('6bc0d5410df032df6c518adca824ddb6') +md5sums=('ca01b7523118e32c904b681d8ff0a085') build() { cd $srcdir/synfigstudio-$pkgver diff --git a/community/ted/PKGBUILD b/community/ted/PKGBUILD index d6dede015..b81d0edc9 100644 --- a/community/ted/PKGBUILD +++ b/community/ted/PKGBUILD @@ -1,36 +1,40 @@ -# $Id: PKGBUILD 64361 2012-02-11 23:24:27Z allan $ +# $Id: PKGBUILD 69512 2012-04-17 16:00:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ted -pkgver=2.21 -pkgrel=5 +pkgver=2.22 +pkgrel=1 pkgdesc="An easy rich text processor (with footnote support)" arch=('i686' 'x86_64' 'mips64el') url="http://www.nllgg.nl/Ted/" depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2') license=('GPL') -source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz +source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz ted-2.21-libpng15.patch) -md5sums=('34ae855938a3b364eb587cca504ba356' +md5sums=('08162c9164dfdde1d46e41ae64df16be' '0c339b0fa7aec6b150e07e9027cd360c') build() { cd "$srcdir/Ted-$pkgver" sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile - patch -p0 -i ../ted-2.21-libpng15.patch make compile.shared make package.shared } package() { - cd "$srcdir/Ted-$pkgver" - mkdir -p "$pkgdir/usr/share/" - cd "$pkgdir/usr/share/" - tar -zxvf "$srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz" + # unpack package + mkdir -p $pkgdir/usr/share + cd "$pkgdir/usr/share" + tar xzf $srcdir/Ted-$pkgver/tedPackage/*.tar.gz + # move bin/* and share/* mv bin ../ - mkdir -p "$pkgdir/usr/share/man/man1" + mv share/* ./ + rmdir share + # move man pages cd "$pkgdir/usr/share/Ted/" + mkdir -p "$pkgdir/usr/share/man/man1" mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/ + # fix shell script and move them to /usr/bin sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh mv *.sh "$pkgdir/usr/bin/" } diff --git a/community/ucarp/PKGBUILD b/community/ucarp/PKGBUILD index 9b2d22f94..90158ebc1 100644 --- a/community/ucarp/PKGBUILD +++ b/community/ucarp/PKGBUILD @@ -1,24 +1,27 @@ -# $Id$ +# $Id: PKGBUILD 69498 2012-04-17 12:05:31Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ucarp pkgver=1.5.2 -pkgrel=2 +pkgrel=3 pkgdesc='UCARP is a portable implementation of the CARP protocol' arch=('i686' 'x86_64') url='http://www.ucarp.org/project/ucarp' license=('GPL2') depends=('libpcap') optdepends=('iproute2') +backup=('etc/conf.d/ucarp') source=("http://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz" 'ucarp.rc' 'ucarp.conf' + 'ucarp.service' 'ucarp.8' '01-fix-getopt.patch' '02-fix-downscript-on-error.c') md5sums=('e3caa733316a32c09e5d3817617e9145' - 'd941d2978c5b43154a29212115729519' - '9b27f0cf552511716b1ce3678b7a77ca' + '11675170473c7e11131d90c3d64ff333' + '79c01b9ba580d2431997efb9df59cf5d' + '582d59cd969b6447a710f58bbaf28846' '05b64a5daeb7aab45a2a59e0f4d83c8f' '3f20699aaf2ef8139dcd337f1e7f06ab' '09d26233c37956cf08e629554a91b8cd') @@ -37,13 +40,6 @@ build() { } package() { - # add initscripts - install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" - install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" - - # add manpage - install -D -m 644 $pkgname.8 "${pkgdir}/usr/share/man/man8/$pkgname.8" - cd $pkgname-$pkgver make DESTDIR="$pkgdir" install @@ -55,6 +51,17 @@ package() { # install README install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README" + + # add initscripts + cd .. + install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" + install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" + install -D -m 644 $pkgname.service \ + "${pkgdir}/usr/lib/systemd/system/$pkgname.service" + + # add manpage + install -D -m 644 $pkgname.8 "${pkgdir}/usr/share/man/man8/$pkgname.8" + } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ucarp/ucarp.conf b/community/ucarp/ucarp.conf index 386c1df8f..1fb8eae07 100644 --- a/community/ucarp/ucarp.conf +++ b/community/ucarp/ucarp.conf @@ -1,3 +1,3 @@ # vim:set ts=2 sw=2 ft=sh noet: -DAEMON_OPTS='--daemonize --interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh' +DAEMON_OPTS='--interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh' diff --git a/community/ucarp/ucarp.rc b/community/ucarp/ucarp.rc index 33f40268f..f8c9d54f3 100644 --- a/community/ucarp/ucarp.rc +++ b/community/ucarp/ucarp.rc @@ -7,6 +7,7 @@ NAME=ucarp DAEMON=/usr/sbin/ucarp PID=$(pidof -o %PPID $DAEMON) +DAEMON_OPTS="--daemonize $DAEMON_OPTS" case "$1" in start) diff --git a/community/ucarp/ucarp.service b/community/ucarp/ucarp.service new file mode 100644 index 000000000..d4afd4d0d --- /dev/null +++ b/community/ucarp/ucarp.service @@ -0,0 +1,9 @@ +[Unit] +Description=UCARP daemon + +[Service] +EnvironmentFile=/etc/conf.d/ucarp +ExecStart=/usr/sbin/ucarp $DAEMON_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD index 01eb6df30..bf103729d 100644 --- a/community/uget/PKGBUILD +++ b/community/uget/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 68396 2012-03-24 05:49:50Z bgyorgy $ +# $Id: PKGBUILD 69404 2012-04-15 22:27:21Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=uget -pkgver=1.8.0 -pkgrel=3 +pkgver=1.8.1 +pkgrel=1 pkgdesc="GTK+ download manager featuring download classification and HTML import" arch=('i686' 'x86_64') url="http://urlget.sourceforge.net/" -license=('GPL') +license=('LGPL') depends=('libnotify' 'gtk3' 'gstreamer0.10' 'curl' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool') optdepends=('aria2: alternative backend') install=$pkgname.install source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz) -md5sums=('2e0ad66ecdd0104b8fb27b29fdb44df1') +md5sums=('e3fc14042820f0496f12c85c3847c6f8') build() { cd "$srcdir/$pkgname-$pkgver" - # Fix aria2 arguments - sed -i 's/\"--enable-xml-rpc\"/"--enable-rpc"/' uget-gtk/UgSetting.c - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-appindicator --with-gtk3 make diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD index 7141e1acb..4991b3673 100644 --- a/community/vsftpd/PKGBUILD +++ b/community/vsftpd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69224 2012-04-10 09:36:37Z bpiotrowski $ +# $Id: PKGBUILD 69566 2012-04-18 17:36:30Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=vsftpd pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64' 'mips64el') url="https://security.appspot.com/vsftpd.html" @@ -28,7 +28,7 @@ build() { -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ -i builddefs.h - make CFLAGS="${CFLAGS} -fPIC" + make CFLAGS="${CFLAGS} -fPIE" LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" } package() { diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index d06da0007..981e41d6e 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 67933 2012-03-16 10:22:42Z spupykin $ +# $Id: PKGBUILD 69440 2012-04-16 10:52:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=5 +pkgrel=6 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" license=('LGPL') backup=('etc/conf.d/xmms2d.conf') -depends=('sqlite3' 'libmad') +depends=('sqlite' 'libmad') makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib' 'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout' 'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex' - 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug') # avahi + 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi') optdepends=('alsa-lib: ALSA audio output' 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' 'boost: C++ language bindings' @@ -24,6 +24,7 @@ optdepends=('alsa-lib: ALSA audio output' 'flac: FLAC support' 'jack: JACK audio output' 'libao: liboa audio output' + 'libgme: game-music-emu support' 'libofa: MusicDNS fingerprinting' 'libmms: play MMS streams' 'libmodplug: to play MOD files' @@ -57,15 +58,19 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} # python2 fix - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf +# sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf ./waf configure --prefix=/usr \ - --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps \ + --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater \ --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \ --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` ./waf build ./waf --destdir=${pkgdir} install + PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d + ./waf build + ./waf --destdir=${pkgdir} install + install -D -m 0755 ../xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d install -D -m 0644 ../xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf } diff --git a/community/zathura-djvu/PKGBUILD b/community/zathura-djvu/PKGBUILD index 0c4010f3c..df7597ad2 100644 --- a/community/zathura-djvu/PKGBUILD +++ b/community/zathura-djvu/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 67824 2012-03-14 16:28:32Z spupykin $ +# $Id: PKGBUILD 69556 2012-04-18 10:59:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-djvu -pkgver=0.1.0 -pkgrel=1 +pkgver=0.1.1 +pkgrel=2 pkgdesc="Adds DjVu support to zathura by using the djvulibre library" arch=('i686' 'x86_64' 'mips64el') url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/" license=('custom') depends=('djvulibre' 'zathura') source=(https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz) -md5sums=('be4d5966ba353f83b261a389789e0260') +md5sums=('d76bf25ad5c3bef220aebef693ff6aad') build(){ cd ${srcdir}/zathura-djvu-$pkgver make make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/zathura-pdf-poppler/PKGBUILD b/community/zathura-pdf-poppler/PKGBUILD index a461d153a..e35f9315e 100644 --- a/community/zathura-pdf-poppler/PKGBUILD +++ b/community/zathura-pdf-poppler/PKGBUILD @@ -4,7 +4,7 @@ pkgname=zathura-pdf-poppler pkgver=0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Adds pdf support to zathura by using the poppler engine" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/" @@ -17,5 +17,5 @@ build(){ cd ${srcdir}/zathura-pdf-poppler-$pkgver make make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } - diff --git a/community/zathura-ps/PKGBUILD b/community/zathura-ps/PKGBUILD index 89809661f..7be83cdf7 100644 --- a/community/zathura-ps/PKGBUILD +++ b/community/zathura-ps/PKGBUILD @@ -4,7 +4,7 @@ pkgname=zathura-ps pkgver=0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Adds ps support to zathura by using the libspectre library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-ps/" @@ -17,5 +17,5 @@ build(){ cd ${srcdir}/zathura-ps-$pkgver make make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } - diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index d48514e95..9013522b7 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69170 2012-04-09 22:13:58Z spupykin $ +# $Id: PKGBUILD 69464 2012-04-16 14:22:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura pkgver=0.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="a document viewer" arch=('i686' 'x86_64' 'mips64el') url="http://pwmt.org/projects/zathura/" @@ -13,8 +13,10 @@ depends=('girara-gtk2' 'cairo' 'sqlite') makedepends=('docutils') optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') install=zathura.install -source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz) -md5sums=('c018b0385a392adb87b465b0f759aaf9') +source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz + bash-completion) +md5sums=('c018b0385a392adb87b465b0f759aaf9' + 'cac20c37f0e77ba62a8138788f4ccabb') build() { cd $srcdir/zathura-$pkgver @@ -25,6 +27,5 @@ package() { cd $srcdir/zathura-$pkgver make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2 install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - mkdir -p $pkgdir/usr/share/bash-completion/completions - echo "complete -f -X '!*.[pf]df' zathura" >$pkgdir/usr/share/bash-completion/completions/zathura + install -Dm0644 $srcdir/bash-completion $pkgdir/usr/share/bash-completion/completions/zathura } diff --git a/community/zathura/bash-completion b/community/zathura/bash-completion new file mode 100644 index 000000000..41c3825b6 --- /dev/null +++ b/community/zathura/bash-completion @@ -0,0 +1,29 @@ +_zathura() { + _init_completion || return + + EXTENTIONS='' + for PLUGIN in /usr/lib/zathura/*.so; do + case ${PLUGIN##*/} in + pdf.so) + EXTENTIONS="$EXTENTIONS|pdf" + ;; + ps.so) + EXTENTIONS="$EXTENTIONS|ps|eps|epsi|epsf" + ;; + djvu.so) + EXTENTIONS="$EXTENTIONS|djvu|djv" + ;; + epub.so) + EXTENTIONS="$EXTENTIONS|epub" + ;; + cb.so) + EXTENTIONS="$EXTENTIONS|cb7|cbr|cbz|cbt|rar|zip|7z|tar" + ;; + *) + ;; + esac + done + + _filedir "${EXTENTIONS#|}" +} && +complete -F _zathura zathura diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD index a1488fcd8..5469f3265 100644 --- a/community/zynaddsubfx/PKGBUILD +++ b/community/zynaddsubfx/PKGBUILD @@ -1,36 +1,39 @@ -# $Id: PKGBUILD 66272 2012-02-23 07:06:41Z spupykin $ +# $Id: PKGBUILD 69533 2012-04-17 22:54:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: SpepS <dreamspepser at yahoo dot it> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=zynaddsubfx -pkgver=2.4.1 -pkgrel=7 -pkgdesc="An opensource software synthesizer capable of making a countless number of instruments." +pkgver=2.4.2 +pkgrel=1 +pkgdesc="Opensource software synthesizer capable of making a countless number of instruments." arch=('i686' 'x86_64') url="http://zynaddsubfx.sourceforge.net" license=('GPL') depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml') -makedepends=('cmake' 'pkgconfig' 'mesa') +makedepends=('cmake' 'pkgconfig' 'mesa' 'setconf' 'gendesk') options=('!emptydirs') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgver.tar.bz2" - "$pkgname.desktop" - "$pkgname.svg" "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch" - "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch") -md5sums=('59eb69ce24d6f8c605f8ba43958d0526' - '5da6735ee59fdfa21f171fdc4d6c80cb' - '6f7e9c3ce3947088a10c99c46a65431f' + "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch" + "$pkgname.svg") +md5sums=('4e1f15fd872f5cc649fc2217676e248e' 'eb95d339ff5deac8c6b54965f04a8c60' - '49464a33ab9c4250520eda0df7705663') + '49464a33ab9c4250520eda0df7705663' + '6f7e9c3ce3947088a10c99c46a65431f') build() { - cd "$srcdir/ZynAddSubFX-$pkgver" + cd "$srcdir" + gendesk + setconf "$pkgname.desktop" Icon "$pkgname.svg" + + cd "ZynAddSubFX-$pkgver" # patches - patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch" - patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch" +# patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch" +# patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch" + sed -i '1,1i#include <unistd.h>' src/Nio/NulEngine.cpp [ -d build ] || mkdir build && cd build cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack -DGuiModule=fltk .. |