diff options
32 files changed, 779 insertions, 80 deletions
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/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/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/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 bb04e7fc9..a240c3a0a 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') -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/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 097526889..392438eb8 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') 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/oss/PKGBUILD b/community/oss/PKGBUILD index 314d6cb0d..cb9e8432e 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') 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/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/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 95f3bab04..ecf4e4c7c 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') 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/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 0d88722b6..fcba9b8b4 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') 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/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/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 04b21679e..29a67fc6d 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) 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 c1ed81cf3..ea74ed99a 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') 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/sdl/PKGBUILD b/extra/sdl/PKGBUILD index 46ed5bfdd..e238ef068 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') 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/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/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/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/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/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 +} |