diff options
210 files changed, 8783 insertions, 259 deletions
diff --git a/community-staging/flightgear/PKGBUILD b/community-staging/flightgear/PKGBUILD new file mode 100644 index 000000000..439e47c9c --- /dev/null +++ b/community-staging/flightgear/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 54030 2011-08-11 23:28:19Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: William Rea <sillywilly@gmail.com> +# Contributor: Hans Janssen <hans@janserv.xs4all.nl> + +pkgname=flightgear +pkgver=2.4.0 +pkgrel=1 +pkgdesc="An open-source, multi-platform flight simulator" +arch=(i686 x86_64) +depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') # 'flightgear-data') +makedepends=('boost') +license=("GPL") +url="http://www.flightgear.org" +options=('!makeflags') +source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") +md5sums=('eb8d1ed8b1de5f1ac7926c9d0c2f37f8') + +build() { + cd $srcdir/fg-flightgear +# [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \; +# [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <GL/glu.h>' {} \; + [ -x configure ] || ./autogen.sh + [ -f Makefile ] || ./configure --prefix=/usr + make +} + +package() { + depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data') + cd $srcdir/fg-flightgear + make DESTDIR=$pkgdir install +} diff --git a/community-staging/simgear/PKGBUILD b/community-staging/simgear/PKGBUILD new file mode 100644 index 000000000..970dbf82b --- /dev/null +++ b/community-staging/simgear/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: William Rea <sillywilly@gmail.com> +# Contributor: Hans Janssen <hans@janserv.xs4all.nl> + +pkgname=simgear +pkgver=2.4.0 +pkgrel=1 +pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." +arch=(i686 x86_64) +depends=('glut' 'freealut' 'plib' 'openscenegraph') +makedepends=('boost') +license=("GPL") +#url="http://www.simgear.org" +url="https://gitorious.org/fg" +options=('!makeflags') +source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver" + build-fix.patch) +md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde' + '905a05cc1364c067b3b9574d41cef7fa') + +build() { + cd $srcdir/fg-simgear +# patch -p1 <$srcdir/build-fix.patch + [ -x configure ] || ./autogen.sh + [ -f Makefile ] || ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/fg-simgear + make DESTDIR=$pkgdir install +} diff --git a/community-staging/simgear/build-fix.patch b/community-staging/simgear/build-fix.patch new file mode 100644 index 000000000..da4ba81f8 --- /dev/null +++ b/community-staging/simgear/build-fix.patch @@ -0,0 +1,71 @@ +diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx +--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx 2011-07-04 13:02:57.000000000 +0400 +@@ -70,9 +70,6 @@ + osg::ref_ptr<osg::RefMatrix> mModelView; + }; + +-osgUtil::RegisterRenderBinProxy +-SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin); +- + class SGClipGroup::CullCallback : public osg::NodeCallback { + public: + virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) +diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx +--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx 2011-07-04 13:03:01.000000000 +0400 +@@ -51,8 +51,6 @@ + class ClipRenderBin; + + std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes; +- +- static osgUtil::RegisterRenderBinProxy clipBinProxy; + }; + + #endif +diff -wbBur SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx +--- SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx 2011-07-12 15:12:21.000000000 +0400 +@@ -21,6 +21,7 @@ + #include <osgDB/ReadFile> + #include <osgDB/Input> + #include <osgDB/ParameterOutput> ++#include <osgDB/DatabasePager> + + #include <simgear/debug/logstream.hxx> + #include <simgear/structure/OSGVersion.hxx> +@@ -67,9 +68,12 @@ + unsigned childNum = getNumChildren(); + setTimeStamp(childNum, 0); + double priority=1.0; ++/* ++FIXME:!!! + dbp->requestNodeFile(getFileName(childNum),this,priority,0, + getDatabaseRequest(childNum), + _readerWriterOptions.get()); ++*/ + } + + bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw) +diff -wbBur SimGear-2.0.0/simgear/scene/sky/bbcache.cxx SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx +--- SimGear-2.0.0/simgear/scene/sky/bbcache.cxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx 2011-07-12 15:14:16.000000000 +0400 +@@ -31,6 +31,7 @@ + #include <simgear/screen/extensions.hxx> + #include <simgear/screen/RenderTexture.h> + #include <osg/GLU> ++#include <GL/glu.h> + + #include "bbcache.hxx" + +diff -wbBur SimGear-2.0.0/simgear/screen/tr.cxx SimGear-2.0.0.my/simgear/screen/tr.cxx +--- SimGear-2.0.0/simgear/screen/tr.cxx 2010-02-17 18:39:22.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/screen/tr.cxx 2011-07-12 15:16:01.000000000 +0400 +@@ -145,6 +145,7 @@ + #endif + + #include <osg/GLU> ++#include <GL/glu.h> + + #include "tr.h" + diff --git a/community-testing/aria2/PKGBUILD b/community-testing/aria2/PKGBUILD new file mode 100644 index 000000000..19a015c8a --- /dev/null +++ b/community-testing/aria2/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=aria2 +pkgver=1.12.1 +pkgrel=2 +pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' +arch=('i686' 'x86_64') +url='http://aria2.sourceforge.net/' +license=('GPL') +depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') +source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") +md5sums=('9f3bf96d92bc8b70b74817ed10c2c7e7') + +build() { + cd aria2-${pkgver} + + ./configure \ + --prefix=/usr \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +package() { + cd aria2-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/ekg2/PKGBUILD b/community-testing/ekg2/PKGBUILD new file mode 100644 index 000000000..403ec002d --- /dev/null +++ b/community-testing/ekg2/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 53828 2011-08-08 16:55:24Z jelle $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> + +pkgname=ekg2 +pkgver=0.3.1 +pkgrel=1 +pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" +arch=('i686' 'x86_64') +url="http://ekg2.org/" +license=('GPL') +depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib' 'gpgme') +optdepends=( 'xosd: for xosd support' + 'sqlite3: sqlite support' + 'gtk2: gtk support') +provides=('ekg2-unicode') +source=(http://pl.ekg2.org/ekg2-$pkgver.tar.gz) +md5sums=('652e492fcf72281a42c3e5960347516e') + +build() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-libgadu \ + --with-xosd \ + --enable-unicode \ + --enable-shared \ + --without-gpg + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + rm -rf $pkgdir/usr/lib/perl5/core_perl/perllocal.pod + mv $pkgdir/usr/libexec/ioctld $pkgdir/usr/lib/ekg2/ioctld + rm -rf $pkgdir/usr/libexec + chmod -R 755 $pkgdir/usr/lib/perl5 +} +md5sums=('68fc05b432c34622df6561eaabef5a40') diff --git a/community-testing/filezilla/PKGBUILD b/community-testing/filezilla/PKGBUILD new file mode 100644 index 000000000..73cb4f030 --- /dev/null +++ b/community-testing/filezilla/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 53693 2011-08-07 21:01:03Z bluewind $ +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=filezilla +pkgver=3.5.0 +pkgrel=2 +pkgdesc="Fast and reliable FTP, FTPS and SFTP client" +arch=('i686' 'x86_64') +url="http://filezilla-project.org/" +license=('GPL') +depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3') +install=filezilla.install +source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2") +md5sums=('25617d75167d07c0d3cfced69a4cf7cc') + +build() { + cd ${pkgname}-${pkgver} + ./autogen.sh + ./configure \ + --prefix=/usr \ + --disable-manualupdatecheck \ + --disable-autoupdatecheck \ + --disable-static \ + --with-tinyxml=builtin + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} +md5sums=('6a83c3afe99c2679d5a3aa73607d80a7') diff --git a/community-testing/filezilla/filezilla.install b/community-testing/filezilla/filezilla.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/community-testing/filezilla/filezilla.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/flightgear/PKGBUILD b/community-testing/flightgear/PKGBUILD new file mode 100644 index 000000000..439e47c9c --- /dev/null +++ b/community-testing/flightgear/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 54030 2011-08-11 23:28:19Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: William Rea <sillywilly@gmail.com> +# Contributor: Hans Janssen <hans@janserv.xs4all.nl> + +pkgname=flightgear +pkgver=2.4.0 +pkgrel=1 +pkgdesc="An open-source, multi-platform flight simulator" +arch=(i686 x86_64) +depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') # 'flightgear-data') +makedepends=('boost') +license=("GPL") +url="http://www.flightgear.org" +options=('!makeflags') +source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") +md5sums=('eb8d1ed8b1de5f1ac7926c9d0c2f37f8') + +build() { + cd $srcdir/fg-flightgear +# [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \; +# [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <GL/glu.h>' {} \; + [ -x configure ] || ./autogen.sh + [ -f Makefile ] || ./configure --prefix=/usr + make +} + +package() { + depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data') + cd $srcdir/fg-flightgear + make DESTDIR=$pkgdir install +} diff --git a/community-testing/freerdp/PKGBUILD b/community-testing/freerdp/PKGBUILD new file mode 100644 index 000000000..799008275 --- /dev/null +++ b/community-testing/freerdp/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 53713 2011-08-07 21:41:20Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Stijn Segers <francesco dot borromini at gmail dot com> + +pkgname=freerdp +pkgver=0.8.2 +pkgrel=3 +pkgdesc="Free RDP client" +arch=('i686' 'x86_64') +url="http://freerdp.sourceforge.net" +license=('GPL') +depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib') +makedepends=('krb5') +conflicts=('freerdp-git') +changelog=${pkgname}.changelog +options=('!libtool') +source=(http://downloads.sourceforge.net/project/freerdp/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz) +md5sums=('cde590336292c977dfc1b4b7badf24d2') + +build() { + cd `find ${srcdir}/ -type d -name freerdp-\*` + [ -x configure ] || sh ./autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd `find ${srcdir}/ -type d -name freerdp-\*` + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/freerdp/freerdp.changelog b/community-testing/freerdp/freerdp.changelog new file mode 100644 index 000000000..d47f165c3 --- /dev/null +++ b/community-testing/freerdp/freerdp.changelog @@ -0,0 +1,2 @@ +0.7.1-1 to 0.7.1-2 +* Added x86_64 to supported architectures (tested by figue). diff --git a/community-testing/gloox/PKGBUILD b/community-testing/gloox/PKGBUILD new file mode 100644 index 000000000..bd6adf0e1 --- /dev/null +++ b/community-testing/gloox/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 53716 2011-08-07 21:42:08Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: William Rea <sillywilly@gmail.com> + +pkgname=gloox +pkgver=1.0 +pkgrel=2 +pkgdesc="C++ libraries for development of Jabber client/component/server" +arch=(i686 x86_64) +url="http://camaya.net/gloox" +options=('!libtool') +license=("GPL") +depends=('libidn' 'gnutls') +source=(http://camaya.net/download/gloox-$pkgver.tar.bz2) +md5sums=('f8eacf1c6476e0a309b453fd04f90e31') + +build() { + cd $startdir/src/gloox-$pkgver + ./configure --prefix=/usr + make + make DESTDIR=$startdir/pkg install +} diff --git a/community-testing/gnustep-base/ChangeLog b/community-testing/gnustep-base/ChangeLog new file mode 100644 index 000000000..590f23f5e --- /dev/null +++ b/community-testing/gnustep-base/ChangeLog @@ -0,0 +1,6 @@ +2007-07-24 Snowman <eric@archlinux> + * rebuilt against toolchain in current + * fixed SMP build + * fixed file ownership +2007-06-26 tardo <tardo@nagi-fanboi.net> +* Built for x86_64 diff --git a/community-testing/gnustep-base/PKGBUILD b/community-testing/gnustep-base/PKGBUILD new file mode 100644 index 000000000..d13e1f326 --- /dev/null +++ b/community-testing/gnustep-base/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 53739 2011-08-07 22:05:20Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Sebastian Sareyko <public@nooms.de> + +pkgname=gnustep-base +pkgver=1.22.0 +pkgrel=3 +pkgdesc="The GNUstep base package" +arch=('i686' 'x86_64') +url="http://www.gnustep.org/" +license=("GPL" "LGPL") +depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make gnutls) +makedepends=(gcc-objc) +conflicts=('gnustep-base-svn') +groups=('gnustep-core') +options=('!emptydirs' '!makeflags') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) +md5sums=('7faab4891ae6c1e7a6c806d6da368410') + +build() { + cd "$srcdir/$pkgname-$pkgver" + source /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/ + # fix file ownership + sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble + make VERBOSE=1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + chown -R root.root "$pkgdir/" +} diff --git a/community-testing/gsasl/PKGBUILD b/community-testing/gsasl/PKGBUILD new file mode 100644 index 000000000..735a57862 --- /dev/null +++ b/community-testing/gsasl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 53719 2011-08-07 21:42:52Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Orivej Desh <smpuj@bk.ru> +# Maintainer: Orivej Desh <smpuj@bk.ru> + +pkgname=gsasl +pkgver=1.6.1 +pkgrel=3 +pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" +arch=("i686" "x86_64") +url="http://josefsson.org/gsasl/" +license=("GPL") +depends=('gnutls' 'libidn' 'krb5' 'libgcrypt') +source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz") +md5sums=('7ae813eeb1f90ad52e9a781ac9e17f28') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la" +} diff --git a/community-testing/gtk-gnutella/PKGBUILD b/community-testing/gtk-gnutella/PKGBUILD new file mode 100644 index 000000000..1eb8c2b0f --- /dev/null +++ b/community-testing/gtk-gnutella/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 53764 2011-08-08 05:26:47Z ebelanger $ +# Contributor: Dan McGee <dan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=gtk-gnutella +pkgver=0.97 +pkgrel=2 +pkgdesc="A Gnutella client written in C" +arch=('i686' 'x86_64') +url="http://gtk-gnutella.sourceforge.net/" +license=('GPL') +depends=('gtk2') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('d44e1af3441fb07a5e5712b0d522fae5') +sha1sums=('1b50790adc494d7023a7cf9319d7cdef1c9ab51e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./build.sh --prefix=/usr --gtk2 --disable-dbus +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make install INSTALL_PREFIX="${pkgdir}" +} diff --git a/community-testing/gwenhywfar/PKGBUILD b/community-testing/gwenhywfar/PKGBUILD new file mode 100644 index 000000000..1512a7eb1 --- /dev/null +++ b/community-testing/gwenhywfar/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 53745 2011-08-07 22:06:07Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: William Rea <sillywilly@gmail.com> + +pkgname=gwenhywfar +pkgver=4.2.0 +pkgrel=2 +pkgdesc="OS abstraction functions for various projects" +arch=(i686 x86_64) +url="http://www.aquamaniac.de" +options=('!libtool') +license=("LGPL") +depends=('openssl' 'gnutls') +makedepends=('gtk2' 'qt') +optdepends=('gtk2' 'qt') +source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=62&file=01&dummy=gwenhywfar-$pkgver.tar.gz") +md5sums=('62d15e090a0c21bc9d22489ceaaadfde') + +build() { + pacman -Q gwenhywfar && return 1 + cd $srcdir/gwenhywfar-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --enable-ssl + make + make DESTDIR=$pkgdir install +} diff --git a/community-testing/ifuse/PKGBUILD b/community-testing/ifuse/PKGBUILD new file mode 100644 index 000000000..e85372405 --- /dev/null +++ b/community-testing/ifuse/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=ifuse +pkgver=1.1.1 +pkgrel=4 +pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' +url='http://libimobiledevice.org/' +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=('libimobiledevice' 'fuse') +source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2") +md5sums=('8d528a79de024b91f12f8ac67965c37c') + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/jabberd14/PKGBUILD b/community-testing/jabberd14/PKGBUILD new file mode 100644 index 000000000..fccef817a --- /dev/null +++ b/community-testing/jabberd14/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 53845 2011-08-08 21:03:13Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=jabberd14 +pkgver=1.6.1.1 +pkgrel=10 +pkgdesc="old (1.4) jabber server branch" +arch=(i686 x86_64) +url="http://jabberd.org/" +license=("GPL") +depends=(pth libidn expat popt gnutls) +optdepends=(libmysqlclient) +conflicts=(jabberd) +backup=(etc/jabberd/jabber.xml) +options=('!libtool') +source=(http://download.jabberd.org/jabberd14/jabberd14-$pkgver.tar.gz + build-fix.patch + jabberd) +md5sums=('597c7ee14518ba22b1cee883b4737d87' + 'ad795626f26c01700a23515e0e75d654' + '5869169394d70977858320648075c7a6') + +build() { + cd $srcdir/jabberd14-$pkgver + export LDFLAGS="$LDFLAGS -lgcrypt" + [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-ssl --enable-legacy --sysconfdir=/etc/jabberd --localstatedir=/var + echo "#undef HAVE_GNUTLS_EXTRA" >>config.h + [ $NOEXTRACT -eq 1 ] || patch -Rp1 <$srcdir/build-fix.patch + make -j1 + make DESTDIR=$pkgdir install + install -D -m 0755 $srcdir/jabberd $pkgdir/etc/rc.d/jabberd + rm -rf $pkgdir/var/run +} diff --git a/community-testing/jabberd14/build-fix.patch b/community-testing/jabberd14/build-fix.patch new file mode 100644 index 000000000..4f39b523e --- /dev/null +++ b/community-testing/jabberd14/build-fix.patch @@ -0,0 +1,84 @@ +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc +--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2011-08-09 00:37:29.000000000 +0400 ++++ jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2007-04-07 23:43:18.000000000 +0400 +@@ -910,8 +910,8 @@ + } + + /* separate this step from the next one, and check for a predicate in this step */ +- start_predicate = strchr((char*)path, '['); +- next_step = strchr((char*)path, '/'); ++ start_predicate = strchr(path, '['); ++ next_step = strchr(path, '/'); + if (start_predicate == NULL && next_step == NULL) { + this_step = pstrdup(p, path); + } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) { +@@ -1833,8 +1833,7 @@ + if (lang != NULL && strchr(lang, '-') != NULL) { + snprintf(general_lang, sizeof(general_lang), "%s", lang); + if (strchr(lang, '-') != NULL) { +- char *tmp = strchr((char*)lang, '-'); +- tmp[0] = 0; ++ strchr(lang, '-')[0] = 0; + } else { + general_lang[0] = 0; + } +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc jabberd14-1.6.1.1/jabberd/log.cc +--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc 2011-08-09 00:37:29.000000000 +0400 ++++ jabberd14-1.6.1.1/jabberd/log.cc 2007-07-20 17:56:59.000000000 +0400 +@@ -86,7 +86,7 @@ + char *pos, c = '\0'; + if(zone != NULL && debug__zones != NULL) + { +- pos = strchr((char*)zone,'.'); ++ pos = strchr(zone,'.'); + if(pos != NULL) + { + c = *pos; +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc jabberd14-1.6.1.1/jabberd/mio_tls.cc +--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc 2011-08-09 00:53:55.000000000 +0400 ++++ jabberd14-1.6.1.1/jabberd/mio_tls.cc 2007-07-17 03:20:44.000000000 +0400 +@@ -43,7 +43,6 @@ + #include <vector> + #include <list> + #include <iostream> +-#include <gnutls/openpgp.h> + + // Tell gcrypt that we are using libpth - had to move this to a plain C file + extern "C" void mio_tls_gcrypt_init(void); +@@ -613,8 +612,7 @@ + } + + // load OpenPGP key/certificate +-// ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); +- ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64); ++ ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); + if (ret < 0) { + log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret)); + continue; +@@ -633,8 +631,7 @@ + } + + // load the OpenPGP keyring +-// ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); +- ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64); ++ ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); + if (ret < 0) { + log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret)); + continue; +@@ -643,8 +640,6 @@ + continue; + } + +- +-/* + // load GnuPG trustdb + if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) { + char const *const file = xmlnode_get_data(cur); +@@ -661,7 +656,6 @@ + continue; + } + } +-*/ + + // setup protocols to use + if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) { diff --git a/community-testing/jabberd14/jabberd b/community-testing/jabberd14/jabberd new file mode 100644 index 000000000..afbe6ef69 --- /dev/null +++ b/community-testing/jabberd14/jabberd @@ -0,0 +1,58 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof /usr/bin/jabberd +} + +case "$1" in + start) + stat_busy "Starting Jabber daemon" + + [ -d /var/run/jabberd ] || mkdir -p /var/run/jabberd + [ -f /var/run/jabberd/jabber.pid ] && rm -f /var/run/jabberd/jabber.pid + PID=`get_pid` + if [ -z "$PID" ]; then + /usr/bin/jabberd -c /etc/jabberd/jabber.xml -B >/dev/null 2>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + sleep 1 # wait on children + echo `get_pid` > /var/run/jabberd/jabberd.pid + add_daemon jabberd + sleep 1 + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Jabber daemon" + PID=`get_pid` + [ ! -z "$PID" ] && kill $PID &> /dev/null + sleep 2 + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/jabberd/jabberd.pid &> /dev/null + rm_daemon jabberd + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/libinfinity/PKGBUILD b/community-testing/libinfinity/PKGBUILD new file mode 100644 index 000000000..6f6e5f123 --- /dev/null +++ b/community-testing/libinfinity/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 53722 2011-08-07 21:43:34Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Gregory Haynes <greg@greghaynes.net> + +pkgname=libinfinity +pkgver=0.5.1 +pkgrel=2 +pkgdesc="An implementation of the Infininote protocol written in GObject-based C" +arch=('i686' 'x86_64') +url="http://gobby.0x539.de" +license=('GPL') +depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2') +makedepends=('gtk-doc' 'pkgconfig') +optdepends=('avahi: zeroconf support' + 'gtk2: gtk support') +options=('!libtool') +source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('85e6d75e101fe25503653d2202054eff') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --localstatedir=/var + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + rm -rf $pkgdir/var +} diff --git a/community-testing/libmicrohttpd/PKGBUILD b/community-testing/libmicrohttpd/PKGBUILD new file mode 100644 index 000000000..357863f07 --- /dev/null +++ b/community-testing/libmicrohttpd/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 53725 2011-08-07 21:44:17Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Norberto Lopes <shelika@mail.telepac.pt> +# Contributor: Kao Dome <kaodome@gmail.com> +# Contributor: Dmitrij D. Czarkoff <czarkoff@gmail.com> +# Contributor: Mathias Rohnstock <linksoft@gmx.de> + +pkgname=libmicrohttpd +pkgver=0.9.12 +pkgrel=2 +pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/libmicrohttpd/" +license=('LGPL') +options=('!libtool') +depends=('gnutls') +install=libmicrohttpd.install +source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) +md5sums=('35b000cd7d201ace2b071d53a02b2c0d') + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --disable-dependency-tracking --enable-largefile \ + --enable-curl --enable-messages --with-pic + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/platform.h \ + ${pkgdir}/usr/include/$pkgname/platform.h + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \ + ${pkgdir}/usr/include/$pkgname/plibc.h + sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \ + $pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc +} diff --git a/community-testing/libmicrohttpd/libmicrohttpd.install b/community-testing/libmicrohttpd/libmicrohttpd.install new file mode 100644 index 000000000..dc0d2b996 --- /dev/null +++ b/community-testing/libmicrohttpd/libmicrohttpd.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(microhttpd.info microhttpd-tutorial.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/community-testing/libvirt/PKGBUILD b/community-testing/libvirt/PKGBUILD new file mode 100644 index 000000000..87c98529a --- /dev/null +++ b/community-testing/libvirt/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 53748 2011-08-07 22:06:51Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jonathan Wiersma <archaur at jonw dot org> + +pkgname=libvirt +pkgver=0.9.4 +pkgrel=2 +pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" +arch=('i686' 'x86_64') +url="http://libvirt.org/" +license=('LGPL') +depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' + 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' + 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' + 'iproute2') +makedepends=('pkgconfig' 'lvm2') +optdepends=('bridge-utils: for briged networking (default)' + 'dnsmasq: for NAT/DHCP for guests' + 'kernel26-ovz24: for openvz guests' + 'kvm' + 'lxc' + 'openbsd-netcat: for remote management over ssh' + 'qemu' + 'user-mode-linux' + 'virtualbox_bin' + 'virtualbox-ose' + 'xen' + 'radvd') +options=('emptydirs' '!libtool') +backup=('etc/conf.d/libvirtd' + 'etc/libvirt/libvirtd.conf' + 'etc/libvirt/qemu.conf' + 'etc/sasl2/libvirt.conf') +install="libvirt.install" +source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" + libvirtd.rc.d + libvirtd.conf.d + openbsd-netcat-default.patch + unixperms.patch + yajl-2.x.patch) +md5sums=('86b411b11bd23d4af20611699f372af7' + 'c43244c40a0437038c82089618e7beaa' + '3ed0e24f5b5e25bf553f5427d64915e6' + 'ee7052f3929d5d918236c646a59edebf' + 'db95aecdf2ccf3693fef5821cdcb7eba' + '5745bb8d0b254abb7a3528c66e03b0f9') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # python2 fix + export PYTHON=`which python2` + for file in $(find . -name '*.py' -print); do + sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + +# for more information on authentication see http://libvirt.org/auth.html +# If you wish to have unix-permissions based access rather than only polkit +# access, create a group called libvirt and uncomment the line below: +# patch -Np1 -i "$srcdir"/unixperms.patch + + [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch + + # fixes for yajl 2.0 API changes +# [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch" + + export LDFLAGS=-lX11 + [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ + --with-storage-lvm --without-xen --with-udev --without-hal + find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \; + make -j1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd + install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd + rm -rf $pkgdir/var/run +} diff --git a/community-testing/libvirt/libvirt.install b/community-testing/libvirt/libvirt.install new file mode 100644 index 000000000..3881386d2 --- /dev/null +++ b/community-testing/libvirt/libvirt.install @@ -0,0 +1,38 @@ +_libvirt_setup() { + rm -f /usr/lib/python?.?/site-packages/libvirt.pyc + echo ">>> To use libvirt as a non-root user:" + echo ">>> Use polkit to grant access." + echo ">>> ...or change the access model in /etc/libvirt/libvirtd.conf." + echo ">>> (see unixperms.patch in PKGBUILD for help)" + echo "" +} + +post_install() { + _libvirt_setup || return 1 + echo ">>> Be sure to see optdepends as you may find some of them helpfull." + echo ">>> Especially: bridge-utils, dnsmasq, and hal." + echo "" + echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root." + echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon" + echo ">>> booting." + echo "" + /bin/true +} + +post_upgrade() { + _libvirt_setup || return 1 + echo ">>> To finish the upgrade, restart libvirtd by running the command:" + echo ">>> '/etc/rc.d/libvirtd restart' as root or rebooting." + echo ">>> You may also need to run 'rm -rf ~/.libvirt'" + echo "" + /bin/true +} + +post_remove() { + rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc + echo ">>> You may wish to delete the group 'libvirt' if it still exists." + echo ">>> It can be removed by running 'groupdel libvirt' as root." + echo "" + depmod -a + /bin/true +} diff --git a/community-testing/libvirt/libvirtd.conf.d b/community-testing/libvirt/libvirtd.conf.d new file mode 100644 index 000000000..d4d25b47a --- /dev/null +++ b/community-testing/libvirt/libvirtd.conf.d @@ -0,0 +1,3 @@ +LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" +LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" +KRB5_KTNAME="/etc/libvirt/krb5.tab" diff --git a/community-testing/libvirt/libvirtd.rc.d b/community-testing/libvirt/libvirtd.rc.d new file mode 100755 index 000000000..193bffa9c --- /dev/null +++ b/community-testing/libvirt/libvirtd.rc.d @@ -0,0 +1,66 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/conf.d/libvirtd +. /etc/rc.d/functions + +LIBVIRTD_CONFIG_ARGS= +if [ -n "$LIBVIRTD_CONFIG" ] +then + LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG" +fi + +PID=`pidof -o %PPID /usr/sbin/libvirtd` +case "$1" in + start) + stat_busy "Starting libvirtd" + export RADVD=/usr/sbin/radvd + for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do + [ -d $i ] || mkdir -p $i + done + [ -z "$PID" ] && ( + mkdir -p /var/{cache,run}/libvirt + rm -rf /var/cache/libvirt/* + KRB5_KTNAME=$KRB5_KTNAME \ + /usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS + ) + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon libvirtd + stat_done + fi + ;; + stop) + stat_busy "Stopping libvirtd" + [ ! -z "$PID" ] && ( + kill $PID &> /dev/null + rm -rf /var/cache/libvirt/* + rm -f /var/run/libvirtd.pid + ) + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon libvirtd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading libvirtd configuration" + [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo $"Usage: $0 {start|stop|restart|reload}" + ;; +esac +exit 0 diff --git a/community-testing/libvirt/openbsd-netcat-default.patch b/community-testing/libvirt/openbsd-netcat-default.patch new file mode 100644 index 000000000..c7543c5a4 --- /dev/null +++ b/community-testing/libvirt/openbsd-netcat-default.patch @@ -0,0 +1,36 @@ +diff -wbBur libvirt-0.9.4.org/src/qemu/qemu_migration.c libvirt-0.9.4/src/qemu/qemu_migration.c +--- libvirt-0.9.4.org/src/qemu/qemu_migration.c 2011-08-03 05:36:34.000000000 +0400 ++++ libvirt-0.9.4/src/qemu/qemu_migration.c 2011-08-03 13:29:56.000000000 +0400 +@@ -1612,7 +1612,7 @@ + ret = qemuMonitorMigrateToUnix(priv->mon, background_flags, + unixfile); + } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) { +- const char *args[] = { "nc", "-U", unixfile, NULL }; ++ const char *args[] = { "nc.openbsd", "-U", unixfile, NULL }; + ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args); + } else { + ret = -1; +diff -wbBur libvirt-0.9.4.org/src/remote/remote_driver.c libvirt-0.9.4/src/remote/remote_driver.c +--- libvirt-0.9.4.org/src/remote/remote_driver.c 2011-07-29 09:14:03.000000000 +0400 ++++ libvirt-0.9.4/src/remote/remote_driver.c 2011-08-03 13:30:05.000000000 +0400 +@@ -588,7 +588,7 @@ + username, + !tty, + !verify, +- netcat ? netcat : "nc", ++ netcat ? netcat : "nc.openbsd", + keyfile, + sockname))) + goto failed; +diff -wbBur libvirt-0.9.4.org/src/rpc/virnetsocket.c libvirt-0.9.4/src/rpc/virnetsocket.c +--- libvirt-0.9.4.org/src/rpc/virnetsocket.c 2011-08-01 05:32:35.000000000 +0400 ++++ libvirt-0.9.4/src/rpc/virnetsocket.c 2011-08-03 13:29:46.000000000 +0400 +@@ -629,7 +629,7 @@ + if (noVerify) + virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); + virCommandAddArgList(cmd, nodename, +- netcat ? netcat : "nc", ++ netcat ? netcat : "nc.openbsd", + "-U", path, NULL); + + return virNetSocketNewConnectCommand(cmd, retsock); diff --git a/community-testing/libvirt/unixperms.patch b/community-testing/libvirt/unixperms.patch new file mode 100644 index 000000000..b3fb86cf5 --- /dev/null +++ b/community-testing/libvirt/unixperms.patch @@ -0,0 +1,47 @@ +diff -ur libvirt-0.7.4-orig/daemon/libvirtd.conf libvirt-0.7.4-patched/daemon/libvirtd.conf +--- libvirt-0.7.4-orig/daemon/libvirtd.conf 2009-11-23 03:10:33.398655655 -0800 ++++ libvirt-0.7.4-patched/daemon/libvirtd.conf 2009-11-23 03:09:37.831189671 -0800 +@@ -78,14 +78,14 @@ + # without becoming root. + # + # This is restricted to 'root' by default. +-#unix_sock_group = "libvirt" ++unix_sock_group = "libvirt" + + # Set the UNIX socket permissions for the R/O socket. This is used + # for monitoring VM status only + # + # Default allows any user. If setting group ownership may want to + # restrict this to: +-#unix_sock_ro_perms = "0777" ++unix_sock_ro_perms = "0770" + + # Set the UNIX socket permissions for the R/W socket. This is used + # for full management of VMs +@@ -95,7 +95,7 @@ + # + # If not using PolicyKit and setting group ownership for access + # control then you may want to relax this to: +-#unix_sock_rw_perms = "0770" ++unix_sock_rw_perms = "0770" + + # Set the name of the directory in which sockets will be found/created. + #unix_sock_dir = "/var/run/libvirt" +@@ -126,7 +126,7 @@ + # + # To restrict monitoring of domains you may wish to enable + # an authentication mechanism here +-#auth_unix_ro = "none" ++auth_unix_ro = "none" + + # Set an authentication scheme for UNIX read-write sockets + # By default socket permissions only allow root. If PolicyKit +@@ -135,7 +135,7 @@ + # + # If the unix_sock_rw_perms are changed you may wish to enable + # an authentication mechanism here +-#auth_unix_rw = "none" ++auth_unix_rw = "none" + + # Change the authentication scheme for TCP sockets. + # diff --git a/community-testing/libvirt/yajl-2.x.patch b/community-testing/libvirt/yajl-2.x.patch new file mode 100644 index 000000000..80d3edce0 --- /dev/null +++ b/community-testing/libvirt/yajl-2.x.patch @@ -0,0 +1,66 @@ +--- a/src/util/json.c 2011-03-24 03:10:26.000000000 -0400 ++++ b/src/util/json.c 2011-04-25 20:01:29.354939116 -0400 +@@ -709,7 +709,7 @@ + + static int virJSONParserHandleNumber(void * ctx, + const char * s, +- unsigned int l) ++ size_t l) + { + virJSONParserPtr parser = ctx; + char *str = strndup(s, l); +@@ -735,7 +735,7 @@ + + static int virJSONParserHandleString(void * ctx, + const unsigned char * stringVal, +- unsigned int stringLen) ++ size_t stringLen) + { + virJSONParserPtr parser = ctx; + virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal, +@@ -756,7 +756,7 @@ + + static int virJSONParserHandleMapKey(void * ctx, + const unsigned char * stringVal, +- unsigned int stringLen) ++ size_t stringLen) + { + virJSONParserPtr parser = ctx; + virJSONParserStatePtr state; +@@ -894,14 +894,14 @@ + /* XXX add an incremental streaming parser - yajl trivially supports it */ + virJSONValuePtr virJSONValueFromString(const char *jsonstring) + { +- yajl_parser_config cfg = { 1, 1 }; + yajl_handle hand; + virJSONParser parser = { NULL, NULL, 0 }; + virJSONValuePtr ret = NULL; + + VIR_DEBUG("string=%s", jsonstring); + +- hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser); ++ hand = yajl_alloc(&parserCallbacks, NULL, &parser); ++ yajl_config(hand, yajl_allow_comments, 1); + + if (yajl_parse(hand, + (const unsigned char *)jsonstring, +@@ -1002,15 +1002,16 @@ + + char *virJSONValueToString(virJSONValuePtr object) + { +- yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */ + yajl_gen g; + const unsigned char *str; + char *ret = NULL; +- unsigned int len; ++ size_t len; + + VIR_DEBUG("object=%p", object); + +- g = yajl_gen_alloc(&conf, NULL); ++ g = yajl_gen_alloc(NULL); ++ yajl_gen_config(g, yajl_gen_beautify, 0); ++ yajl_gen_config(g, yajl_gen_indent_string, " "); + + if (virJSONValueToStringOne(object, g) < 0) { + virReportOOMError(); diff --git a/community-testing/mailutils/PKGBUILD b/community-testing/mailutils/PKGBUILD new file mode 100644 index 000000000..521f58a01 --- /dev/null +++ b/community-testing/mailutils/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 53728 2011-08-07 21:45:04Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=mailutils +pkgver=2.2 +pkgrel=3 +pkgdesc="MUA command line tool (mailx)" +arch=(i686 x86_64) +url="http://www.gnu.org/software/mailutils/" +license=('GPL') +depends=('libldap' 'pam' 'gnutls' 'guile') +makedepends=('python2' 'emacs') +optdepends=('python2') +conflicts=('libsieve') +install=mailutils.install +options=(zipman !emptydirs) +source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2) +md5sums=('834d2f616b922856127ecfe6c2de7d1a') + +build() { + cd "$srcdir/mailutils-$pkgver" + + py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2` + py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2` + + export PYTHON=/usr/bin/python2 + export PYTHON_CONFIG=/usr/bin/python2-config + export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`" + export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`" + + [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \ + --libexecdir=/usr/lib/$pkgname --without-fribidi \ + --without-tcp-wrappers +# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \; + make -j1 +} + +package() { + cd "$srcdir/mailutils-$pkgver" + make -j1 DESTDIR=$pkgdir install + rm -f $pkgdir/usr/share/info/dir + mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail + mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1 + chown -R root:root $pkgdir +} diff --git a/community-testing/mailutils/mailutils.install b/community-testing/mailutils/mailutils.install new file mode 100644 index 000000000..03b451b3e --- /dev/null +++ b/community-testing/mailutils/mailutils.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(mailutils.info mailutils.info-1 mailutils.info-2) + +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/community-testing/minbif/PKGBUILD b/community-testing/minbif/PKGBUILD new file mode 100644 index 000000000..663b6d65a --- /dev/null +++ b/community-testing/minbif/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 53751 2011-08-07 23:40:14Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: AkiraYB <brunoyb!yahoo,com,br> + +pkgname=minbif +pkgver=1.0.4 +pkgrel=4 +pkgdesc='An IRC gateway to IM networks that uses libpurple.' +arch=('i686' 'x86_64') +url='http://minbif.im/' +license=('GPL2') +depends=('gnutls' 'libcaca' 'libpurple') +makedepends=('cmake') +optdepends=('xinetd: to run minbif through xinetd') +backup=('etc/minbif/minbif.conf' + 'etc/minbif/minbif.motd') +install='minbif.install' +source=("http://minbif.im/attachments/download/90/${pkgname}-${pkgver}.tar.gz" + 'minbif') +md5sums=('25069fb6015dfb9ddc24ef2e09e74da3' + '307a6fab42bcaeed11a55b5fb4589778') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \ + ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -dm0755 "${pkgdir}/var/lib" + install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif" + install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif/users" + install -Dm0755 "${srcdir}/minbif" "${pkgdir}/etc/rc.d/minbif" + + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/minbif/minbif b/community-testing/minbif/minbif new file mode 100644 index 000000000..47888d169 --- /dev/null +++ b/community-testing/minbif/minbif @@ -0,0 +1,49 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/minbif` +case "$1" in + start) + stat_busy "Starting minbif daemon" + if [ -z "$PID" ]; then + if [ ! -d /var/run/minbif ]; then + mkdir -p /var/run/minbif && chown minbif:minbif /var/run/minbif + fi + [ -f /var/run/minbif/minbif.pid ] && rm -f /var/run/minbif/minbif.pid + CMD='/usr/bin/minbif --pidfile /var/run/minbif/minbif.pid \ + /etc/minbif/minbif.conf' + su -s /bin/sh -c "$CMD" minbif + + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon minbif + stat_done + fi + else + stat_fail + fi + ;; + + stop) + stat_busy "Stopping minbif daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/minbif/minbif.pid + rm_daemon minbif + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/minbif/minbif.install b/community-testing/minbif/minbif.install new file mode 100644 index 000000000..264763407 --- /dev/null +++ b/community-testing/minbif/minbif.install @@ -0,0 +1,18 @@ +post_install() { + grep -qs ^minbif: /etc/group || groupadd -g 67 minbif + grep -qs ^minbif: /etc/passwd || useradd -u 67 -g minbif \ + -d /var/lib/minbif -s /bin/false minbif + + chown -R minbif:minbif /var/lib/minbif + chmod 0770 /var/lib/minbif + chmod 0770 /var/lib/minbif/users +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + grep -qs ^minbif: /etc/passwd && userdel minbif + grep -qs ^minbif: /etc/group && groupdel minbif +} diff --git a/community-testing/net6/PKGBUILD b/community-testing/net6/PKGBUILD new file mode 100644 index 000000000..1d5a6e025 --- /dev/null +++ b/community-testing/net6/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 53842 2011-08-08 20:25:54Z spupykin $ +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=net6 +pkgver=1.3.12 +pkgrel=2 +pkgdesc="A library that provides a TCP protocol abstraction for C++" +arch=('i686' 'x86_64') +url="http://gobby.0x539.de/" +license=('LGPL') +depends=('gnutls' 'libsigc++2.0') +options=('!libtool') +source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz + build-fix.patch) +md5sums=('506776416d8aea2b9ea13a81f9145383' + '18ac67590d6bce0a0a4a6a21af8da429') + +build() { + cd ${srcdir}/$pkgname-$pkgver + patch -Rp1 <$srcdir/build-fix.patch + ./configure --prefix=/usr + make + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/net6/build-fix.patch b/community-testing/net6/build-fix.patch new file mode 100644 index 000000000..7e932bce6 --- /dev/null +++ b/community-testing/net6/build-fix.patch @@ -0,0 +1,24 @@ +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp net6-1.3.12/inc/encrypt.hpp +--- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp 2011-08-09 00:19:29.000000000 +0400 ++++ net6-1.3.12/inc/encrypt.hpp 2009-11-15 16:02:46.000000000 +0300 +@@ -34,7 +34,7 @@ + typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t; + typedef gnutls_transport_ptr gnutls_transport_ptr_t; + typedef gnutls_dh_params gnutls_dh_params_t; +-//typedef gnutls_connection_end gnutls_connection_end_t; ++typedef gnutls_connection_end gnutls_connection_end_t; + + class dh_params: private net6::non_copyable + { +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp net6-1.3.12/src/encrypt.cpp +--- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp 2011-08-09 00:20:12.000000000 +0400 ++++ net6-1.3.12/src/encrypt.cpp 2009-11-15 16:02:46.000000000 +0300 +@@ -25,7 +25,7 @@ + { + const unsigned int DH_BITS = 1024; + +- net6::gnutls_session_t create_session(gnutls_connection_end_t end) ++ net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) + { + net6::gnutls_session_t session; + gnutls_init(&session, end); diff --git a/community-testing/nzbget/ChangeLog b/community-testing/nzbget/ChangeLog new file mode 100644 index 000000000..74030cd3d --- /dev/null +++ b/community-testing/nzbget/ChangeLog @@ -0,0 +1,18 @@ +2010-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Fixed FS#19399 - missing postprocess-example.conf file + +2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.7.0 + +2009-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Dependency added (gnutls) in v0.6.0-2 + +2008-03-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.6.0 + +2008-09-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.5.1 + +2008-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Package moved to [community] + * Update to major release 0.5.0 diff --git a/community-testing/nzbget/PKGBUILD b/community-testing/nzbget/PKGBUILD new file mode 100644 index 000000000..278e38ac8 --- /dev/null +++ b/community-testing/nzbget/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 53834 2011-08-08 19:30:16Z jelle $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=nzbget +pkgver=0.7.0 +pkgrel=3 +pkgdesc="Downloads from Usenet using .nzb files" +arch=('i686' 'x86_64') +url="http://nzbget.sourceforge.net/" +license=('GPL') +depends=('gnutls' 'libpar2' 'libxml2' 'ncurses') +makedepends=('autoconf' 'automake') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('27971846aba75f5e312d80dce7edbc5d') + +build() { + cd ${srcdir}/$pkgname-$pkgver + +# autoreconf -fi || return 1 +#uudeview ("uulib") has been removed, and "it did not work well anyway" + ./configure --prefix=/usr --enable-parcheck || return 1 + make +} +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install + +#other files + install -d ${pkgdir}/usr/share/$pkgname || return 1 + install -m644 -t ${pkgdir}/usr/share/$pkgname \ + AUTHORS postprocess-example.sh postprocess-example.conf \ + ChangeLog nzbget.conf.example README || return 1 +} diff --git a/community-testing/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD new file mode 100644 index 000000000..d405bd160 --- /dev/null +++ b/community-testing/openscenegraph/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 50969 2011-07-03 18:11:27Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Hans Janssen <janserv@gmail.com> +# Contributor: my64 <packages@obordes.com> +# Contributor: Colin Pitrat <colin.pitrat@gmail.com> + +pkgname=openscenegraph +pkgver=3.0.0 +pkgrel=1 +pkgdesc="An Open Source, high performance real-time graphics toolkit" +arch=('i686' 'x86_64') +license=('custom:OSGPL') +url="http://www.openscenegraph.org" +depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') +makedepends=('cmake' 'libvncserver') +optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') +conflicts=('openthreads') +provides=('openthreads') +#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip) +source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") +md5sums=('121829b854349a9e9d1aebc25cf3e52d') + +build() { + cd OpenSceneGraph-$pkgver + [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp + make +} + +package() { + cd OpenSceneGraph-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true +} diff --git a/community-testing/remmina-plugins/PKGBUILD b/community-testing/remmina-plugins/PKGBUILD new file mode 100644 index 000000000..9e4534e2f --- /dev/null +++ b/community-testing/remmina-plugins/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 53731 2011-08-07 21:45:50Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Stijn Segers <francesco dot borromini at gmail dot com> + +pkgname=remmina-plugins +pkgver=0.9.2 +pkgrel=2 +pkgdesc="Remina plugins" +#"Remmina supports multiple network protocols in an integrated and consistant user interface. +# Currently RDP, VNC, XDMCP and SSH are supported." +arch=(i686 x86_64) +url="http://sourceforge.net/projects/remmina/" +license=('GPL') +conflicts=(remmina-plugins-svn) +depends=("remmina>=0.9.0" freerdp libxkbfile telepathy-glib) +makedepends=(intltool pkgconfig gettext perl avahi) +install=remmina-plugins.install +options=('!libtool') +source=(http://downloads.sourceforge.net/project/remmina/0.9/$pkgname-$pkgver.tar.gz) +md5sums=('6f6b7cb18f7604f3f17eeda5173ede6a') + +build() { + cd $srcdir/${pkgname}-${pkgver} + ./configure --prefix=/usr --enable-ssh --enable-rdp \ + --enable-vnc --enable-xdmcp --enable-nx \ + --enable-telepathy + make + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/remmina-plugins/remmina-plugins.install b/community-testing/remmina-plugins/remmina-plugins.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/community-testing/remmina-plugins/remmina-plugins.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/rsyslog/PKGBUILD b/community-testing/rsyslog/PKGBUILD new file mode 100644 index 000000000..14d38eb88 --- /dev/null +++ b/community-testing/rsyslog/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 53982 2011-08-10 20:56:05Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=rsyslog +pkgver=5.8.4 +pkgrel=2 +pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" +url="http://www.rsyslog.com/" +arch=('i686' 'x86_64') +license=('GPL3') +depends=('zlib') +makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') +optdepends=('postgresql-libs: PostgreSQL Database Support' + 'libmysqlclient: MySQL Database Support' + 'net-snmp' + 'gnutls') +backup=('etc/rsyslog.conf' \ + 'etc/logrotate.d/rsyslog' + 'etc/conf.d/rsyslog') +options=('strip' 'zipman' '!libtool') +source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" + 'rsyslog' + 'rsyslog.logrotate' + 'rsyslog.conf.d') +md5sums=('a2c2a65ac84d9a895c52a754aff61986' + 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' + '8065db4bef3061a4f000ba58779f6829' + '1a0cd4530dd5d1439456d5ae230574d9') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --enable-mysql \ + --enable-pgsql \ + --enable-mail \ + --enable-imfile \ + --enable-imtemplate \ + --enable-snmp \ + --enable-gnutls \ + --enable-inet \ + --with-systemdsystemunitdir=/lib/systemd/system + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} + # Install Daemons and Configuration Files + install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d + install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf + install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} + install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} +} diff --git a/community-testing/rsyslog/rsyslog b/community-testing/rsyslog/rsyslog new file mode 100755 index 000000000..ee0145418 --- /dev/null +++ b/community-testing/rsyslog/rsyslog @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/rsyslog + +PID=`pidof -o %PPID /usr/sbin/rsyslogd` +case "$1" in + start) + stat_busy "Starting RSyslogd" + [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon rsyslogd + stat_done + fi + ;; + stop) + stat_busy "Stopping RSyslogd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/rsyslogd.pid + rm -f /var/rsyslogd.persist + rm_daemon rsyslogd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/rsyslog/rsyslog.conf.d b/community-testing/rsyslog/rsyslog.conf.d new file mode 100644 index 000000000..e39f8c3b9 --- /dev/null +++ b/community-testing/rsyslog/rsyslog.conf.d @@ -0,0 +1,6 @@ +# +# Parameters to be passed to rsyslogd +# This should almost certainly include at least the current compatability +# level, e.g. -c4 +# +RSYSLOGD_ARGS="-c4" diff --git a/community-testing/rsyslog/rsyslog.logrotate b/community-testing/rsyslog/rsyslog.logrotate new file mode 100644 index 000000000..76306c560 --- /dev/null +++ b/community-testing/rsyslog/rsyslog.logrotate @@ -0,0 +1,7 @@ +/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log { + missingok + sharedscripts + postrotate + /usr/bin/killall -HUP /usr/sbin/rsyslogd + endscript +} diff --git a/community-testing/simgear/PKGBUILD b/community-testing/simgear/PKGBUILD new file mode 100644 index 000000000..970dbf82b --- /dev/null +++ b/community-testing/simgear/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: William Rea <sillywilly@gmail.com> +# Contributor: Hans Janssen <hans@janserv.xs4all.nl> + +pkgname=simgear +pkgver=2.4.0 +pkgrel=1 +pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." +arch=(i686 x86_64) +depends=('glut' 'freealut' 'plib' 'openscenegraph') +makedepends=('boost') +license=("GPL") +#url="http://www.simgear.org" +url="https://gitorious.org/fg" +options=('!makeflags') +source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver" + build-fix.patch) +md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde' + '905a05cc1364c067b3b9574d41cef7fa') + +build() { + cd $srcdir/fg-simgear +# patch -p1 <$srcdir/build-fix.patch + [ -x configure ] || ./autogen.sh + [ -f Makefile ] || ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/fg-simgear + make DESTDIR=$pkgdir install +} diff --git a/community-testing/simgear/build-fix.patch b/community-testing/simgear/build-fix.patch new file mode 100644 index 000000000..da4ba81f8 --- /dev/null +++ b/community-testing/simgear/build-fix.patch @@ -0,0 +1,71 @@ +diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx +--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx 2011-07-04 13:02:57.000000000 +0400 +@@ -70,9 +70,6 @@ + osg::ref_ptr<osg::RefMatrix> mModelView; + }; + +-osgUtil::RegisterRenderBinProxy +-SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin); +- + class SGClipGroup::CullCallback : public osg::NodeCallback { + public: + virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) +diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx +--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx 2011-07-04 13:03:01.000000000 +0400 +@@ -51,8 +51,6 @@ + class ClipRenderBin; + + std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes; +- +- static osgUtil::RegisterRenderBinProxy clipBinProxy; + }; + + #endif +diff -wbBur SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx +--- SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx 2011-07-12 15:12:21.000000000 +0400 +@@ -21,6 +21,7 @@ + #include <osgDB/ReadFile> + #include <osgDB/Input> + #include <osgDB/ParameterOutput> ++#include <osgDB/DatabasePager> + + #include <simgear/debug/logstream.hxx> + #include <simgear/structure/OSGVersion.hxx> +@@ -67,9 +68,12 @@ + unsigned childNum = getNumChildren(); + setTimeStamp(childNum, 0); + double priority=1.0; ++/* ++FIXME:!!! + dbp->requestNodeFile(getFileName(childNum),this,priority,0, + getDatabaseRequest(childNum), + _readerWriterOptions.get()); ++*/ + } + + bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw) +diff -wbBur SimGear-2.0.0/simgear/scene/sky/bbcache.cxx SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx +--- SimGear-2.0.0/simgear/scene/sky/bbcache.cxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx 2011-07-12 15:14:16.000000000 +0400 +@@ -31,6 +31,7 @@ + #include <simgear/screen/extensions.hxx> + #include <simgear/screen/RenderTexture.h> + #include <osg/GLU> ++#include <GL/glu.h> + + #include "bbcache.hxx" + +diff -wbBur SimGear-2.0.0/simgear/screen/tr.cxx SimGear-2.0.0.my/simgear/screen/tr.cxx +--- SimGear-2.0.0/simgear/screen/tr.cxx 2010-02-17 18:39:22.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/screen/tr.cxx 2011-07-12 15:16:01.000000000 +0400 +@@ -145,6 +145,7 @@ + #endif + + #include <osg/GLU> ++#include <GL/glu.h> + + #include "tr.h" + diff --git a/community-testing/smalltalk/PKGBUILD b/community-testing/smalltalk/PKGBUILD new file mode 100644 index 000000000..1be6f7500 --- /dev/null +++ b/community-testing/smalltalk/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 53831 2011-08-08 19:25:38Z jelle $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: mrshpot <mrshpot at gmail dot com> +# Contributor: Michael Fellinger <m.fellinger@gmail.com> + +pkgname=smalltalk +pkgver=3.2.4 +pkgrel=2 +pkgdesc='A free implementation of Smalltalk-80 by the GNU project' +url='http://smalltalk.gnu.org/' +license=('GPL' 'LGPL') +arch=('i686' 'x86_64') +options=('!libtool') + +depends=('gmp' 'libffi' 'libsigsegv' 'readline') +makedepends=('gdbm' 'gtk2' 'sqlite3' 'tk' 'zip') + +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('a36a7c9beddca08dc492b500738efc82') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/smalltalk \ + --with-imagedir=/var/lib/smalltalk \ + --enable-gtk=yes \ + --with-system-libffi \ + --with-system-libsigsegv \ + --with-readline \ + --with-tcl --with-tk \ + --with-x --without-emacs + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install + + # fix manpage symlink + rm -f $pkgdir/usr/share/man/man1/gst-reload.1 + ln -s gst-load.1 $pkgdir/usr/share/man/man1/gst-reload.1 +} diff --git a/community/acpitool/PKGBUILD b/community/acpitool/PKGBUILD index 35ba084ca..95c0534e9 100644 --- a/community/acpitool/PKGBUILD +++ b/community/acpitool/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 24573 2010-08-26 12:50:31Z lcarlier $ +# $Id: PKGBUILD 54004 2011-08-11 17:55:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> # Contributor: Milosz Piglas <archeofuture@gmail.com> pkgname=acpitool pkgver=0.5.1 -pkgrel=2 +pkgrel=3 pkgdesc="ACPI client - replacement for apm tool" url="http://sourceforge.net/projects/acpitool/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2) depends=('gcc-libs') -md5sums=('9e4ec55201be0be71ffbc56d38b42b57') +source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2 + linux-3.0.patch) +md5sums=('9e4ec55201be0be71ffbc56d38b42b57' + 'eb149edb32be6cdf20a7d16beb3e9f70') build() { cd "$srcdir/$pkgname-$pkgver" - + patch -p1 <$srcdir/linux-3.0.patch ./configure --prefix=/usr make } package() { cd "$srcdir/$pkgname-$pkgver" - make prefix="$pkgdir/usr" install } diff --git a/community/acpitool/linux-3.0.patch b/community/acpitool/linux-3.0.patch new file mode 100644 index 000000000..ba454a0c2 --- /dev/null +++ b/community/acpitool/linux-3.0.patch @@ -0,0 +1,18 @@ +diff -wbBur acpitool-0.5.1/src/acpitool.cpp acpitool-0.5.1.my/src/acpitool.cpp +--- acpitool-0.5.1/src/acpitool.cpp 2009-08-13 23:37:48.000000000 +0400 ++++ acpitool-0.5.1.my/src/acpitool.cpp 2011-08-11 21:53:17.000000000 +0400 +@@ -205,8 +205,12 @@ + Kernel_24 = 1; + Kernel_26 = 0; + } +- +- if(strncmp(str,"2.6",3)==0) ++ else if(strncmp(str,"2.6",3)==0) ++ { ++ Kernel_24 = 0; ++ Kernel_26 = 1; ++ } ++ else + { + Kernel_24 = 0; + Kernel_26 = 1; diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 5190d90c6..061e57461 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53589 2011-08-06 08:10:57Z giovanni $ +# $Id: PKGBUILD 54056 2011-08-12 21:56:43Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.13 +pkgver=0.8.14 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('5612e030dce1cd5e46762d0dcaed00b0' +md5sums=('61e41474f9104ea8513bd21e8754b7be' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/dopewars/PKGBUILD b/community/dopewars/PKGBUILD index 4433977cc..4116a23d3 100644 --- a/community/dopewars/PKGBUILD +++ b/community/dopewars/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51778 2011-07-14 18:25:43Z schuay $ +# $Id: PKGBUILD 54061 2011-08-13 02:36:39Z ebelanger $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -6,41 +6,42 @@ pkgname=dopewars pkgver=1.5.12 -pkgrel=5 +pkgrel=6 pkgdesc="A drug dealing game set in New York" url="http://dopewars.sourceforge.net/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('gtk2' 'alsa-lib' 'audiofile' 'esd' 'sdl_mixer' 'ncurses') +depends=('gtk2' 'alsa-lib' 'audiofile' 'sdl_mixer' 'ncurses') install='dopewars.install' source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('debf749de9053dc2fb2e74c37ae06206') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --localstatedir=/var/games \ --mandir=/usr/share/man make } + package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install # setup shortcut menu entries - mkdir -p $pkgdir/usr/share/applications - mv $pkgdir/usr/share/gnome/apps/Games/dopewars.desktop \ - $pkgdir/usr/share/applications - rm -r $pkgdir/usr/share/gnome + mkdir -p "$pkgdir/usr/share/applications" + mv "$pkgdir/usr/share/gnome/apps/Games/dopewars.desktop" \ + "$pkgdir/usr/share/applications" + rm -r "$pkgdir/usr/share/gnome" # set appropriate permissions and destinations - chown root:games $pkgdir/usr/bin/dopewars - chmod 2755 $pkgdir/usr/bin/dopewars - chown root:games $pkgdir/var/games - chmod 775 $pkgdir/var/games + chown root:games "$pkgdir/usr/bin/dopewars" + chmod 2755 "$pkgdir/usr/bin/dopewars" + chown root:games "$pkgdir/var/games" + chmod 775 "$pkgdir/var/games" # Handle the scores file creation in the install script - rm $pkgdir/var/games/dopewars.sco + rm "$pkgdir/var/games/dopewars.sco" } diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index bfdb31285..54909e46e 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 50330 2011-06-28 12:02:03Z spupykin $ +# $Id: PKGBUILD 54030 2011-08-11 23:28:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=flightgear -pkgver=2.0.0 -pkgrel=3 +pkgver=2.4.0 +pkgrel=1 pkgdesc="An open-source, multi-platform flight simulator" -arch=(i686 x86_64 'mips64el') -depends=('simgear' 'libxmu' 'libxi' 'zlib' 'flightgear-data' 'openscenegraph' 'subversion') +arch=(i686 x86_64 mips64el) +depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') # 'flightgear-data') makedepends=('boost') license=("GPL") url="http://www.flightgear.org" options=('!makeflags') -#source=(ftp://ftp.ibiblio.org/pub/mirrors/flightgear/ftp/Source/FlightGear-$pkgver.tar.gz) -source=(http://ftp.linux.kiev.ua/pub/fgfs/Source/FlightGear-$pkgver.tar.gz) -md5sums=('549aa45171480082f5b6e5e8d5ce8930') +source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") +md5sums=('eb8d1ed8b1de5f1ac7926c9d0c2f37f8') build() { - cd $startdir/src/FlightGear-$pkgver - [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \; - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr + cd $srcdir/fg-flightgear +# [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \; +# [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <GL/glu.h>' {} \; + [ -x configure ] || ./autogen.sh + [ -f Makefile ] || ./configure --prefix=/usr make } package() { - cd $startdir/src/FlightGear-$pkgver - make DESTDIR=$startdir/pkg install + depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data') + cd $srcdir/fg-flightgear + make DESTDIR=$pkgdir install } diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index b91ae57da..bb70c97e7 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 53990 2011-08-11 07:04:13Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -11,8 +12,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=2.99.1 -pkgrel=4 +pkgver=2.99.2 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -21,12 +22,12 @@ groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' - 'curl' 'poppler' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' + 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('ab4c182b9d7dfec06b3a42bb002a779a' +md5sums=('247a13e28972985766855a6bc4d6d368' 'b284be39d147ec799f1116a6abc068b4' 'a8ec8e5a6aba7a7e453ce7a35c1800a9') diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index ed9b26701..e0c68877d 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,24 +1,36 @@ -# $Id: PKGBUILD 43364 2011-03-25 11:11:43Z mherych $ +# $Id: PKGBUILD 54036 2011-08-12 13:08:25Z lfleischer $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" license=('GPL') depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'mesa' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools') -optdepends=('esound') +makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils') +optdepends=('alsa-lib: for ALSA support' + 'jack: for JACK support' + 'libquicktime: for movie encoding' + 'pulseaudio: for PulseAudio support' + 'v4l-utils: for video conversion') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) options=('!libtool') md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6') + build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + rm -rf cpuinfo.sh - ./configure --prefix=/usr \ - --without-doxygen - make || return 1 - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/share/info/dir + + ./configure --prefix=/usr --without-doxygen + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + rm -rf "$pkgdir/usr/share/info/dir" } diff --git a/community/lash/PKGBUILD b/community/lash/PKGBUILD new file mode 100644 index 000000000..70985c530 --- /dev/null +++ b/community/lash/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: DonVla <donvla@users.sourceforge.net> + +pkgname=lash +pkgver=0.6.0~rc2 +_relver=0.6.0.594 +pkgrel=5 +pkgdesc="A session management system for JACK and ALSA" +arch=('i686' 'x86_64') +options=('!libtool') +url="http://lash-audio.org" +license=('GPL') +depends=('dbus-core' 'gtk2' 'jack' 'libxml2' 'python2') +install=$pkgname.install +source=("http://download.savannah.gnu.org/releases/lash/${pkgname}-${pkgver}.tar.bz2" "makefile.patch") +md5sums=('af1dc4f4ceb284b1b0845de4f4c2fe47' + '24ceb7e3d008c25e1490102983165612') + +build() { + cd "${srcdir}/${pkgname}-${_relver}" + patch -p0 < "${srcdir}/makefile.patch" + + # Python2 fixes + export PYTHON="python2" + sed -i "s#env python#&2#" clients/lash_control + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${_relver}" + make DESTDIR=${pkgdir} install +} diff --git a/community/lash/lash.install b/community/lash/lash.install new file mode 100644 index 000000000..a169a2211 --- /dev/null +++ b/community/lash/lash.install @@ -0,0 +1,6 @@ +post_install() { + printf "\n" + printf "==> You might need to add following line to your /etc/services(without quotes):\n" + printf "==> \"lash 14541/tcp # LASH client/server protocol\"\n" + printf "\n" +} diff --git a/community/lash/makefile.patch b/community/lash/makefile.patch new file mode 100644 index 000000000..3d35a1d2d --- /dev/null +++ b/community/lash/makefile.patch @@ -0,0 +1,14 @@ +--- docs/Makefile.in.orig 2008-11-09 22:45:28.000000000 +0100 ++++ docs/Makefile.in 2011-07-23 17:12:26.000000000 +0200 +@@ -527,9 +527,9 @@ + @HAVE_TEXI2HTML_TRUE@ mkdir -lash-manual-html-split; \ + @HAVE_TEXI2HTML_TRUE@ fi + @HAVE_TEXI2HTML_TRUE@ cd lash-manual-html-one-page && \ +-@HAVE_TEXI2HTML_TRUE@ texi2html --number ../$(top_srcdir)/docs/lash-manual.texi ++@HAVE_TEXI2HTML_TRUE@ texi2html --number-footnotes --number-sections ../$(top_srcdir)/docs/lash-manual.texi + @HAVE_TEXI2HTML_TRUE@ cd lash-manual-html-split && \ +-@HAVE_TEXI2HTML_TRUE@ texi2html --number --split=chapter ../$(top_srcdir)/docs/lash-manual.texi ++@HAVE_TEXI2HTML_TRUE@ texi2html --number-footnotes --number-sections --split=chapter ../$(top_srcdir)/docs/lash-manual.texi + @HAVE_TEXI2HTML_TRUE@ touch html-manual-stamp + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 00f4ad0df..23024aec9 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 50319 2011-06-28 10:21:19Z spupykin $ +# $Id: PKGBUILD 50969 2011-07-03 18:11:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=openscenegraph -pkgver=2.8.5 +pkgver=3.0.0 pkgrel=1 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,9 @@ makedepends=('cmake' 'libvncserver') optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') conflicts=('openthreads') provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip) -md5sums=('de844947d410726ba50ed07eb6319e6f') +#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip) +source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") +md5sums=('121829b854349a9e9d1aebc25cf3e52d') build() { cd OpenSceneGraph-$pkgver diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index f5e95e73d..92ea3ded2 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 53275 2011-08-02 16:11:02Z bluewind $ +# $Id: PKGBUILD 54037 2011-08-12 13:13:29Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=oss -pkgver=4.2_2004 -pkgrel=2 +pkgver=4.2_2005 +pkgrel=1 pkgdesc="Open Sound System UNIX audio architecture" arch=('i686' 'x86_64' 'mips64el') url="http://developer.opensound.com/" @@ -23,7 +23,7 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_ "soundon.patch" "remove-hal.patch" ) -md5sums=('256aba264d523fb8ee444aaacfb8d3da' +md5sums=('964b1ec63b48b22baba6688fe2fc0633' 'b9a380a0ac8896390d71ac13676f27e1' 'cbcbce5c03b127df5eafa8faa091492c' '65f07fe241bfbf912f76d8b6d8f276b5' diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD index f19c3c1be..5ca5b140c 100644 --- a/community/parcellite/PKGBUILD +++ b/community/parcellite/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 53903 2011-08-09 19:26:51Z spupykin $ +# $Id: PKGBUILD 54009 2011-08-11 18:03:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=parcellite pkgver=1.0.2rc3 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight GTK+ clipboard manager" arch=('i686' 'x86_64' 'mips64el') url="http://parcellite.sourceforge.net/" license=('GPL3') depends=('gtk2') makedepends=('intltool') -source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz) -md5sums=('3fe1196cc2bb3f34d57d0e34e10449b3') +source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz + history_menu_crash_patch) +md5sums=('3fe1196cc2bb3f34d57d0e34e10449b3' + '8fd6e07fa907865ca4db7b3e13441ce6') build() { cd "$srcdir/parcellite-$pkgver" + (cd src && patch -p0 <$srcdir/history_menu_crash_patch) ./configure --prefix=/usr --sysconfdir=/etc make make DESTDIR="$pkgdir" install diff --git a/community/parcellite/history_menu_crash_patch b/community/parcellite/history_menu_crash_patch new file mode 100644 index 000000000..961106839 --- /dev/null +++ b/community/parcellite/history_menu_crash_patch @@ -0,0 +1,39 @@ +Index: main.c +=================================================================== +--- main.c (revision 232) ++++ main.c (working copy) +@@ -1199,24 +1199,28 @@ + { + GString* string = g_string_new((gchar*)element->data); + /* Ellipsize text */ +- if (string->len > prefs.item_length) ++ glong len = g_utf8_strlen(string->str, string->len); ++ if (len > prefs.item_length) + { + switch (prefs.ellipsize) + { + case PANGO_ELLIPSIZE_START: +- string = g_string_erase(string, 0, string->len-(prefs.item_length)); ++ string = g_string_erase(string, 0, g_utf8_offset_to_pointer(string->str, len - prefs.item_length) - string->str); + string = g_string_prepend(string, "..."); + break; + case PANGO_ELLIPSIZE_MIDDLE: +- string = g_string_erase(string, (prefs.item_length/2), string->len-(prefs.item_length)); +- string = g_string_insert(string, (string->len/2), "..."); ++ ; /* to avoid wierd gcc error */ ++ gchar* p1 = g_utf8_offset_to_pointer(string->str, prefs.item_length / 2); ++ gchar* p2 = g_utf8_offset_to_pointer(string->str, len - prefs.item_length / 2); ++ string = g_string_erase(string, p1 - string->str, p2 - p1); ++ string = g_string_insert(string, p1 - string->str, "..."); + break; + case PANGO_ELLIPSIZE_END: +- string = g_string_truncate(string, prefs.item_length); ++ string = g_string_truncate(string, g_utf8_offset_to_pointer(string->str, prefs.item_length) - string->str); + string = g_string_append(string, "..."); + break; + } +- } ++ } + /* Remove control characters */ + gsize i = 0; + while (i < string->len) diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD index 767c61739..9336274c2 100644 --- a/community/prelink/PKGBUILD +++ b/community/prelink/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 35759 2010-12-22 11:17:45Z lfleischer $ +# $Id: PKGBUILD 54150 2011-08-13 19:36:37Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Rouslan Solomakhin <rouslan@localnet.com> pkgname=prelink -pkgver=20100106 -pkgrel=3 +pkgver=20110622 +pkgrel=1 pkgdesc='ELF prelinking utility to speed up dynamic linking.' arch=('i686' 'x86_64' 'mips64el') url='http://people.redhat.com/jakub/prelink/' license=('GPL') depends=('elfutils') backup=('etc/prelink.conf') -source=("http://people.redhat.com/jakub/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'prelink.conf' - 'arch-x86_64-dynamic_linker.patch') -md5sums=('56e2a1b5a478795352bf6e4d2bc6e0ab' +md5sums=('2863a9c9e68d076916bf9a46ad6bca78' '0793ed49e9b31c125cba4d936c333cf6' 'b347580536e078b34c547742d36a3e9d') +source=("http://pkgs.fedoraproject.org/repo/pkgs/${pkgname}/${pkgname}-${pkgver}.tar.bz2/${md5sums[0]}/${pkgname}-${pkgver}.tar.bz2" + 'prelink.conf' + 'arch-x86_64-dynamic_linker.patch') build() { cd "${srcdir}/${pkgname}" diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD index c6a528fe6..4e3e69e34 100644 --- a/community/qps/PKGBUILD +++ b/community/qps/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 52003 2011-07-19 16:41:14Z spupykin $ +# $Id: PKGBUILD 54014 2011-08-11 18:04:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Rosenstrauch <darose@darose.net> pkgname=qps pkgver=1.10.15 _dlpkgver=5946 -pkgrel=1 +pkgrel=2 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'." url="http://qps.kldp.net/projects/qps" depends=('qt') arch=('i686' 'x86_64') license="GPL" -source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2) -md5sums=('25a6c6f8ac9172a6874e3514edf1eda1') +source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2 + version-patch.diff) +md5sums=('25a6c6f8ac9172a6874e3514edf1eda1' + 'e323a796a3dbf44a99af386e867f7848') build() { cd $srcdir/$pkgname-$pkgver + patch -p0 <$srcdir/version-patch.diff qmake make } diff --git a/community/qps/version-patch.diff b/community/qps/version-patch.diff new file mode 100644 index 000000000..bfddd2a0a --- /dev/null +++ b/community/qps/version-patch.diff @@ -0,0 +1,14 @@ +--- proc_linux.cpp 2011-07-17 08:03:52.000000000 -0400 ++++ proc_linux.cpp.new 2011-08-09 11:09:47.278589772 -0400 +@@ -1962,7 +1962,10 @@ + int result; + + result = sscanf(p, "%d.%d.%d", &major, &minor, &patch); +- if(result < 3) { ++ if(result == 2) { ++ patch = 0; ++ } ++ else if(result < 3) { + fprintf(stderr, "Qps: can't determine version, read %s \n", p); + fprintf(stderr, "please report this bug.\n"); + exit(1); diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD index 13f8b6f97..96b89ac1c 100644 --- a/community/rusxmms/PKGBUILD +++ b/community/rusxmms/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 14511 2010-04-04 18:33:41Z spupykin $ +# $Id: PKGBUILD 54066 2011-08-13 05:45:42Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,12 +6,12 @@ pkgname=rusxmms pkgver=1.2.11_csa43 _xmmsver=1.2.11 _csaver=csa43 -pkgrel=2 +pkgrel=3 pkgdesc="XMMS with librcc" arch=(i686 x86_64 'mips64el') license=(GPL) url="http://rusxmms.sourceforge.net/" -depends=(libsm libxxf86vm zlib gtk libvorbis esd alsa-lib libgl librcc librcd openssl) +depends=(libsm libxxf86vm zlib gtk libvorbis alsa-lib libgl librcc librcd openssl) makedepends=(mesa patch) provides=(xmms) conflicts=(xmms) @@ -22,16 +22,24 @@ md5sums=('f3e6dbaf0b3f571a532ab575656be506' '8f387dd2e5c95f8730979e09687b6e02') build() { - cd ${startdir}/src/xmms-${_xmmsver} + cd "${srcdir}"/xmms-${_xmmsver} if true; then - ln -s $srcdir/RusXMMS2 $srcdir/xmms-${_xmmsver}/RusXMMS2 - (cd $srcdir/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh) || return 1 + ln -s "$srcdir"/RusXMMS2 "$srcdir"/xmms-${_xmmsver}/RusXMMS2 + (cd "$srcdir"/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh) - mv $srcdir/RusXMMS2/source/* $srcdir/xmms-${_xmmsver}/libxmms/ && \ -# sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' $srcdir/xmms-${_xmmsver}/libxmms/Makefile.am && \ - aclocal && automake && autoconf || return 1 - (cd libxmms && aclocal && automake && autoconf) || return 1 + mv "$srcdir"/RusXMMS2/source/* "$srcdir"/xmms-${_xmmsver}/libxmms/ +# sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' "$srcdir"/xmms-${_xmmsver}/libxmms/Makefile.am && \ + +# I already remove esound from repo and it has some autotools errors that I can't seem to figure out. So let's use a hack to get the esound removal rebuild done. +# aclocal +# automake +autoconf + sed -i 's/unicode.c//g' Input/mpg123/Makefile.in + sed -i 's/unicode.lo//g' Input/mpg123/Makefile.in + + + (cd libxmms && aclocal && automake && autoconf) case $CARCH in x86_64) @@ -46,13 +54,17 @@ if true; then esac fi - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + make +} + +package(){ + cd "${srcdir}"/xmms-${_xmmsver} + make DESTDIR="$pkgdir" install - mkdir -p ${startdir}/pkg/usr/share/{applications,pixmaps} - install -m 644 xmms/xmms.desktop ${startdir}/pkg/usr/share/applications && \ - install -m 644 xmms/xmms_mini.xpm ${startdir}/pkg/usr/share/pixmaps/xmms.xpm || return 1 + mkdir -p "$pkgdir"/usr/share/{applications,pixmaps} + install -m 644 xmms/xmms.desktop "$pkgdir"/usr/share/applications + install -m 644 xmms/xmms_mini.xpm "$pkgdir"/usr/share/pixmaps/xmms.xpm # don't want wmxmms - rm -rf $startdir/pkg/usr/bin/wmxmms $startdir/pkg/usr/share/xmms && \ - rm -f $startdir/pkg/usr/man/man1/{gnomexmms.1,wmxmms.1} + rm -rf "$pkgdir"/usr/bin/wmxmms "$pkgdir"/usr/share/xmms + rm -f "$pkgdir"/usr/share/man/man1/{gnomexmms.1,wmxmms.1} } diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD index a120b9f65..abe367c63 100644 --- a/community/scrotwm/PKGBUILD +++ b/community/scrotwm/PKGBUILD @@ -2,20 +2,20 @@ # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=scrotwm -pkgver=0.9.33 +pkgver=0.9.34 pkgrel=1 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way." arch=('i686' 'x86_64') url="http://www.scrotwm.org" license=('custom:ISC') -depends=('dmenu' 'libxrandr' 'profont') +depends=('dmenu' 'libxrandr' 'libxtst' 'profont') makedepends=('libxt') optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font') backup=(etc/scrotwm.conf) source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ LICENSE \ baraction.sh) -md5sums=('fcfd0aba8e48217e26db823226640547' +md5sums=('d38e296dd0bf014046e82cd42932f398' 'a67cfe51079481e5b0eab1ad371379e3' '6132ba773ee00f39d8f67ac0347a9814') diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index c183908ef..2838b76b7 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 52817 2011-07-28 21:00:43Z svenstaro $ +# $Id: PKGBUILD 54051 2011-08-12 21:19:26Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> @@ -7,7 +7,7 @@ pkgname=sfml _git=true if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110728 + pkgver=1.99.git20110812 fi pkgrel=1 diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index 2b688116e..47fb6260e 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 50327 2011-06-28 11:35:39Z spupykin $ +# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=simgear -pkgver=2.0.0 -pkgrel=3 +pkgver=2.4.0 +pkgrel=1 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." arch=(i686 x86_64 'mips64el') depends=('glut' 'freealut' 'plib' 'openscenegraph') makedepends=('boost') license=("GPL") -url="http://www.simgear.org" +#url="http://www.simgear.org" +url="https://gitorious.org/fg" options=('!makeflags') -source=(ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/SimGear-$pkgver.tar.gz) -md5sums=('414bea545ea1e8ce17e4aa0809159cec') +source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver" + build-fix.patch) +md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde' + '905a05cc1364c067b3b9574d41cef7fa') build() { - cd $startdir/src/SimGear-$pkgver - ./configure --prefix=/usr + cd $srcdir/fg-simgear +# patch -p1 <$srcdir/build-fix.patch + [ -x configure ] || ./autogen.sh + [ -f Makefile ] || ./configure --prefix=/usr make } package() { - cd $startdir/src/SimGear-$pkgver - make DESTDIR=$startdir/pkg install + cd $srcdir/fg-simgear + make DESTDIR=$pkgdir install } diff --git a/community/simgear/build-fix.patch b/community/simgear/build-fix.patch new file mode 100644 index 000000000..da4ba81f8 --- /dev/null +++ b/community/simgear/build-fix.patch @@ -0,0 +1,71 @@ +diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx +--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx 2011-07-04 13:02:57.000000000 +0400 +@@ -70,9 +70,6 @@ + osg::ref_ptr<osg::RefMatrix> mModelView; + }; + +-osgUtil::RegisterRenderBinProxy +-SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin); +- + class SGClipGroup::CullCallback : public osg::NodeCallback { + public: + virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) +diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx +--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx 2011-07-04 13:03:01.000000000 +0400 +@@ -51,8 +51,6 @@ + class ClipRenderBin; + + std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes; +- +- static osgUtil::RegisterRenderBinProxy clipBinProxy; + }; + + #endif +diff -wbBur SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx +--- SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx 2011-07-12 15:12:21.000000000 +0400 +@@ -21,6 +21,7 @@ + #include <osgDB/ReadFile> + #include <osgDB/Input> + #include <osgDB/ParameterOutput> ++#include <osgDB/DatabasePager> + + #include <simgear/debug/logstream.hxx> + #include <simgear/structure/OSGVersion.hxx> +@@ -67,9 +68,12 @@ + unsigned childNum = getNumChildren(); + setTimeStamp(childNum, 0); + double priority=1.0; ++/* ++FIXME:!!! + dbp->requestNodeFile(getFileName(childNum),this,priority,0, + getDatabaseRequest(childNum), + _readerWriterOptions.get()); ++*/ + } + + bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw) +diff -wbBur SimGear-2.0.0/simgear/scene/sky/bbcache.cxx SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx +--- SimGear-2.0.0/simgear/scene/sky/bbcache.cxx 2010-02-17 18:39:21.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx 2011-07-12 15:14:16.000000000 +0400 +@@ -31,6 +31,7 @@ + #include <simgear/screen/extensions.hxx> + #include <simgear/screen/RenderTexture.h> + #include <osg/GLU> ++#include <GL/glu.h> + + #include "bbcache.hxx" + +diff -wbBur SimGear-2.0.0/simgear/screen/tr.cxx SimGear-2.0.0.my/simgear/screen/tr.cxx +--- SimGear-2.0.0/simgear/screen/tr.cxx 2010-02-17 18:39:22.000000000 +0300 ++++ SimGear-2.0.0.my/simgear/screen/tr.cxx 2011-07-12 15:16:01.000000000 +0400 +@@ -145,6 +145,7 @@ + #endif + + #include <osg/GLU> ++#include <GL/glu.h> + + #include "tr.h" + diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 698163689..d22d93518 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.8.1 +pkgver=0.9.0 pkgrel=1 pkgdesc="An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('custom') install=('stone-soup.install') source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.bz2" "${pkgname}.desktop") -md5sums=('7ddeb1ff048401e55af0d1c11038f937' +md5sums=('3f73fb051215df3633a554d81e67a452' '98be780cddb2a0915bbab15ad93644f1') build() { diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index 3f2e01124..14212e190 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48297 2011-05-31 09:33:14Z spupykin $ +# $Id: PKGBUILD 53999 2011-08-11 17:49:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> pkgname=tomoyo-tools -_basever=2.3.0 -_timestamp=20110511 +_basever=2.4.0 +_timestamp=20110806 pkgver=${_basever}.${_timestamp} pkgrel=1 pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernel 2.6.36 and later' @@ -15,15 +15,18 @@ depends=('ncurses') makedepends=('help2man') conflicts=('ccs-tools') install=tomoyo-tools.install -source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/${pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('bbbbaeb145ae12e5fe6154707807b90e') +source=("tomoyo-tools-${_basever}-${_timestamp}.tar.gz::http://sourceforge.jp/frs/redir.php?m=iij&f=%2Ftomoyo%2F52848%2Ftomoyo-tools-${_basever}-${_timestamp}.tar.gz" + build-fix.patch) +md5sums=('111109a71684f48bcac58bba07b8f49e' + '063c85ec6c56b90796ced9c203098f41') build() { - cd "${srcdir}/${pkgname}" - make -j1 + cd "${srcdir}/${pkgname}" + patch -p1 <$srcdir/build-fix.patch + make } package() { - cd "${srcdir}/${pkgname}" - make INSTALLDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}" + make INSTALLDIR="${pkgdir}" install } diff --git a/community/tomoyo-tools/build-fix.patch b/community/tomoyo-tools/build-fix.patch new file mode 100644 index 000000000..ca949072b --- /dev/null +++ b/community/tomoyo-tools/build-fix.patch @@ -0,0 +1,11 @@ +diff -wbBur tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c tomoyo-tools.my/usr_lib_tomoyo/tomoyo-editpolicy-agent.c +--- tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c 2011-08-06 04:00:00.000000000 +0400 ++++ tomoyo-tools.my/usr_lib_tomoyo/tomoyo-editpolicy-agent.c 2011-08-11 21:47:05.000000000 +0400 +@@ -35,6 +35,7 @@ + #include <dirent.h> + #define _GNU_SOURCE + #include <sched.h> ++#include <linux/sched.h> + #include <sys/mount.h> + + static _Bool wait_data(const int fd) diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD index 214c31f00..fec3402fb 100644 --- a/community/xapian-core/PKGBUILD +++ b/community/xapian-core/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 53882 2011-08-09 08:32:11Z spupykin $ +# $Id: PKGBUILD 54076 2011-08-13 09:16:09Z spupykin $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=xapian-core -pkgver=1.2.6 +pkgver=1.2.7 pkgrel=1 pkgdesc='Open source search engine library.' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('sh' 'gcc-libs' 'zlib' 'util-linux') # xapian config requires libxapian.la options=('libtool') source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('30f5cc976f063694f93cbdf9b83dc2ea') +md5sums=('6684eb7a990b9cedf4257f41bfddb584') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD new file mode 100644 index 000000000..b07dafb05 --- /dev/null +++ b/community/zynaddsubfx/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 54081 2011-08-13 09:18:00Z 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> + +_p=ZynAddSubFX +pkgname=zynaddsubfx +pkgver=2.4.1 +pkgrel=3 +pkgdesc="An opensource software synthesizer capable of making a countless number of instruments." +arch=('i686' 'x86_64') +url="http://zynaddsubfx.sourceforge.net" +license=('GPL') +depends=('fltk' 'fftw' 'lash') +makedepends=('mxml' 'cmake') +options=('!emptydirs') +source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$_p-$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' + 'eb95d339ff5deac8c6b54965f04a8c60' + '49464a33ab9c4250520eda0df7705663') + +build() { + cd "$srcdir/$_p-$pkgver" + + # patches + patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch" + patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch" + + [ -d build ] || mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack .. + make + + # build external programs + cd ../ExternalPrograms/Spliter && make + cd ../Controller && sed -i "s|Box\.h|Box\.H|" ControllerUI.fl && make +} + +package() { + cd "$srcdir/$_p-$pkgver/build" + + make DESTDIR="$pkgdir/" install + + # install external programs + install -Dm755 ../ExternalPrograms/Spliter/spliter "$pkgdir/usr/bin/spliter" + install -Dm755 ../ExternalPrograms/Controller/controller "$pkgdir/usr/bin/controller" + install -Dm644 ../ExternalPrograms/Spliter/readme.txt "$pkgdir/usr/share/doc/$pkgname/SPLITER.txt" + + # banks and examples + install -d "$pkgdir/usr/share/$pkgname" + cp -a ../banks "$pkgdir/usr/share/$pkgname" + cp -a ../examples "$pkgdir/usr/share/$pkgname" + + # desktop file and icon + install -Dm644 "$srcdir/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg" + install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" +} diff --git a/community/zynaddsubfx/zynaddsubfx.desktop b/community/zynaddsubfx/zynaddsubfx.desktop new file mode 100644 index 000000000..ebca740ef --- /dev/null +++ b/community/zynaddsubfx/zynaddsubfx.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=ZynAddSubFX +Comment=A powerful realtime software synthesizer +Exec=zynaddsubfx +Icon=zynaddsubfx +Terminal=false +Type=Application +Categories=Application;AudioVideo; diff --git a/community/zynaddsubfx/zynaddsubfx.svg b/community/zynaddsubfx/zynaddsubfx.svg new file mode 100644 index 000000000..d81c651ad --- /dev/null +++ b/community/zynaddsubfx/zynaddsubfx.svg @@ -0,0 +1,313 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg1" + sodipodi:version="0.32" + inkscape:version="0.48.2 r9819" + width="507.1875" + height="509.21875" + sodipodi:docname="zynaddsubfx_icon.svg" + version="1.1"> + <defs + id="defs3"> + <linearGradient + id="linearGradient4809"> + <stop + style="stop-color:#d5d8db;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop4810" /> + <stop + style="stop-color:#6d8ec2;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop4811" /> + </linearGradient> + <linearGradient + id="linearGradient4179"> + <stop + style="stop-color:#bec8c6;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop4180" /> + <stop + style="stop-color:#bbcac9;stop-opacity:1.0000000;" + offset="0.59527779" + id="stop4182" /> + <stop + style="stop-color:#879797;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop4181" /> + </linearGradient> + <linearGradient + id="linearGradient4038"> + <stop + style="stop-color:#4a8a61;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop4039" /> + <stop + style="stop-color:#557c7d;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop4040" /> + </linearGradient> + <linearGradient + id="linearGradient2162"> + <stop + style="stop-color:#549c6d;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop2163" /> + <stop + style="stop-color:#679697;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop2164" /> + </linearGradient> + <linearGradient + id="linearGradient2158"> + <stop + style="stop-color:#dbdbdb;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop2159" /> + <stop + style="stop-color:#a1aec2;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop2160" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2158" + id="radialGradient2165" + cx="205.28555" + cy="152.50184" + r="486.22545" + fx="198.52472" + fy="148.59325" + gradientTransform="matrix(0.99940285,0,0,1.0005975,-127.46875,-47)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4038" + id="linearGradient4043" + x1="119.48864" + y1="387.75519" + x2="462.45943" + y2="302.28432" + gradientTransform="scale(1.0666754,0.9374923)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient4809" + id="radialGradient4184" + cx="-6.2401056" + cy="138.19312" + r="63.0278" + fx="-5.4719041" + fy="137.48498" + spreadMethod="pad" + gradientUnits="userSpaceOnUse" + gradientTransform="scale(1.0322663,0.96874227)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient4809" + id="radialGradient3021" + gradientUnits="userSpaceOnUse" + spreadMethod="pad" + cx="-6.2401056" + cy="138.19312" + fx="-5.4719041" + fy="137.48498" + r="63.0278" + gradientTransform="scale(1.0322663,0.96874227)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.61399264" + inkscape:cx="305.35982" + inkscape:cy="328.83153" + inkscape:window-width="1278" + inkscape:window-height="760" + inkscape:window-x="0" + inkscape:window-y="19" + showguides="true" + inkscape:guide-bbox="true" + showgrid="false" + inkscape:snap-global="true" + inkscape:snap-nodes="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg1" /> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <rect + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.13874531pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="rect2793" + width="497.32657" + height="497.92426" + x="8.5265961" + y="9.9727058" + rx="10" + ry="10.000001" /> + <rect + style="fill:url(#radialGradient2165);fill-opacity:0.75;fill-rule:evenodd;stroke:#c7ffc7;stroke-width:2.67499995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" + id="rect1532" + width="497.32657" + height="497.92426" + x="1.3287659" + y="1.3353081" + rx="10" + ry="10.000001" /> + <g + id="g4871" + transform="matrix(1,0,0,0.72153,-123.39704,-123.99862)"> + <rect + style="fill:url(#linearGradient4043);fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.50865927pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="rect2794" + width="374.5567" + height="328.96643" + x="144.30453" + y="199.03429" + rx="10.000001" + ry="13.85943" /> + <path + style="fill:none;stroke:#fafafa;stroke-width:20;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" + d="m 153.53968,361.37008 c 70.53877,201.53936 110.35828,210.2256 177.45839,6.10757 66.67288,-202.81841 104.2451,-205.61109 176.22345,0.24698" + id="path4175" + sodipodi:nodetypes="czc" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#000000;stroke-width:7.375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" + d="m 145.99255,362.80964 c 369.96869,0 369.3724,1.43957 369.3724,1.43957" + id="path4176" + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + </g> + <g + id="g4852" + transform="matrix(-1.360555,0.352222,-0.352222,-1.360555,196.67455,583.0333)"> + <path + sodipodi:type="arc" + style="fill:url(#radialGradient3021);fill-opacity:0.75;fill-rule:evenodd;stroke:none" + id="path4853" + sodipodi:cx="16.555019" + sodipodi:cy="147.59439" + sodipodi:rx="46.785923" + sodipodi:ry="43.906792" + d="m 63.340942,147.59439 a 46.785923,43.906792 0 1 1 -93.571846,0 46.785923,43.906792 0 1 1 93.571846,0 z" + transform="matrix(1.045432,0,0,1.113986,-125.3003,-37.14836)" /> + <path + sodipodi:type="arc" + style="fill:none;stroke:#000000;stroke-width:11.85730171;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:11.857302, 23.714604;stroke-dashoffset:0" + id="path4854" + sodipodi:cx="16.555019" + sodipodi:cy="147.59439" + sodipodi:rx="46.785923" + sodipodi:ry="43.906792" + d="m 63.340942,147.59439 a 46.785923,43.906792 0 1 1 -93.571846,0 46.785923,43.906792 0 1 1 93.571846,0 z" + transform="matrix(1.162718,0.507361,-0.579194,1.268918,-39.94742,-66.78193)" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" + d="m -108.49675,123.27211 c 36.885113,-10.80173 39.904052,-12.46015 39.904052,-12.46015 l -33.461822,23.25931 -6.44223,-10.79916 z" + id="path4855" + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" /> + </g> + <g + id="g4864" + transform="matrix(0.687211,0,0,0.854478,499.66235,-75.81607)"> + <rect + style="fill:#000000;fill-opacity:0.75;fill-rule:evenodd;stroke:none" + id="rect4856" + width="110.64801" + height="545.60913" + x="-136.40228" + y="109.76131" /> + <rect + style="fill:#00bc1a;fill-opacity:1;fill-rule:evenodd;stroke:none" + id="rect4857" + width="39.393082" + height="442.41235" + x="-128.61479" + y="205.44652" /> + <rect + style="fill:#00bc1a;fill-opacity:1;fill-rule:evenodd;stroke:none" + id="rect4858" + width="37.357227" + height="525.88245" + x="-74.664627" + y="120.64261" /> + <rect + style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none" + id="rect4860" + width="95.883904" + height="12.21513" + x="-128.35823" + y="221.73334" /> + <rect + style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none" + id="rect4862" + width="95.883904" + height="12.21513" + x="-129.37616" + y="563.75702" /> + <rect + style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none" + id="rect4863" + width="95.883904" + height="12.21513" + x="-127.34029" + y="386.6376" /> + </g> + <g + id="g4875" + transform="matrix(-1.360555,0.352222,-0.352222,-1.360555,3.44525,587.1877)"> + <path + sodipodi:type="arc" + style="fill:url(#radialGradient4184);fill-opacity:0.75;fill-rule:evenodd;stroke:none" + id="path4876" + sodipodi:cx="16.555019" + sodipodi:cy="147.59439" + sodipodi:rx="46.785923" + sodipodi:ry="43.906792" + d="m 63.340942,147.59439 c 0,24.24905 -20.946771,43.90679 -46.785923,43.90679 -25.8391514,0 -46.785923,-19.65774 -46.785923,-43.90679 0,-24.24905 20.9467716,-43.90679 46.785923,-43.90679 25.839152,0 46.785923,19.65774 46.785923,43.90679 z" + transform="matrix(1.045432,0,0,1.113986,-125.3003,-37.14836)" /> + <path + sodipodi:type="arc" + style="fill:none;stroke:#000000;stroke-width:11.85730171;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:11.857302, 23.714604;stroke-dashoffset:0" + id="path4877" + sodipodi:cx="16.555019" + sodipodi:cy="147.59439" + sodipodi:rx="46.785923" + sodipodi:ry="43.906792" + d="m 63.340942,147.59439 c 0,24.24905 -20.946771,43.90679 -46.785923,43.90679 -25.8391514,0 -46.785923,-19.65774 -46.785923,-43.90679 0,-24.24905 20.9467716,-43.90679 46.785923,-43.90679 25.839152,0 46.785923,19.65774 46.785923,43.90679 z" + transform="matrix(1.162718,0.507361,-0.579194,1.268918,-39.94742,-66.78193)" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" + d="m -108.49675,123.27211 c 36.885113,-10.80173 39.904052,-12.46015 39.904052,-12.46015 l -33.461822,23.25931 -6.44223,-10.79916 z" + id="path4878" + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 1d8ecb84c..29c8d9b28 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 132306 2011-07-22 16:28:25Z bisson $ +# $Id: PKGBUILD 135326 2011-08-12 20:59:31Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.0 -pkgrel=5 +pkgver=3.0.1 +pkgrel=1 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' arch=('i686' 'x86_64' 'mips64el') url='http://audacious-media-player.org/' @@ -13,7 +13,7 @@ license=('GPL3') depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('unzip: zipped skins support') source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") -sha1sums=('d32de719f5b09440d0f6c802a5140a32b3827475') +sha1sums=('1532fce78702da80418d940dea96b857b75c1f9e') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index 5d3424581..664c29d51 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123903 2011-05-14 09:54:29Z thomas $ +# $Id: PKGBUILD 135462 2011-08-13 23:06:44Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=bftpd -pkgver=3.4 +pkgver=3.6 pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64 'mips64el') @@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz bftpd.logrotate bftpd.pam bftpd.xinetd) -md5sums=('dcee04b5fad8c918e86c49712424fcdd' +md5sums=('7c45b158646e3b266530bf46778fc2d0' '56a1bf7738a6db2b2cff89e611f4f11a' '853680dad0df39d0b4d2fb43d4be430a' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD index 800feeca4..ea646f637 100644 --- a/extra/bmp/PKGBUILD +++ b/extra/bmp/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 134409 2011-08-03 18:32:37Z angvp $ +# $Id: PKGBUILD 135355 2011-08-13 06:32:50Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> pkgname=bmp pkgver=0.9.7.1 -pkgrel=6 +pkgrel=8 pkgdesc="gtk2 port of xmms" -arch=(i686 x86_64 'mips64el') +arch=(i686 x86_64 mips64el) url="http://sourceforge.net/projects/beepmp/" license=('GPL') -depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip') +depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils') makedepends=('libxt') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) +install=bmp.install +source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \ + ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) md5sums=('c25d5a8d49cc5851d13d525a20023c4c' 'fa1bdf5a8d03e8539a6bed5caa471176' '42ad4109ddb66024d4c6d1f3e572ab86') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i ../${pkgver}-visualization.patch patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch ./configure --prefix=/usr --mandir=/usr/share/man @@ -26,7 +28,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/bmp/bmp.install b/extra/bmp/bmp.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/extra/bmp/bmp.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/ettercap/01_pointers_and_ints_dont_mix.diff b/extra/ettercap/01_pointers_and_ints_dont_mix.diff index bf7022266..65571309c 100644 --- a/extra/ettercap/01_pointers_and_ints_dont_mix.diff +++ b/extra/ettercap/01_pointers_and_ints_dont_mix.diff @@ -1,12 +1,13 @@ See debian bug #521857, patch from Timothy Redaelli <timothy@redaelli.eu> +Revised by Robert Edmonds <edmonds@debian.org> ---- ettercap-0.7.3.orig/src/protocols/ec_tcp.c -+++ ettercap-0.7.3/src/protocols/ec_tcp.c +--- a/src/protocols/ec_tcp.c ++++ b/src/protocols/ec_tcp.c @@ -116,7 +116,7 @@ tcp = (struct tcp_header *)DECODE_DATA; opt_start = (u_char *)(tcp + 1); - opt_end = (u_char *)((int)tcp + tcp->off * 4); -+ opt_end = (u_char *)(tcp + tcp->off * 4); ++ opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4); DECODED_LEN = (u_int32)(tcp->off * 4); diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD index 4c26f1985..34d86d7e1 100644 --- a/extra/ettercap/PKGBUILD +++ b/extra/ettercap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134606 2011-08-06 11:42:31Z giovanni $ +# $Id: PKGBUILD 135334 2011-08-12 21:28:33Z giovanni $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ettercap pkgver=NG_0.7.3 _origver=NG-0.7.3 -pkgrel=17 +pkgrel=18 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" arch=('i686' 'x86_64' 'mips64el') url="http://ettercap.sourceforge.net/" @@ -18,8 +18,8 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar. 01_pointers_and_ints_dont_mix.diff ettercap-NG-0.7.3_dns_support_on_x86_64.patch) md5sums=('28fb15cd024162c55249888fe1b97820' - 'ad235cd90aaa3e168575d06efac4d862' - 'f3d66186eece056a6d71453f9f288623') + 'c8f2b004f69ac3522ffebb530478b324' + 'd44f80292afcefdc13cba9a30c6391d6') build() { cd ${srcdir}/${pkgname}-${_origver} diff --git a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch index ed455a878..1754f2e3d 100644 --- a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch +++ b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch @@ -14,7 +14,7 @@ else - if false; then -+if true; then ++ if true; then HAVE_DN_EXPAND_TRUE= HAVE_DN_EXPAND_FALSE='#' else diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD index 3dc9b7c38..b56f92c4c 100644 --- a/extra/hydrogen/PKGBUILD +++ b/extra/hydrogen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115128 2011-03-17 06:06:23Z schiv $ +# $Id: PKGBUILD 135233 2011-08-11 10:28:18Z schiv $ # Maintainer: tobias <tobias@archlinux.org> # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> @@ -14,13 +14,16 @@ url="http://www.hydrogen-music.org/" depends=('libarchive' 'liblrdf' 'qt' 'jack') makedepends=('scons') options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e96f291d60e58f5d62fe616cee577dc0') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + lrdf_raptor2.patch) +md5sums=('e96f291d60e58f5d62fe616cee577dc0' + '2124851e890f46158189b5fa90006d40') build() { cd "${srcdir}/${pkgname}-${pkgver}" export QTDIR=/usr + patch -Np1 -i "${srcdir}/lrdf_raptor2.patch" scons prefix=/usr libarchive=1 } diff --git a/extra/hydrogen/lrdf_raptor2.patch b/extra/hydrogen/lrdf_raptor2.patch new file mode 100644 index 000000000..ec176b716 --- /dev/null +++ b/extra/hydrogen/lrdf_raptor2.patch @@ -0,0 +1,11 @@ +diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct +--- hydrogen-0.9.5.old/Sconstruct 2011-08-11 18:00:07.889112348 +0800 ++++ hydrogen-0.9.5/Sconstruct 2011-08-11 18:00:34.945632437 +0800 +@@ -83,6 +83,7 @@ + includes.append( './' ) + includes.append( 'gui/src/' ) + includes.append( '3rdparty/install/include' ) ++ includes.append( '/usr/include/raptor2' ) + + if sys.platform == "darwin": + ldflags.append( '-L/opt/local/lib' ) diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD index 91d32fd90..2f98df6db 100644 --- a/extra/java-commons-daemon/PKGBUILD +++ b/extra/java-commons-daemon/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=('java-commons-daemon' 'java-jsvc') pkgbase=java-commons-daemon -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 arch=('i686' 'x86_64') url="http://commons.apache.org/daemon/" license=('APACHE') _libname=commons-daemon source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz) -md5sums=('2fe0a35d4a9c0338ecd45dad20f33662') +md5sums=('28dc2e0a3634b2dc3605e9e6444d079f') makedepends=('apache-ant' 'docbook2x' 'docbook-xsl') @@ -25,7 +25,7 @@ build() { } package_java-commons-daemon() { - pkgdesc="Set of Apache libraries for making Java applications run on UNIX more easily" + pkgdesc="Alternative invocation mechanism for unix-daemon-like java code" depends=('java-runtime') cd "${srcdir}/${_libname}-${pkgver}-src" @@ -40,7 +40,6 @@ package_java-jsvc() { pkgdesc="Apache application for making Java applications run on UNIX more easily" depends=("java-${_libname}" 'libcap') - # jsvc cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix" install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 3fa56c015..239a2ca67 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132576 2011-07-25 00:12:30Z andrea $ +# $Id: PKGBUILD 135257 2011-08-11 16:57:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python pkgver=4.7.0 -pkgrel=1 -pkgdesc="KDE bindings for python" +pkgrel=2 +pkgdesc="KDE bindings for Python" url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 122ba1559..6dc563a50 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 133252 2011-07-27 22:57:56Z andrea $ +# $Id: PKGBUILD 135366 2011-08-13 08:45:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.6.95 +pkgver=4.7.0 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt') +depends=('kdebase-runtime' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-smoke') -source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") -sha1sums=('304fcb7a38b3656db1d6614b8ff77e6e27274de6') +source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") +sha1sums=('7f0366cc6144ea684c571ed3876dd0eac6d72fb6') build() { cd "${srcdir}" @@ -21,7 +21,8 @@ build() { cd build cmake ../smokeqt-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Qwt5=OFF make } diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD index 3f6cc1113..2040b2742 100644 --- a/extra/libxfont/PKGBUILD +++ b/extra/libxfont/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97682 2010-11-01 09:15:00Z jgc $ +# $Id: PKGBUILD 135207 2011-08-11 07:14:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfont -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="X11 font rasterisation library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2) -sha1sums=('191b40c566f80737cf6838747d86ebaee7b0c7d7') +sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041') build() { cd "${srcdir}/libXfont-${pkgver}" diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 91e94bb66..8f6b5e32e 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 128517 2011-06-24 07:46:40Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 135431 2011-08-13 11:30:30Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.9.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -17,17 +17,23 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nm09-more.patch) + nm09-more.patch + ticket-14351-multiple-display-of-room-members.patch) md5sums=('2cd285c7a40f93b7a51bfe733971d3a6' - 'a673659d86c7a65aa710f7c8c7feda82') + 'a673659d86c7a65aa710f7c8c7feda82' + '47f16f838b741cfdeda18d7b08a7b816') build() { cd "$srcdir/$pkgname-$pkgver" # Further fixes for NetworkManager 0.9 - # (http://developer.pidgin.im/ticket/13859) + # http://developer.pidgin.im/ticket/13859 patch -Np1 -i "$srcdir/nm09-more.patch" + # Fix upstream issue #14351: multiple display of room members + # http://developer.pidgin.im/ticket/14351 + patch -Np0 -i "$srcdir/ticket-14351-multiple-display-of-room-members.patch" + # Use Python 2 sed -i 's/env python$/\02/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} @@ -74,8 +80,7 @@ package_pidgin(){ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' - 'cyrus-sasl-plugins') + depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') diff --git a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch new file mode 100644 index 000000000..bf0966891 --- /dev/null +++ b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch @@ -0,0 +1,17 @@ +# +# +# patch "libpurple/conversation.c" +# from [cd6817f4863abafef969359f65cc025f9483b401] +# to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803] +# +============================================================ +--- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401 ++++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803 +@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC + } + + g_hash_table_remove_all(chat->users); +- chat->users = NULL; + + g_list_free(users); + chat->in_room = NULL; diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index 5f2d31f30..ce2edc0c0 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122181 2011-05-02 17:31:08Z andrea $ +# $Id: PKGBUILD 135252 2011-08-11 16:55:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') -pkgver=4.8.4 +pkgver=4.8.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" @@ -13,7 +13,7 @@ license=('GPL') makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat') source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('97c5dc1042feb5b3fe20baabad055af1') +md5sums=('0e4264bb912edfbda319bb236ac84407') build() { cd "${srcdir}" diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 2f16810e5..e1016b0c9 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 126938 2011-06-08 20:01:54Z tpowa $ +# $Id: PKGBUILD 135290 2011-08-12 09:22:48Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm -pkgver=0.14.1 -pkgrel=2 +pkgver=0.15.0 +pkgrel=1 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64 'mips64el') license=('GPL2' 'LGPL2.1') url="http://www.linux-kvm.org" -depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') -makedepends=('texi2html' 'perl') +depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') +makedepends=('texi2html' 'perl' 'python2') backup=('etc/qemu/target-x86_64.conf') install=qemu-kvm.install conflicts=('qemu') @@ -23,8 +23,9 @@ build() cd ${srcdir}/${pkgname}-${pkgver} # fix esound building ./configure --prefix=/usr \ + --python=/usr/bin/python2 \ --sysconfdir=/etc \ - --audio-drv-list=alsa,sdl,oss,esd \ + --audio-drv-list=alsa,sdl,oss \ --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs make @@ -53,5 +54,5 @@ package() esac done } -md5sums=('ed37a2c0b1981220b842920140574c63' +md5sums=('b45b0deebba4ce47dcaaab3807f6ed47' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index f6b1913ea..61389e8e7 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 124178 2011-05-17 13:06:59Z tpowa $ +# $Id: PKGBUILD 135285 2011-08-12 09:21:08Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=0.14.1 +pkgver=0.15.0 pkgrel=1 -pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." +pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" -makedepends=('texi2html' 'perl') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl') +makedepends=('texi2html' 'perl' 'python2') +depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl') backup=('etc/qemu/target-x86_64.conf') install=qemu.install -source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz 65-kvm.rules) options=(!strip) @@ -19,10 +19,10 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i -e 's/lib64/lib/g' x86_64.ld - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,esd \ + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \ + --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs \ - --kerneldir="/usr/src/linux-$(uname -r)" + --enable-docs make } @@ -40,5 +40,5 @@ package() { done } -md5sums=('b6c713a8db638e173af53a62d5178640' +md5sums=('dbc55b014bcd21b98e347f6a90f7fb6d' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index c41f9caee..b2c5880a7 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124858 2011-05-24 19:56:15Z schiv $ +# $Id: PKGBUILD 135263 2011-08-11 18:35:34Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -13,22 +13,23 @@ url="http://www.rosegardenmusic.com/" license=('GPL') depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils' 'perl' 'qt' 'shared-mime-info') -makedepends=('pkgconfig' 'imake') +makedepends=('imake') optdepends=('lilypond: notation display' 'cups: printing support' 'okular: print preview, or any other PDF viewer' 'timidity++: MIDI playback, or any other softsynth' 'flac' 'wavpack') -[ "$CARCH" = "i686" ] && optdepends=("${optdepends[@]}" - 'dssi-vst: win32 VST support') +[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('77ab43d06de53ace338843ff82e26288') build() { cd "$srcdir/$pkgname-$pkgver" + # lrdf + raptor2 compatibility + export lrdf_CFLAGS="$(pkg-config --cflags raptor2)" ./configure --prefix=/usr make } @@ -36,7 +37,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch new file mode 100644 index 000000000..fe5a807ee --- /dev/null +++ b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch @@ -0,0 +1,43 @@ +From b43c51beeb0569a38900e1e5a78606711f987742 Mon Sep 17 00:00:00 2001 +From: Paul Khuong <pvk@pvk.ca> +Date: Wed, 3 Aug 2011 10:20:41 -0400 +Subject: [PATCH] Fix version string parsing for Linux 3.0 + + Stop assuming the presence of minor and patch version numbers; missing + values are defaulted to 0 (e.g. 3.0.0). + + Reported by a few people on IRC. +--- + src/runtime/linux-os.c | 14 ++++++++++---- + 1 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c +index db72fa6..e262f41 100644 +--- a/src/runtime/linux-os.c ++++ b/src/runtime/linux-os.c +@@ -198,12 +198,18 @@ os_init(char *argv[], char *envp[]) + int patch_version; + char *p; + uname(&name); ++ + p=name.release; + major_version = atoi(p); +- p=strchr(p,'.')+1; +- minor_version = atoi(p); +- p=strchr(p,'.')+1; +- patch_version = atoi(p); ++ minor_version = patch_version = 0; ++ p=strchr(p,'.'); ++ if (p != NULL) { ++ minor_version = atoi(++p); ++ p=strchr(p,'.'); ++ if (p != NULL) ++ patch_version = atoi(++p); ++ } ++ + if (major_version<2) { + lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)\n", + major_version); +-- +1.7.6 + diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 6b53be48d..c1e659b61 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 132801 2011-07-26 10:22:05Z juergen $ +# $Id: PKGBUILD 135444 2011-08-13 20:11:24Z dreisner $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Leslie Polzer (skypher) +# Contributor: Leslie Polzer (skypher) pkgname=sbcl pkgver=1.0.50 -pkgrel=1 +pkgrel=2 pkgdesc="Steel Bank Common Lisp" +url="http://www.sbcl.org/" arch=('i686' 'x86_64' 'mips64el') license=('custom') depends=('glibc') @@ -20,17 +21,24 @@ source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pk md5sums=('74ce9b24516885d066ec4287cde52e8c' '7ac0c1936547f4278198b8bf7725204d' 'a456535d65d6c5b85b1b646f11455fce') -url="http://www.sbcl.org/" install=sbcl.install +source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" + "arch-fixes.lisp" + "0001-Fix-version-string-parsing-for-Linux-3.0.patch") +md5sums=('74ce9b24516885d066ec4287cde52e8c' + '7ac0c1936547f4278198b8bf7725204d' + '7af58d1de2d788ad6a8d82c89279a75f') build() { - export CFLAGS="${CFLAGS} -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" + cd "$srcdir/$pkgname-$pkgver" + + export CFLAGS+=" -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" export GNUMAKE="make -e" # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS - export LINKFLAGS="$LD_FLAGS" + export LINKFLAGS="$LDFLAGS" unset LDFLAGS - cd ${startdir}/src/${pkgname}-${pkgver} + # Make a multi-threaded SBCL, disable LARGEFILE cat >customize-target-features.lisp <<EOF (lambda (features) @@ -40,44 +48,40 @@ build() { (disable :largefile))) EOF + # fix build against 3.0-ARCH + patch -Np1 < "$srcdir/0001-Fix-version-string-parsing-for-Linux-3.0.patch" patch -Nup1 < "${srcdir}/mips-arch.h.diff" if [ "$CARCH" = "mips64el" ]; then - sh make.sh clisp + sh make.sh clisp else - sh make.sh sbcl + sh make.sh sbcl fi - mkdir -p ${startdir}/pkg/usr - pushd doc/manual - make info || return 1 - popd - INSTALL_ROOT=${startdir}/pkg/usr sh install.sh + + make -C doc/manual info +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + INSTALL_ROOT="$pkgdir/usr" sh install.sh src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/arch-fixes.lisp mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core -# sources - mkdir -p ${startdir}/pkg/usr/share/sbcl-source - cp -R -t ${startdir}/pkg/usr/share/sbcl-source \ - ${startdir}/src/${pkgname}-${pkgver}/{src,contrib} + # sources + mkdir -p "$pkgdir/usr/share/sbcl-source" + cp -R -t "$pkgdir/usr/share/sbcl-source" "$srcdir/$pkgname-$pkgver/"{src,contrib} -# drop unwanted files - find ${startdir}/pkg/usr/share/sbcl-source -type f \ - -name \*.fasl -or \ - -name \*.o -or \ - -name \*.log -or \ - -name \*.so -or \ - -name a.out -delete - - rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl - rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl.nm + # license + install -D -m644 "$srcdir/$pkgname-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/license.txt" - find ${startdir}/pkg \( -name Makefile -o -name .cvsignore \) -delete + # drop unwanted files + find "$pkgdir" \( -name Makefile -o -name .cvsignore \) -delete + find "$pkgdir/usr/share/sbcl-source" -type f \ + \( -name \*.fasl -o -name \*.o -o -name \*.log -o -name \*.so -o -name a.out \) -delete - rm $startdir/pkg/usr/share/info/dir - gzip -9nf $startdir/pkg/usr/share/info/* + rm "$pkgdir/usr/share/sbcl-source/src/runtime/sbcl"{,.nm} - # license - install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt } diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD index c894ec8dd..1fa433641 100644 --- a/extra/scummvm/PKGBUILD +++ b/extra/scummvm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106447 2011-01-17 06:22:16Z angvp $ +# $Id: PKGBUILD 135227 2011-08-11 09:16:00Z juergen $ # Maintainer: juergen <juergen@hoetzel.info> # Contributor: Manolis Tzanidakis, Petter Gundersen pkgname=scummvm -pkgver=1.2.1 +pkgver=1.3.1 pkgrel=1 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games." arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') url="http://www.scummvm.org/" depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'flac>=1.1.4' 'sdl' 'fluidsynth') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b1d224d7640bc7fdccaca958164b31df') +md5sums=('87e5076e93bfa762f1c5d7f45b41d4e2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/sdl/PKGBUILD b/extra/sdl/PKGBUILD index b7c5035aa..daaf7073f 100644 --- a/extra/sdl/PKGBUILD +++ b/extra/sdl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 99967 2010-11-19 16:37:58Z heftig $ +# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=sdl pkgver=1.2.14 -pkgrel=6 +pkgrel=7 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64' 'mips64el') url="http://www.libsdl.org" license=('LGPL') depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'esound' 'mesa' 'libpulse') +makedepends=('alsa-lib' 'mesa' 'libpulse') options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-joystick-crash.diff diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 5d73e1d73..b326c385e 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,25 +1,20 @@ -# $Id: PKGBUILD 130000 2011-06-30 19:02:46Z andrea $ +# $Id: PKGBUILD 135247 2011-08-11 16:54:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.12.3 -pkgrel=2 +pkgver=4.12.4 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') -source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz" - 'fix-regression.patch') -md5sums=('d0f1fa60494db04b4d115d4c2d92f79e' - '598ffc65ebaf1c0e8855a352b02c43e7') +source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") +md5sums=('6cbd56abb7d35aad833789c98ae61652') build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/fix-regression.patch - cd "${srcdir}" cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 7fd6833d9..3c35d24a2 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 126185 2011-06-02 11:28:46Z thomas $ +# $Id: PKGBUILD 135456 2011-08-13 22:59:53Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=0.8.4 +pkgver=0.8.5 pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('qt') optdepends=('qt') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7') +sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/staging/gnutls/PKGBUILD b/staging/gnutls/PKGBUILD index 38d7d94d6..232866e8e 100644 --- a/staging/gnutls/PKGBUILD +++ b/staging/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134729 2011-08-07 19:08:57Z andyrtr $ +# $Id: PKGBUILD 135280 2011-08-12 06:48:04Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') license=('GPL3' 'LGPL') @@ -11,11 +11,15 @@ url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) -md5sums=('0677a66667f48810ff8df8335a9a9f9b') +source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz + align.patch) +md5sums=('0677a66667f48810ff8df8335a9a9f9b' + 'bce979498addb45d0fa8d6951f93fab3') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # fix AES-NI for i686 + patch -Np1 -i ${srcdir}/align.patch ./configure --prefix=/usr \ --with-zlib \ --disable-static \ @@ -24,13 +28,10 @@ build() { make } -# i686 test segfault - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" - #make check # passes all || /bin/true -# make check # || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html -#} +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check # passes all || /bin/true +} package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/staging/gnutls/align.patch b/staging/gnutls/align.patch new file mode 100644 index 000000000..dce5cf408 --- /dev/null +++ b/staging/gnutls/align.patch @@ -0,0 +1,64 @@ +diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c +index 6801e7e..ff5b714 100644 +--- a/lib/accelerated/intel/aes-x86.c ++++ b/lib/accelerated/intel/aes-x86.c +@@ -40,6 +40,10 @@ struct aes_ctx + uint8_t iv[16]; + }; + ++#define AESNI_MIN_ALIGN 16 ++#define AESNI_ALIGN(x) \ ++ ((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1))) ++ + static int + aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx) + { +@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t keysize) + struct aes_ctx *ctx = _ctx; + int ret; + +- ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key); ++ ret = aesni_set_encrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key)); + if (ret != 0) + return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED); + +- ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec); ++ ret = aesni_set_decrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key_dec)); + if (ret != 0) + return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED); + +@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size, + { + struct aes_ctx *ctx = _ctx; + +- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1); ++ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), ctx->iv, 1); + return 0; + } + +@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size, + { + struct aes_ctx *ctx = _ctx; + +- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0); ++ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), ctx->iv, 0); + + return 0; + } +diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h +index 8f49ff3..20a169e 100644 +--- a/lib/accelerated/intel/aes-x86.h ++++ b/lib/accelerated/intel/aes-x86.h +@@ -11,10 +11,11 @@ void register_x86_crypto (void); + # define ALIGN16 + #endif + ++#define AES_KEY_ALIGN_SIZE 8 + #define AES_MAXNR 14 + typedef struct + { +- uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)]; ++ uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE]; + int rounds; + } AES_KEY; + diff --git a/staging/libepc/PKGBUILD b/staging/libepc/PKGBUILD new file mode 100644 index 000000000..55d302e51 --- /dev/null +++ b/staging/libepc/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 135240 2011-08-11 10:52:34Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libepc +pkgver=0.3.11 +pkgrel=2 +pkgdesc="Easy Publish and Consume Library" +arch=(i686 x86_64) +license=('LGPL') +url="http://live.gnome.org/libepc" +depends=('gtk2' 'avahi' 'libsoup') +makedepends=('intltool') +options=('!libtool' '!makeflags') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/loudmouth/01-fix-sasl-md5-digest-uri.patch b/staging/loudmouth/01-fix-sasl-md5-digest-uri.patch new file mode 100644 index 000000000..5bca69c0c --- /dev/null +++ b/staging/loudmouth/01-fix-sasl-md5-digest-uri.patch @@ -0,0 +1,24 @@ +diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c +index 21c1bc2..ae8de94 100644 +--- a/loudmouth/lm-connection.c ++++ b/loudmouth/lm-connection.c +@@ -1441,11 +1441,18 @@ lm_connection_authenticate (LmConnection *connection, + connection->effective_jid = g_strdup_printf ("%s/%s", + connection->jid, connection->resource); + + if (connection->use_sasl) { ++ gchar *domain = NULL; ++ ++ if (!connection_get_server_from_jid (connection->jid, &domain)) { ++ domain = g_strdup (connection->server); ++ } ++ + lm_sasl_authenticate (connection->sasl, + username, password, +- connection->server, ++ domain, + connection_sasl_auth_finished); ++ g_free (domain); + + connection->features_cb = + lm_message_handler_new (connection_features_cb, diff --git a/staging/loudmouth/03-drop-stanzas-on-fail.patch b/staging/loudmouth/03-drop-stanzas-on-fail.patch new file mode 100644 index 000000000..87b86a998 --- /dev/null +++ b/staging/loudmouth/03-drop-stanzas-on-fail.patch @@ -0,0 +1,45 @@ +From: Sjoerd Simons <sjoerd.simons@collabora.co.uk> +Date: Tue, 13 Jan 2009 11:28:44 +0000 +Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages + +when a stanza comes in that for some reason can't be parsed into an LmMessage, +just drop them on the floor instead of blocking the parser. I've seen this +issue happen in practise because some (buggy?) client sending an iq with a +prefix e.g. <client:iq xmlns:client="jabber:client" ... /> +--- + loudmouth/lm-parser.c | 15 ++++++--------- + 1 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c +index 1938d56..89f6675 100644 +--- a/loudmouth/lm-parser.c ++++ b/loudmouth/lm-parser.c +@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext *context, + if (!m) { + g_warning ("Couldn't create message: %s\n", + parser->cur_root->name); +- return; +- } +- +- g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER, ++ } else { ++ g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER, + "Have a new message\n"); +- if (parser->function) { +- (* parser->function) (parser, m, parser->user_data); ++ if (parser->function) { ++ (* parser->function) (parser, m, parser->user_data); ++ } ++ lm_message_unref (m); + } + +- lm_message_unref (m); + lm_message_node_unref (parser->cur_root); +- +- + parser->cur_node = parser->cur_root = NULL; + } else { + LmMessageNode *tmp_node; +-- +1.5.6.5 + diff --git a/staging/loudmouth/04-use-pkg-config-for-gnutls.patch b/staging/loudmouth/04-use-pkg-config-for-gnutls.patch new file mode 100644 index 000000000..20f388e89 --- /dev/null +++ b/staging/loudmouth/04-use-pkg-config-for-gnutls.patch @@ -0,0 +1,23 @@ +Description: use pkg-config to detect gnutls +Debian: http://bugs.debian.org/529835 +Origin: http://groups.google.com/group/loudmouth-dev/browse_thread/thread/3f78255837048daf# + +--- a/configure.ac.orig 2009-08-16 20:29:36.000000000 +0200 ++++ b/configure.ac 2009-08-16 20:30:43.000000000 +0200 +@@ -146,10 +146,12 @@ AC_ARG_WITH(openssl-libs, + enable_ssl=no + if test "x$ac_ssl" = "xgnutls"; then + dnl Look for GnuTLS +- AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no) +- if test "x$have_libgnutls" = "xyes"; then +- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" +- LIBS="$LIBS $LIBGNUTLS_LIBS" ++ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no) ++ if test "x$have_gnutls" = "xyes"; then ++ AC_SUBST(ASYNCNS_CFLAGS) ++ AC_SUBST(ASYNCNS_LIBS) ++ CFLAGS="$CFLAGS $GNUTLS_CFLAGS" ++ LIBS="$LIBS $GNUTLS_LIBS" + AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.]) + enable_ssl=GnuTLS + else diff --git a/staging/loudmouth/PKGBUILD b/staging/loudmouth/PKGBUILD new file mode 100644 index 000000000..d1686df56 --- /dev/null +++ b/staging/loudmouth/PKGBUILD @@ -0,0 +1,39 @@ +# $Id +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: damir <damir@archlinux.org> +# Contributor: Brice Carpentier <brice.carpentier@orange.fr> + +pkgname=loudmouth +pkgver=1.4.3 +pkgrel=3 +pkgdesc="A lightweight Jabber client library written in C/Glib" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://groups.google.com/group/loudmouth-dev" +depends=('glib2' 'gnutls' 'libidn') +options=('!libtool') +makedepends=('intltool' 'pkgconfig' 'gtk-doc') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2 + 01-fix-sasl-md5-digest-uri.patch + 03-drop-stanzas-on-fail.patch + 04-use-pkg-config-for-gnutls.patch) +md5sums=('55339ca42494690c3942ee1465a96937' + 'dc799cea18b24847b1e008c7424010a3' + 'b7b2d81b01a5eee5fd5e21cae67b4af7' + 'bffb25b9551df43255fe1706588582f3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch" + patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch" + patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch" + libtoolize --force + autoreconf + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/qemu-kvm/65-kvm.rules b/staging/qemu-kvm/65-kvm.rules new file mode 100644 index 000000000..c2f7317aa --- /dev/null +++ b/staging/qemu-kvm/65-kvm.rules @@ -0,0 +1 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/staging/qemu-kvm/PKGBUILD b/staging/qemu-kvm/PKGBUILD new file mode 100644 index 000000000..604d55da4 --- /dev/null +++ b/staging/qemu-kvm/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 135315 2011-08-12 16:52:46Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=qemu-kvm +pkgver=0.15.0 +pkgrel=2 +pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." +arch=(i686 x86_64) +license=('GPL2' 'LGPL2.1') +url="http://www.linux-kvm.org" +depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') +makedepends=('texi2html' 'perl' 'python2') +backup=('etc/qemu/target-x86_64.conf') +install=qemu-kvm.install +conflicts=('qemu') +provides=('qemu') +replaces=('kvm') +source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz + 65-kvm.rules) +options=(!strip) + +build() +{ + cd ${srcdir}/${pkgname}-${pkgver} + # fix esound building + ./configure --prefix=/usr \ + --python=/usr/bin/python2 \ + --sysconfdir=/etc \ + --audio-drv-list=alsa,sdl,oss \ + --audio-card-list=ac97,sb16,es1370,hda \ + --enable-docs + make +} +package() +{ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + # symbolic link for backwards compatibility + ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm + # symbolic link for to qemu binary for emulator apps + ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu + # symbolic link for to qemu binary for emulator apps + ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/kvm + # fix man page + mv ${pkgdir}/usr/share/man/man1/qemu.1 \ + ${pkgdir}/usr/share/man/man1/qemu-kvm.1 + # install udev rules + install -D -m644 ${srcdir}/65-kvm.rules \ + ${pkgdir}/lib/udev/rules.d/65-kvm.rules + # strip scripts directory + find ${pkgdir}/usr/bin -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done +} +md5sums=('b45b0deebba4ce47dcaaab3807f6ed47' + 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/staging/qemu-kvm/qemu-kvm.install b/staging/qemu-kvm/qemu-kvm.install new file mode 100644 index 000000000..84aa773b9 --- /dev/null +++ b/staging/qemu-kvm/qemu-kvm.install @@ -0,0 +1,16 @@ +post_install() { + groupadd kvm -f -g 78 + echo ">>> PLEASE READ FOR KVM USAGE!" + echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" + echo ">>> Add yourself to the group 'kvm'." + echo ">>> Use 'qemu-kvm -enable-kvm' to use KVM." + echo "" +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + groupdel kvm +} diff --git a/staging/xf86-input-wacom/70-wacom.rules b/staging/xf86-input-wacom/70-wacom.rules new file mode 100644 index 000000000..f6aa20835 --- /dev/null +++ b/staging/xf86-input-wacom/70-wacom.rules @@ -0,0 +1,12 @@ +ACTION!="add|change", GOTO="wacom_end" + +# Match all serial wacom tablets with a serial ID starting with WACf +# Notes: We assign NAME though we shouldn't, but currently the server requires it +# We assign the lot to subsystem pnp too because server reads NAME from +# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" +# will do and the ENV{NAME} can be removed. +SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" +SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" + +LABEL="wacom_end" + diff --git a/staging/xf86-input-wacom/PKGBUILD b/staging/xf86-input-wacom/PKGBUILD new file mode 100644 index 000000000..9f693c3c5 --- /dev/null +++ b/staging/xf86-input-wacom/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 135212 2011-08-11 07:18:08Z jgc $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: M Rawash <mrawash@gmail.com> + +pkgname=xf86-input-wacom +pkgver=0.11.1 +pkgrel=3 +pkgdesc="X.Org Wacom tablet driver" +arch=('i686' 'x86_64') +url="http://linuxwacom.sourceforge.net/" +license=('GPL') +backup=('etc/X11/xorg.conf.d/50-wacom.conf') +depends=('libxi' 'libxrandr') +makedepends=('xorg-server-devel>=1.10.99.902' 'libxext' 'libxi') +conflicts=('xorg-server<1.10.99.902') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + 70-wacom.rules) +md5sums=('0aec4a338cc583ed497b6af68d6d80ab' + '10db4f8272286690255c1bcc18bfdd92') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/lib/udev/rules.d" + install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/lib/udev/rules.d/" +} diff --git a/staging/xf86-video-voodoo/PKGBUILD b/staging/xf86-video-voodoo/PKGBUILD new file mode 100644 index 000000000..10d718da0 --- /dev/null +++ b/staging/xf86-video-voodoo/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 135221 2011-08-11 07:49:16Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-voodoo +pkgver=1.2.4 +pkgrel=5 +pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto') +conflicts=('xorg-server<1.10.99.902') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('7ecd232cc0b7fe507e18e08799791eefa9fdaf48') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/xf86-video-xgi/PKGBUILD b/staging/xf86-video-xgi/PKGBUILD new file mode 100644 index 000000000..731c3ea69 --- /dev/null +++ b/staging/xf86-video-xgi/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 135218 2011-08-11 07:46:30Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-xgi +pkgver=1.6.0 +pkgrel=4 +pkgdesc="X.org XGI video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto') +conflicts=('xorg-server<1.10.99.902') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + git-fixes.patch) +sha1sums=('826f14d6ba799cd2aae9f0c818f84cf8b75f1ddb' + '61ce13325c69befaa710c3389a85a8aa9d1cf28d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-video-xgi/git-fixes.patch b/staging/xf86-video-xgi/git-fixes.patch new file mode 100644 index 000000000..f15fea88a --- /dev/null +++ b/staging/xf86-video-xgi/git-fixes.patch @@ -0,0 +1,451 @@ +diff --git a/man/xgi.man b/man/xgi.man +index 19880f2..5699ae4 100644 +--- a/man/xgi.man ++++ b/man/xgi.man +@@ -1,4 +1,3 @@ +-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi.man,v 1.14 2003/11/12 16:50:36 twini Exp $ + .\" shorthand for double quote that works everywhere. + .ds q \N'34' + .TH XGI __drivermansuffix__ __vendorversion__ +diff --git a/src/vb_init.c b/src/vb_init.c +index 8338410..50980c4 100755 +--- a/src/vb_init.c ++++ b/src/vb_init.c +@@ -131,6 +131,8 @@ static void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT, + static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT, + PVB_DEVICE_INFO); + static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO); ++/* horrible */ ++#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType + + static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo, + UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5], +@@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension , + } + + temp3 = 0 ; +- for( k = 0 ; k < 4 ; k++ ) ++ for( k = 1 ; k < 4 ; k++ ) + { + XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ; /* CR6E_D[1:0] select channel */ + temp2 = 0 ; +diff --git a/src/vgatypes.h b/src/vgatypes.h +index 8a60927..7484661 100755 +--- a/src/vgatypes.h ++++ b/src/vgatypes.h +@@ -1,5 +1,3 @@ +-/* $XFree86$ */ +-/* $XdotOrg$ */ + /* + * General type definitions for universal mode switching modules + * +diff --git a/src/xgi.h b/src/xgi.h +index 715502f..e818631 100755 +--- a/src/xgi.h ++++ b/src/xgi.h +@@ -981,6 +981,7 @@ int compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div, + void XGI_WaitBeginRetrace(XGIIOADDRESS RelIO); + void XGI_WaitEndRetrace(XGIIOADDRESS RelIO); + ++#include <unistd.h> + /* 2005/11/21 added by jjtseng */ + #define DelayS(sec) usleep((sec)*1000000) + #define DelayMS(millisec) usleep((millisec)*1000) +diff --git a/src/xgi_accel.c b/src/xgi_accel.c +index c072691..4c298ed 100755 +--- a/src/xgi_accel.c ++++ b/src/xgi_accel.c +@@ -200,20 +200,7 @@ extern int FbDevExist; + #endif + + #if X_BYTE_ORDER == X_BIG_ENDIAN +-static CARD32 BE_SWAP32 (CARD32 val) +-{ +- PDEBUG(ErrorF("X_BIG_ENDIAN...\n")); +- if (CurrentColorDepth == 8) +- return ((((val) & 0x000000ff) << 24) | \ +- (((val) & 0x0000ff00) << 8) | \ +- (((val) & 0x00ff0000) >> 8) | \ +- (((val) & 0xff000000) >> 24)); +- if (CurrentColorDepth == 24) +- return val; +- if (CurrentColorDepth == 16) +- return ((((val) & 0x0000ffff) << 16) | \ +- (((val) & 0xffff0000) >> 16)); +-} ++#define BE_SWAP32(x) lswapl(x) + #else + static CARD32 BE_SWAP32 (CARD32 val) + { +diff --git a/src/xgi_dga.c b/src/xgi_dga.c +index 04f90aa..8bd84bc 100755 +--- a/src/xgi_dga.c ++++ b/src/xgi_dga.c +@@ -103,18 +103,18 @@ XGISetupDGAMode( + + if(pMode->HDisplay != otherPitch) { + +- newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec)); ++ newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec)); + oneMore = TRUE; + + } else { + +- newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec)); ++ newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec)); + oneMore = FALSE; + + } + + if(!newmodes) { +- xfree(modes); ++ free(modes); + return NULL; + } + modes = newmodes; +diff --git a/src/xgi_dri.c b/src/xgi_dri.c +index 93687e1..e575c19 100755 +--- a/src/xgi_dri.c ++++ b/src/xgi_dri.c +@@ -46,7 +46,6 @@ + + #include "xf86.h" + #include "xf86_OSproc.h" +-#include "xf86Priv.h" + + #include "xf86PciInfo.h" + #include "xf86Pci.h" +@@ -145,13 +144,13 @@ XGIInitVisualConfigs(ScreenPtr pScreen) + } + if (!(pXGIConfigs = (XGIConfigPrivPtr)xnfcalloc(sizeof(XGIConfigPrivRec), + numConfigs))) { +- xfree(pConfigs); ++ free(pConfigs); + return FALSE; + } + if (!(pXGIConfigPtrs = (XGIConfigPrivPtr*)xnfcalloc(sizeof(XGIConfigPrivPtr), + numConfigs))) { +- xfree(pConfigs); +- xfree(pXGIConfigs); ++ free(pConfigs); ++ free(pXGIConfigs); + return FALSE; + } + for (i=0; i<numConfigs; i++) +@@ -333,7 +332,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen) + pDRIInfo->bufferRequests = DRI_ALL_WINDOWS; + + if (!DRIScreenInit(pScreen, pDRIInfo, &pXGI->drmSubFD)) { +- xfree(pDRIInfo->devPrivate); ++ free(pDRIInfo->devPrivate); + pDRIInfo->devPrivate=0; + DRIDestroyInfoRec(pXGI->pDRIInfo); + pXGI->pDRIInfo=0; +@@ -537,14 +536,14 @@ XGIDRICloseScreen(ScreenPtr pScreen) + + if (pXGI->pDRIInfo) { + if (pXGI->pDRIInfo->devPrivate) { +- xfree(pXGI->pDRIInfo->devPrivate); ++ free(pXGI->pDRIInfo->devPrivate); + pXGI->pDRIInfo->devPrivate=0; + } + DRIDestroyInfoRec(pXGI->pDRIInfo); + pXGI->pDRIInfo=0; + } +- if (pXGI->pVisualConfigs) xfree(pXGI->pVisualConfigs); +- if (pXGI->pVisualConfigsPriv) xfree(pXGI->pVisualConfigsPriv); ++ if (pXGI->pVisualConfigs) free(pXGI->pVisualConfigs); ++ if (pXGI->pVisualConfigsPriv) free(pXGI->pVisualConfigsPriv); + + if(pXGI->agpSize){ + /* ErrorF("Freeing agp memory\n"); */ +diff --git a/src/xgi_driver.c b/src/xgi_driver.c +index b4f83b8..b8b8679 100755 +--- a/src/xgi_driver.c ++++ b/src/xgi_driver.c +@@ -54,7 +54,7 @@ + #include "fb.h" + #include "micmap.h" + #include "xf86.h" +-#include "xf86Priv.h" ++#include "xf86Module.h" + #include "xf86_OSproc.h" + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" +@@ -106,6 +106,10 @@ + #include <unistd.h> + #endif + ++#ifndef DEFAULT_DPI ++#define DEFAULT_DPI 96 ++#endif ++ + /* Jong 01/22/2009; compiler error; type conflict */ + /* + #include <fcntl.h> +@@ -556,13 +560,13 @@ XGIFreeRec(ScrnInfoPtr pScrn) + * head. + */ + if (pXGIEnt->BIOS) +- xfree(pXGIEnt->BIOS); ++ free(pXGIEnt->BIOS); + pXGIEnt->BIOS = pXGI->BIOS = NULL; + if (pXGIEnt->XGI_Pr) +- xfree(pXGIEnt->XGI_Pr); ++ free(pXGIEnt->XGI_Pr); + pXGIEnt->XGI_Pr = pXGI->XGI_Pr = NULL; + if (pXGIEnt->RenderAccelArray) +- xfree(pXGIEnt->RenderAccelArray); ++ free(pXGIEnt->RenderAccelArray); + pXGIEnt->RenderAccelArray = pXGI->RenderAccelArray = NULL; + } + else { +@@ -573,19 +577,19 @@ XGIFreeRec(ScrnInfoPtr pScrn) + } + else { + if (pXGI->BIOS) +- xfree(pXGI->BIOS); ++ free(pXGI->BIOS); + pXGI->BIOS = NULL; + if (pXGI->XGI_Pr) +- xfree(pXGI->XGI_Pr); ++ free(pXGI->XGI_Pr); + pXGI->XGI_Pr = NULL; + if (pXGI->RenderAccelArray) +- xfree(pXGI->RenderAccelArray); ++ free(pXGI->RenderAccelArray); + pXGI->RenderAccelArray = NULL; + } + + #ifdef XGIMERGED + if (pXGI->MetaModes) +- xfree(pXGI->MetaModes); ++ free(pXGI->MetaModes); + pXGI->MetaModes = NULL; + + if (pXGI->CRT1Modes) { +@@ -595,8 +599,8 @@ XGIFreeRec(ScrnInfoPtr pScrn) + do { + DisplayModePtr p = pScrn->currentMode->next; + if (pScrn->currentMode->Private) +- xfree(pScrn->currentMode->Private); +- xfree(pScrn->currentMode); ++ free(pScrn->currentMode->Private); ++ free(pScrn->currentMode); + pScrn->currentMode = p; + } while (pScrn->currentMode != pScrn->modes); + } +@@ -612,7 +616,7 @@ XGIFreeRec(ScrnInfoPtr pScrn) + pXGI->pVbe = NULL; + if (pScrn->driverPrivate == NULL) + return; +- xfree(pScrn->driverPrivate); ++ free(pScrn->driverPrivate); + pScrn->driverPrivate = NULL; + } + +@@ -975,7 +979,7 @@ XGIProbe(DriverPtr drv, int flags) + numDevSections, drv, &usedChips); + + /* Free it since we don't need that list after this */ +- xfree(devSections); ++ free(devSections); + if (numUsed <= 0) + return FALSE; + +@@ -1015,7 +1019,7 @@ XGIProbe(DriverPtr drv, int flags) + + #endif + } +- xfree(usedChips); ++ free(usedChips); + + return foundScreen; + } +@@ -1044,11 +1048,11 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, + + ErrorF("XGICopyModeNLink()...Use Virtual Size-1\n"); + +- if (!((mode = xalloc(sizeof(DisplayModeRec))))) ++ if (!((mode = malloc(sizeof(DisplayModeRec))))) + return dest; + memcpy(mode, i, sizeof(DisplayModeRec)); +- if (!((mode->Private = xalloc(sizeof(XGIMergedDisplayModeRec))))) { +- xfree(mode); ++ if (!((mode->Private = malloc(sizeof(XGIMergedDisplayModeRec))))) { ++ free(mode); + return dest; + } + ((XGIMergedDisplayModePtr) mode->Private)->CRT1 = i; +@@ -1125,8 +1129,8 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Skipped %dx%d, not enough video RAM or beyond hardware specs\n", + mode->HDisplay, mode->VDisplay); +- xfree(mode->Private); +- xfree(mode); ++ free(mode->Private); ++ free(mode); + + return dest; + } +@@ -1559,10 +1563,10 @@ XGIFreeCRT2Structs(XGIPtr pXGI) + pXGI->CRT2pScrn->monitor->Modes); + } + if (pXGI->CRT2pScrn->monitor->DDC) +- xfree(pXGI->CRT2pScrn->monitor->DDC); +- xfree(pXGI->CRT2pScrn->monitor); ++ free(pXGI->CRT2pScrn->monitor->DDC); ++ free(pXGI->CRT2pScrn->monitor); + } +- xfree(pXGI->CRT2pScrn); ++ free(pXGI->CRT2pScrn); + pXGI->CRT2pScrn = NULL; + } + } +@@ -2438,7 +2442,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) + + #ifdef XGIMERGED + if (pXGI->MergedFB) { +- pXGI->CRT2pScrn->monitor = xalloc(sizeof(MonRec)); ++ pXGI->CRT2pScrn->monitor = malloc(sizeof(MonRec)); + if (pXGI->CRT2pScrn->monitor) { + DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL; + memcpy(pXGI->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec)); +@@ -2446,11 +2450,11 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) + pXGI->CRT2pScrn->monitor->Modes = NULL; + tempm = pScrn->monitor->Modes; + while (tempm) { +- if (!(newm = xalloc(sizeof(DisplayModeRec)))) ++ if (!(newm = malloc(sizeof(DisplayModeRec)))) + break; + memcpy(newm, tempm, sizeof(DisplayModeRec)); +- if (!(newm->name = xalloc(strlen(tempm->name) + 1))) { +- xfree(newm); ++ if (!(newm->name = malloc(strlen(tempm->name) + 1))) { ++ free(newm); + break; + } + strcpy(newm->name, tempm->name); +@@ -2490,7 +2494,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) + "Failed to allocate memory for CRT2 monitor, %s.\n", + mergeddisstr); + if (pXGI->CRT2pScrn) +- xfree(pXGI->CRT2pScrn); ++ free(pXGI->CRT2pScrn); + pXGI->CRT2pScrn = NULL; + pXGI->MergedFB = FALSE; + } +@@ -3540,7 +3544,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) + /* Do some MergedFB mode initialisation */ + #ifdef XGIMERGED + if (pXGI->MergedFB) { +- pXGI->CRT2pScrn = xalloc(sizeof(ScrnInfoRec)); ++ pXGI->CRT2pScrn = malloc(sizeof(ScrnInfoRec)); + if (!pXGI->CRT2pScrn) { + XGIErrorLog(pScrn, + "Failed to allocate memory for 2nd pScrn, %s\n", +@@ -3586,7 +3590,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) + XGIErrorLog(pScrn, mergednocrt1, mergeddisstr); + } + if (pXGI->CRT2pScrn) +- xfree(pXGI->CRT2pScrn); ++ free(pXGI->CRT2pScrn); + pXGI->CRT2pScrn = NULL; + pXGI->MergedFB = FALSE; + } +@@ -3627,7 +3631,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) + XGIErrorLog(pScrn, mergednocrt2, mergeddisstr); + } + if (pXGI->CRT2pScrn) +- xfree(pXGI->CRT2pScrn); ++ free(pXGI->CRT2pScrn); + pXGI->CRT2pScrn = NULL; + pXGI->MergedFB = FALSE; + } +@@ -4901,7 +4905,7 @@ XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + + if (pXGI->ShadowFB) { + pXGI->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); +- pXGI->ShadowPtr = xalloc(pXGI->ShadowPitch * height); ++ pXGI->ShadowPtr = malloc(pXGI->ShadowPitch * height); + displayWidth = pXGI->ShadowPitch / (pScrn->bitsPerPixel >> 3); + FBStart = pXGI->ShadowPtr; + } +@@ -5777,17 +5781,17 @@ XGICloseScreen(int scrnIndex, ScreenPtr pScreen) + } + + if (pXGI->ShadowPtr) { +- xfree(pXGI->ShadowPtr); ++ free(pXGI->ShadowPtr); + pXGI->ShadowPtr = NULL; + } + + if (pXGI->DGAModes) { +- xfree(pXGI->DGAModes); ++ free(pXGI->DGAModes); + pXGI->DGAModes = NULL; + } + + if (pXGI->adaptor) { +- xfree(pXGI->adaptor); ++ free(pXGI->adaptor); + pXGI->adaptor = NULL; + pXGI->ResetXv = pXGI->ResetXvGamma = NULL; + } +diff --git a/src/xgi_opt.c b/src/xgi_opt.c +index 09346e4..c0608d5 100755 +--- a/src/xgi_opt.c ++++ b/src/xgi_opt.c +@@ -195,7 +195,7 @@ xgiOptions(ScrnInfoPtr pScrn) + xf86CollectOptions(pScrn, NULL); + + /* Process the options */ +- if(!(pXGI->Options = xalloc(sizeof(XGIOptions)))) return; ++ if(!(pXGI->Options = malloc(sizeof(XGIOptions)))) return; + + memcpy(pXGI->Options, XGIOptions, sizeof(XGIOptions)); + +diff --git a/src/xgi_setup.c b/src/xgi_setup.c +index c1d2cdc..6641b09 100755 +--- a/src/xgi_setup.c ++++ b/src/xgi_setup.c +@@ -678,7 +678,7 @@ bAccessVGAPCIInfo(PXGI_HW_DEVICE_INFO pHwDevInfo, ULONG ulOffset, ULONG ulSet, U + err = pci_device_cfg_write_u32(pXGI->PciInfo, *pulValue, + ulOffset & ~3); + } else { +- err = pci_device_cfg_write_u32(pXGI->PciInfo, pulValue, ++ err = pci_device_cfg_read_u32(pXGI->PciInfo, pulValue, + ulOffset & ~3); + } + +diff --git a/src/xgi_video.c b/src/xgi_video.c +index 31cffd5..df76d14 100755 +--- a/src/xgi_video.c ++++ b/src/xgi_video.c +@@ -142,7 +142,7 @@ void XGIInitVideo(ScreenPtr pScreen) + adaptors = &newAdaptor; + } else { + newAdaptors = /* need to free this someplace */ +- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); ++ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); + if(newAdaptors) { + memcpy(newAdaptors, adaptors, num_adaptors * + sizeof(XF86VideoAdaptorPtr)); +@@ -157,7 +157,7 @@ void XGIInitVideo(ScreenPtr pScreen) + xf86XVScreenInit(pScreen, adaptors, num_adaptors); + + if(newAdaptors) +- xfree(newAdaptors); ++ free(newAdaptors); + + } + +@@ -395,7 +395,7 @@ XGISetupImageVideo(ScreenPtr pScreen) + struct v4l2_standard standard; + # endif//VC + +- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + ++ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + + sizeof(XGIPortPrivRec) + + sizeof(DevUnion)))) + return NULL; diff --git a/staging/xf86-video-xgixp/PKGBUILD b/staging/xf86-video-xgixp/PKGBUILD new file mode 100644 index 000000000..afe49186d --- /dev/null +++ b/staging/xf86-video-xgixp/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 135215 2011-08-11 07:24:33Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-xgixp +pkgver=1.8.0 +pkgrel=4 +pkgdesc="X.org XGIXP video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.10.99.902') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + api-compat-fix-for-DRAWABLE_BUFFER.patch) +sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3' + 'ea140a13963bbf33cdff1ad75789d765867ec53b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch" + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch new file mode 100644 index 000000000..f8cb64673 --- /dev/null +++ b/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch @@ -0,0 +1,23 @@ +From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Fri, 25 Mar 2011 22:46:55 +0000 +Subject: API compat fix for DRAWABLE_BUFFER + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/xgi_driver.c b/src/xgi_driver.c +index e54d8c7..189b84a 100644 +--- a/src/xgi_driver.c ++++ b/src/xgi_driver.c +@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr, + { + switch (pDraw->type) { + case DRAWABLE_WINDOW: ++#ifdef DRAWABLE_BUFFER + case DRAWABLE_BUFFER: ++#endif + *read_ptr = xg47_read_memory_swap_func; + *write_ptr = xg47_write_memory_swap_func; + break; +-- +cgit v0.8.3-6-g21f6 diff --git a/testing/abiword/PKGBUILD b/testing/abiword/PKGBUILD new file mode 100644 index 000000000..fc132f7b3 --- /dev/null +++ b/testing/abiword/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 135371 2011-08-13 09:02:34Z andyrtr $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Maël Lavault <moimael@neuf.fr> + +pkgbase=abiword +pkgname=('abiword' 'abiword-plugins') +pkgver=2.8.6 +pkgrel=5 +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.abisource.com" +makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup') +options=('!makeflags' '!libtool') +source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz" + compat_libwpg_0_9.patch + abiword-2.8.6-no-undefined.patch) +sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df' + 'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea' + '159b1cd0b9354868ab86f851b64a03dae7d254dc') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch" + # fix a gcc 4.6.x build issue, patch from Fedora + patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch" + libtoolize --force + autoreconf + + ./configure --prefix=/usr --enable-clipart --enable-templates --enable-collab-backend-xmpp --enable-collab-backend-tcp --enable-collab-backend-service --disable-collab-backend-sugar --enable-plugins --without-gnomevfs --with-gio --with-goffice --disable-static --with-psiconv-config=/nothere + make +} + +package_abiword() { + pkgdesc="A fully-featured word processor" + depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils') + install=$pkgname.install + optdepends=('abiword-plugins') + conflicts=("abiword-plugins<${pkgver}-${pkgrel}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i plugins/Makefile \ + -e 's/ collab / /' \ + -e 's/ wpg / /' \ + -e 's/ wmf / /' \ + -e 's/ grammar / /' \ + -e 's/ mathview / /' \ + -e 's/ aiksaurus / /' \ + -e 's/ latex / /' \ + -e 's/ ots / /' \ + -e 's/ wordperfect / /' + make DESTDIR="${pkgdir}" install +} + +package_abiword-plugins() { + pkgdesc="Additional plugins for Abiword" + depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf') + + cd "${srcdir}/${pkgbase}-${pkgver}/plugins" + for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do + make -C ${dir} DESTDIR="${pkgdir}" install + done +} diff --git a/testing/abiword/abiword-2.8.6-no-undefined.patch b/testing/abiword/abiword-2.8.6-no-undefined.patch new file mode 100644 index 000000000..c07000edb --- /dev/null +++ b/testing/abiword/abiword-2.8.6-no-undefined.patch @@ -0,0 +1,21 @@ +diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am +--- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200 ++++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:35:51.904761961 +0200 +@@ -107,7 +107,7 @@ + + AbiWord_LDFLAGS = \ + $(DEPS_LIBS) \ +- --no-undefined \ ++ -Wl,--no-undefined \ + -avoid-version \ + -export-dynamic \ + -headerpad_max_install_names +@@ -129,7 +129,7 @@ + + abiword_LDFLAGS = \ + $(platform_ldflags) \ +- --no-undefined \ ++ -Wl,--no-undefined \ + -avoid-version \ + -export-dynamic + diff --git a/testing/abiword/abiword.install b/testing/abiword/abiword.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/testing/abiword/abiword.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/abiword/compat_libwpg_0_9.patch b/testing/abiword/compat_libwpg_0_9.patch new file mode 100644 index 000000000..cf36e188e --- /dev/null +++ b/testing/abiword/compat_libwpg_0_9.patch @@ -0,0 +1,371 @@ +diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4 +--- abiword-2.8.6.orig//plugin-configure.m4 2010-06-13 14:17:27.000000000 -0700 ++++ abiword-2.8.6/plugin-configure.m4 2010-12-06 13:59:43.083048588 -0800 +@@ -794,7 +794,7 @@ + AC_SUBST([OPENXML_LIBS]) + + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +@@ -1497,8 +1497,8 @@ + AC_SUBST([EML_LIBS]) + + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4 +--- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 2010-05-30 07:50:46.000000000 -0700 ++++ abiword-2.8.6/plugins/wordperfect/plugin.m4 2010-12-06 13:59:53.929715254 -0800 +@@ -1,6 +1,6 @@ + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp +--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-02-06 13:06:11.000000000 -0800 ++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-12-06 13:59:53.926381921 -0800 +@@ -60,7 +60,7 @@ + + // Stream class + +-#include <libwpd/WPXStream.h> ++#include <libwpd-stream/libwpd-stream.h> + + #include <gsf/gsf-input.h> + #include <gsf/gsf-infile.h> +@@ -70,12 +70,7 @@ + #include <libwps/libwps.h> + #endif + +-class AbiWordperfectInputStream : +-#ifdef HAVE_LIBWPS +- public WPSInputStream +-#else +- public WPXInputStream +-#endif ++class AbiWordperfectInputStream : public WPXInputStream + { + public: + AbiWordperfectInputStream(GsfInput *input); +@@ -86,7 +81,7 @@ + + virtual WPXInputStream * getDocumentOLEStream(const char * name); + +- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); + virtual int seek(long offset, WPX_SEEK_TYPE seekType); + virtual long tell(); + virtual bool atEOS(); +@@ -98,11 +93,7 @@ + }; + + AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) : +-#ifdef HAVE_LIBWPS +- WPSInputStream(), +-#else +- WPXInputStream(true), +-#endif ++ WPXInputStream(), + m_input(input), + m_ole(NULL) + { +@@ -117,9 +108,9 @@ + g_object_unref(G_OBJECT(m_input)); + } + +-const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead) ++const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) + { +- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); ++ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); + + if (buf == NULL) + numBytesRead = 0; +@@ -256,19 +247,12 @@ + { + AbiWordperfectInputStream gsfInput(input); + +- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true); ++ WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput); + + switch (confidence) + { + case WPD_CONFIDENCE_NONE: +- // libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document) +- // however, we'll let the text importer handle such cases +- case WPD_CONFIDENCE_POOR: + return UT_CONFIDENCE_ZILCH; +- case WPD_CONFIDENCE_LIKELY: +- return UT_CONFIDENCE_SOSO; +- case WPD_CONFIDENCE_GOOD: +- return UT_CONFIDENCE_GOOD; + case WPD_CONFIDENCE_EXCELLENT: + return UT_CONFIDENCE_PERFECT; + default: +@@ -328,7 +312,7 @@ + UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input) + { + AbiWordperfectInputStream gsfInput(input); +- WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this)); ++ WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL); + + if (error != WPD_OK) + { +@@ -381,9 +365,9 @@ + float marginLeft = 1.0f, marginRight = 1.0f; + + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + + if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */ + /* marginTop != m_marginBottom || marginBottom != m_marginBottom */ ) +@@ -456,15 +440,15 @@ + float marginTop = 0.0f, marginBottom = 0.0f; + float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f; + if (propList["fo:margin-top"]) +- marginTop = propList["fo:margin-top"]->getFloat(); ++ marginTop = propList["fo:margin-top"]->getDouble(); + if (propList["fo:margin-bottom"]) +- marginBottom = propList["fo:margin-bottom"]->getFloat(); ++ marginBottom = propList["fo:margin-bottom"]->getDouble(); + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + if (propList["fo:text-indent"]) +- textIndent = propList["fo:text-indent"]->getFloat(); ++ textIndent = propList["fo:text-indent"]->getDouble(); + + m_topMargin = marginTop; + m_bottomMargin = marginBottom; +@@ -487,7 +471,7 @@ + + float lineSpacing = 1.0f; + if (propList["fo:line-height"]) +- lineSpacing = propList["fo:line-height"]->getFloat(); ++ lineSpacing = propList["fo:line-height"]->getDouble(); + + UT_String tmpBuffer; + UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f", +@@ -504,7 +488,7 @@ + propBuffer += tmpBuffer; + if (i()["style:position"]) + { +- UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat()); ++ UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble()); + propBuffer += tmpBuffer; + } + +@@ -640,9 +624,9 @@ + + // TODO: support spaceAfter + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + + if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount) + m_bSectionChanged = true; +@@ -709,9 +693,9 @@ + if (propList["style:num-format"]) + listType = propList["style:num-format"]->getStr().cstr()[0]; + if (propList["text:space-before"]) +- listLeftOffset = propList["text:space-before"]->getFloat(); ++ listLeftOffset = propList["text:space-before"]->getDouble(); + if (propList["text:min-label-width"]) +- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); + + if (!m_pCurrentListDefinition || + m_pCurrentListDefinition->getOutlineHash() != listID || +@@ -749,9 +733,9 @@ + if (propList["libwpd:level"]) + level = propList["libwpd:level"]->getInt(); + if (propList["text:space-before"]) +- listLeftOffset = propList["text:space-before"]->getFloat(); ++ listLeftOffset = propList["text:space-before"]->getDouble(); + if (propList["text:min-label-width"]) +- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); + + if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID) + { +@@ -871,10 +855,10 @@ + + UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel) + + m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) +- - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); ++ - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); + propBuffer += tempBuffer; + UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) +- + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); ++ + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); + propBuffer += tempBuffer; + + listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME; +@@ -1263,7 +1247,7 @@ + virtual UT_Error _loadFile(GsfInput * input) + { + AbiWordperfectInputStream gsfInput(input); +- WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this)); ++ WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this)); + + if (error != WPS_OK) + { +@@ -1302,18 +1286,12 @@ + { + AbiWordperfectInputStream gsfInput(input); + +- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true); ++ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput); + + switch (confidence) + { + case WPS_CONFIDENCE_NONE: + return UT_CONFIDENCE_ZILCH; +- case WPS_CONFIDENCE_POOR: +- return UT_CONFIDENCE_POOR; +- case WPS_CONFIDENCE_LIKELY: +- return UT_CONFIDENCE_SOSO; +- case WPS_CONFIDENCE_GOOD: +- return UT_CONFIDENCE_GOOD; + case WPS_CONFIDENCE_EXCELLENT: + return UT_CONFIDENCE_PERFECT; + default: +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h +--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h 2009-06-19 01:55:49.000000000 -0700 ++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h 2010-12-06 13:59:53.929715254 -0800 +@@ -30,13 +30,7 @@ + #define IE_IMP_WP_H + + #include <stdio.h> +-#ifdef _WIN32 +-#define POINT WPX_POINT +-#endif + #include <libwpd/libwpd.h> +-#ifdef _WIN32 +-#undef POINT +-#endif + #include "ie_imp.h" + #include "ut_string.h" + #include "ut_string_class.h" +@@ -98,7 +92,7 @@ + IE_Imp ** ppie); + }; + +-class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl ++class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface + { + public: + IE_Imp_WordPerfect(PD_Document * pDocument); +@@ -154,6 +148,21 @@ + virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {} + virtual void closeTable(); + ++ virtual void definePageStyle(const WPXPropertyList&) {} ++ virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} ++ virtual void defineCharacterStyle(const WPXPropertyList&) {} ++ virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} ++ virtual void insertSpace() {} ++ virtual void insertField(const WPXString&, const WPXPropertyList&) {} ++ virtual void openComment(const WPXPropertyList&) {} ++ virtual void closeComment() {} ++ virtual void openTextBox(const WPXPropertyList&) {} ++ virtual void closeTextBox() {} ++ virtual void openFrame(const WPXPropertyList&) {} ++ virtual void closeFrame() {} ++ virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {} ++ virtual void insertEquation(const WPXPropertyList&, const WPXString&) {} ++ + + protected: + virtual UT_Error _loadFile(GsfInput * input); +diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4 +--- abiword-2.8.6.orig//plugins/wpg/plugin.m4 2010-05-30 07:50:46.000000000 -0700 ++++ abiword-2.8.6/plugins/wpg/plugin.m4 2010-12-06 13:59:53.929715254 -0800 +@@ -1,5 +1,5 @@ + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp +--- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp 2008-08-15 14:52:32.000000000 -0700 ++++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp 2010-12-06 13:59:53.923048588 -0800 +@@ -31,11 +31,10 @@ + #include <gsf/gsf-input-memory.h> + #include <gsf/gsf-input-stdio.h> + #include <gsf/gsf-infile-msole.h> +-#include <libwpd/WPXStream.h> ++#include <libwpd-stream/libwpd-stream.h> + #include "xap_Module.h" + + using libwpg::WPGraphics; +-using libwpg::WPGString; + + ABI_PLUGIN_DECLARE("WPG") + +@@ -48,7 +47,7 @@ + virtual bool isOLEStream(); + virtual WPXInputStream * getDocumentOLEStream(); + virtual WPXInputStream * getDocumentOLEStream(const char * name); +- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); + virtual int seek(long offset, WPX_SEEK_TYPE seekType); + virtual long tell(); + virtual bool atEOS(); +@@ -60,7 +59,7 @@ + }; + + AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) : +- WPXInputStream(true), ++ WPXInputStream(), + m_input(input), + m_ole(NULL) + { +@@ -75,9 +74,9 @@ + g_object_unref(G_OBJECT(m_input)); + } + +-const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead) ++const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) + { +- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); ++ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); + + if (buf == NULL) + numBytesRead = 0; +@@ -245,10 +244,10 @@ + UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg) + { + AbiWordPerfectGraphicsInputStream gsfInput(input); +- WPGString svgOutput; ++ WPXString svgOutput; + if (WPGraphics::generateSVG(&gsfInput, svgOutput)) + { +- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false); ++ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false); + UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg); + g_object_unref(svgInput); + return result; diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD new file mode 100644 index 000000000..1e283304a --- /dev/null +++ b/testing/blender/PKGBUILD @@ -0,0 +1,92 @@ +# $Id: PKGBUILD 135345 2011-08-13 01:50:31Z eric $ +# Contributor: John Sowiak <john@archlinux.org> +# Maintainer: tobias <tobias@archlinux.org> + +# Apparently, the blender guys refuse to release source tarballs for +# intermediate releases that deal mainly with binaries but incorporate tiny +# minor changes from svn. Since I'm sick and tired of the urges of users that +# look for release numbers only, we make a messy PKGBUILD that can checkout svn +# release if necessary. + +#_svn=true +_svn=false + +pkgname=blender +pkgver=2.59 +pkgrel=1 +epoch=2 +pkgdesc="A fully integrated 3D graphics creation suite" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.blender.org" +depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ + 'freetype2' 'openal' 'libsamplerate' 'ffmpeg') +makedepends=('cmake') # 'subversion' +install=blender.install +if [ $_svn = false ]; then + source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) + md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe') +else + source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) + md5sums=('7579d1139d0d6025df8afcfca64a65c4') +fi + +# source PKGBUILD && mksource +mksource() { + _svnver=38016 + _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" + _svnmod="$pkgname-$pkgver" + mkdir ${pkgname}-$pkgver + pushd ${pkgname}-$pkgver + svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* + popd +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + mkdir build + cd build + + [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" + + cmake .. \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DWITH_INSTALL_PORTABLE:BOOL=OFF \ + -DWITH_PYTHON_INSTALL:BOOL=OFF \ + -DWITH_OPENCOLLADA:BOOL=OFF \ + -DWITH_GAMEENGINE:BOOL=ON \ + -DWITH_PLAYER:BOOL=ON \ + -DWITH_BUILTIN_GLEW:BOOL=OFF \ + -DWITH_CODEC_FFMPEG:BOOL=ON \ + -DWITH_CODEC_SNDFILE:BOOL=ON \ + -DPYTHON_VERSION:STRING=3.2 \ + -DPYTHON_LIBPATH:STRING=/usr/lib \ + -DPYTHON_LIBRARY:STRING=python3.2mu \ + -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ + $ENABLESSE2 + + make $MAKEFLAGS + + cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ + "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ + cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi + chmod 755 bmake + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="${pkgdir}" install + python -m compileall "${pkgdir}/usr/share/blender" + +# install plugins + install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ +} diff --git a/testing/blender/blender.install b/testing/blender/blender.install new file mode 100644 index 000000000..f4d7cc443 --- /dev/null +++ b/testing/blender/blender.install @@ -0,0 +1,17 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_remove() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/testing/claws-mail/PKGBUILD b/testing/claws-mail/PKGBUILD new file mode 100644 index 000000000..b395a6177 --- /dev/null +++ b/testing/claws-mail/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 134940 2011-08-09 15:03:29Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=claws-mail +pkgver=3.7.9 +pkgrel=5 +pkgdesc="A GTK+ based e-mail client." +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.claws-mail.org" +depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant' + 'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind') +optdepends=('python2: needed for some tools' + 'perl: needed for some tools' + 'spamassassin: adds support for spamfiltering' + 'bogofilter: adds support for spamfiltering' + 'html2ps: AUR pkg - adds support for printing html mails together with html plugins') +replaces=('sylpheed-claws') +provides=('claws') +options=(!libtool) +install=claws-mail.install +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + claws-notify-crash.patch) +md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3' + '9a2903449f679344b5f5f51c91825b45') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np0 -i $srcdir/claws-notify-crash.patch + sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + + ./configure --prefix=/usr --disable-static \ + --enable-enchant \ + --enable-gnutls \ + --enable-ldap \ + --disable-dillo-viewer-plugin \ + --enable-crash-dialog \ + --enable-pgpmime-plugin \ + --enable-spamassassin-plugin \ + --enable-bogofilter-plugin \ + --enable-jpilot + + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # build and install extra tools + cd tools + make + # all executables and .conf files ; only top directory + find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do + install -D -m755 ${i} \ + ${pkgdir}/usr/lib/claws-mail/tools/${i} + done +} diff --git a/testing/claws-mail/claws-mail.install b/testing/claws-mail/claws-mail.install new file mode 100644 index 000000000..648480c3b --- /dev/null +++ b/testing/claws-mail/claws-mail.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/testing/claws-mail/claws-notify-crash.patch b/testing/claws-mail/claws-notify-crash.patch new file mode 100644 index 000000000..e1d4eb686 --- /dev/null +++ b/testing/claws-mail/claws-notify-crash.patch @@ -0,0 +1,18 @@ +Index: src/main.c +=================================================================== +RCS file: //claws/src/main.c,v +retrieving revision 1.115.2.237 +retrieving revision 1.115.2.238 +diff -u -r1.115.2.237 -r1.115.2.238 +--- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237 ++++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238 +@@ -331,7 +331,7 @@ + gtk_widget_show(hack); + } + +- xdisplay = gdk_display_get_default(); ++ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); + sn_display = sn_display_new(xdisplay, + sn_error_trap_push, + sn_error_trap_pop); + diff --git a/testing/cups/PKGBUILD b/testing/cups/PKGBUILD new file mode 100644 index 000000000..628600839 --- /dev/null +++ b/testing/cups/PKGBUILD @@ -0,0 +1,148 @@ +# $Id: PKGBUILD 134929 2011-08-09 13:34:46Z ibiru $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgbase="cups" +pkgname=('libcups' 'cups') +pkgver=1.4.8 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.cups.org/" +makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' + 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme') +source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 + cups-avahi.patch + cups-no-export-ssllibs.patch + cups-no-gcrypt.patch + cups cups.logrotate cups.pam) +#options=('!emptydirs') +md5sums=('0ec52d3f3c69bc2ab5ed70c594edbce6' + '8ebd390197501ffd709f0ee546937fd5' + '9b8467a1e51d360096b70e2c3c081e6c' + 'c9ede95cfc8e76571bd8156f0a573e3b' + '9657daa21760bb0b5fa3d8b51d5e01a1' + 'f861b18f4446c43918c8643dcbbd7f6d' + '96f82c38f3f540b53f3e5144900acf17') + +# move client.conf man page for next update to the client pkg. + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + # Avahi support in the dnssd backend. patch from Fedora + patch -Np1 -i ${srcdir}/cups-avahi.patch + + # Do not export SSL libs in cups-config + patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch" + + patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch" + + # Rebuild configure script for --enable-avahi. + aclocal -I config-scripts + autoconf -I config-scripts + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libdir=/usr/lib \ + --with-logdir=/var/log/cups \ + --with-docdir=/usr/share/cups/doc \ + --with-cups-user=daemon \ + --with-cups-group=lp \ + --enable-pam=yes \ + --disable-ldap \ + --enable-raw-printing \ + --enable-dbus --with-dbusdir=/etc/dbus-1 \ + --enable-ssl=yes --enable-gnutls \ + --disable-threads \ + --enable-avahi\ + --with-php=/usr/bin/php-cgi \ + --with-pdftops=pdftops \ + --with-optim="$CFLAGS" + + #reminder + #Restored support for GNU TLS and OpenSSL with threading enabled (STR #3605) in cups 1.5b1 + + make +} + +check() { + cd "$srcdir/$pkgbase-$pkgver" + #httpAddrGetList(workstation64): FAIL + #1 TESTS FAILED! + #make[1]: *** [testhttp] Error 1 + make -k check || /bin/true +} + +package_libcups() { +pkgdesc="The CUPS Printing System - client libraries and headers" +depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi') + + cd ${srcdir}/${pkgbase}-${pkgver} + make BUILDROOT=${pkgdir} install-headers install-libs + # put this into the libs pkg to make other software find the libs(no pkg-config file included) + mkdir -p ${pkgdir}/usr/bin + install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config +} + +package_cups() { +pkgdesc="The CUPS Printing System - deamon package" +install=cups.install +backup=(etc/cups/cupsd.conf + etc/cups/mime.convs + etc/cups/mime.types + etc/cups/snmp.conf + etc/cups/printers.conf + etc/cups/classes.conf + etc/cups/client.conf + etc/cups/subscriptions.conf + etc/dbus-1/system.d/cups.conf + etc/logrotate.d/cups + etc/pam.d/cups + etc/xinetd.d/cups-lpd) +depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme') +optdepends=('php: for included phpcups.so module' + 'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' + 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly' + 'xdg-utils: xdg .desktop file support') + + cd ${srcdir}/${pkgbase}-${pkgver} + make BUILDROOT=${pkgdir} install-data install-exec + + # this one we ship in the libcups pkg + rm -f ${pkgdir}/usr/bin/cups-config + + # kill the sysv stuff + rm -rf ${pkgdir}/etc/rc*.d + rm -rf ${pkgdir}/etc/init.d + install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd + install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups + install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups + + # fix perms on /var/spool and /etc + chmod 755 ${pkgdir}/var/spool + chmod 755 ${pkgdir}/etc + + # serial backend needs to run as root (http://bugs.archlinux.org/task/20396) + chmod 700 ${pkgdir}/usr/lib/cups/backend/serial + + # install ssl directory where to store the certs, solves some samba issues + install -dm700 -g lp ${pkgdir}/etc/cups/ssl + # remove directory from package, we create it in cups rc.d file + rm -rf ${pkgdir}/var/run +# install -dm511 -g lp ${pkgdir}/var/run/cups/certs + + # install some more configuration files that will get filled by cupsd + touch ${pkgdir}/etc/cups/printers.conf + touch ${pkgdir}/etc/cups/classes.conf + touch ${pkgdir}/etc/cups/client.conf + echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf + echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf + touch ${pkgdir}/etc/cups/subscriptions.conf + chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf} + + # fix .desktop file + sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop + + # compress some driver files, adopted from Fedora + find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f +} diff --git a/testing/cups/cups b/testing/cups/cups new file mode 100755 index 000000000..744c8e663 --- /dev/null +++ b/testing/cups/cups @@ -0,0 +1,68 @@ +#!/bin/bash + +daemon_name=cupsd + +. /etc/rc.conf +. /etc/rc.d/functions +#. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/testing/cups/cups-avahi.patch b/testing/cups/cups-avahi.patch new file mode 100644 index 000000000..cf1056a75 --- /dev/null +++ b/testing/cups/cups-avahi.patch @@ -0,0 +1,1089 @@ +diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c +--- cups-1.4.5/backend/dnssd.c.avahi 2009-08-08 00:27:12.000000000 +0200 ++++ cups-1.4.5/backend/dnssd.c 2010-11-12 13:13:31.000000000 +0100 +@@ -22,6 +22,7 @@ + * exec_backend() - Execute the backend that corresponds to the + * resolved service name. + * get_device() - Create or update a device. ++* find_device() + * query_callback() - Process query data. + * sigterm_handler() - Handle termination signals... + * unquote() - Unquote a name string. +@@ -33,7 +34,18 @@ + + #include "backend-private.h" + #include <cups/array.h> +-#include <dns_sd.h> ++#ifdef HAVE_DNSSD ++# include <dns_sd.h> ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++# include <avahi-client/client.h> ++# include <avahi-client/lookup.h> ++# include <avahi-common/simple-watch.h> ++# include <avahi-common/domain.h> ++# include <avahi-common/error.h> ++# include <avahi-common/malloc.h> ++#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX ++#endif /* HAVE_AVAHI */ + + + /* +@@ -52,7 +64,12 @@ typedef enum + + typedef struct + { ++#ifdef HAVE_DNSSD + DNSServiceRef ref; /* Service reference for resolve */ ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ int resolved; /* Did we resolve the device? */ ++#endif /* HAVE_AVAHI */ + char *name, /* Service name */ + *domain, /* Domain name */ + *fullName, /* Full name */ +@@ -64,6 +81,20 @@ typedef struct + sent; /* Did we list the device? */ + } cups_device_t; + ++typedef struct ++{ ++ char key[256]; ++ char value[256]; ++ ++#ifdef HAVE_DNSSD ++ const uint8_t *data; ++ const uint8_t *datanext; ++ const uint8_t *dataend; ++#else /* HAVE_AVAHI */ ++ AvahiStringList *txt; ++#endif /* HAVE_DNSSD */ ++} cups_txt_records_t; ++ + + /* + * Local globals... +@@ -77,6 +108,7 @@ static int job_canceled = 0; + * Local functions... + */ + ++#ifdef HAVE_DNSSD + static void browse_callback(DNSServiceRef sdRef, + DNSServiceFlags flags, + uint32_t interfaceIndex, +@@ -92,12 +124,6 @@ static void browse_local_callback(DNSSe + const char *regtype, + const char *replyDomain, + void *context); +-static int compare_devices(cups_device_t *a, cups_device_t *b); +-static void exec_backend(char **argv); +-static cups_device_t *get_device(cups_array_t *devices, +- const char *serviceName, +- const char *regtype, +- const char *replyDomain); + static void query_callback(DNSServiceRef sdRef, + DNSServiceFlags flags, + uint32_t interfaceIndex, +@@ -106,9 +132,111 @@ static void query_callback(DNSServiceRe + uint16_t rrclass, uint16_t rdlen, + const void *rdata, uint32_t ttl, + void *context); ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++static void avahi_client_callback (AvahiClient *client, ++ AvahiClientState state, ++ void *context); ++static void avahi_browse_callback (AvahiServiceBrowser *browser, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiBrowserEvent event, ++ const char *serviceName, ++ const char *regtype, ++ const char *replyDomain, ++ AvahiLookupResultFlags flags, ++ void *context); ++#endif /* HAVE_AVAHI */ ++ ++static cups_device_t * find_device (cups_array_t *devices, ++ cups_txt_records_t *txt, ++ cups_device_t *dkey); ++static int compare_devices(cups_device_t *a, cups_device_t *b); ++static void exec_backend(char **argv); ++static cups_device_t *get_device(cups_array_t *devices, ++ const char *serviceName, ++ const char *regtype, ++ const char *replyDomain); + static void sigterm_handler(int sig); + static void unquote(char *dst, const char *src, size_t dstsize); + ++#ifdef HAVE_AVAHI ++static AvahiSimplePoll *simple_poll = NULL; ++static int avahi_got_callback; ++#endif /* HAVE_AVAHI */ ++ ++ ++/* ++ * cups_txt_records_t access functions ++ */ ++static cups_txt_records_t * ++next_txt_record (cups_txt_records_t *txt) ++{ ++#ifdef HAVE_DNSSD ++ txt->data = txt->datanext; ++#else /* HAVE_AVAHI */ ++ txt->txt = avahi_string_list_get_next (txt->txt); ++ if (txt->txt == NULL) ++ return NULL; ++#endif /* HAVE_DNSSD */ ++ ++ return txt; ++} ++ ++static int ++parse_txt_record_pair (cups_txt_records_t *txt) ++{ ++#ifdef HAVE_DNSSD ++ uint8_t datalen; ++ uint8_t *data = txt->data; ++ char *ptr; ++ ++ /* ++ * Read a key/value pair starting with an 8-bit length. Since the ++ * length is 8 bits and the size of the key/value buffers is 256, we ++ * don't need to check for overflow... ++ */ ++ ++ datalen = *data++; ++ if (!datalen || (data + datalen) >= txt->dataend) ++ return NULL; ++ txt->datanext = data + datalen; ++ ++ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++) ++ *ptr++ = *data; ++ *ptr = '\0'; ++ ++ if (data < txt->datanext && *data == '=') ++ { ++ data++; ++ ++ if (data < datanext) ++ memcpy (txt->value, data, txt->datanext - data); ++ value[txt->datanext - data] = '\0'; ++ } ++ else ++ return 1; ++#else /* HAVE_AVAHI */ ++ char *key, *value; ++ size_t len; ++ avahi_string_list_get_pair (txt->txt, &key, &value, &len); ++ if (len > sizeof (txt->value) - 1) ++ len = sizeof (txt->value) - 1; ++ ++ memcpy (txt->value, value, len); ++ txt->value[len] = '\0'; ++ len = strlen (key); ++ if (len > sizeof (txt->key) - 1) ++ len = sizeof (txt->key) - 1; ++ ++ memcpy (txt->key, key, len); ++ txt->key[len] = '\0'; ++ avahi_free (key); ++ avahi_free (value); ++#endif /* HAVE_AVAHI */ ++ ++ return 0; ++} + + /* + * 'main()' - Browse for printers. +@@ -119,6 +247,13 @@ main(int argc, /* I - Number of comm + char *argv[]) /* I - Command-line arguments */ + { + const char *name; /* Backend name */ ++ cups_array_t *devices; /* Device array */ ++ cups_device_t *device; /* Current device */ ++ char uriName[1024]; /* Unquoted fullName for URI */ ++#ifdef HAVE_DNSSD ++ int fd; /* Main file descriptor */ ++ fd_set input; /* Input set for select() */ ++ struct timeval timeout; /* Timeout for select() */ + DNSServiceRef main_ref, /* Main service reference */ + fax_ipp_ref, /* IPP fax service reference */ + ipp_ref, /* IPP service reference */ +@@ -130,12 +265,11 @@ main(int argc, /* I - Number of comm + pdl_datastream_ref, /* AppSocket service reference */ + printer_ref, /* LPD service reference */ + riousbprint_ref; /* Remote IO service reference */ +- int fd; /* Main file descriptor */ +- fd_set input; /* Input set for select() */ +- struct timeval timeout; /* Timeout for select() */ +- cups_array_t *devices; /* Device array */ +- cups_device_t *device; /* Current device */ +- char uriName[1024]; /* Unquoted fullName for URI */ ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ AvahiClient *client; ++ int error; ++#endif /* HAVE_AVAHI */ + #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) + struct sigaction action; /* Actions for POSIX signals */ + #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ +@@ -194,6 +328,49 @@ main(int argc, /* I - Number of comm + * Browse for different kinds of printers... + */ + ++#ifdef HAVE_AVAHI ++ if ((simple_poll = avahi_simple_poll_new ()) == NULL) ++ { ++ perror ("ERROR: Unable to create avahi simple poll object"); ++ return (1); ++ } ++ ++ client = avahi_client_new (avahi_simple_poll_get (simple_poll), ++ 0, avahi_client_callback, NULL, &error); ++ if (!client) ++ { ++ perror ("ERROR: Unable to create avahi client"); ++ return (1); ++ } ++ ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_fax-ipp._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_ipp._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_ipp-tls._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_pdl-datastream._tcp", ++ NULL, 0, ++ avahi_browse_callback, ++ devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_printer._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_riousbprint._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++#endif /* HAVE_AVAHI */ ++#ifdef HAVE_DNSSD + if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) + { + perror("ERROR: Unable to create service connection"); +@@ -245,6 +422,7 @@ main(int argc, /* I - Number of comm + riousbprint_ref = main_ref; + DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, + "_riousbprint._tcp", NULL, browse_callback, devices); ++#endif /* HAVE_DNSSD */ + + /* + * Loop until we are killed... +@@ -252,6 +430,9 @@ main(int argc, /* I - Number of comm + + while (!job_canceled) + { ++ int announce = 0; ++ ++#ifdef HAVE_DNSSD + FD_ZERO(&input); + FD_SET(fd, &input); + +@@ -271,11 +452,35 @@ main(int argc, /* I - Number of comm + } + else + { ++ announce = 1; ++ } ++#else /* HAVE_AVAHI */ ++ int r; ++ avahi_got_callback = 0; ++ r = avahi_simple_poll_iterate (simple_poll, 1); ++ if (r != 0 && r != EINTR) ++ { ++ /* ++ * We've been told to exit the loop. Perhaps the connection to ++ * avahi failed. ++ */ ++ ++ break; ++ } ++ ++ if (avahi_got_callback) ++ announce = 1; ++#endif /* HAVE_DNSSD */ ++ ++ if (announce) ++ { + /* + * Announce any devices we've found... + */ + ++#ifdef HAVE_DNSSD + DNSServiceErrorType status; /* DNS query status */ ++#endif /* HAVE_DNSSD */ + cups_device_t *best; /* Best matching device */ + char device_uri[1024]; /* Device URI */ + int count; /* Number of queries */ +@@ -285,6 +490,7 @@ main(int argc, /* I - Number of comm + best = NULL, count = 0; + device; + device = (cups_device_t *)cupsArrayNext(devices)) ++#ifdef HAVE_DNSSD + if (!device->ref && !device->sent) + { + /* +@@ -313,14 +519,23 @@ main(int argc, /* I - Number of comm + count ++; + } + } +- else if (!device->sent) ++ else ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ if (!device->resolved) ++ continue; ++ else ++#endif /* HAVE_AVAHI */ ++ if (!device->sent) + { ++#ifdef HAVE_DNSSD + /* + * Got the TXT records, now report the device... + */ + + DNSServiceRefDeallocate(device->ref); + device->ref = 0; ++#endif /* HAVE_DNSSD */ + + if (!best) + best = device; +@@ -372,6 +587,7 @@ main(int argc, /* I - Number of comm + * 'browse_callback()' - Browse devices. + */ + ++#ifdef HAVE_DNSSD + static void + browse_callback( + DNSServiceRef sdRef, /* I - Service reference */ +@@ -405,12 +621,14 @@ browse_callback( + + get_device((cups_array_t *)context, serviceName, regtype, replyDomain); + } ++#endif /* HAVE_DNSSD */ + + + /* + * 'browse_local_callback()' - Browse local devices. + */ + ++#ifdef HAVE_DNSSD + static void + browse_local_callback( + DNSServiceRef sdRef, /* I - Service reference */ +@@ -456,6 +674,7 @@ browse_local_callback( + device->fullName); + device->sent = 1; + } ++#endif /* HAVE_DNSSD */ + + + /* +@@ -528,6 +747,32 @@ exec_backend(char **argv) /* I - Comman + exit(CUPS_BACKEND_STOP); + } + ++static int ++device_type (const char *regtype) ++{ ++#ifdef HAVE_AVAHI ++ if (!strcmp(regtype, "_ipp._tcp") || ++ !strcmp(regtype, "_ipp-tls._tcp")) ++ return (CUPS_DEVICE_IPP); ++ else if (!strcmp(regtype, "_fax-ipp._tcp")) ++ return (CUPS_DEVICE_FAX_IPP); ++ else if (!strcmp(regtype, "_printer._tcp")) ++ return (CUPS_DEVICE_PDL_DATASTREAM); ++#else ++ if (!strcmp(regtype, "_ipp._tcp.") || ++ !strcmp(regtype, "_ipp-tls._tcp.")) ++ return (CUPS_DEVICE_IPP); ++ else if (!strcmp(regtype, "_fax-ipp._tcp.")) ++ return (CUPS_DEVICE_FAX_IPP); ++ else if (!strcmp(regtype, "_printer._tcp.")) ++ return (CUPS_DEVICE_PRINTER); ++ else if (!strcmp(regtype, "_pdl-datastream._tcp.")) ++ return (CUPS_DEVICE_PDL_DATASTREAM); ++#endif /* HAVE_AVAHI */ ++ ++ return (CUPS_DEVICE_RIOUSBPRINT); ++} ++ + + /* + * 'get_device()' - Create or update a device. +@@ -550,18 +795,7 @@ get_device(cups_array_t *devices, /* I - + */ + + key.name = (char *)serviceName; +- +- if (!strcmp(regtype, "_ipp._tcp.") || +- !strcmp(regtype, "_ipp-tls._tcp.")) +- key.type = CUPS_DEVICE_IPP; +- else if (!strcmp(regtype, "_fax-ipp._tcp.")) +- key.type = CUPS_DEVICE_FAX_IPP; +- else if (!strcmp(regtype, "_printer._tcp.")) +- key.type = CUPS_DEVICE_PRINTER; +- else if (!strcmp(regtype, "_pdl-datastream._tcp.")) +- key.type = CUPS_DEVICE_PDL_DATASTREAM; +- else +- key.type = CUPS_DEVICE_RIOUSBPRINT; ++ key.type = device_type (regtype); + + for (device = cupsArrayFind(devices, &key); + device; +@@ -581,8 +815,14 @@ get_device(cups_array_t *devices, /* I - + free(device->domain); + device->domain = strdup(replyDomain); + ++#ifdef HAVE_DNSSD + DNSServiceConstructFullName(fullName, device->name, regtype, + replyDomain); ++#else /* HAVE_AVAHI */ ++ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, ++ serviceName, regtype, replyDomain); ++#endif /* HAVE_DNSSD */ ++ + free(device->fullName); + device->fullName = strdup(fullName); + } +@@ -602,6 +842,9 @@ get_device(cups_array_t *devices, /* I - + device->domain = strdup(replyDomain); + device->type = key.type; + device->priority = 50; ++#ifdef HAVE_AVAHI ++ device->resolved = 0; ++#endif /* HAVE_AVAHI */ + + cupsArrayAdd(devices, device); + +@@ -609,7 +852,13 @@ get_device(cups_array_t *devices, /* I - + * Set the "full name" of this service, which is used for queries... + */ + ++#ifdef HAVE_DNSSD + DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain); ++#else /* HAVE_AVAHI */ ++ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, ++ serviceName, regtype, replyDomain); ++#endif /* HAVE_DNSSD */ ++ + device->fullName = strdup(fullName); + + return (device); +@@ -620,6 +869,7 @@ get_device(cups_array_t *devices, /* I - + * 'query_callback()' - Process query data. + */ + ++#ifdef HAVE_DNSSD + static void + query_callback( + DNSServiceRef sdRef, /* I - Service reference */ +@@ -639,7 +889,7 @@ query_callback( + *ptr; /* Pointer into string */ + cups_device_t dkey, /* Search key */ + *device; /* Device */ +- ++ cups_txt_records_t txt; + + fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " + "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " +@@ -673,84 +923,212 @@ query_callback( + if ((ptr = strstr(name, "._")) != NULL) + *ptr = '\0'; + +- if (strstr(fullName, "_ipp._tcp.") || +- strstr(fullName, "_ipp-tls._tcp.")) +- dkey.type = CUPS_DEVICE_IPP; +- else if (strstr(fullName, "_fax-ipp._tcp.")) +- dkey.type = CUPS_DEVICE_FAX_IPP; +- else if (strstr(fullName, "_printer._tcp.")) +- dkey.type = CUPS_DEVICE_PRINTER; +- else if (strstr(fullName, "_pdl-datastream._tcp.")) +- dkey.type = CUPS_DEVICE_PDL_DATASTREAM; ++ dkey.type = device_type (fullName); ++ ++ txt.data = rdata; ++ txt.dataend = rdata + rdlen; ++ device = find_device ((cups_array_t *) context, &txt, &dkey); ++ if (!device) ++ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); ++} ++#endif /* HAVE_DNSSD */ ++ ++#ifdef HAVE_AVAHI ++static void ++avahi_client_callback(AvahiClient *client, ++ AvahiClientState state, ++ void *context) ++{ ++ /* ++ * If the connection drops, quit. ++ */ ++ ++ if (state == AVAHI_CLIENT_FAILURE) ++ { ++ fprintf (stderr, "ERROR: Avahi connection failed\n"); ++ avahi_simple_poll_quit (simple_poll); ++ } ++} ++ ++static void ++avahi_query_callback(AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ AvahiClient *client; ++ cups_device_t key, ++ *device; ++ char uqname[1024], ++ *ptr; ++ cups_txt_records_t txtr; ++ ++ client = avahi_service_resolver_get_client (resolver); ++ if (event != AVAHI_RESOLVER_FOUND) ++ { ++ if (event == AVAHI_RESOLVER_FAILURE) ++ { ++ fprintf (stderr, "ERROR: %s\n", ++ avahi_strerror (avahi_client_errno (client))); ++ } ++ ++ avahi_service_resolver_free (resolver); ++ return; ++ } ++ ++ /* ++ * Set search key for device. ++ */ ++ ++ key.name = uqname; ++ unquote (uqname, name, sizeof (uqname)); ++ if ((ptr = strstr(name, "._")) != NULL) ++ *ptr = '\0'; ++ ++ key.domain = (char *) domain; ++ key.type = device_type (type); ++ ++ /* ++ * Find the device and the the TXT information. ++ */ ++ ++ txtr.txt = txt; ++ device = find_device ((cups_array_t *) context, &txtr, &key); ++ if (device) ++ { ++ /* ++ * Let the main loop know to announce the device. ++ */ ++ ++ device->resolved = 1; ++ avahi_got_callback = 1; ++ } + else +- dkey.type = CUPS_DEVICE_RIOUSBPRINT; ++ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); ++ ++ avahi_service_resolver_free (resolver); ++} ++ ++static void ++avahi_browse_callback(AvahiServiceBrowser *browser, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiBrowserEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ AvahiClient *client = avahi_service_browser_get_client (browser); ++ ++ switch (event) ++ { ++ case AVAHI_BROWSER_FAILURE: ++ fprintf (stderr, "ERROR: %s\n", ++ avahi_strerror (avahi_client_errno (client))); ++ avahi_simple_poll_quit (simple_poll); ++ return; ++ ++ case AVAHI_BROWSER_NEW: ++ /* ++ * This object is new on the network. ++ */ ++ ++ if (flags & AVAHI_LOOKUP_RESULT_LOCAL) ++ { ++ /* ++ * This comes from the local machine so ignore it. ++ */ ++ ++ fprintf (stderr, "DEBUG: ignoring local service %s\n", name); ++ } ++ else ++ { ++ /* ++ * Create a device entry for it if it doesn't yet exist. ++ */ ++ ++ get_device ((cups_array_t *)context, name, type, domain); ++ ++ /* ++ * Now look for a TXT entry. ++ */ ++ ++ if (avahi_service_resolver_new (client, interface, protocol, ++ name, type, domain, ++ AVAHI_PROTO_UNSPEC, 0, ++ avahi_query_callback, context) == NULL) ++ { ++ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n", ++ name, avahi_strerror (avahi_client_errno (client))); ++ } ++ } ++ ++ break; + +- for (device = cupsArrayFind(devices, &dkey); ++ case AVAHI_BROWSER_REMOVE: ++ case AVAHI_BROWSER_ALL_FOR_NOW: ++ case AVAHI_BROWSER_CACHE_EXHAUSTED: ++ break; ++ } ++} ++#endif /* HAVE_AVAHI */ ++ ++static cups_device_t * ++find_device (cups_array_t *devices, ++ cups_txt_records_t *txt, ++ cups_device_t *dkey) ++{ ++ cups_device_t *device; ++ char *ptr; ++ ++ for (device = cupsArrayFind(devices, dkey); + device; + device = cupsArrayNext(devices)) + { +- if (strcasecmp(device->name, dkey.name) || +- strcasecmp(device->domain, dkey.domain)) ++ if (strcasecmp(device->name, dkey->name) || ++ strcasecmp(device->domain, dkey->domain)) + { + device = NULL; + break; + } +- else if (device->type == dkey.type) ++ else if (device->type == dkey->type) + { + /* + * Found it, pull out the priority and make and model from the TXT + * record and save it... + */ + +- const uint8_t *data, /* Pointer into data */ +- *datanext, /* Next key/value pair */ +- *dataend; /* End of entire TXT record */ +- uint8_t datalen; /* Length of current key/value pair */ +- char key[256], /* Key string */ +- value[256], /* Value string */ +- make_and_model[512], ++ char make_and_model[512], + /* Manufacturer and model */ + model[256], /* Model */ +- device_id[2048];/* 1284 device ID */ +- ++ device_id[2048]; /* 1284 device ID */ + + device_id[0] = '\0'; + make_and_model[0] = '\0'; + + strcpy(model, "Unknown"); + +- for (data = rdata, dataend = data + rdlen; +- data < dataend; +- data = datanext) ++ for (;;) + { +- /* +- * Read a key/value pair starting with an 8-bit length. Since the +- * length is 8 bits and the size of the key/value buffers is 256, we +- * don't need to check for overflow... +- */ +- +- datalen = *data++; +- +- if (!datalen || (data + datalen) >= dataend) +- break; +- +- datanext = data + datalen; ++ char *key; ++ char *value; + +- for (ptr = key; data < datanext && *data != '='; data ++) +- *ptr++ = *data; +- *ptr = '\0'; +- +- if (data < datanext && *data == '=') +- { +- data ++; +- +- if (data < datanext) +- memcpy(value, data, datanext - data); +- value[datanext - data] = '\0'; +- } +- else +- continue; ++ if (parse_txt_record_pair (txt)) ++ goto next; + ++ key = txt->key; ++ value = txt->value; + if (!strncasecmp(key, "usb_", 4)) + { + /* +@@ -805,6 +1183,10 @@ query_callback( + if (device->type == CUPS_DEVICE_PRINTER) + device->sent = 1; + } ++ ++ next: ++ if (next_txt_record (txt) == NULL) ++ break; + } + + if (device->device_id) +@@ -854,11 +1236,9 @@ query_callback( + } + } + +- if (!device) +- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); ++ return device; + } + +- + /* + * 'sigterm_handler()' - Handle termination signals... + */ +diff -up cups-1.4.5/config.h.in.avahi cups-1.4.5/config.h.in +--- cups-1.4.5/config.h.in.avahi 2010-08-13 06:11:46.000000000 +0200 ++++ cups-1.4.5/config.h.in 2010-11-12 13:13:31.000000000 +0100 +@@ -344,6 +344,13 @@ + + + /* ++ * Do we have Avahi for DNS Service Discovery? ++ */ ++ ++#undef HAVE_AVAHI ++ ++ ++/* + * Do we have <sys/ioctl.h>? + */ + +diff -up cups-1.4.5/config-scripts/cups-dnssd.m4.avahi cups-1.4.5/config-scripts/cups-dnssd.m4 +--- cups-1.4.5/config-scripts/cups-dnssd.m4.avahi 2009-08-29 00:54:34.000000000 +0200 ++++ cups-1.4.5/config-scripts/cups-dnssd.m4 2010-11-12 13:13:31.000000000 +0100 +@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn + DNSSDLIBS="" + DNSSD_BACKEND="" + ++AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], ++ [if test x$enable_avahi = xyes; then ++ AC_MSG_CHECKING(for Avahi) ++ if $PKGCONFIG --exists avahi-client; then ++ AC_MSG_RESULT(yes) ++ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" ++ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" ++ DNSSD_BACKEND="dnssd" ++ AC_DEFINE(HAVE_AVAHI) ++ enable_dnssd=no ++ else ++ AC_MSG_RESULT(no) ++ fi ++ fi]) ++ + if test x$enable_dnssd != xno; then + AC_CHECK_HEADER(dns_sd.h, [ + case "$uname" in +diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c +--- cups-1.4.5/cups/http-support.c.avahi 2010-10-02 00:40:38.000000000 +0200 ++++ cups-1.4.5/cups/http-support.c 2010-11-12 13:28:45.000000000 +0100 +@@ -55,6 +55,11 @@ + # include <dns_sd.h> + # include <poll.h> + #endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++# include <avahi-client/client.h> ++# include <avahi-client/lookup.h> ++# include <avahi-common/simple-watch.h> ++#endif /* HAVE_AVAHI */ + + + /* +@@ -121,6 +126,24 @@ static void resolve_callback(DNSService + void *context); + #endif /* HAVE_DNSSD */ + ++#ifdef HAVE_AVAHI ++static void avahi_resolve_uri_client_cb(AvahiClient *client, ++ AvahiClientState state, ++ void *simple_poll); ++static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context); ++#endif /* HAVE_AVAHI */ + + /* + * 'httpAssembleURI()' - Assemble a uniform resource identifier from its +@@ -1351,16 +1374,27 @@ _httpResolveURI( + + if (strstr(hostname, "._tcp")) + { ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) ++ char *regtype, /* Pointer to type in hostname */ ++ *domain; /* Pointer to domain in hostname */ + #ifdef HAVE_DNSSD + DNSServiceRef ref, /* DNS-SD master service reference */ + domainref, /* DNS-SD service reference for domain */ + localref; /* DNS-SD service reference for .local */ + int domainsent = 0, /* Send the domain resolve? */ + offline = 0; /* offline-report state set? */ +- char *regtype, /* Pointer to type in hostname */ +- *domain; /* Pointer to domain in hostname */ + _http_uribuf_t uribuf; /* URI buffer */ + struct pollfd polldata; /* Polling data */ ++#else /* HAVE_AVAHI */ ++ AvahiSimplePoll *simple_poll; ++ AvahiClient *client; ++ int error; ++ struct ++ { ++ AvahiSimplePoll *poll; ++ _http_uribuf_t uribuf; ++ } user_data; ++#endif /* HAVE_DNSSD */ + + + if (logit) +@@ -1398,8 +1432,13 @@ _httpResolveURI( + if (domain) + *domain++ = '\0'; + ++#ifdef HAVE_DNSSD + uribuf.buffer = resolved_uri; + uribuf.bufsize = resolved_size; ++#else ++ user_data.uribuf.buffer = resolved_uri; ++ user_data.uribuf.bufsize = resolved_size; ++#endif + + resolved_uri[0] = '\0'; + +@@ -1414,6 +1453,7 @@ _httpResolveURI( + + uri = NULL; + ++#ifdef HAVE_DNSSD + if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) + { + localref = ref; +@@ -1500,6 +1540,36 @@ _httpResolveURI( + + DNSServiceRefDeallocate(ref); + } ++#else /* HAVE_AVAHI */ ++ if ((simple_poll = avahi_simple_poll_new ()) != NULL) ++ { ++ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll), ++ 0, avahi_resolve_uri_client_cb, ++ &simple_poll, &error)) != NULL) ++ { ++ user_data.poll = simple_poll; ++ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, hostname, ++ regtype, domain, AVAHI_PROTO_UNSPEC, 0, ++ avahi_resolve_uri_resolver_cb, ++ &user_data) != NULL) ++ { ++ avahi_simple_poll_loop (simple_poll); ++ ++ /* ++ * Collect the result. ++ */ ++ ++ if (resolved_uri[0]) ++ uri = resolved_uri; ++ } ++ ++ avahi_client_free (client); ++ } ++ ++ avahi_simple_poll_free (simple_poll); ++ } ++#endif /* HAVE_DNSSD */ + + if (logit) + { +@@ -1511,13 +1581,13 @@ _httpResolveURI( + fputs("STATE: -connecting-to-device,offline-report\n", stderr); + } + +-#else ++#else /* HAVE_DNSSD || HAVE_AVAHI */ + /* + * No DNS-SD support... + */ + + uri = NULL; +-#endif /* HAVE_DNSSD */ ++#endif /* HAVE_DNSSD || HAVE_AVAHI */ + + if (logit && !uri) + _cupsLangPuts(stderr, _("Unable to find printer!\n")); +@@ -1722,6 +1792,105 @@ resolve_callback( + } + #endif /* HAVE_DNSSD */ + ++#ifdef HAVE_AVAHI ++static void ++avahi_resolve_uri_client_cb (AvahiClient *client, ++ AvahiClientState state, ++ void *simple_poll) ++{ ++ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, " ++ "simple_poll=%p)\n", client, state, simple_poll)); ++ ++ /* ++ * If the connection drops, quit. ++ */ ++ ++ if (state == AVAHI_CLIENT_FAILURE) ++ avahi_simple_poll_quit (simple_poll); ++} ++ ++static void ++avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ const char *scheme; /* URI scheme */ ++ char rp[256]; /* Remote printer */ ++ AvahiStringList *pair; ++ char *value; ++ size_t valueLen = 0; ++ char addr[AVAHI_ADDRESS_STR_MAX]; ++ struct ++ { ++ AvahiSimplePoll *poll; ++ _http_uribuf_t uribuf; ++ } *poll_uribuf = context; ++ ++ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, " ++ "interface=%d, protocol=%d, event=%d, name=\"%s\", " ++ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, " ++ "port=%d, txt=%p, flags=%d, context=%p)\n", ++ resolver, interface, protocol, event, name, type, domain, ++ host_name, address, port, txt, flags, context)); ++ ++ if (event != AVAHI_RESOLVER_FOUND) ++ { ++ avahi_service_resolver_free (resolver); ++ avahi_simple_poll_quit (poll_uribuf->poll); ++ return; ++ } ++ ++ /* ++ * Figure out the scheme from the full name... ++ */ ++ ++ if (strstr(type, "_ipp.")) ++ scheme = "ipp"; ++ else if (strstr(type, "_printer.")) ++ scheme = "lpd"; ++ else if (strstr(type, "_pdl-datastream.")) ++ scheme = "socket"; ++ else ++ scheme = "riousbprint"; ++ ++ /* ++ * Extract the "remote printer key from the TXT record... ++ */ ++ ++ if ((pair = avahi_string_list_find (txt, "rp")) != NULL) ++ { ++ avahi_string_list_get_pair (pair, NULL, &value, &valueLen); ++ rp[0] = '/'; ++ memcpy (rp + 1, value, valueLen); ++ rp[valueLen + 1] = '\0'; ++ } ++ else ++ rp[0] = '\0'; ++ ++ /* ++ * Assemble the final device URI... ++ */ ++ ++ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address); ++ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer, ++ poll_uribuf->uribuf.bufsize, scheme, NULL, ++ addr, port, rp); ++ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n", ++ poll_uribuf->uribuf.buffer)); ++ avahi_simple_poll_quit (poll_uribuf->poll); ++} ++#endif /* HAVE_AVAHI */ ++ + + /* + * End of "$Id: http-support.c 9322 2010-10-01 22:40:38Z mike $". diff --git a/testing/cups/cups-no-export-ssllibs.patch b/testing/cups/cups-no-export-ssllibs.patch new file mode 100644 index 000000000..9be3c819b --- /dev/null +++ b/testing/cups/cups-no-export-ssllibs.patch @@ -0,0 +1,12 @@ +diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4 +--- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200 ++++ cups-1.5b1/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200 +@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES) + AC_SUBST(SSLFLAGS) + AC_SUBST(SSLLIBS) + +-EXPORT_SSLLIBS="$SSLLIBS" ++EXPORT_SSLLIBS="" + AC_SUBST(EXPORT_SSLLIBS) + + diff --git a/testing/cups/cups-no-gcrypt.patch b/testing/cups/cups-no-gcrypt.patch new file mode 100644 index 000000000..203b4f4ac --- /dev/null +++ b/testing/cups/cups-no-gcrypt.patch @@ -0,0 +1,39 @@ +diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4 +--- cups-1.4.7.orig//config-scripts/cups-ssl.m4 2011-01-11 08:05:58.000000000 +0100 ++++ cups-1.4.7/config-scripts/cups-ssl.m4 2011-08-02 10:44:26.011047900 +0200 +@@ -74,7 +74,6 @@ + dnl Then look for GNU TLS... + if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then + AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) +- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) + if $PKGCONFIG --exists gnutls; then + if test "x$have_pthread" = xyes; then + AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.]) +@@ -96,16 +95,6 @@ + AC_DEFINE(HAVE_GNUTLS) + fi + fi +- +- if test $have_ssl = 1; then +- if $PKGCONFIG --exists gcrypt; then +- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`" +- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`" +- elif test "x$LIBGCRYPTCONFIG" != x; then +- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`" +- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`" +- fi +- fi + fi + + dnl Check for the OpenSSL library last... +diff -ruN cups-1.4.7.orig//cups/http-private.h cups-1.4.7/cups/http-private.h +--- cups-1.4.7.orig//cups/http-private.h 2011-01-22 01:07:22.000000000 +0100 ++++ cups-1.4.7/cups/http-private.h 2011-08-02 10:42:43.341604107 +0200 +@@ -98,7 +98,6 @@ + * The GNU TLS library is more of a "bare metal" SSL/TLS library... + */ + # include <gnutls/gnutls.h> +-# include <gcrypt.h> + + typedef struct + { diff --git a/testing/cups/cups.install b/testing/cups/cups.install new file mode 100644 index 000000000..47c3d9b82 --- /dev/null +++ b/testing/cups/cups.install @@ -0,0 +1,26 @@ +post_install() { + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi + echo ">> If you use an HTTPS connection to CUPS, the first time you access" + echo ">> the interface it may take a very long time before the site comes up." + echo ">> This is because the first request triggers the generation of the CUPS" + echo ">> SSL certificates which can be a very time-consuming job." +} + +post_upgrade() { + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi + if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then + # important upgrade notice + echo "daemon script has been renamed to /etc/rc.d/cupsd" + echo "change your entry in /etc/rc.conf" + fi +} + +post_remove() { + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi +} diff --git a/testing/cups/cups.logrotate b/testing/cups/cups.logrotate new file mode 100644 index 000000000..9c49bbdaf --- /dev/null +++ b/testing/cups/cups.logrotate @@ -0,0 +1,8 @@ +/var/log/cups/*log { + missingok + notifempty + delaycompress + postrotate + /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/cups/cups.pam b/testing/cups/cups.pam new file mode 100644 index 000000000..53724d1f8 --- /dev/null +++ b/testing/cups/cups.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD new file mode 100644 index 000000000..952c577d6 --- /dev/null +++ b/testing/empathy/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 134982 2011-08-09 18:33:31Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=empathy +pkgver=3.0.2 +pkgrel=2 +pkgdesc="A GNOME instant messaging client using the Telepathy framework." +arch=('i686' 'x86_64') +url="http://live.gnome.org/Empathy" +license=('GPL2') +depends=('telepathy-glib' 'telepathy-mission-control' 'folks' 'telepathy-logger' 'telepathy-farsight' 'gnome-keyring' 'gnutls' 'evolution-data-server' + 'libcanberra' 'libnotify' 'enchant' 'iso-codes' 'libwebkit3' 'dconf' 'ca-certificates') +makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gnome-control-center') +optdepends=('telepathy-gabble: XMPP/Jabber support' + 'telepathy-butterfly: MSN support' + 'telepathy-idle: IRC support' + 'telepathy-salut: Link-local XMPP support' + 'telepathy-sofiasip: SIP support' + 'telepathy-haze: libpurple support') +options=('!libtool') +groups=('gnome-extra') +install=empathy.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/empathy \ + --disable-static \ + --disable-scrollkeeper \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install new file mode 100644 index 000000000..63dd6b907 --- /dev/null +++ b/testing/empathy/empathy.install @@ -0,0 +1,16 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + echo "To use Empathy you need to install at least one Telepathy connection manager." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD new file mode 100644 index 000000000..d97a99aad --- /dev/null +++ b/testing/glib-networking/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 135436 2011-08-13 13:27:37Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +pkgname=glib-networking +pkgver=2.28.7 +pkgrel=4 +pkgdesc="Network-related giomodules for glib" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') +makedepends=('intltool') +options=('!libtool') +install=glib-networking.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2 + glib-networking-2.29.9-port-gnutls3-API.patch) +sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c' + '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np0 -i "$srcdir/glib-networking-2.29.9-port-gnutls3-API.patch" + ./configure \ + --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/glib-networking --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch b/testing/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch new file mode 100644 index 000000000..19a168638 --- /dev/null +++ b/testing/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch @@ -0,0 +1,17 @@ +Index: tls/gnutls/gtlsconnection-gnutls.c +=================================================================== +--- tls/gnutls/gtlsconnection-gnutls.c ++++ tls/gnutls/gtlsconnection-gnutls.c 2011-08-04 00:40:33.194189789 +0200 +@@ -860,9 +860,10 @@ + + if (peer_certificate) + { +- int status; ++ int verify_ret; ++ unsigned int status; + +- status = gnutls_certificate_verify_peers (gnutls->priv->session); ++ verify_ret = gnutls_certificate_verify_peers2 (gnutls->priv->session, &status); + peer_certificate_errors = g_tls_certificate_gnutls_convert_flags (status); + if (peer_certificate_errors) + { diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install new file mode 100644 index 000000000..595f1c75b --- /dev/null +++ b/testing/glib-networking/glib-networking.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gio-querymodules usr/lib/gio/modules +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-vfs/PKGBUILD b/testing/gnome-vfs/PKGBUILD new file mode 100644 index 000000000..5b98fc8e8 --- /dev/null +++ b/testing/gnome-vfs/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 135094 2011-08-10 09:17:01Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-vfs +pkgver=2.24.4 +pkgrel=5 +pkgdesc="The GNOME Virtual File System" +arch=(i686 x86_64) +license=('LGPL') +depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt') +makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=gnome-vfs.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2 + gnutls-config.patch + gcrypt-config.patch) +sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa' + '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d' + 'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + #Fix build with new gnutls + patch -Np1 -i "${srcdir}/gnutls-config.patch" + #fix build with new libgcrypt >= 1.5.0 + patch -Np1 -i "${srcdir}/gcrypt-config.patch" + libtoolize --force + gtkdocize + aclocal + autoconf + automake + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-vfs-2.0 \ + --enable-samba --disable-hal \ + --enable-avahi --disable-howl \ + --disable-openssl --enable-gnutls + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -d -m755 "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/gnome-vfs/gcrypt-config.patch b/testing/gnome-vfs/gcrypt-config.patch new file mode 100644 index 000000000..8ce91870a --- /dev/null +++ b/testing/gnome-vfs/gcrypt-config.patch @@ -0,0 +1,31 @@ +# Allow gnome-vfs-2.24 to build with libgcrypt >= 1.5.0 +--- gnome-vfs-2.24.4/configure.in 2010-07-01 12:36:09.000000000 -0300 ++++ gnome-vfs-2.24.4-libgcrypt//configure.in 2011-07-22 15:55:02.296325640 -0300 +@@ -689,6 +689,16 @@ + AM_CONDITIONAL(HAVE_SSL, test x$have_ssl = xtrue) + + dnl **************************** ++dnl LibGCrypt 1.5.0 ++dnl **************************** ++ ++AM_PATH_LIBGCRYPT(1.5.0) ++ ++if test "x${LIBGCRYPT_LIBS}" = "x"; then ++ AC_MSG_ERROR([unable to find libgcrypt]) ++fi ++ ++dnl **************************** + dnl DNS-SD implementations + dnl **************************** + AM_CONDITIONAL(HAVE_AVAHI, false) +@@ -1045,8 +1055,8 @@ + dnl ============================================================================== + + PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) +-LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS" +-LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS" ++LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS $LIBGCRYPT_CFLAGS" ++LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS $LIBGCRYPT_LIBS" + AC_SUBST(LIBGNOMEVFS_CFLAGS) + AC_SUBST(LIBGNOMEVFS_LIBS) + diff --git a/testing/gnome-vfs/gnome-vfs.install b/testing/gnome-vfs/gnome-vfs.install new file mode 100644 index 000000000..793a3e7ab --- /dev/null +++ b/testing/gnome-vfs/gnome-vfs.install @@ -0,0 +1,17 @@ +pkgname=gnome-vfs + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/testing/gnome-vfs/gnutls-config.patch b/testing/gnome-vfs/gnutls-config.patch new file mode 100644 index 000000000..f6fa18b17 --- /dev/null +++ b/testing/gnome-vfs/gnutls-config.patch @@ -0,0 +1,25 @@ +# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 +# Use pkg-config in place of gnutls own macro since it's not present anymore. +--- a/configure.in 2009-03-07 19:59:53.805507753 +0100 ++++ b/configure.in 2009-03-07 18:34:36.928169018 +0100 +@@ -686,14 +686,14 @@ + AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) + else + AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) +- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) +- have_ssl=true]) ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) ++ have_ssl=true]) + + if test "x${LIBGNUTLS_LIBS}" = "x"; then +- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) +- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) +- have_ssl=true], +- AC_MSG_ERROR([Unable to find GNUTLS])) ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) ++ AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) ++ have_ssl=true], ++ AC_MSG_ERROR([Unable to find GNUTLS])) + fi + fi + fi diff --git a/testing/gnutls/PKGBUILD b/testing/gnutls/PKGBUILD new file mode 100644 index 000000000..232866e8e --- /dev/null +++ b/testing/gnutls/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 135280 2011-08-12 06:48:04Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnutls +pkgver=3.0.0 +pkgrel=2 +pkgdesc="A library which provides a secure layer over a reliable transport layer" +arch=('i686' 'x86_64') +license=('GPL3' 'LGPL') +url="http://www.gnu.org/software/gnutls/" +install=gnutls.install +options=('!libtool' '!zipman') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2') +source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz + align.patch) +md5sums=('0677a66667f48810ff8df8335a9a9f9b' + 'bce979498addb45d0fa8d6951f93fab3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix AES-NI for i686 + patch -Np1 -i ${srcdir}/align.patch + ./configure --prefix=/usr \ + --with-zlib \ + --disable-static \ + --disable-guile \ + --without-p11-kit + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check # passes all || /bin/true +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman + # gzip -9 all files in infodir and manpages manually + find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \; + find "$pkgdir/usr/share/man" -exec gzip -9 {} \; +} diff --git a/testing/gnutls/align.patch b/testing/gnutls/align.patch new file mode 100644 index 000000000..dce5cf408 --- /dev/null +++ b/testing/gnutls/align.patch @@ -0,0 +1,64 @@ +diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c +index 6801e7e..ff5b714 100644 +--- a/lib/accelerated/intel/aes-x86.c ++++ b/lib/accelerated/intel/aes-x86.c +@@ -40,6 +40,10 @@ struct aes_ctx + uint8_t iv[16]; + }; + ++#define AESNI_MIN_ALIGN 16 ++#define AESNI_ALIGN(x) \ ++ ((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1))) ++ + static int + aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx) + { +@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t keysize) + struct aes_ctx *ctx = _ctx; + int ret; + +- ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key); ++ ret = aesni_set_encrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key)); + if (ret != 0) + return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED); + +- ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec); ++ ret = aesni_set_decrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key_dec)); + if (ret != 0) + return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED); + +@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size, + { + struct aes_ctx *ctx = _ctx; + +- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1); ++ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), ctx->iv, 1); + return 0; + } + +@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size, + { + struct aes_ctx *ctx = _ctx; + +- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0); ++ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), ctx->iv, 0); + + return 0; + } +diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h +index 8f49ff3..20a169e 100644 +--- a/lib/accelerated/intel/aes-x86.h ++++ b/lib/accelerated/intel/aes-x86.h +@@ -11,10 +11,11 @@ void register_x86_crypto (void); + # define ALIGN16 + #endif + ++#define AES_KEY_ALIGN_SIZE 8 + #define AES_MAXNR 14 + typedef struct + { +- uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)]; ++ uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE]; + int rounds; + } AES_KEY; + diff --git a/testing/gnutls/gnutls.install b/testing/gnutls/gnutls.install new file mode 100644 index 000000000..9ce7c6edc --- /dev/null +++ b/testing/gnutls/gnutls.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $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 $infodir/dir 2> /dev/null + done +} diff --git a/testing/gtk-vnc/PKGBUILD b/testing/gtk-vnc/PKGBUILD new file mode 100644 index 000000000..b8e4c8856 --- /dev/null +++ b/testing/gtk-vnc/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 134864 2011-08-08 05:59:44Z eric $ +# Maintainer: +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Allan McRae <mcrae_allan@hotmail.com> +# Contributor: lp76 <l.peduto@gmail.com> + +pkgname=gtk-vnc +pkgver=0.4.3 +pkgrel=2 +pkgdesc="A VNC viewer widget for GTK" +arch=('i686' 'x86_64') +url="http://live.gnome.org/gtk-vnc" +license=('LGPL') +depends=('gtk3') +optdepends=('gtk2: GTK2 widget') +makedepends=('intltool' 'pygtk' 'pygobject-devel' 'gtk-doc' 'gtk2') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377') + +build() { + cd "$srcdir" + cp -a $pkgname-$pkgver gtk3-build + + ( cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --with-python --disable-static --with-gtk=2.0 + make ) + + ( cd gtk3-build + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --with-python --with-examples --disable-static --with-gtk=3.0 + make ) +} + +package() { + cd "${srcdir}" + make -C $pkgname-$pkgver -j1 DESTDIR="${pkgdir}" install + make -C gtk3-build -j1 DESTDIR="${pkgdir}" install +} diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD new file mode 100644 index 000000000..0a361a0d5 --- /dev/null +++ b/testing/iw/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 135459 2011-08-13 23:03:17Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=iw +pkgver=3.0 +pkgrel=1 +pkgdesc="nl80211 based CLI configuration utility for wireless devices" +arch=("i686" "x86_64") +url="http://wireless.kernel.org/en/users/Documentation/iw" +license=("GPL") +depends=("libnl") +makedepends=("kernel-headers") +source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('a0ccbf1ce71ae4bdb05495ca18ab00a87c06dce2c3bf8b8358c615e60c4632fb') + +build() { + cd "$srcdir"/$pkgname-$pkgver + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/lftp/PKGBUILD b/testing/lftp/PKGBUILD new file mode 100644 index 000000000..9cd8e8d15 --- /dev/null +++ b/testing/lftp/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 134943 2011-08-09 15:13:13Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> + +pkgname=lftp +pkgver=4.3.1 +pkgrel=2 +pkgdesc="Sophisticated command line based FTP client" +arch=('i686' 'x86_64') +license=('GPL3') +depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') +optdepends=('perl: needed for convert-netscape-cookies and verify-file') +makedepends=('autoconf') +url="http://lftp.yar.ru/" +backup=('etc/lftp.conf') +source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) +md5sums=('ea45acfb47b5590d4675c50dc0c6e13c') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --with-gnutls \ + --without-openssl --disable-static + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + rm -rf ${pkgdir}/usr/lib +}
\ No newline at end of file diff --git a/testing/libedit/PKGBUILD b/testing/libedit/PKGBUILD new file mode 100644 index 000000000..781325d1b --- /dev/null +++ b/testing/libedit/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 135318 2011-08-12 19:30:04Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Roman Cheplyaka <roma@ro-che.info> + +pkgname=libedit +pkgver=20110802_3.0 +pkgrel=1 +pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions' +arch=('i686' 'x86_64') +url='http://www.thrysoee.dk/editline/' +license=('BSD') +depends=('ncurses') +options=('!libtool') +source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz") +sha1sums=('b06e3cf248a4235617c71454e15ca3a54a61d467') + +build() { + cd "${srcdir}/${pkgname}-${pkgver/_/-}" + ./configure --prefix=/usr --enable-widec --enable-static=no + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver/_/-}" + make prefix="${pkgdir}"/usr install + + cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3 + install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE +} diff --git a/testing/libepc/PKGBUILD b/testing/libepc/PKGBUILD new file mode 100644 index 000000000..55d302e51 --- /dev/null +++ b/testing/libepc/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 135240 2011-08-11 10:52:34Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libepc +pkgver=0.3.11 +pkgrel=2 +pkgdesc="Easy Publish and Consume Library" +arch=(i686 x86_64) +license=('LGPL') +url="http://live.gnome.org/libepc" +depends=('gtk2' 'avahi' 'libsoup') +makedepends=('intltool') +options=('!libtool' '!makeflags') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/libgnomecups/PKGBUILD b/testing/libgnomecups/PKGBUILD new file mode 100644 index 000000000..ad012813e --- /dev/null +++ b/testing/libgnomecups/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 135360 2011-08-13 07:42:39Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Paulius Palevicius <paulius@birzai.com> + +pkgname=libgnomecups +pkgver=0.2.3 +pkgrel=9 +pkgdesc="GNOME cups library" +arch=(i686 x86_64) +license=('LGPL' 'GPL') +url="http://www.gnome.org" +depends=('libcups' 'glib2' 'krb5' 'gnutls') +makedepends=('perlxml') +options=(!libtool) +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2 + libgnomecups_0.2.3-ignore-ipp-not-found.patch) +md5sums=('dc4920c15c9f886f73ea74fbff0ae48b' + '973a1b9d93013ce431400a14b78f5d94') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # This avoids generating huge 'IPP request failed with status 1030' lines + patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch b/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch new file mode 100644 index 000000000..797367bf9 --- /dev/null +++ b/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch @@ -0,0 +1,11 @@ +--- a/libgnomecups/gnome-cups-request.c 2007-01-31 10:49:17.000000000 -0800 ++++ b/libgnomecups/gnome-cups-request.c 2009-11-24 12:49:30.000000000 -0800 +@@ -349,7 +349,7 @@ + if (request->response == NULL) + status = IPP_INTERNAL_ERROR; + +- if (status > IPP_OK_CONFLICT) { ++ if (status > IPP_OK_CONFLICT && status != IPP_NOT_FOUND) { + g_warning ("IPP request failed with status %d", status); + if (request->error != NULL) + *(request->error) = g_error_new (GNOME_CUPS_ERROR, diff --git a/testing/libgnomeprint/PKGBUILD b/testing/libgnomeprint/PKGBUILD new file mode 100644 index 000000000..3e86111ac --- /dev/null +++ b/testing/libgnomeprint/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 135363 2011-08-13 07:48:01Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libgnomeprint +pkgver=2.18.8 +pkgrel=3 +pkgdesc="Printing routines for GNOME" +arch=(i686 x86_64) +license=('LGPL' 'GPL') +depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls' 'libgcrypt' 'bzip2') +makedepends=('intltool' 'pkgconfig') +replaces=('libgnomeprint-cups') +conflicts=('libgnomeprint-cups') +url="http://www.gnome.org" +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/libgpod/PKGBUILD b/testing/libgpod/PKGBUILD new file mode 100644 index 000000000..58ef7b358 --- /dev/null +++ b/testing/libgpod/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 134924 2011-08-09 13:21:55Z ibiru $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=libgpod +pkgver=0.8.2 +pkgrel=2 +pkgdesc="A shared library to access the contents of an iPod" +arch=(i686 x86_64) +license=('LGPL') +depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') +makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2') +optdepends=('gtk-sharp-2: Mono bindings') +url="http://www.gtkpod.org/libgpod/" +source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs') +md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --enable-udev --with-python=/usr/bin/python2 + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="${pkgdir}" install +} + diff --git a/testing/libimobiledevice/PKGBUILD b/testing/libimobiledevice/PKGBUILD new file mode 100644 index 000000000..a6f48d786 --- /dev/null +++ b/testing/libimobiledevice/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 134921 2011-08-09 12:21:53Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=libimobiledevice +pkgver=1.1.1 +pkgrel=2 +pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" +url="http://libimobiledevice.org/" +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +depends=('glib2' 'gnutls' 'libgcrypt' 'libplist' 'usbmuxd') +makedepends=('swig' 'python2') +options=('!libtool') +source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2 + swig-version-check.patch) +md5sums=('cdc13037e822d9ac2e109536701d153a' + '8bb215e36fe0e08a72332c108c7842cc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # SWIG version check is wrong (still not fixed upstream) + patch -p1 -i "$srcdir"/swig-version-check.patch + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/libimobiledevice/swig-version-check.patch b/testing/libimobiledevice/swig-version-check.patch new file mode 100644 index 000000000..c56b095db --- /dev/null +++ b/testing/libimobiledevice/swig-version-check.patch @@ -0,0 +1,14 @@ +diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure +--- libimobiledevice-1.0.3.old/configure 2010-10-04 07:38:37.000000000 -0700 ++++ libimobiledevice-1.0.3/configure 2010-10-08 05:43:05.466686656 -0700 +@@ -3477,9 +3477,7 @@ + if test -z "$available_patch" ; then + available_patch=0 + fi +- if test $available_major -ne $required_major \ +- -o $available_minor -ne $required_minor \ +- -o $available_patch -lt $required_patch ; then ++ if test $available_major -lt $required_major ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&5 + $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&2;} + SWIG=false diff --git a/testing/libvncserver/PKGBUILD b/testing/libvncserver/PKGBUILD new file mode 100644 index 000000000..1b45fd593 --- /dev/null +++ b/testing/libvncserver/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 134732 2011-08-07 19:13:36Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=libvncserver +pkgver=0.9.8 +pkgrel=3 +pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server" +arch=('i686' 'x86_64') +url="http://libvncserver.sourceforge.net/" +license=('GPL') +depends=('libjpeg' 'zlib' 'gnutls') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz") +md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3') + +build() { + cd "${srcdir}/LibVNCServer-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/LibVNCServer-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/loudmouth/01-fix-sasl-md5-digest-uri.patch b/testing/loudmouth/01-fix-sasl-md5-digest-uri.patch new file mode 100644 index 000000000..5bca69c0c --- /dev/null +++ b/testing/loudmouth/01-fix-sasl-md5-digest-uri.patch @@ -0,0 +1,24 @@ +diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c +index 21c1bc2..ae8de94 100644 +--- a/loudmouth/lm-connection.c ++++ b/loudmouth/lm-connection.c +@@ -1441,11 +1441,18 @@ lm_connection_authenticate (LmConnection *connection, + connection->effective_jid = g_strdup_printf ("%s/%s", + connection->jid, connection->resource); + + if (connection->use_sasl) { ++ gchar *domain = NULL; ++ ++ if (!connection_get_server_from_jid (connection->jid, &domain)) { ++ domain = g_strdup (connection->server); ++ } ++ + lm_sasl_authenticate (connection->sasl, + username, password, +- connection->server, ++ domain, + connection_sasl_auth_finished); ++ g_free (domain); + + connection->features_cb = + lm_message_handler_new (connection_features_cb, diff --git a/testing/loudmouth/03-drop-stanzas-on-fail.patch b/testing/loudmouth/03-drop-stanzas-on-fail.patch new file mode 100644 index 000000000..87b86a998 --- /dev/null +++ b/testing/loudmouth/03-drop-stanzas-on-fail.patch @@ -0,0 +1,45 @@ +From: Sjoerd Simons <sjoerd.simons@collabora.co.uk> +Date: Tue, 13 Jan 2009 11:28:44 +0000 +Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages + +when a stanza comes in that for some reason can't be parsed into an LmMessage, +just drop them on the floor instead of blocking the parser. I've seen this +issue happen in practise because some (buggy?) client sending an iq with a +prefix e.g. <client:iq xmlns:client="jabber:client" ... /> +--- + loudmouth/lm-parser.c | 15 ++++++--------- + 1 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c +index 1938d56..89f6675 100644 +--- a/loudmouth/lm-parser.c ++++ b/loudmouth/lm-parser.c +@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext *context, + if (!m) { + g_warning ("Couldn't create message: %s\n", + parser->cur_root->name); +- return; +- } +- +- g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER, ++ } else { ++ g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER, + "Have a new message\n"); +- if (parser->function) { +- (* parser->function) (parser, m, parser->user_data); ++ if (parser->function) { ++ (* parser->function) (parser, m, parser->user_data); ++ } ++ lm_message_unref (m); + } + +- lm_message_unref (m); + lm_message_node_unref (parser->cur_root); +- +- + parser->cur_node = parser->cur_root = NULL; + } else { + LmMessageNode *tmp_node; +-- +1.5.6.5 + diff --git a/testing/loudmouth/04-use-pkg-config-for-gnutls.patch b/testing/loudmouth/04-use-pkg-config-for-gnutls.patch new file mode 100644 index 000000000..20f388e89 --- /dev/null +++ b/testing/loudmouth/04-use-pkg-config-for-gnutls.patch @@ -0,0 +1,23 @@ +Description: use pkg-config to detect gnutls +Debian: http://bugs.debian.org/529835 +Origin: http://groups.google.com/group/loudmouth-dev/browse_thread/thread/3f78255837048daf# + +--- a/configure.ac.orig 2009-08-16 20:29:36.000000000 +0200 ++++ b/configure.ac 2009-08-16 20:30:43.000000000 +0200 +@@ -146,10 +146,12 @@ AC_ARG_WITH(openssl-libs, + enable_ssl=no + if test "x$ac_ssl" = "xgnutls"; then + dnl Look for GnuTLS +- AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no) +- if test "x$have_libgnutls" = "xyes"; then +- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" +- LIBS="$LIBS $LIBGNUTLS_LIBS" ++ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no) ++ if test "x$have_gnutls" = "xyes"; then ++ AC_SUBST(ASYNCNS_CFLAGS) ++ AC_SUBST(ASYNCNS_LIBS) ++ CFLAGS="$CFLAGS $GNUTLS_CFLAGS" ++ LIBS="$LIBS $GNUTLS_LIBS" + AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.]) + enable_ssl=GnuTLS + else diff --git a/testing/loudmouth/PKGBUILD b/testing/loudmouth/PKGBUILD new file mode 100644 index 000000000..d1686df56 --- /dev/null +++ b/testing/loudmouth/PKGBUILD @@ -0,0 +1,39 @@ +# $Id +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: damir <damir@archlinux.org> +# Contributor: Brice Carpentier <brice.carpentier@orange.fr> + +pkgname=loudmouth +pkgver=1.4.3 +pkgrel=3 +pkgdesc="A lightweight Jabber client library written in C/Glib" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://groups.google.com/group/loudmouth-dev" +depends=('glib2' 'gnutls' 'libidn') +options=('!libtool') +makedepends=('intltool' 'pkgconfig' 'gtk-doc') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2 + 01-fix-sasl-md5-digest-uri.patch + 03-drop-stanzas-on-fail.patch + 04-use-pkg-config-for-gnutls.patch) +md5sums=('55339ca42494690c3942ee1465a96937' + 'dc799cea18b24847b1e008c7424010a3' + 'b7b2d81b01a5eee5fd5e21cae67b4af7' + 'bffb25b9551df43255fe1706588582f3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch" + patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch" + patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch" + libtoolize --force + autoreconf + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules new file mode 100644 index 000000000..d2c167324 --- /dev/null +++ b/testing/lvm2/11-dm-initramfs.rules @@ -0,0 +1,3 @@ +# needed with new udev/mkinitcpio and as implemented in dracut: +# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> +SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD new file mode 100644 index 000000000..c29ed8030 --- /dev/null +++ b/testing/lvm2/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 135451 2011-08-13 22:32:08Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgbase=lvm2 +pkgname=('lvm2' 'device-mapper') +pkgver=2.02.87 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://sourceware.org/lvm2/" +license=('GPL2' 'LGPL2.1') +groups=('base') +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz + lvm2_install + lvm2_hook + 11-dm-initramfs.rules) +md5sums=('4c36c7f216edfe65a6193d2adc389ecd' + 'dcb82506d732cc7b10159a89b579dba8' + '8d613b84a175cd85f752a75198e40e15' + '69e40679cd8b3658bfc619e48baae125') +sha1sums=('4b217d405133bdc6120568253574a49fae2caa4f' + '7f108b2f2056eb050fc898bf5190ecf9145aed8a' + 'a0e0513c2efb183006e57e595d93ce18be297928' + 'f6a554eea9557c3c236df2943bb6e7e723945c41') + +build() { + cd "${srcdir}/LVM2.${pkgver}" + sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh + unset LDFLAGS + ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + --includedir=/usr/include --with-usrlibdir=/usr/lib \ + --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ + --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules + make +} + +package_device-mapper() { + pkgdesc="Device mapper userspace library and tools" + url="http://sourceware.org/dm/" + depends=('glibc' 'udev') + + cd "${srcdir}/LVM2.${pkgver}" + make DESTDIR="${pkgdir}" install_device-mapper + # extra udev rule for device-mapper in initramfs + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" +} + +package_lvm2() { + pkgdesc="Logical Volume Manager 2 utilities" + depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') + conflicts=('lvm' 'mkinitcpio<0.7') + backup=('etc/lvm/lvm.conf') + options=('!makeflags') + + cd "${srcdir}/LVM2.${pkgver}" + make DESTDIR="${pkgdir}" install_lvm2 + # install applib + make -C liblvm DESTDIR="${pkgdir}" install + # /etc directories + install -d "${pkgdir}"/etc/lvm/{archive,backup} + # mkinitcpio hook + install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" + install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" +} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook new file mode 100644 index 000000000..874b91d06 --- /dev/null +++ b/testing/lvm2/lvm2_hook @@ -0,0 +1,25 @@ +# vim:set ft=sh: +run_hook () +{ + /sbin/modprobe -q dm-mod >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + fi + + # If the lvmwait= parameter has been specified on the command line + # wait for the device(s) before trying to activate the volume group(s) + if [ -n "${lvmwait}" ]; then + for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do + poll_device ${pvdev} ${rootdelay} + done + fi + + [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" + + msg "Activating logical volumes..." + [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit + eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET + fi +} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install new file mode 100644 index 000000000..94175b523 --- /dev/null +++ b/testing/lvm2/lvm2_install @@ -0,0 +1,29 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" dm-mod dm-snapshot dm-mirror" + BINARIES="" + FILES="" + SCRIPT="lvm2" + + add_binary "/sbin/lvm" + add_binary "/sbin/dmsetup" + add_file "/lib/udev/rules.d/10-dm.rules" + add_file "/lib/udev/rules.d/13-dm-disk.rules" + add_file "/lib/udev/rules.d/95-dm-notify.rules" + add_file "/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for an LVM2 root device. + + The optional lvmwait= parameter followed by a comma-separated + list of device names can be given on the command line. + It will cause the hook to wait until all given devices exist + before trying to scan and activate any volume groups. +HELPEOF +} diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD new file mode 100644 index 000000000..0e50e672b --- /dev/null +++ b/testing/mkinitcpio-busybox/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 135465 2011-08-13 23:34:47Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +pkgname=mkinitcpio-busybox +pkgver=1.18.5 +pkgrel=1 +pkgdesc="base initramfs tools" +arch=('i686' 'x86_64') +url="http://www.busybox.net/" +license=('GPL') +depends=('glibc') +source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 + config) +sha256sums=('10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0' + '0961b4db5eb5eaa1b8d353a3fc792884f4f2733ec0f5715ba88a0e667f0f48ec') + +build() { + cd "${srcdir}/busybox-${pkgver}" + + unset CFLAGS CXXFLAGS + if [ ${CARCH} = "x86_64" ]; then + sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config + else + sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config + fi + make +} + +package() { + install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox" +} +# vim:set ts=2 sw=2 et: diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config new file mode 100644 index 000000000..31a9d4330 --- /dev/null +++ b/testing/mkinitcpio-busybox/config @@ -0,0 +1,990 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.18.5 +# Sun Aug 14 01:22:25 2011 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_DESKTOP is not set +# CONFIG_EXTRA_COMPAT is not set +# CONFIG_INCLUDE_SUSv2 is not set +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +CONFIG_FEATURE_INSTALLER=y +# CONFIG_INSTALL_NO_USR is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_WTMP is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_PIDFILE is not set +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_EXTRA_CFLAGS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=0 +CONFIG_FEATURE_FAST_TOP=y +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_USE_TERMIOS is not set +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=15 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set +CONFIG_FEATURE_NON_POSIX_CP=y +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +# CONFIG_FEATURE_SEAMLESS_XZ is not set +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +# CONFIG_FEATURE_SEAMLESS_BZ2 is not set +# CONFIG_FEATURE_SEAMLESS_GZ is not set +# CONFIG_FEATURE_SEAMLESS_Z is not set +# CONFIG_AR is not set +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_FEATURE_AR_CREATE is not set +# CONFIG_BUNZIP2 is not set +# CONFIG_BZIP2 is not set +# CONFIG_CPIO is not set +# CONFIG_FEATURE_CPIO_O is not set +# CONFIG_FEATURE_CPIO_P is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +# CONFIG_GUNZIP is not set +# CONFIG_GZIP is not set +# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set +# CONFIG_LZOP is not set +# CONFIG_LZOP_COMPR_HIGH is not set +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +# CONFIG_TAR is not set +# CONFIG_FEATURE_TAR_CREATE is not set +# CONFIG_FEATURE_TAR_AUTODETECT is not set +# CONFIG_FEATURE_TAR_FROM is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_FEATURE_TAR_TO_COMMAND is not set +# CONFIG_FEATURE_TAR_UNAME_GNAME is not set +# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set +# CONFIG_FEATURE_TAR_SELINUX is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_LZMA is not set +# CONFIG_UNXZ is not set +# CONFIG_XZ is not set +# CONFIG_UNZIP is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +# CONFIG_TR is not set +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +# CONFIG_BASE64 is not set +# CONFIG_CAL is not set +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_COMM is not set +CONFIG_CP=y +# CONFIG_FEATURE_CP_LONG_OPTIONS is not set +CONFIG_CUT=y +CONFIG_DD=y +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +# CONFIG_FEATURE_DF_FANCY is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +# CONFIG_FOLD is not set +# CONFIG_FSYNC is not set +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +# CONFIG_HOSTID is not set +# CONFIG_ID is not set +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +# CONFIG_LENGTH is not set +CONFIG_LN=y +# CONFIG_LOGNAME is not set +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +# CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set +# CONFIG_OD is not set +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +# CONFIG_REALPATH is not set +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +# CONFIG_SPLIT is not set +# CONFIG_FEATURE_SPLIT_FANCY is not set +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +# CONFIG_STTY is not set +# CONFIG_SUM is not set +# CONFIG_SYNC is not set +# CONFIG_TAC is not set +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +# CONFIG_TEE is not set +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TOUCH=y +CONFIG_TRUE=y +# CONFIG_TTY is not set +CONFIG_UNAME=y +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNIQ=y +# CONFIG_USLEEP is not set +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +# CONFIG_WHO is not set +# CONFIG_WHOAMI is not set +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +# CONFIG_FGCONSOLE is not set +# CONFIG_CLEAR is not set +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +# CONFIG_RESET is not set +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set +# CONFIG_SETCONSOLE is not set +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETFONT=y +# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set +CONFIG_DEFAULT_SETFONT_DIR="" +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set +# CONFIG_SHOWKEY is not set + +# +# Common options for loadfont and setfont +# +CONFIG_FEATURE_LOADFONT_PSF2=y +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +# CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +# CONFIG_WHICH is not set + +# +# Editors +# +# CONFIG_PATCH is not set +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +# CONFIG_CMP is not set +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_ED is not set +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +# CONFIG_FEATURE_ALLOW_EXEC is not set + +# +# Finding Utilities +# +# CONFIG_FIND is not set +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set +# CONFIG_FEATURE_FIND_MAXDEPTH is not set +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_EXEC is not set +# CONFIG_FEATURE_FIND_USER is not set +# CONFIG_FEATURE_FIND_GROUP is not set +# CONFIG_FEATURE_FIND_NOT is not set +# CONFIG_FEATURE_FIND_DEPTH is not set +# CONFIG_FEATURE_FIND_PAREN is not set +# CONFIG_FEATURE_FIND_SIZE is not set +# CONFIG_FEATURE_FIND_PRUNE is not set +# CONFIG_FEATURE_FIND_DELETE is not set +# CONFIG_FEATURE_FIND_PATH is not set +# CONFIG_FEATURE_FIND_REGEX is not set +# CONFIG_FEATURE_FIND_CONTEXT is not set +# CONFIG_FEATURE_FIND_LINKS is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set +# CONFIG_XARGS is not set +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +# CONFIG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="" +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_CRYPT is not set +# CONFIG_USE_BB_CRYPT_SHA is not set +# CONFIG_ADDUSER is not set +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_FIRST_SYSTEM_ID=0 +CONFIG_LAST_SYSTEM_ID=0 +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_DELUSER is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_GETTY is not set +# CONFIG_LOGIN is not set +# CONFIG_PAM is not set +# CONFIG_LOGIN_SCRIPTS is not set +# CONFIG_FEATURE_NOLOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +# CONFIG_CRYPTPW is not set +# CONFIG_CHPASSWD is not set +# CONFIG_SU is not set +# CONFIG_FEATURE_SU_SYSLOG is not set +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_TUNE2FS is not set + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_2_4_MODULES is not set +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" + +# +# Linux System Utilities +# +# CONFIG_BLOCKDEV is not set +# CONFIG_REV is not set +# CONFIG_ACPID is not set +# CONFIG_FEATURE_ACPID_COMPAT is not set +# CONFIG_BLKID is not set +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_GPT_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FINDFS is not set +# CONFIG_FLOCK is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_EXT2 is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +# CONFIG_MKFS_VFAT is not set +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +# CONFIG_FEATURE_HEXDUMP_REVERSE is not set +# CONFIG_HD is not set +# CONFIG_HWCLOCK is not set +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_LSPCI is not set +# CONFIG_LSUSB is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_UUID is not set +# CONFIG_MORE is not set +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +# CONFIG_PIVOT_ROOT is not set +# CONFIG_RDATE is not set +# CONFIG_RDEV is not set +# CONFIG_READPROFILE is not set +# CONFIG_RTCWAKE is not set +# CONFIG_SCRIPT is not set +# CONFIG_SCRIPTREPLAY is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_FEATURE_SWAPON_PRI is not set +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +# CONFIG_FEATURE_VOLUMEID_EXT is not set +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +# CONFIG_BEEP is not set +CONFIG_FEATURE_BEEP_FREQ=0 +CONFIG_FEATURE_BEEP_LENGTH_MS=0 +# CONFIG_CHAT is not set +# CONFIG_FEATURE_CHAT_NOFAIL is not set +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +# CONFIG_CHRT is not set +# CONFIG_CROND is not set +# CONFIG_FEATURE_CROND_D is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="" +# CONFIG_CRONTAB is not set +# CONFIG_DC is not set +# CONFIG_FEATURE_DC_LIBM is not set +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_DEVMEM is not set +# CONFIG_EJECT is not set +# CONFIG_FEATURE_EJECT_SCSI is not set +# CONFIG_FBSPLASH is not set +# CONFIG_FLASHCP is not set +# CONFIG_FLASH_LOCK is not set +# CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASH_ERASEALL is not set +# CONFIG_IONICE is not set +# CONFIG_INOTIFYD is not set +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_SMALL is not set +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MAN is not set +# CONFIG_MICROCOM is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +# CONFIG_RFKILL is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +# CONFIG_SETSID is not set +CONFIG_STRINGS=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_TIME is not set +# CONFIG_TIMEOUT is not set +# CONFIG_TTYSIZE is not set +# CONFIG_VOLNAME is not set +# CONFIG_WALL is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +# CONFIG_NBDCLIENT is not set +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_FEATURE_IPV6=y +# CONFIG_FEATURE_UNIX_LOCAL is not set +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set +# CONFIG_ARPING is not set +# CONFIG_BRCTL is not set +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPD is not set +# CONFIG_FEATURE_FTP_WRITE is not set +# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +# CONFIG_HOSTNAME is not set +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +# CONFIG_FEATURE_HTTPD_GZIP is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +# CONFIG_IFENSLAVE is not set +# CONFIG_IFPLUGD is not set +# CONFIG_IFUPDOWN is not set +CONFIG_IFUPDOWN_IFSTATE_PATH="" +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PSCAN is not set +CONFIG_ROUTE=y +# CONFIG_SLATTACH is not set +# CONFIG_TCPSVD is not set +CONFIG_TELNET=y +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +# CONFIG_FEATURE_TFTP_PUT is not set +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_TFTP_DEBUG is not set +# CONFIG_TRACEROUTE is not set +# CONFIG_TRACEROUTE6 is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TUNCTL is not set +# CONFIG_FEATURE_TUNCTL_UG is not set +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +# CONFIG_UDPSVD is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +# CONFIG_ZCIP is not set + +# +# Print Utilities +# +# CONFIG_LPD is not set +# CONFIG_LPR is not set +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +# CONFIG_MAKEMIME is not set +CONFIG_FEATURE_MIME_CHARSET="" +# CONFIG_POPMAILDIR is not set +# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set +# CONFIG_REFORMIME is not set +# CONFIG_FEATURE_REFORMIME_COMPAT is not set +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +# CONFIG_IOSTAT is not set +# CONFIG_MPSTAT is not set +# CONFIG_PMAP is not set +# CONFIG_POWERTOP is not set +# CONFIG_SMEMCAP is not set +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_KILLALL5 is not set +# CONFIG_NMETER is not set +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +# CONFIG_PKILL is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +# CONFIG_FEATURE_PS_TIME is not set +# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +# CONFIG_RENICE is not set +# CONFIG_BB_SYSCTL is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +# CONFIG_FEATURE_TOPMEM is not set +# CONFIG_FEATURE_SHOW_THREADS is not set +CONFIG_UPTIME=y +# CONFIG_WATCH is not set + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_FEATURE_RUNSVDIR_LOG is not set +# CONFIG_SV is not set +CONFIG_SV_DEFAULT_SERVICE_DIR="" +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +# CONFIG_SH_MATH_SUPPORT_64 is not set +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set + +# +# System Logging Utilities +# +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_SYSLOGD_DUP is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_KLOGD is not set +# CONFIG_FEATURE_KLOGD_KLOGCTL is not set +# CONFIG_LOGGER is not set diff --git a/testing/msmtp/PKGBUILD b/testing/msmtp/PKGBUILD new file mode 100644 index 000000000..44d3e6209 --- /dev/null +++ b/testing/msmtp/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 134900 2011-08-08 19:38:44Z eric $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Ben Mazer <blm@groknil.org> + +pkgname=msmtp +pkgver=1.4.24 +pkgrel=3 +pkgdesc="A mini smtp client" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://msmtp.sourceforge.net" +depends=('gnutls' 'libidn') +makedepends=('texlive-core') +provides=('smtp-forwarder') +install=msmtp.install +source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2) +md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls + make + make -C doc html pdf +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" -C doc install-html install-pdf + +# Installing example configs and scripts to /usr/share/doc/msmtp +# as they are not installed by default (Debian and Gentoo do it this way) + install -d "${pkgdir}/usr/share/doc/msmtp" + cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/" + install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/" + + install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim" +} diff --git a/testing/msmtp/msmtp.install b/testing/msmtp/msmtp.install new file mode 100644 index 000000000..c4dd76476 --- /dev/null +++ b/testing/msmtp/msmtp.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(msmtp.info) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/nettle/PKGBUILD b/testing/nettle/PKGBUILD new file mode 100644 index 000000000..e079a16f8 --- /dev/null +++ b/testing/nettle/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 134726 2011-08-07 17:54:31Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: bender02 at gmx dot com + +pkgname=nettle +pkgver=2.2 +pkgrel=1 +pkgdesc="A low-level cryptographic library" +arch=('i686' 'x86_64') +url="http://www.lysator.liu.se/~nisse/nettle/" +license=('GPL2') +install=$pkgname.install +depends=('gmp') +source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) +md5sums=('9a9c6102eb9909019f8a13b67578cdfe') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --libdir=/usr/lib \ + --enable-shared \ + --disable-static # <-- seems not working now + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + # remove static libs + rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a +} diff --git a/testing/nettle/nettle.install b/testing/nettle/nettle.install new file mode 100644 index 000000000..3d19b5f19 --- /dev/null +++ b/testing/nettle/nettle.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(nettle.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/openvpn/PKGBUILD b/testing/openvpn/PKGBUILD new file mode 100644 index 000000000..9dc460d16 --- /dev/null +++ b/testing/openvpn/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 135441 2011-08-13 17:34:29Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=openvpn +pkgver=2.2.1 +pkgrel=1 +pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" +arch=(i686 x86_64) +url="http://openvpn.net/index.php/open-source.html" +depends=('openssl' 'lzo2' 'iproute2') +license=('custom') +backup=(usr/share/openvpn/easy-rsa/vars + usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf + etc/conf.d/openvpn-tapdev) +source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz + openvpn.rc + openvpn-tapdev.rc + openvpn-tapdev.conf) +md5sums=('500bee5449b29906150569aaf2eb2730' + 'a3809b9727f0c2af2d0770f5c7442db2' + 'd2c48e970088d679dd3c2afd914ff731' + '722f483c9e3ce2ec66d3301aaf7cf3d5') + +build() { + cd $srcdir/$pkgname-$pkgver + # Build openvpn + CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \ + --prefix=/usr \ + --enable-password-save \ + --mandir=/usr/share/man \ + --enable-iproute2 + make + + # Build plugins + for plug in auth-pam down-root; do + cd $srcdir/$pkgname-$pkgver/plugin/$plug + make + done +} + +package() { + cd $srcdir/$pkgname-$pkgver + # Install openvpn + make DESTDIR=$pkgdir install + install -d -m755 $pkgdir/etc/openvpn + # Install examples + install -d -m755 $pkgdir/usr/share/openvpn + cp -r sample-config-files $pkgdir/usr/share/openvpn/examples + find $pkgdir/usr/share/openvpn -type f -exec chmod 644 {} \; + find $pkgdir/usr/share/openvpn -type d -exec chmod 755 {} \; + # Install license + install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + # Install plugins + for plug in auth-pam down-root; do + cd $srcdir/$pkgname-$pkgver/plugin/$plug + install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so + cd - + done + # Install contrib + install -d -m755 $pkgdir/usr/share/openvpn/contrib + cp -r contrib $pkgdir/usr/share/openvpn + # Install easy-rsa + cd $srcdir/$pkgname-$pkgver + make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa + rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf + # Install rc scripts + install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn + install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev + install -D -m644 $srcdir/openvpn-tapdev.conf $pkgdir/etc/conf.d/openvpn-tapdev +} diff --git a/testing/openvpn/openvpn-tapdev.conf b/testing/openvpn/openvpn-tapdev.conf new file mode 100644 index 000000000..afa5586dd --- /dev/null +++ b/testing/openvpn/openvpn-tapdev.conf @@ -0,0 +1,12 @@ +# +# /etc/conf.d/openvpn-tapdev +# +# Place openvpn-tapdev before network into your DAEMONS array +# This will create permanent tap devices which you can use for bridging +# +# Example: +# TAPDEVS="work home" +# Will create two tap devices "work" and "home" +# + +TAPDEVS="" diff --git a/testing/openvpn/openvpn-tapdev.rc b/testing/openvpn/openvpn-tapdev.rc new file mode 100755 index 000000000..2c51f8248 --- /dev/null +++ b/testing/openvpn/openvpn-tapdev.rc @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +. /etc/conf.d/openvpn-tapdev + +case "$1" in + start) + stat_busy "Creating tap devices for OpenVPN ... " + success=0 + for tapdev in ${TAPDEVS}; do + stat_append "${tapdev} " + /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? + done + if [ $success -eq 0 ]; then + add_daemon openvpn-tapdev + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy "Destroying tap devices for OpenVPN ..." + for tapdev in ${TAPDEVS}; do + stat_append "${tapdev} " + /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? + done + rm_daemon openvpn-tapdev + stat_done + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/openvpn/openvpn.rc b/testing/openvpn/openvpn.rc new file mode 100755 index 000000000..96c28b641 --- /dev/null +++ b/testing/openvpn/openvpn.rc @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +CFGDIR="/etc/openvpn" +STATEDIR="/var/run/openvpn" + +case "$1" in + start) + stat_busy "Starting OpenVPN ... " + success=0 + mkdir -p "${STATEDIR}" + for cfg in "${CFGDIR}"/*.conf; do + stat_append "$(basename "${cfg}" .conf) " + /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$? + done + if [ $success -eq 0 ]; then + add_daemon openvpn + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping OpenVPN ..." + for pidfile in "${STATEDIR}"/*.pid; do + stat_append "$(basename "${pidfile}" .pid) " + kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null + rm -f "${pidfile}" + done + rm_daemon openvpn + stat_done + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/qemu-kvm/65-kvm.rules b/testing/qemu-kvm/65-kvm.rules new file mode 100644 index 000000000..c2f7317aa --- /dev/null +++ b/testing/qemu-kvm/65-kvm.rules @@ -0,0 +1 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/testing/qemu-kvm/PKGBUILD b/testing/qemu-kvm/PKGBUILD new file mode 100644 index 000000000..604d55da4 --- /dev/null +++ b/testing/qemu-kvm/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 135315 2011-08-12 16:52:46Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=qemu-kvm +pkgver=0.15.0 +pkgrel=2 +pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." +arch=(i686 x86_64) +license=('GPL2' 'LGPL2.1') +url="http://www.linux-kvm.org" +depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') +makedepends=('texi2html' 'perl' 'python2') +backup=('etc/qemu/target-x86_64.conf') +install=qemu-kvm.install +conflicts=('qemu') +provides=('qemu') +replaces=('kvm') +source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz + 65-kvm.rules) +options=(!strip) + +build() +{ + cd ${srcdir}/${pkgname}-${pkgver} + # fix esound building + ./configure --prefix=/usr \ + --python=/usr/bin/python2 \ + --sysconfdir=/etc \ + --audio-drv-list=alsa,sdl,oss \ + --audio-card-list=ac97,sb16,es1370,hda \ + --enable-docs + make +} +package() +{ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + # symbolic link for backwards compatibility + ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm + # symbolic link for to qemu binary for emulator apps + ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu + # symbolic link for to qemu binary for emulator apps + ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/kvm + # fix man page + mv ${pkgdir}/usr/share/man/man1/qemu.1 \ + ${pkgdir}/usr/share/man/man1/qemu-kvm.1 + # install udev rules + install -D -m644 ${srcdir}/65-kvm.rules \ + ${pkgdir}/lib/udev/rules.d/65-kvm.rules + # strip scripts directory + find ${pkgdir}/usr/bin -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done +} +md5sums=('b45b0deebba4ce47dcaaab3807f6ed47' + 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/testing/qemu-kvm/qemu-kvm.install b/testing/qemu-kvm/qemu-kvm.install new file mode 100644 index 000000000..84aa773b9 --- /dev/null +++ b/testing/qemu-kvm/qemu-kvm.install @@ -0,0 +1,16 @@ +post_install() { + groupadd kvm -f -g 78 + echo ">>> PLEASE READ FOR KVM USAGE!" + echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" + echo ">>> Add yourself to the group 'kvm'." + echo ">>> Use 'qemu-kvm -enable-kvm' to use KVM." + echo "" +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + groupdel kvm +} diff --git a/testing/qemu/65-kvm.rules b/testing/qemu/65-kvm.rules new file mode 100644 index 000000000..c2f7317aa --- /dev/null +++ b/testing/qemu/65-kvm.rules @@ -0,0 +1 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/testing/qemu/PKGBUILD b/testing/qemu/PKGBUILD new file mode 100644 index 000000000..0fbbd0d46 --- /dev/null +++ b/testing/qemu/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 135352 2011-08-13 06:11:28Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=qemu +pkgver=0.15.0 +pkgrel=2 +pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +url="http://wiki.qemu.org/Index.html" +makedepends=('texi2html' 'perl' 'python2') +depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl') +backup=('etc/qemu/target-x86_64.conf') +install=qemu.install +source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz + 65-kvm.rules) +options=(!strip) + +build() +{ + cd ${srcdir}/${pkgname}-${pkgver} + sed -i -e 's/lib64/lib/g' x86_64.ld + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \ + --python=/usr/bin/python2 \ + --audio-card-list=ac97,sb16,es1370,hda \ + --enable-docs + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -D -m644 ${srcdir}/65-kvm.rules \ + ${pkgdir}/lib/udev/rules.d/65-kvm.rules + # strip scripts directory + find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done + +} +md5sums=('dbc55b014bcd21b98e347f6a90f7fb6d' + 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/testing/qemu/qemu.install b/testing/qemu/qemu.install new file mode 100644 index 000000000..e16ac027c --- /dev/null +++ b/testing/qemu/qemu.install @@ -0,0 +1,24 @@ +# kvm: the new package version +post_install() { + # + groupadd kvm -f -g 78 + echo ">>> PLEASE READ FOR KVM USAGE!" + echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" + echo ">>> Add yourself to the group 'kvm'." + echo ">>> Use 'qemu -enable-kvm' to use KVM." + echo "" + if [ "$(vercmp $2 0.11)" -lt 0 ]; then + echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module" + echo "is no longer supported and will be removed from the repositories. You" + echo "can safely uninstall it from your system." + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + # + groupdel kvm +} diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD new file mode 100644 index 000000000..2343a7aa5 --- /dev/null +++ b/testing/samba/PKGBUILD @@ -0,0 +1,138 @@ +# $Id: PKGBUILD 135295 2011-08-12 10:01:24Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +pkgbase=samba +pkgname=('smbclient' 'samba') +pkgver=3.6.0 +# We use the 'A' to fake out pacman's version comparators. Samba chooses +# to append 'a','b',etc to their subsequent releases, which pamcan +# misconstrues as alpha, beta, etc. Bad samba! +_realver=3.6.0 +pkgrel=1 +arch=(i686 x86_64) +url="http://www.samba.org" +license=('GPL3') +makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb') +options=(!makeflags) +source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz + samba samba.logrotate + swat.xinetd + samba.pam + samba.conf.d + fix-ipv6-mount.patch) +### UNINSTALL dmapi package before building!!! + +build() { + cd ${srcdir}/${pkgbase}-${_realver}/source3 + ./configure --prefix=/usr \ + --libdir=/usr/lib/ \ + --localstatedir=/var \ + --with-configdir=/etc/samba \ + --with-lockdir=/var/cache/samba \ + --with-piddir=/var/run/samba \ + --with-fhs \ + --with-pam \ + --with-pam_smbpass \ + --with-pammodulesdir=/lib/security \ + --with-ads \ + --with-acl-support \ + --with-cifsmount \ + --with-libsmbclient \ + --with-syslog \ + --enable-external-libtalloc \ + --disable-dnssd \ + --disable-avahi \ + --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \ + --enable-external-libtdb + make +} + +package_smbclient () { +pkgdesc="Tools to access a server's filespace and printers via SMB" +depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc') + cd ${srcdir}/${pkgbase}-${_realver}/source3 + mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib + install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ + for i in libnetapi* libwbclient* libsmbclient*;do + cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ + done + install -m755 script/smbtar ${pkgdir}/usr/bin/ + mkdir -p ${pkgdir}/usr/lib/cups/backend + ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb + mkdir -p ${pkgdir}/usr/include + install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ + install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ + mkdir -p ${pkgdir}/usr/share/man/man{1,7} + for man in rpcclient smbcacls smbclient smbcquotas smbget \ + smbtree smbtar nmblookup; do + install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/ + done + install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ +} + +package_samba () { +pkgdesc="Tools to access a server's filespace and printers via SMB" +backup=(etc/logrotate.d/samba + etc/pam.d/samba + etc/samba/smb.conf + etc/xinetd.d/swat + etc/conf.d/samba) +depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') + cd ${srcdir}/samba-${_realver}/source3 + mkdir -p ${pkgdir}/etc/samba/private + chmod 700 ${pkgdir}/etc/samba/private + make DESTDIR=${pkgdir} install + chmod 644 ${pkgdir}/usr/include/*.h + rm -rf ${pkgdir}/usr/var + (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh) + install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba + install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba + mkdir -p ${pkgdir}/etc/samba + cat ../examples/smb.conf.default | \ + sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default + install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba + install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat + install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba + # spool directory + install -d -m1777 ${pkgdir}/var/spool/samba + sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default + # fix logrotate + sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default + # nsswitch libraries + install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so + ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2 + install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so + # remove conflict files of smbclient + for man in libsmbclient smbspool \ + mount.cifs net cifs.upcall; do + rm -f ${pkgdir}/usr/share/man/man8/${man}.8 + done + for i in libnetapi* libwbclient* libsmbclient*;do + rm -f ${pkgdir}/usr/lib/$i + done + for bin in net \ + nmblookup rpcclient smbcacls smbclient \ + smbcquotas smbget smbspool smbtar smbtree; do + rm -f ${pkgdir}/usr/bin/$bin + done + rm -f ${pkgdir}/usr/sbin/cifs.upcall + rm -f ${pkgdir}/usr/include/netapi.h + for man in rpcclient smbcacls smbclient smbcquotas \ + smbtree smbtar nmblookup smbget; do + rm -f ${pkgdir}/usr/share/man/man1/${man}.1 + done + for man in tdbbackup tdbdump tdbtool; do + rm -f ${pkgdir}/usr/share/man/man8/${man}.8 + done + rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7 + rm -f ${pkgdir}/usr/include/libsmbclient.h + # copy ldap example + install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema +} +md5sums=('e297e0ea7923c7de8d7c1d8fd0ec0a05' + 'a3da19515a234c703876cf850c44e996' + '5697da77590ec092cc8a883bae06093c' + 'a4bbfa39fee95bba2e7ad6b535fae7e6' + '96f82c38f3f540b53f3e5144900acf17' + 'f2f2e348acd1ccb566e95fa8a561b828' + 'c6a38a8c8fa24979e6217aed533358ea') diff --git a/testing/samba/fix-ipv6-mount.patch b/testing/samba/fix-ipv6-mount.patch new file mode 100644 index 000000000..89bef6533 --- /dev/null +++ b/testing/samba/fix-ipv6-mount.patch @@ -0,0 +1,11 @@ +--- client/mount.cifs.c.orig 2010-03-03 13:42:02.143936727 +1000 ++++ client/mount.cifs.c 2010-03-04 01:53:22.752879004 +1000 +@@ -1563,7 +1563,7 @@ + } + } + +- if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { ++ if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { + strlcat(options, "%", options_size); + current_len = strnlen(options, options_size); + optionstail = options + current_len; diff --git a/testing/samba/samba b/testing/samba/samba new file mode 100755 index 000000000..458eb8e2b --- /dev/null +++ b/testing/samba/samba @@ -0,0 +1,57 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba + +[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) + +case "$1" in + start) + rc=0 + stat_busy "Starting Samba Server" + if [ ! -x /var/run/samba ] ; then + install -m755 -g 81 -o 81 -d /var/run/samba + fi + if [ ! -x /var/log/samba ] ; then + install -m755 -g 81 -o 81 -d /var/log/samba + fi + for d in ${SAMBA_DAEMONS[@]}; do + PID=`pidof -o %PPID /usr/sbin/$d` + [ -z "$PID" ] && /usr/sbin/$d -D + rc=$(($rc+$?)) + done + if [ $rc -gt 0 ]; then + stat_fail + else + add_daemon samba + stat_done + fi + ;; + stop) + rc=0 + stat_busy "Stopping Samba Server" + for d in ${SAMBA_DAEMONS[@]}; do + PID=`pidof -o %PPID /usr/sbin/$d` + [ -z "$PID" ] || kill $PID &> /dev/null + rc=$(($rc+$?)) + done + if [ $rc -gt 0 ]; then + stat_fail + else + rm /var/run/samba/smbd.pid &>/dev/null + rm /var/run/samba/nmbd.pid &>/dev/null + rm /var/run/samba/winbindd.pid &>/dev/null + rm_daemon samba + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/samba/samba.conf.d b/testing/samba/samba.conf.d new file mode 100644 index 000000000..8721f956a --- /dev/null +++ b/testing/samba/samba.conf.d @@ -0,0 +1,7 @@ +# +# Configuration for the samba init script +# + +# space separated list of daemons to launch +SAMBA_DAEMONS=(smbd nmbd) +#SAMBA_DAEMONS=(smbd nmbd winbindd) diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate new file mode 100644 index 000000000..581f4c33b --- /dev/null +++ b/testing/samba/samba.logrotate @@ -0,0 +1,9 @@ +/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { + notifempty + missingok + sharedscripts + copytruncate + postrotate + /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam new file mode 100644 index 000000000..53724d1f8 --- /dev/null +++ b/testing/samba/samba.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd new file mode 100644 index 000000000..2e62a82b2 --- /dev/null +++ b/testing/samba/swat.xinetd @@ -0,0 +1,10 @@ +service swat +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/swat + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} diff --git a/testing/telepathy-gabble/PKGBUILD b/testing/telepathy-gabble/PKGBUILD new file mode 100644 index 000000000..04a19b6a9 --- /dev/null +++ b/testing/telepathy-gabble/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 134985 2011-08-09 18:45:11Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Daniel Balieiro <daniel@balieiro.com> +# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> +pkgname=telepathy-gabble +pkgver=0.12.4 +pkgrel=2 +pkgdesc="A Jabber/XMPP connection manager for Telepathy" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +groups=('telepathy') +license=('LGPL2.1') +depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3') +makedepends=('libxslt' 'python2') +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz) +install=telepathy-gabble.install +md5sums=('428962565d568667d3ff1aa7eee3da51') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/telepathy-gabble/telepathy-gabble.install b/testing/telepathy-gabble/telepathy-gabble.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/testing/telepathy-gabble/telepathy-gabble.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD new file mode 100644 index 000000000..ddd37f61e --- /dev/null +++ b/testing/vino/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 134988 2011-08-09 18:47:51Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=vino +pkgver=3.0.3 +pkgrel=2 +pkgdesc="a VNC server for the GNOME desktop" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils') +makedepends=('intltool' 'networkmanager') +groups=('gnome-extra') +url="http://www.gnome.org" +options=(!emptydirs) +install=vino.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('0e58027d3c10649da61445cdd5205e31c4d1aa0b63f4911de3db4e7052d7bbfb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/vino \ + --localstatedir=/var \ + --enable-gnome-keyring \ + --enable-avahi + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/vino/vino.install b/testing/vino/vino.install new file mode 100644 index 000000000..469266843 --- /dev/null +++ b/testing/vino/vino.install @@ -0,0 +1,18 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall vino + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD new file mode 100644 index 000000000..c7d6642bf --- /dev/null +++ b/testing/vlc/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 135024 2011-08-09 21:18:13Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> + +pkgname=vlc +pkgver=1.1.11 +pkgrel=4 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') +url="http://www.videolan.org/vlc/" +license=('GPL') +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') +makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' + 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' + 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' + 'lirc-utils' 'gnutls' 'libcaca') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' + 'libpulse: PulseAudio support') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') +backup=('usr/share/vlc/http/.hosts' + 'usr/share/vlc/http/dialogs/.hosts' + 'usr/share/vlc/lua/http/.hosts' + 'usr/share/vlc/lua/http/dialogs/.hosts') +options=('!libtool') +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('a64846d6f21ea179ae8e8bfb6f9447fe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-faad \ + --enable-v4l \ + --enable-snapshot \ + --enable-dbus-control \ + --enable-nls \ + --enable-lirc \ + --enable-pvr \ + --enable-ncurses \ + --with-live555-tree=/usr/lib/live \ + --enable-upnp \ + --enable-realrtsp + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install + + for res in 16 32 48 128; do + install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" + done +} diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install new file mode 100644 index 000000000..4a1091bc5 --- /dev/null +++ b/testing/vlc/vlc.install @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/vlc/plugins/plugins-*.dat +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/testing/vpnc/PKGBUILD b/testing/vpnc/PKGBUILD new file mode 100644 index 000000000..04ee61cfc --- /dev/null +++ b/testing/vpnc/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 135374 2011-08-13 09:06:19Z thomas $ +# Maintainer: Thomas Baechler <thomas@archlinux.org> + +pkgname=vpnc +pkgver=0.5.3 +pkgrel=4 +pkgdesc="VPN client for cisco3000 VPN Concentrators" +url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" +license=('GPL') +depends=('libgcrypt' 'openssl' 'iproute2' 'net-tools') +optdepends=('openresolv: Let vpnc manage resolv.conf') +arch=('i686' 'x86_64') +source=("http://www.unix-ag.uni-kl.de/~massar/vpnc/$pkgname-$pkgver.tar.gz" + 'vpnc.conf' + 'vpnc.rc' + fix-iproute-syntax.patch) +backup=('etc/vpnc/default.conf') +md5sums=('4378f9551d5b077e1770bbe09995afb3' + 'a3f4e0cc682f437e310a1c86ae198e45' + 'c5885162ac198eaa36da9a01e7c0c55b' + '193a35773594667a2782701aff372551') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # Build hybrid support + sed -i 's|^#OPENSSL|OPENSSL|g' Makefile + + # Fix vpnc-script + sed 's|/sbin/resolvconf|/usr/sbin/resolvconf|g' -i vpnc-script.in + patch -p1 -i "${srcdir}"/fix-iproute-syntax.patch + + make PREFIX=/usr +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" PREFIX=/usr install + + install -D -m644 "${srcdir}"/vpnc.conf "${pkgdir}"/etc/vpnc/default.conf + install -D -m755 "${srcdir}"/vpnc.rc "${pkgdir}"/etc/rc.d/vpnc + rm -f "${pkgdir}"/etc/vpnc/vpnc.conf +} diff --git a/testing/vpnc/fix-iproute-syntax.patch b/testing/vpnc/fix-iproute-syntax.patch new file mode 100644 index 000000000..9cba4bec3 --- /dev/null +++ b/testing/vpnc/fix-iproute-syntax.patch @@ -0,0 +1,26 @@ +From a1cac186f66d0f2e8b1dce67e648aae4219c3013 Mon Sep 17 00:00:00 2001 +From: Alessandro Suardi <alessandro.suardi@gmail.com> +Date: Sat, 28 May 2011 23:20:15 +0100 +Subject: [PATCH 1/1] Cope with new kernel/iproute including ipid in route list + +Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> +--- + vpnc-script | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/vpnc-script b/vpnc-script +index cc62997..e0140c5 100755 +--- a/vpnc-script.in ++++ b/vpnc-script.in +@@ -139,7 +139,7 @@ destroy_tun_device() { + + if [ -n "$IPROUTE" ]; then + fix_ip_get_output () { +- sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' ++ sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g' + } + + set_vpngateway_route() { +-- +1.7.3.4 + diff --git a/testing/vpnc/vpnc.conf b/testing/vpnc/vpnc.conf new file mode 100644 index 000000000..914f827fd --- /dev/null +++ b/testing/vpnc/vpnc.conf @@ -0,0 +1,17 @@ +# example vpnc configuration file +# see vpnc --long-help for details + +#Interface name tun0 +#IKE DH Group dh2 +#Perfect Forward Secrecy nopfs + +# You may replace this script with something better +#Script /etc/vpnc/vpnc-script +# Enable this option for NAT traversal +#UDP Encapsulate + +#IPSec gateway my.gateway.com +#IPSec ID someid +#IPSec secret somesecret +#Xauth username myusername +#Xauth password mypassword diff --git a/testing/vpnc/vpnc.rc b/testing/vpnc/vpnc.rc new file mode 100644 index 000000000..972ed3211 --- /dev/null +++ b/testing/vpnc/vpnc.rc @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Connecting to VPN" + /usr/sbin/vpnc + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon vpnc + stat_done + fi + ;; + stop) + stat_busy "Disconnecting from VPN" + /usr/sbin/vpnc-disconnect + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon vpnc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/weechat/PKGBUILD b/testing/weechat/PKGBUILD new file mode 100644 index 000000000..6e53c7d86 --- /dev/null +++ b/testing/weechat/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 135012 2011-08-09 21:04:57Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: lucke <lucke at o2 dot pl> + +pkgname=weechat +pkgver=0.3.5 +pkgrel=3 +pkgdesc="Fast, light and extensible IRC client (curses UI)" +arch=('i686' 'x86_64') +url="http://www.weechat.org/" +license=('GPL') +depends=('gnutls') +makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') +optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') +options=('!libtool') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('0d2a089bfbfa550e0c65618a171fb3c4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + mkdir build + cd build + cmake .. -DPREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + + make DESTDIR="${pkgdir}/" install +} diff --git a/testing/wireshark/PKGBUILD b/testing/wireshark/PKGBUILD new file mode 100644 index 000000000..66b2f859c --- /dev/null +++ b/testing/wireshark/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 134932 2011-08-09 14:19:48Z guillaume $ +# Maintainer: Guillaume ALAUX <guillaume at alaux dot net> +# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> +pkgname=(wireshark-cli wireshark-gtk) +pkgbase=wireshark +pkgver=1.6.1 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL2') +makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua') +url="http://www.wireshark.org/" +options=(!libtool) +source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) +md5sums=('dc1e8c9800b64130674b120a183e2308') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + export CFLAGS="-fno-unit-at-a-time ${CFLAGS}" + + ./configure \ + --prefix=/usr \ + --with-ssl \ + --with-zlib=yes \ + --with-lua + make all +} + +package_wireshark-cli() { + pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version" + depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2' 'lua') + install=wireshark.install + conflicts=(wireshark) + + cd "${srcdir}/${pkgbase}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + #wireshark uid group is 150 + chgrp 150 "${pkgdir}/usr/bin/dumpcap" + chmod 754 "${pkgdir}/usr/bin/dumpcap" + rm "$pkgdir/usr/bin/wireshark" +} + +package_wireshark-gtk() { + pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - GTK frontend" + depends=('gtk2' 'wireshark-cli') + install=wireshark-gtk.install + replaces=(wireshark) + conflicts=(wireshark) + + cd "${srcdir}/${pkgbase}-${pkgver}" + + install -Dm755 .libs/wireshark "$pkgdir/usr/bin/wireshark" + for d in 16 32 48; do + install -Dm644 image/hi${d}-app-wireshark.png ${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png + done + install -Dm644 wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop +} diff --git a/testing/wireshark/wireshark-gtk.install b/testing/wireshark/wireshark-gtk.install new file mode 100644 index 000000000..6b1b64bdd --- /dev/null +++ b/testing/wireshark/wireshark-gtk.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/wireshark/wireshark.install b/testing/wireshark/wireshark.install new file mode 100644 index 000000000..6585ba272 --- /dev/null +++ b/testing/wireshark/wireshark.install @@ -0,0 +1,18 @@ +post_install() { + getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" +} + +post_upgrade() { + getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap +} + +post_remove() { + if getent group wireshark >/dev/null 2>&1; then + groupdel wireshark + fi +} diff --git a/testing/xfce4-mailwatch-plugin/PKGBUILD b/testing/xfce4-mailwatch-plugin/PKGBUILD new file mode 100644 index 000000000..4a992bd09 --- /dev/null +++ b/testing/xfce4-mailwatch-plugin/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 134951 2011-08-09 15:38:12Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Suzy Williams <suzanne.williams3@verizon.net> + +pkgname=xfce4-mailwatch-plugin +pkgver=1.1.0 +pkgrel=4 +pkgdesc="A mailbox watch/check plugin for the Xfce4 panel" +arch=(i686 x86_64) +license=('GPL2') +url="http://spurint.org/projects/xfce4-mailwatch-plugin/" +groups=('xfce4-goodies') +depends=('xfce4-panel' 'libxfcegui4' 'gnutls' 'libgcrypt' 'hicolor-icon-theme') +makedepends=('intltool' 'xfce4-dev-tools') +options=('!libtool') +install=${pkgname}.install +source=(http://spuriousinterrupt.org/files/mailwatch/${pkgname}-${pkgver}.tar.bz2 + xfce4-mailwatch-plugin-1.1.0-underlink.patch) +md5sums=('f84dce86be1d7f25f169f262aaacee4e' + '47fe8588e3bb642e1b507a854927e6db') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # fix for panel4.8 from Fedora + patch -Np1 -i ${srcdir}/xfce4-mailwatch-plugin-1.1.0-underlink.patch + xdt-autogen + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch new file mode 100644 index 000000000..ada0df041 --- /dev/null +++ b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch @@ -0,0 +1,21 @@ +--- xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am 2008-08-26 03:42:36.000000000 +0100 ++++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am.new 2011-01-14 17:27:44.116199383 +0000 +@@ -50,6 +50,7 @@ + -I$(top_srcdir)/libmailwatch-core \ + @GTHREAD_CFLAGS@ \ + @LIBXFCE4PANEL_CFLAGS@ \ ++ @LIBXFCEGUI4_CFLAGS@ \ + -DDATADIR=\"$(datadir)\" \ + -DLOCALEDIR=\"$(localedir)\" + +@@ -60,7 +61,9 @@ + $(top_builddir)/libmailwatch-core/libmailwatch-core.la \ + @GTHREAD_LIBS@ \ + @LIBXFCE4PANEL_LIBS@ \ +- @GNUTLS_LIBS@ ++ @LIBXFCEGUI4_LIBS@ \ ++ @GNUTLS_LIBS@ \ ++ -lgcrypt + + if HAVE_CYGWIN + xfce4_mailwatch_plugin_LDFLAGS += \ diff --git a/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install new file mode 100644 index 000000000..21b79d2d4 --- /dev/null +++ b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/xmlsec/PKGBUILD b/testing/xmlsec/PKGBUILD new file mode 100644 index 000000000..c15a0ac98 --- /dev/null +++ b/testing/xmlsec/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 134954 2011-08-09 15:50:09Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Hussam Al-Tayeb <ht990332@gmail.com> + +pkgname=xmlsec +pkgver=1.2.18 +pkgrel=2 +pkgdesc="XML Security Library is a C library based on LibXML2" +license=('custom') +arch=(i686 x86_64) +url="http://www.aleksey.com/xmlsec/index.html" +depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool') +makedepends=('pkgconfig') +options=('!libtool') +source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz) +md5sums=('8694b4609aab647186607f79e1da7f1a') + +build() { + cd ${srcdir}/${pkgname}1-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "$srcdir/${pkgname}1-$pkgver" + make -k check +} + +package() { + cd ${srcdir}/${pkgname}1-${pkgver} + make DESTDIR=${pkgdir} install + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ +} |
