diff options
88 files changed, 1308 insertions, 272 deletions
diff --git a/community-staging/cegui/PKGBUILD b/community-staging/cegui/PKGBUILD index b76a4e5e7..18759cd5f 100644 --- a/community-staging/cegui/PKGBUILD +++ b/community-staging/cegui/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 73583 2012-07-10 18:04:30Z svenstaro $ +# $Id: PKGBUILD 78692 2012-10-22 21:30:12Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> pkgname=cegui -pkgver=0.7.6 -pkgrel=4 +pkgver=0.7.7 +pkgrel=2 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" @@ -18,16 +18,12 @@ optdepends=("python2: python bindings" "ogre: ogre module" "irrlicht: irrlicht module") options=(!libtool) -source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz - cegui-0.7.6-python-detection.patch) -md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3' - '4600775f78b7349621a8a314ade8c902') +source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) +md5sums=('8b83577f86eaa1581765dd155c7c8f24') build() { cd $srcdir/CEGUI-${pkgver} - patch -Np0 < $srcdir/cegui-0.7.6-python-detection.patch - ./bootstrap ./configure --prefix=/usr \ diff --git a/community-staging/converseen/PKGBUILD b/community-staging/converseen/PKGBUILD new file mode 100644 index 000000000..8712b24c1 --- /dev/null +++ b/community-staging/converseen/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 78710 2012-10-23 01:14:53Z ebelanger $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: archtux <antonio.arias99999 at gmail.com> + +pkgname=converseen +pkgver=0.5.1 +pkgrel=2 +pkgdesc="The batch image converter and resizer" +arch=('i686' 'x86_64') +url="http://converseen.sourceforge.net/" +license=('GPL3') +depends=('imagemagick' 'qt' 'libwmf' 'openexr') +makedepends=('cmake') +install=converseen.install +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('db00c0cf86977494effa971fd238c786') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}/build" + + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/converseen/converseen.install b/community-staging/converseen/converseen.install new file mode 100644 index 000000000..9af7fa81f --- /dev/null +++ b/community-staging/converseen/converseen.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/cuneiform/PKGBUILD b/community-staging/cuneiform/PKGBUILD new file mode 100644 index 000000000..8e94e925b --- /dev/null +++ b/community-staging/cuneiform/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 78628 2012-10-22 10:49:00Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Maxim Vuets <maxim.vuets@gmail.com> + +pkgname=cuneiform +pkgver=1.1.0 +_dpkgver=1.1 +pkgrel=4 +pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." +arch=('i686' 'x86_64') +url="https://launchpad.net/cuneiform-linux" +license=('BSD') +depends=('imagemagick') +makedepends=('cmake') +source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2) +md5sums=('09fd160cdfc512f26442a7e91246598d') + +_SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" + +build() { + cd "${_SRC_ROOT}" + sed -i 's#lib64#lib#' install_files.cmake + mkdir builddir + cd builddir + + cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "${_SRC_ROOT}"/builddir + make DESTDIR="${pkgdir}" install + + install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ + "${pkgdir}/usr/share/licenses/cuneiform/license.txt" +} diff --git a/community-staging/darktable/PKGBUILD b/community-staging/darktable/PKGBUILD index 404ccda05..3548f4fed 100644 --- a/community-staging/darktable/PKGBUILD +++ b/community-staging/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74554 2012-07-30 14:07:01Z spupykin $ +# $Id: PKGBUILD 78630 2012-10-22 10:52:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,7 +6,7 @@ pkgname=darktable pkgver=1.0.5 _pkgver=1.0 -pkgrel=2 +pkgrel=4 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ @@ -22,8 +22,9 @@ source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/ md5sums=('9ad88a1a6b9761fce28c8073d8f47941') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt + sed -i 's/-Werror//' src/CMakeLists.txt mkdir -p build cd build cmake \ @@ -38,8 +39,8 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver/build - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="$pkgdir" install mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" # mkdir -p "${pkgdir}/usr/share/gconf/schemas/" # mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" diff --git a/community-staging/freewrl/PKGBUILD b/community-staging/freewrl/PKGBUILD index 754a4dbf1..3099fb0ce 100644 --- a/community-staging/freewrl/PKGBUILD +++ b/community-staging/freewrl/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 74429 2012-07-28 09:52:22Z spupykin $ +# $Id: PKGBUILD 78632 2012-10-22 11:20:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl -pkgver=1.22.13 -pkgrel=2 +pkgver=1.22.13.1 +_pkgver=1.22.13 +pkgrel=3 pkgdesc="VRML viewer" arch=('i686' 'x86_64') url="http://freewrl.sourceforge.net/" license=('GPL') depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' - 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js') -makedepends=('java-environment' 'xulrunner') + 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js' 'glu') +makedepends=('java-environment' 'xulrunner' 'wget' 'mesa') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('7e432c7a9eb5d00497d34d93e2b4d420') +md5sums=('27f4bf163011d8ac2088a535cb58a13d') build() { . /etc/profile.d/jre.sh . /etc/profile.d/jdk.sh - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${_pkgver} export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185" ./configure \ @@ -31,6 +32,6 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${_pkgver} make DESTDIR=$pkgdir install } diff --git a/community-staging/gmic/PKGBUILD b/community-staging/gmic/PKGBUILD new file mode 100644 index 000000000..f45bf8391 --- /dev/null +++ b/community-staging/gmic/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 78634 2012-10-22 11:21:17Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: farid <farid at archlinuc-br.org> +# Contributor: Archie <Mymaud@gmail.com> + +pkgbase=gmic +pkgname=("gmic" "gimp-plugin-gmic" "zart") +pkgver=1.5.1.8 +pkgrel=4 +arch=("i686" "x86_64") +url="http://gmic.sourceforge.net" +license=("custom:CeCILL") +makedepends=("gimp" "qt" "fftw" "openexr" "opencv") +#options=('!emptydirs') +source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" + "opencv-buildfix.patch") +md5sums=('1fc38346269bdd829dd7c4864a27fbc3' + '8d1cf5000239099255d25c7d3dbe5728') + +build() { + cd "${srcdir}/gmic-${pkgver}" + patch -p1 -i "${srcdir}/opencv-buildfix.patch" + find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \; + find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; + make -C src all +} + +package_gmic() { + pkgdesc="GREYC's Magic Image Converter: image processing framework" + depends=("fftw" "libtiff" "libjpeg" "libpng" "openexr" "libx11") + replaces=("greycstoration") + + cd "${srcdir}/gmic-${pkgver}" + make -C src install DESTDIR="$pkgdir" USR="/usr" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -rf "${pkgdir}/usr/"{bin/zart,lib/gimp,share/zart} +} + +package_zart() { + pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam" + depends=("opencv" "fftw" "qt") + + cd "${srcdir}/gmic-${pkgver}" + make -C src install DESTDIR="$pkgdir" USR="/usr" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -rf "${pkgdir}/usr/"{bin/gmic,include,lib,share/{man,bash-completion}} +} + +package_gimp-plugin-gmic() { + pkgdesc="Gimp plugin for the G'MIC image processing framework" + depends=("gimp" "fftw") + replaces=("gimp-plugin-greycstoration" "gimp-plugin-gmic4gimp") + + cd "${srcdir}/gmic-${pkgver}" + install -Dm755 src/gmic_gimp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/gmic_gimp" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community-staging/gmic/opencv-buildfix.patch b/community-staging/gmic/opencv-buildfix.patch new file mode 100644 index 000000000..b204cb721 --- /dev/null +++ b/community-staging/gmic/opencv-buildfix.patch @@ -0,0 +1,32 @@ +diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile +--- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400 ++++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400 +@@ -296,7 +296,7 @@ + + zart: lib + ifneq ($(OS),Darwin) +- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart ++ cd ../zart && qmake zart.pro && $(MAKE) && strip zart + else + cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" + endif +@@ -403,6 +403,7 @@ + mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ + cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz + cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz ++ if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi + if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi + if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi + +diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro +--- gmic-1.5.1.7/zart/zart.pro 2012-07-26 12:59:33.000000000 +0400 ++++ gmic-1.5.1.7.q/zart/zart.pro 2012-08-03 12:32:27.000000000 +0400 +@@ -34,7 +34,7 @@ + FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui + + !macx { +- LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml -lfftw3 ++ LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui -lfftw3 + } else { + LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3 + } diff --git a/community-staging/gource/PKGBUILD b/community-staging/gource/PKGBUILD index bb61c0e40..05dc9af51 100644 --- a/community-staging/gource/PKGBUILD +++ b/community-staging/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74461 2012-07-29 03:22:52Z svenstaro $ +# $Id: PKGBUILD 78702 2012-10-22 23:36:06Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.38 -pkgrel=3 +pkgrel=5 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) diff --git a/community-staging/megaglest/PKGBUILD b/community-staging/megaglest/PKGBUILD new file mode 100644 index 000000000..4c51617d4 --- /dev/null +++ b/community-staging/megaglest/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 78704 2012-10-22 23:38:03Z ebelanger $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> + +pkgname=megaglest +pkgver=3.6.0.3 +pkgrel=5 +pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/megaglest/" +license=('GPL3') +depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew' +'libircclient' 'miniupnpc' 'wxgtk' 'glu') +makedepends=('ftjam' 'cmake' 'mesa') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz" + lol.patch) +md5sums=('5a4a2429435031d9f9cc5d9535a9de9d' + '68fd326b73ed1c75981004fbdef6b73a') + +build() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ + + patch -Np1 < "$srcdir/lol.patch" + + [[ -d build ]] && rm -r build + mkdir build && cd build + cmake .. \ + -DWANT_SVN_STAMP=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version + make +} + +package() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ + + cd build + make DESTDIR="$pkgdir" install +} + +# vim: sw=2:ts=2 et: diff --git a/community-staging/megaglest/lol.patch b/community-staging/megaglest/lol.patch new file mode 100644 index 000000000..56f94c852 --- /dev/null +++ b/community-staging/megaglest/lol.patch @@ -0,0 +1,43 @@ +diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h +index 8fcfb27..3cb7a41 100644 +--- a/source/shared_lib/include/graphics/math_util.h ++++ b/source/shared_lib/include/graphics/math_util.h +@@ -184,10 +184,10 @@ public: + + Rect2<T> computeBoundingRect() const{ + return Rect2i( +- min(p[0].x, p[1].x), +- min(p[0].y, p[2].y), +- max(p[2].x, p[3].x), +- max(p[1].y, p[3].y)); ++ std::min(p[0].x, p[1].x), ++ std::min(p[0].y, p[2].y), ++ std::max(p[2].x, p[3].x), ++ std::max(p[1].y, p[3].y)); + } + + bool isInside(const Vec2<T> &pt) const{ +diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp +index b09c972..ddebd03 100644 +--- a/source/shared_lib/sources/platform/posix/ircclient.cpp ++++ b/source/shared_lib/sources/platform/posix/ircclient.cpp +@@ -13,6 +13,7 @@ + #include "ircclient.h" + #include "util.h" + #include "platform_common.h" ++#include "libirc_rfcnumeric.h" + #include "libircclient.h" + + #include <stdio.h> +diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp +index 05478fc..c27aa62 100644 +--- a/source/shared_lib/sources/util/util.cpp ++++ b/source/shared_lib/sources/util/util.cpp +@@ -19,6 +19,7 @@ + #include <stdarg.h> + #include <time.h> + #include <fcntl.h> // for open() ++#include <unistd.h> + + #ifdef WIN32 + #include <io.h> // for open() diff --git a/community-staging/openimageio/PKGBUILD b/community-staging/openimageio/PKGBUILD index ea6bbd54a..7fe4972b7 100644 --- a/community-staging/openimageio/PKGBUILD +++ b/community-staging/openimageio/PKGBUILD @@ -1,36 +1,34 @@ -# $Id: PKGBUILD 73518 2012-07-09 01:05:28Z svenstaro $ +# $Id: PKGBUILD 78698 2012-10-22 22:44:01Z ebelanger $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio -pkgver=1.0.6 -pkgrel=1 +pkgver=1.0.9 +pkgrel=4 pkgdesc="A library for reading and writing images, including classes, utilities, and applications." arch=(i686 x86_64) url="http://www.openimageio.org/" license=('custom') depends=('openexr' 'boost-libs' 'jasper' 'glew') -makedepends=('cmake' 'qt' 'python2' 'boost') +makedepends=('cmake' 'qt' 'python2' 'boost' 'mesa') optdepends=('qt: iv image viewer' 'python2: bindings support') source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('fa6e3f4be98d8e1868b389410b56563a') +md5sums=('4b98a057515cc95fc954743c987f19ba') build() { cd "$srcdir"/$_pkgname*/src [[ -d build ]] && rm -r build mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. + cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages .. make } package() { cd "$srcdir"/$_pkgname*/src/build - make DESTDIR=$pkgdir install - - mv $pkgdir/usr/lib/python $pkgdir/usr/lib/python2.7 + make DESTDIR="$pkgdir" install # license cd ../.. diff --git a/community-staging/rss-glx/PKGBUILD b/community-staging/rss-glx/PKGBUILD index 92714fa2b..adf2bfcff 100644 --- a/community-staging/rss-glx/PKGBUILD +++ b/community-staging/rss-glx/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 74431 2012-07-28 09:53:08Z spupykin $ +# $Id: PKGBUILD 78636 2012-10-22 11:22:11Z spupykin $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=9 +pkgrel=12 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64') url="http://rss-glx.sourceforge.net/" license=('GPL') -depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick') +depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick' 'glu') +makedepends=('mesa') optdepends=('xscreensaver: xscreensaver integration') install=rss-glx.install options=('!libtool') diff --git a/community-staging/sfml/PKGBUILD b/community-staging/sfml/PKGBUILD new file mode 100644 index 000000000..c59465784 --- /dev/null +++ b/community-staging/sfml/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 78696 2012-10-22 22:13:12Z ebelanger $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Ondrej Martinak <omartinak@gmail.com> + +pkgname=sfml +pkgver=2.0rc1 +pkgrel=3 +pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' +arch=('i686' 'x86_64') +url='http://www.sfml-dev.org/' +license=('zlib') +depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') +makedepends=('mesa' 'cmake' 'doxygen') +install=sfml.install +source=("2.0-rc.tar.gz::https://github.com/LaurentGomila/SFML/tarball/2.0-rc") +md5sums=('03c8e6817f4525092b94a3d44e8eada8') + +build() { + cd "$srcdir"/Laurent* + + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ + -DBUILD_DOC=true \ + -DBUILD_EXAMPLES=true + make + make doc +} + +package() { + cd "$srcdir"/Laurent*/build + + make DESTDIR="$pkgdir/" install + + install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-2.8/Modules/FindSFML.cmake" + + install -Dm644 ../license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + diff --git a/community-staging/sfml/sfml.install b/community-staging/sfml/sfml.install new file mode 100644 index 000000000..75f760be6 --- /dev/null +++ b/community-staging/sfml/sfml.install @@ -0,0 +1,3 @@ +post_install() { + echo "To view the SFML samples, go to /usr/share/SFML/examples/ and run them individually" +} diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD index 654885736..9dc8d199f 100644 --- a/community-staging/spring/PKGBUILD +++ b/community-staging/spring/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 73670 2012-07-13 06:44:56Z svenstaro $ +# $Id: PKGBUILD 78694 2012-10-22 21:41:06Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.89.0 -_pkgver=89.0 -pkgrel=1 +pkgver=0.91.0 +_pkgver=91.0 +pkgrel=3 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') url="http://springrts.com/" license=('GPL') depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl' - 'libxcursor') -makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment') + 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils') +makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa') optdepends=('python2: python-based bots' 'java-runtime: java-based bots') -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma - boost-1.50.patch) -md5sums=('36fc266e925bc3790a68bf1bc7ebb315' - 'a3c3b4a53eeb499090b027fd6b3cf848') +install=spring.install +source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) +md5sums=('8849ace38f2ae20dc100b9d0a8d743e9') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma @@ -27,21 +26,20 @@ build() { cd spring_${_pkgver} sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h - patch -Np1 < $srcdir/boost-1.50.patch cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATADIR=share/spring + -DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES make } package() { cd spring_${_pkgver} - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install - install -d $pkgdir/etc/spring - echo '$HOME/.spring' > $pkgdir/etc/spring/datadir + install -d "$pkgdir/etc/spring" + echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir" } # vim sw=2:ts=2 et: diff --git a/community-staging/spring/spring.install b/community-staging/spring/spring.install new file mode 100644 index 000000000..41f09f887 --- /dev/null +++ b/community-staging/spring/spring.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-staging/xbmc/ChangeLog b/community-staging/xbmc/ChangeLog new file mode 100644 index 000000000..66ae97e3b --- /dev/null +++ b/community-staging/xbmc/ChangeLog @@ -0,0 +1,69 @@ +2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com> + * 9.11-15 : + Made it back compliant with FHS ( thx pierre for pointing that out ) + namcap checked and modified to fit its needs as far as it was possible + +2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-10 : + Try and fix some autoconf issues (thanks Gentoo ebuild). + +2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-9 : + Replace some libtool 'ltmain.sh' scripts with the one from libtool + installed with Arch. + Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault + on systems using the nvidia driver. + +2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-8 : + Fix some include's so that gcc 4.3.x is happy, shouldn't complain about + undefined '::realloc' anymore. + Remove Mac OS X specific files. + +2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-7 : + Moved libcdio, pmount, smbclient and unrar to optdepends. + Removed unneeded dependency on sdl_gfx. + Removed dependency on libpng as sdl_image depends on it. + +2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-6 : + Added libpng to dependency list. + Added gawk to dependency list. + Removed '--disable-mms' and '--enable-halmount' configure flags as they + are not mentioned as supported in the configure script. + +2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-5 : + Added libmad to the dependency list. + Streamripper 1.64.0+ does not include tre anymore, removed streamripper + and added tre instead. + Removed subversion from makedepends. + +2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-4 : + Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not + fail any longer. + +2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-3 : + Added lirc to the optdepends array. + +2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-2 : + Added install file which informs users that a display depth of at + least 24-bit is required. + +2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-1 : + Initial package, based on previous work by Zeqadious. diff --git a/community-staging/xbmc/PKGBUILD b/community-staging/xbmc/PKGBUILD new file mode 100644 index 000000000..b76b374cc --- /dev/null +++ b/community-staging/xbmc/PKGBUILD @@ -0,0 +1,120 @@ +# $Id: PKGBUILD 78638 2012-10-22 11:38:41Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> +# Contributor: Zeqadious <zeqadious.at.gmail.dot.com> +# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > + +_prefix=/usr + +pkgname=xbmc +pkgver=11.0 +pkgrel=10 +pkgdesc="A software media player and entertainment hub for digital media" +arch=('i686' 'x86_64') +url="http://xbmc.org" +license=('GPL' 'custom') +depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' + 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' + 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' + 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' + 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu') +makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' + 'udisks' 'upower' 'bluez' 'mesa') +optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' + 'vdpau-video: accelerated video playback for nvidia cards' + 'xvba-video: accelerated video playback for amd cards' + 'pulseaudio: pulseaudio support' + 'lirc: remote controller support' + 'udisks: automount external drives' + 'upower: used to trigger suspend functionality' + 'unrar: access compressed files without unpacking them' + 'xorg-xinit: autostart xbmc') +install="${pkgname}.install" +source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" + "xbmc.service") +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' + '395ca1afd3430ad66239bafbffde0eedf9c43409b77f65341ef387f09cd65588') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' + '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' + '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' + '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af') + +build() { + cd "${srcdir}/xbmc-$pkgver" + + # fix lsb_release dependency + sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp + + # Bootstrapping XBMC + ./bootstrap + + # Configuring XBMC + export PYTHON_VERSION=2 # external python v2 + ./configure --prefix=$_prefix --exec-prefix=$_prefix \ + --disable-debug \ + --enable-optimizations \ + --enable-gl \ + --enable-sdl \ + --enable-vaapi \ + --enable-vdpau \ + --enable-xvba \ + --enable-joystick \ + --enable-xrandr \ + --enable-rsxs \ + --enable-projectm \ + --enable-x11 \ + --enable-pulse \ + --enable-rtmp \ + --enable-samba \ + --enable-nfs \ + --enable-afpclient \ + --enable-airplay \ + --enable-airtunes \ + --enable-ffmpeg-libvorbis \ + --enable-dvdcss \ + --disable-hal \ + --enable-avahi \ + --enable-webserver \ + --enable-optical-drive \ + --enable-libbluray \ + --enable-texturepacker \ + --enable-udev \ + --enable-libusb \ + --enable-libcec \ + --enable-external-libraries \ + --disable-external-ffmpeg + # Now (finally) build + make +} + +package() { + cd "${srcdir}/xbmc-$pkgver" + # Running make install + make DESTDIR="${pkgdir}" install + + # run feh with python2 + sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc + + # lsb_release fix + sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc" + sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc" + + # Tools + install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr" + install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" + + # Licenses + install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}" + for licensef in LICENSE.GPL copying.txt; do + mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}" + done + + # systemd stuff + install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service +} +# vim:set ts=2 sw=2 et: diff --git a/community-staging/xbmc/xbmc.install b/community-staging/xbmc/xbmc.install new file mode 100644 index 000000000..a3ae3d0d8 --- /dev/null +++ b/community-staging/xbmc/xbmc.install @@ -0,0 +1,16 @@ +post_install() { + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications + groupadd xbmc + useradd -G xbmc -d /var/empty xbmc +} + +post_upgrade() { + post_install $1 + echo "You may want to add xbmc user and group to use xbmc standalone" +} + +post_remove() { + post_install $1 + echo "You may want to remove xbmc user and group" +} diff --git a/community-staging/xbmc/xbmc.service b/community-staging/xbmc/xbmc.service new file mode 100644 index 000000000..b66e35c80 --- /dev/null +++ b/community-staging/xbmc/xbmc.service @@ -0,0 +1,13 @@ +[Unit] +Description = Starts instance of XBMC using xinit +After = remote-fs.target + +[Service] +User = xbmc +Group = xbmc +Type = simple +ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 +Restart = on-failure + +[Install] +WantedBy = multi-user.target diff --git a/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD index bd5a16ff1..5cb7fc64d 100644 --- a/community-testing/virtualbox-modules/PKGBUILD +++ b/community-testing/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77179 2012-10-06 09:12:30Z tpowa $ +# $Id: PKGBUILD 78656 2012-10-22 13:29:39Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.0 -pkgrel=6 +pkgver=4.2.2 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -16,8 +16,8 @@ makedepends=('linux-headers' build() { # current kernel version - #_kernver=$(expac -Q '%v' linux-headers)-ARCH - _kernver=3.6.0-1-ARCH + _kernver=$(expac -Q '%v' linux-headers)-ARCH + #_kernver=3.6.0-1-ARCH # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -36,8 +36,8 @@ package_virtualbox-host-modules(){ conflicts=('virtualbox-modules') install=virtualbox-host-modules.install - #_kernver=$(expac -Q '%v' linux-headers)-ARCH - _kernver=3.6.0-1-ARCH + _kernver=$(expac -Q '%v' linux-headers)-ARCH + # _kernver=3.6.0-1-ARCH _extraver=extramodules-${_kernver%.*}-ARCH install -dm755 "$pkgdir/usr/lib/modules/$_extraver" @@ -55,8 +55,8 @@ package_virtualbox-guest-modules(){ conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install - #_kernver=$(expac -Q '%v' linux-headers)-ARCH - _kernver=3.6.0-1-ARCH + _kernver=$(expac -Q '%v' linux-headers)-ARCH + #_kernver=3.6.0-1-ARCH _extraver=extramodules-${_kernver%.*}-ARCH install -dm755 "$pkgdir/usr/lib/modules/$_extraver" diff --git a/community/astromenace/PKGBUILD b/community/astromenace/PKGBUILD index 145b5e98e..8f6c185a2 100644 --- a/community/astromenace/PKGBUILD +++ b/community/astromenace/PKGBUILD @@ -1,55 +1,42 @@ -# $Id: PKGBUILD 77621 2012-10-13 11:41:17Z allan $ +# $Id: PKGBUILD 78708 2012-10-23 00:34:23Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Ivan Bobrov <ibobrik at gmail dot com> # Contributor: Black_Mage <vleon1 at gmail dot com> pkgname=astromenace -pkgver=1.2.0 -pkgrel=6 -pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities. English version" +pkgver=1.3.0 +pkgrel=1 +pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities" arch=('i686' 'x86_64') url="http://www.viewizard.com/astromenace/index_linux.php" license=('GPL3') -depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu') +depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu' 'freetype2' 'libxinerama') makedepends=('cmake' 'mesa') -source=(http://downloads.sourceforge.net/openastromenace/openamenace-src-$pkgver.tar.bz2 - http://downloads.sourceforge.net/openastromenace/oamenace-data-$pkgver.tar.bz2 - http://downloads.sourceforge.net/openastromenace/oamenace-lang-en-$pkgver.tar.bz2 - astromenace.desktop - astromenace.png - astromenace.patch - astromenace.sh) -md5sums=('3c8e7013aa64fcde7ba8a7750df51ab8' - 'a8ad3495f8eac419ebcf93473008484d' - 'f137da529da1345a0243f22fb8bf4913' - '1edc9367564a6c639a2b8199adf26a08' - '1643d876d4e21cc0c6ceddc8e7c8ceed' - '8d23310a2bb9c96dd150d30ab39799a1' - '2d4504929a620709cd058657bba335b3') +source=(http://downloads.sourceforge.net/openastromenace/openastromenace-src-$pkgver.tar.bz2 + astromenace.desktop) +md5sums=('f48385106da687c12996d25852191e76' + '1edc9367564a6c639a2b8199adf26a08') build() { - cd $srcdir/OpenAstroMenaceSVN + cd $srcdir/AstroMenace - # Patch build and install the engine - patch -Np1 -i $srcdir/$pkgname.patch - cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr - sed -i 's/`sdl-config --libs`/-lSDL -lpthread/' CMakeFiles/AstroMenace.dir/link.txt + [[ -d build ]] && rm -r build + mkdir build && cd build + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDATADIR=/usr/share/astromenace make } package() { - cd $srcdir/OpenAstroMenaceSVN + cd $srcdir/AstroMenace - # Manually install the engine and data - install -Dm 755 AstroMenace $pkgdir/usr/bin/astromenace_bin - install -Dm 644 $srcdir/gamedata.vfs $pkgdir/usr/share/astromenace/gamedata.vfs - install -Dm 644 $srcdir/gamelang_en.vfs $pkgdir/usr/share/astromenace/gamelang_en.vfs - install -d $pkgdir/usr/share/astromenace/DATA/SCRIPT - install -m 644 $srcdir/DATA/SCRIPT/* $pkgdir/usr/share/astromenace/DATA/SCRIPT + build/AstroMenace --pack --rawdata=./RAW_VFS_DATA --dir=build - # Install .desktop, icon and bin + install -Dm755 build/AstroMenace $pkgdir/usr/bin/astromenace + install -Dm644 build/gamedata.vfs $pkgdir/usr/share/astromenace/gamedata.vfs + + install -Dm 644 astromenace_128.png $pkgdir/usr/share/pixmaps/astromenace.png install -Dm 644 $srcdir/astromenace.desktop $pkgdir/usr/share/applications/astromenace.desktop - install -Dm 644 $srcdir/astromenace.png $pkgdir/usr/share/pixmaps/astromenace.png - install -Dm 755 $srcdir/astromenace.sh $pkgdir/usr/bin/astromenace } diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index cb43c9935..ce2b394d7 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76448 2012-09-18 16:21:17Z tredaelli $ +# $Id: PKGBUILD 78662 2012-10-22 14:00:29Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.7.0 +pkgver=0.7.1 pkgrel=1 arch=('i686' 'x86_64') url="http://www.bitcoin.org/" @@ -13,7 +13,7 @@ conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git') replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git') license=('MIT') source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz) -sha256sums=('4b7a44fec28cbd9194a1303dd65bba8f13aa2facd4e06e4a3d1df6d66bc1deb5') +sha256sums=('431d28cedc76999131fcb34fd7fac2be72e8fa0d0817f1af025569cb3dff7c55') build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD index c03f041cb..ec74052b2 100644 --- a/community/darkstat/PKGBUILD +++ b/community/darkstat/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 78362 2012-10-17 15:24:25Z spupykin $ +# $Id: PKGBUILD 78624 2012-10-22 09:39:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=darkstat pkgver=3.0.715 -pkgrel=3 +pkgrel=5 pkgdesc="Network statistics gatherer (packet sniffer)" url="http://dmr.ath.cx/net/darkstat/" license=("GPL") arch=(i686 x86_64) depends=('libpcap' 'zlib' 'gcc-libs') +backup=('etc/conf.d/darkstat.conf') source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2 darkstat darkstat.service @@ -16,7 +17,7 @@ source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2 install=darkstat.install md5sums=('5b7abc7538dcd8e30667dac150e81d77' '1021f95fabe16cfab4c95f6264d535e5' - 'd22a09fa1f66b2b1afb8521ceea693d6' + '57af85cff73c49d9f87dc4f6fe206bf7' 'aa9a9effd1e8f08860afcd6439fc94c5') build() { diff --git a/community/darkstat/darkstat.install b/community/darkstat/darkstat.install index fa0ccea48..a8e6826ca 100644 --- a/community/darkstat/darkstat.install +++ b/community/darkstat/darkstat.install @@ -1,19 +1,20 @@ daemon_name=darkstat -daemon_chroot=/var/"$daemon_name" +daemon_chroot=var/darkstat post_install() { if [ ! -d "$daemon_chroot" ]; then install -d "$daemon_chroot" + touch "$daemon_chroot/darkstat.dat" fi - /usr/sbin/useradd \ + useradd \ --system \ --home "$daemon_chroot" \ --shell /bin/false \ --no-user-group \ --gid nobody "$daemon_name" - chown -R "$daemon_name":nobody "$daemon_chroot" + chown -R "$daemon_name":nobody "/$daemon_chroot" } post_remove() { - /usr/sbin/userdel "$daemon_name" + userdel "$daemon_name" } diff --git a/community/darkstat/darkstat.service b/community/darkstat/darkstat.service index 5e303411f..49630bfd3 100644 --- a/community/darkstat/darkstat.service +++ b/community/darkstat/darkstat.service @@ -2,14 +2,15 @@ Description=Network statistics gatherer (packet sniffer) [Service] -User=couchdb -Type=forking +Type=simple EnvironmentFile=/etc/conf.d/darkstat.conf PIDFile=/var/darkstat/darkstat.pid ExecStart=/usr/sbin/darkstat --user "darkstat" --chroot "/var/darkstat" \ --import "darkstat.dat" --export "darkstat.dat" \ --pidfile /var/darkstat/darkstat.pid \ + -b 0.0.0.0 \ -i "$DARKSTAT_IFACE" $DARKSTAT_ARGS +ExecStopPost=rm -f /var/darkstat/darkstat.pid [Install] WantedBy=multi-user.target diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index 327af4f3d..3dcfdd521 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77108 2012-10-05 10:15:29Z spupykin $ +# $Id: PKGBUILD 78626 2012-10-22 09:47:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.11 -pkgrel=4 +pkgrel=5 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686') url="http://www.ejabberd.im/" @@ -36,6 +36,7 @@ package() { install -d "$pkgdir/var/lib/$pkgname" install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" chmod ug+r "$pkgdir/etc/$pkgname/"* + chmod a+rx "$pkgdir/usr/sbin/ejabberdctl" rm -rf "$pkgdir/var/lock" install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service } diff --git a/community/grace/PKGBUILD b/community/grace/PKGBUILD index 0c0296724..1cb307dee 100644 --- a/community/grace/PKGBUILD +++ b/community/grace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63610 2012-02-05 12:00:16Z ibiru $ +# $Id: PKGBUILD 78616 2012-10-22 09:17:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: damir <damir@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=grace -pkgver=5.1.22 -pkgrel=6 +pkgver=5.1.23 +pkgrel=1 pkgdesc="2D plotting tool" arch=(i686 x86_64) url="http://plasma-gate.weizmann.ac.il/Grace/" @@ -13,7 +13,7 @@ depends=('libjpeg' 'libpng' 'lesstif' 't1lib' 'netcdf') makedepends=('netcdf' 'fftw') license=('GPL') source=(ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/$pkgname-$pkgver.tar.gz) -md5sums=('672356466f18fe59ed21a8fb44f9851d') +md5sums=('e2b28ebe31288952d899fbb5c97858ae') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/grsync/PKGBUILD b/community/grsync/PKGBUILD index c1d2aad71..7640a3c24 100644 --- a/community/grsync/PKGBUILD +++ b/community/grsync/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62005 2012-01-14 00:21:54Z spupykin $ +# $Id: PKGBUILD 78660 2012-10-22 13:48:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=grsync -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="GTK GUI for rsync" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('gtk2' 'rsync') makedepends=('gettext' 'intltool') install=grsync.install source=(http://www.opbyte.it/release/grsync-$pkgver.tar.gz) -md5sums=('e57f46d67f7f9e8df08fdd0b97db10a6') +md5sums=('1b40ee3c9191dbf6080285ce6dc2383d') build() { cd $srcdir/grsync-$pkgver diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index 57e1a992b..26e941512 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70883 2012-05-18 13:41:50Z spupykin $ +# $Id: PKGBUILD 78618 2012-10-22 09:18:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Lee.MaRS <leemars@gmail.com> pkgname=gsoap -pkgver=2.8.8 +pkgver=2.8.11 pkgrel=1 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" @@ -13,8 +13,8 @@ license=('GPL' 'custom') depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip - LICENSE) -md5sums=('cffb523b66eb36c51ca455645f1cfeb0' + LICENSE) +md5sums=('ea2d7ee876d274a188b8fbb365702eec' '27aaa3f5166db94d44044c11a7b2c37b') build() { diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD index 7d4a125d4..69a8ac95c 100644 --- a/community/gummi/PKGBUILD +++ b/community/gummi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72952 2012-06-25 13:05:56Z arodseth $ +# $Id: PKGBUILD 78640 2012-10-22 12:45:21Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Sergio A. Morales <sergiomorales@archlinux.cl> # Contributor: soeren <nonick@posteo.de> pkgname=gummi -pkgver=0.6.4 +pkgver=0.6.5 pkgrel=1 pkgdesc='Simple LaTex editor for GTK users' arch=('x86_64' 'i686') @@ -14,11 +14,11 @@ license=('MIT') depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib' 'desktop-file-utils') makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool') install=$pkgname.install -source=("http://dev.midnightcoding.org/projects/$pkgname/latest.tar.gz") -sha256sums=('ac5c1de476f8689040a185b01515544a5e53da45ff4e10a072b8944e9de8a6ff') +source=("$pkgname-$pkgver.tar.gz::http://dev.midnightcoding.org/projects/$pkgname/latest.tar.gz") +sha256sums=('b23c2958376ea43c701a276ad19ceac5b50d9cb32a489a10897b25aa5004fffb') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver find . -type f -exec touch {} \; ./configure --prefix=/usr @@ -26,10 +26,10 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver - make prefix="$pkgdir/usr" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + make prefix=$pkgdir/usr install + install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } # vim:set ts=2 sw=2 et: diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 21ff94ed8..669b500dc 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78526 2012-10-20 09:33:25Z heftig $ +# $Id: PKGBUILD 78664 2012-10-22 14:19:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor -pkgver=0.6.3 -pkgrel=8 +pkgver=1.0.1 +pkgrel=1 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64") license=('GPL') @@ -21,9 +21,9 @@ optdepends=('flac: flac support' 'libvorbis: ogg/vorbis support') options=('!libtool' '!makeflags') install=libextractor.install -source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('7004ff6be06e400050f0ad7016140981' - '81f95c31831dde62428a98ae32464c51') +source=("http://ftp.gnu.org/gnu/libextractor/${pkgname}-${pkgver}.tar.gz"{,.sig}) +md5sums=('593c40670fd7fc8c3ae7adc3df557f64' + 'ef9bfeb3ade063dc9a5b29b2afd0732e') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/libnet/PKGBUILD b/community/libnet/PKGBUILD index b113033fc..dbab7bf3d 100644 --- a/community/libnet/PKGBUILD +++ b/community/libnet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68329 2012-03-21 20:31:50Z andrea $ +# $Id: PKGBUILD 78620 2012-10-22 09:19:25Z spupykin $ # Maintainer: # Contributor: damir <damir@archlinux.org> pkgname=libnet -pkgver=1.1.5 -pkgrel=2 +pkgver=1.1.6 +pkgrel=1 pkgdesc="A library which provides API for commonly used low-level net functions" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/libnet-dev/" @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/libnet-dev/${pkgname}-${pkgver}.tar.gz") -md5sums=('a9bc1d75a610efcfee200d3e28d8eb8f') +md5sums=('710296fe424a49344e5fcc0d09e53317') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD index 6d7d9549c..c17fc8fbb 100644 --- a/community/mariadb/PKGBUILD +++ b/community/mariadb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76117 2012-09-11 15:49:50Z bpiotrowski $ +# $Id: PKGBUILD 78669 2012-10-22 14:43:04Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.27 +pkgver=5.5.28 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -12,7 +12,7 @@ makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz service rc.d tmpfiles.conf) -md5sums=('ad6f3239a1d5af0a667e30f7c0b05037' +md5sums=('9a4055300ccadf7990167ebd1ce875fa' '9e7aa0fa646f48662df569259061fcef' '3bb5a9a96340feb0184bc057ee6e330b' '32f30449d3111714fe190931d08fdb8c') diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 06f1f7ed1..47b01740e 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78328 2012-10-17 14:22:01Z spupykin $ +# $Id: PKGBUILD 78612 2012-10-22 09:08:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips @@ -26,7 +26,7 @@ options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz opensips.init opensips.service) -md5sums=('9fa0f8b7c58668ff4669e5c54bf4c00a' +md5sums=('ec3d0f13bf8198a74aed91e5c38ec445' '685fbe00826df1285b410d4610dcbb0c' '0d80ef75b5c10324e6db790b7741c2eb') diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 96d07690c..fcd359303 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77658 2012-10-13 11:44:51Z allan $ +# $Id: PKGBUILD 78685 2012-10-22 20:51:13Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.5.1 -pkgrel=2 +pkgver=1.5.3 +pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') url="http://www.qlandkarte.org/" @@ -18,7 +18,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd' +sha256sums=('9b535d70b362475a1a8f19a142ce03f83757ab442599e6439471e40b544ddc92' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index 47c05ab04..a905f4d0b 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2012-10-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.5.3-1 + 2012-09-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.5.1-1 diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index c15685c12..6b51e42a0 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76236 2012-09-14 19:21:38Z bpiotrowski $ +# $Id: PKGBUILD 78679 2012-10-22 19:59:29Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> pkgname=spacefm -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc='A multi-panel tabbed file manager' arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ optdepends=('lsof: device processes' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz) -md5sums=('e9fe71ecd1f2ac07f4cbda2036279a99') +md5sums=('4120611f138b3dd530d8f65319366ba1') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index 1ed0a02fc..1cf1b6253 100644 --- a/community/torcs/PKGBUILD +++ b/community/torcs/PKGBUILD @@ -1,23 +1,21 @@ -# $Id: PKGBUILD 77665 2012-10-13 11:45:51Z allan $ +# $Id: PKGBUILD 78671 2012-10-22 16:39:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> pkgname=torcs -pkgver=1.3.3 -pkgrel=2 +pkgver=1.3.4 +pkgrel=1 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") arch=('i686' 'x86_64') depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis' 'glu') -makedepends=('plib') +makedepends=('plib' 'mesa') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 - torcs.desktop - torcs-gcc.patch) -md5sums=('0319c996dac4480f1182c03d2331b14a' - '328e419e9f985c3e7b69924fe299330d' - '5ae7e903df37300d3b8744328c756bff') + torcs.desktop) +md5sums=('07dbc9c53e2b177be1f53fe97d53d039' + '328e419e9f985c3e7b69924fe299330d') build() { cd $srcdir/$pkgname-${pkgver/_/-} diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD index e08ade8d2..7e4142bba 100644 --- a/community/udevil/PKGBUILD +++ b/community/udevil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76234 2012-09-14 18:50:59Z bpiotrowski $ +# $Id: PKGBUILD 78681 2012-10-22 20:02:54Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ pkgname=udevil -pkgver=0.3.3 +pkgver=0.3.4 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Mount and unmount without password' @@ -24,7 +24,7 @@ provides=('devmon') backup=('etc/udevil/udevil.conf') install=$pkgname.install source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz) -md5sums=('81abe64e0c6d3555f0b66b7d7fa9a340') +md5sums=('6b2fef714c0ef184086901896e226a80') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 052a65379..87ec6cc8d 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78360 2012-10-17 15:21:03Z spupykin $ +# $Id: PKGBUILD 78622 2012-10-22 09:20:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.9 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64') url="http://unrealircd.com" @@ -12,7 +12,8 @@ license=('GPL2') depends=('openssl' 'curl' 'c-ares') conflicts=('ircd') provides=('ircd') -backup=(etc/unrealircd/unrealircd.conf) +backup=('etc/unrealircd/unrealircd.conf' + 'etc/conf.d/unrealircd') source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.rc unrealircd.service diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD index 3e9199cdf..56413a611 100644 --- a/community/vifm/PKGBUILD +++ b/community/vifm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 73402 2012-07-07 08:01:19Z jlichtblau $ +# $Id: PKGBUILD 78687 2012-10-22 20:52:48Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=vifm -pkgver=0.7.3a +pkgver=0.7.4a pkgrel=1 pkgdesc="Ncurses based file manager with vi like keybindings" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('ncurses' 'gtk2') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('77dbf8bb8caaf1b8e805c98dc6c3345d08a855fe1c09e93e6eb5a1b2cf0fd383') +sha256sums=('fe9b8bcd992f4f34ad83dd3de46064e5d3d8d4a0c468dbd11869f9790f3dcd1f') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog index 767b7b70a..ef4ac0ea9 100644 --- a/community/vifm/vifm.changelog +++ b/community/vifm/vifm.changelog @@ -1,3 +1,6 @@ +2012-10-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vifm 0.7.4a-1 + 2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * vifm 0.7.3a-1 diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index 73b0cd14b..a0ac79479 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70645 2012-05-13 19:04:54Z jlichtblau $ +# $Id: PKGBUILD 78691 2012-10-22 20:56:11Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=yaz -pkgver=4.2.33 +pkgver=4.2.43 pkgrel=1 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ url="http://www.indexdata.dk/yaz" license=('BSD') depends=('openssl' 'libxslt' 'icu') options=('!libtool') -source=("http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('77baecaa0b032c0155676e704d39b49415d4793ab65ad6c26e04f6dfb0be1276') +source=(http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('849419a3e647568f2cc9a6097e009f0be8f379759d6d13274eb5d19314b1bfc2') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD index c7c556c27..33ca6f2b3 100644 --- a/extra/di/PKGBUILD +++ b/extra/di/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143044 2011-11-21 22:39:45Z eric $ +# $Id: PKGBUILD 169510 2012-10-22 19:36:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=di -pkgver=4.31 +pkgver=4.32 pkgrel=1 pkgdesc="A disk information utility, displaying everything (and more) that your df command does" arch=('i686' 'x86_64') @@ -10,10 +10,12 @@ url="http://www.gentoo.com/di/" license=('ZLIB') depends=('glibc') source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz) -sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79') +sha1sums=('b819e877e1135f34f362ba2f72d1e694c1878249') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|error|//error|' C/di.h + sed -i '11i\#include <string.h>' C/di.h make } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 66e7cbcaf..0fa9bee31 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169122 2012-10-18 14:05:32Z dan $ +# $Id: PKGBUILD 169498 2012-10-22 12:48:27Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.12.4 +pkgver=1.8.0 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -109,8 +109,8 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('5f3f0feb59d96f8106e0a56112bc73db' - '9370b44fa97843c5f8adaaaf29b7a4d3' +md5sums=('12f4d20f34ae37086d86dd3b9d037bba' + '66f0a839d933c7d573fb40cb051b5e66' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD index 9eb917056..5d65fe003 100644 --- a/extra/libkgapi/PKGBUILD +++ b/extra/libkgapi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165471 2012-08-20 13:27:31Z andrea $ +# $Id: PKGBUILD 169492 2012-10-22 07:20:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkgapi -pkgver=0.4.2 +pkgver=0.4.3 pkgrel=1 pkgdesc="A KDE-based library for accessing various Google services via their public API" url='https://projects.kde.org/projects/extragear/libs/libkgapi' @@ -12,11 +12,10 @@ depends=('kdepimlibs' 'qjson') makedepends=('cmake' 'automoc4' 'boost') replaces=('akonadi-google' 'libkgoogle') conflicts=('akonadi-google' 'libkgoogle') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7da940eb4ed9bdb909d29e93ef6bce67') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('99e61ad50edd51f679170db3b997736b') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -26,6 +25,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 5afccbcfb..011b94f3a 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=31 +pkgrel=32 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index fc86511e9..7dc94ab41 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,9 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.6.2 +_kernver=3.6.3 +_kernrel=1 pkgname=('linux-libre-kmod-alx') +_pkgver=2012-10-03 pkgver=20121003 -pkgrel=1 +pkgrel=2 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' @@ -11,7 +13,7 @@ license=('GPL2') depends=("linux-libre=$_kernver") makedepends=("linux-libre-headers=$_kernver") install=linux-libre-kmod-alx.install -source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-2012-10-03-pc.tar.bz2) +source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2) md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13') @@ -20,17 +22,17 @@ build() { # current extramodules version _extraver=extramodules-3.6-LIBRE - cd ${srcdir}/compat-wireless-2012-10-03-pc + cd $srcdir/compat-wireless-$_pkgver-pc # replacing to specific linux-libre kernel version - sed -i -e 's/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/3.6.2-1-LIBRE/' Makefile + sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE/" Makefile ./scripts/driver-select alx make - cd ${srcdir}/compat-wireless-2012-10-03-pc/compat + cd $srcdir/compat-wireless-$_pkgver-pc/compat gzip -9 compat.ko - install -D -m 0644 compat.ko.gz ${pkgdir}/lib/modules/$_extraver/compat.ko.gz - cd ${srcdir}/compat-wireless-2012-10-03-pc/drivers/net/ethernet/atheros/alx + install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz + cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx gzip -9 alx.ko - install -D -m 0644 alx.ko.gz ${pkgdir}/lib/modules/$_extraver/alx.ko.gz + install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz } diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 646b3658a..c94d23b3d 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,9 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.46 +_kernver=3.0.47 +_kernrel=1 pkgname=('linux-libre-lts-kmod-alx') +_pkgver=2012-10-03 pkgver=20121003 -pkgrel=1 +pkgrel=2 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' @@ -11,7 +13,7 @@ license=('GPL2') depends=("linux-libre-lts=$_kernver") makedepends=("linux-libre-lts-headers=$_kernver") install=linux-libre-lts-kmod-alx.install -source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-2012-10-03-pc.tar.bz2) +source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2) md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13') @@ -20,17 +22,17 @@ build() { # current extramodules version _extraver=extramodules-3.0-LIBRE-LTS - cd ${srcdir}/compat-wireless-2012-10-03-pc + cd ${srcdir}/compat-wireless-$_pkgver-pc # replacing to specific linux-libre-lts kernel version - sed -i -e 's/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/3.0.46-1-LIBRE-LTS/' Makefile + sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE-LTS/" Makefile ./scripts/driver-select alx make - cd ${srcdir}/compat-wireless-2012-10-03-pc/compat + cd $srcdir/compat-wireless-$_pkgver-pc/compat gzip -9 compat.ko - install -D -m 0644 compat.ko.gz ${pkgdir}/lib/modules/$_extraver/compat.ko.gz - cd ${srcdir}/compat-wireless-2012-10-03-pc/drivers/net/ethernet/atheros/alx + install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz + cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx gzip -9 alx.ko - install -D -m 0644 alx.ko.gz ${pkgdir}/lib/modules/$_extraver/alx.ko.gz + install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz } diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index d544abb26..65e5e55b0 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=46 +_sublevel=47 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.45 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.46 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -28,9 +28,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch' + 'module-symbol-waiting-3.0.patch' + 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'a2ced38cb23963b9efef79100f5885c5' + '6ad7f8f5b7230d1425dcb2c0bc336cf8' 'aed25ab047e1c0b020a1516c235c6a74' '7d37e8ce0f4bd5a957172b12ae742ea0' 'c072b17032e80debc6a8626299245d46' @@ -40,7 +42,9 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - '2fb6f217d649733bd5d977bf32c1f292') + '670931649c60fcb3ef2e0119ed532bd4' + '8a71abc4224f575008f974a099b5cf6f' + '546d9b9893e49bddf13a106f890caf94') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -78,6 +82,11 @@ build() { # https://bugs.archlinux.org/task/28653 patch -Np1 -i "${srcdir}/ext4-options.patch" + # fix module initialisation + # https://bugs.archlinux.org/task/32122 + patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch" + patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 57f19a417..3dc3be117 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.46-1-LIBRE-LTS +KERNEL_VERSION=3.0.47-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-lts/module-init-wait-3.0.patch b/libre/linux-libre-lts/module-init-wait-3.0.patch new file mode 100644 index 000000000..1bcfd2491 --- /dev/null +++ b/libre/linux-libre-lts/module-init-wait-3.0.patch @@ -0,0 +1,77 @@ +From: Rusty Russell <rusty@rustcorp.com.au> +Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) +Subject: module: wait when loading a module which is currently initializing. +X-Git-Tag: v3.7-rc1~2^2~32 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538 + +module: wait when loading a module which is currently initializing. + +The original module-init-tools module loader used a fnctl lock on the +.ko file to avoid attempts to simultaneously load a module. +Unfortunately, you can't get an exclusive fcntl lock on a read-only +fd, making this not work for read-only mounted filesystems. +module-init-tools has a hacky sleep-and-loop for this now. + +It's not that hard to wait in the kernel, and only return -EEXIST once +the first module has finished loading (or continue loading the module +if the first one failed to initialize for some reason). It's also +consistent with what we do for dependent modules which are still loading. + +Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> +Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> +--- + +diff --git a/kernel/module.c b/kernel/module.c +index 63cf6e7..74bc195 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info) + return module_finalize(info->hdr, info->sechdrs, mod); + } + ++/* Is this module of this name done loading? No locks held. */ ++static bool finished_loading(const char *name) ++{ ++ struct module *mod; ++ bool ret; ++ ++ mutex_lock(&module_mutex); ++ mod = find_module(name); ++ ret = !mod || mod->state != MODULE_STATE_COMING; ++ mutex_unlock(&module_mutex); ++ ++ return ret; ++} ++ + /* Allocate and load the module: note that size of section 0 is always + zero, and we rely on this for optional sections. */ + static struct module *load_module(void __user *umod, +@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod, + const char __user *uargs) + { + struct load_info info = { NULL, }; +- struct module *mod; ++ struct module *mod, *old; + long err; + + pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n", +@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod, + * function to insert in a way safe to concurrent readers. + * The mutex protects against concurrent writers. + */ ++again: + mutex_lock(&module_mutex); +- if (find_module(mod->name)) { ++ if ((old = find_module(mod->name)) != NULL) { ++ if (old->state == MODULE_STATE_COMING) { ++ /* Wait in case it fails to load. */ ++ mutex_unlock(&module_mutex); ++ err = wait_event_interruptible(module_wq, ++ finished_loading(mod->name)); ++ if (err) ++ goto free_arch_cleanup; ++ goto again; ++ } + err = -EEXIST; + goto unlock; + } diff --git a/libre/linux-libre-lts/module-symbol-waiting-3.0.patch b/libre/linux-libre-lts/module-symbol-waiting-3.0.patch new file mode 100644 index 000000000..b87a38ff5 --- /dev/null +++ b/libre/linux-libre-lts/module-symbol-waiting-3.0.patch @@ -0,0 +1,66 @@ +From: Rusty Russell <rusty@rustcorp.com.au> +Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) +Subject: module: fix symbol waiting when module fails before init +X-Git-Tag: v3.7-rc1~2^2~33 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1 + +module: fix symbol waiting when module fails before init + +We use resolve_symbol_wait(), which blocks if the module containing +the symbol is still loading. However: + +1) The module_wq we use is only woken after calling the modules' init + function, but there are other failure paths after the module is + placed in the linked list where we need to do the same thing. + +2) wake_up() only wakes one waiter, and our waitqueue is shared by all + modules, so we need to wake them all. + +3) wake_up_all() doesn't imply a memory barrier: I feel happier calling + it after we've grabbed and dropped the module_mutex, not just after + the state assignment. + +Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> +--- + +diff --git a/kernel/module.c b/kernel/module.c +index 7f2ee45f..63cf6e7 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod, + /* Unlink carefully: kallsyms could be walking list. */ + list_del_rcu(&mod->list); + module_bug_cleanup(mod); +- ++ wake_up_all(&module_wq); + ddebug: + dynamic_debug_remove(info.debug); + unlock: +@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_GOING, mod); + free_module(mod); +- wake_up(&module_wq); ++ wake_up_all(&module_wq); + return ret; + } + if (ret > 0) { +@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + dump_stack(); + } + +- /* Now it's a first class citizen! Wake up anyone waiting for it. */ ++ /* Now it's a first class citizen! */ + mod->state = MODULE_STATE_LIVE; +- wake_up(&module_wq); + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_LIVE, mod); + +@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + mod->init_ro_size = 0; + mod->init_text_size = 0; + mutex_unlock(&module_mutex); ++ wake_up_all(&module_wq); + + return 0; + } diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index a0f8777e6..8fd3e3138 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -29,17 +29,21 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' + 'module-symbol-waiting-3.6.patch' + 'module-init-wait-3.6.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '1014a197e2bea449600d7b2cca415eec' - '600af9b069c8a1c18dd5ef1f25bf7080' - 'c18004748092bf4ee57ade7e25fdef22' + '844bd14e9f58225274e096c31bbb8a8f' + 'e4a3a4677e1fac6ecf0e0fb44c41ca08' + '68fc36a4efb6ade0eca409b9444fef0c' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' - '1690532ad271b11a87e8824f7da65101') + '670931649c60fcb3ef2e0119ed532bd4' + '8a71abc4224f575008f974a099b5cf6f' + '34508a324c3704662e9fc115d07735a3') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -64,6 +68,11 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix module initialisation + # https://bugs.archlinux.org/task/32122 + patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch" + patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index e553c3d44..6533b0402 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.0 Kernel Configuration +# Linux/i386 3.6.3 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -134,7 +134,10 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -# CONFIG_MEMCG is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 479c39929..fbc1c7588 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.0 Kernel Configuration +# Linux/x86_64 3.6.3 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -136,7 +136,10 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -# CONFIG_MEMCG is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index e5af2a1bd..e327cd7ea 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.6.2-1-LIBRE +KERNEL_VERSION=3.6.3-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/module-init-wait-3.6.patch b/libre/linux-libre/module-init-wait-3.6.patch new file mode 100644 index 000000000..1bcfd2491 --- /dev/null +++ b/libre/linux-libre/module-init-wait-3.6.patch @@ -0,0 +1,77 @@ +From: Rusty Russell <rusty@rustcorp.com.au> +Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) +Subject: module: wait when loading a module which is currently initializing. +X-Git-Tag: v3.7-rc1~2^2~32 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538 + +module: wait when loading a module which is currently initializing. + +The original module-init-tools module loader used a fnctl lock on the +.ko file to avoid attempts to simultaneously load a module. +Unfortunately, you can't get an exclusive fcntl lock on a read-only +fd, making this not work for read-only mounted filesystems. +module-init-tools has a hacky sleep-and-loop for this now. + +It's not that hard to wait in the kernel, and only return -EEXIST once +the first module has finished loading (or continue loading the module +if the first one failed to initialize for some reason). It's also +consistent with what we do for dependent modules which are still loading. + +Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> +Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> +--- + +diff --git a/kernel/module.c b/kernel/module.c +index 63cf6e7..74bc195 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info) + return module_finalize(info->hdr, info->sechdrs, mod); + } + ++/* Is this module of this name done loading? No locks held. */ ++static bool finished_loading(const char *name) ++{ ++ struct module *mod; ++ bool ret; ++ ++ mutex_lock(&module_mutex); ++ mod = find_module(name); ++ ret = !mod || mod->state != MODULE_STATE_COMING; ++ mutex_unlock(&module_mutex); ++ ++ return ret; ++} ++ + /* Allocate and load the module: note that size of section 0 is always + zero, and we rely on this for optional sections. */ + static struct module *load_module(void __user *umod, +@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod, + const char __user *uargs) + { + struct load_info info = { NULL, }; +- struct module *mod; ++ struct module *mod, *old; + long err; + + pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n", +@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod, + * function to insert in a way safe to concurrent readers. + * The mutex protects against concurrent writers. + */ ++again: + mutex_lock(&module_mutex); +- if (find_module(mod->name)) { ++ if ((old = find_module(mod->name)) != NULL) { ++ if (old->state == MODULE_STATE_COMING) { ++ /* Wait in case it fails to load. */ ++ mutex_unlock(&module_mutex); ++ err = wait_event_interruptible(module_wq, ++ finished_loading(mod->name)); ++ if (err) ++ goto free_arch_cleanup; ++ goto again; ++ } + err = -EEXIST; + goto unlock; + } diff --git a/libre/linux-libre/module-symbol-waiting-3.6.patch b/libre/linux-libre/module-symbol-waiting-3.6.patch new file mode 100644 index 000000000..b87a38ff5 --- /dev/null +++ b/libre/linux-libre/module-symbol-waiting-3.6.patch @@ -0,0 +1,66 @@ +From: Rusty Russell <rusty@rustcorp.com.au> +Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) +Subject: module: fix symbol waiting when module fails before init +X-Git-Tag: v3.7-rc1~2^2~33 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1 + +module: fix symbol waiting when module fails before init + +We use resolve_symbol_wait(), which blocks if the module containing +the symbol is still loading. However: + +1) The module_wq we use is only woken after calling the modules' init + function, but there are other failure paths after the module is + placed in the linked list where we need to do the same thing. + +2) wake_up() only wakes one waiter, and our waitqueue is shared by all + modules, so we need to wake them all. + +3) wake_up_all() doesn't imply a memory barrier: I feel happier calling + it after we've grabbed and dropped the module_mutex, not just after + the state assignment. + +Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> +--- + +diff --git a/kernel/module.c b/kernel/module.c +index 7f2ee45f..63cf6e7 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod, + /* Unlink carefully: kallsyms could be walking list. */ + list_del_rcu(&mod->list); + module_bug_cleanup(mod); +- ++ wake_up_all(&module_wq); + ddebug: + dynamic_debug_remove(info.debug); + unlock: +@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_GOING, mod); + free_module(mod); +- wake_up(&module_wq); ++ wake_up_all(&module_wq); + return ret; + } + if (ret > 0) { +@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + dump_stack(); + } + +- /* Now it's a first class citizen! Wake up anyone waiting for it. */ ++ /* Now it's a first class citizen! */ + mod->state = MODULE_STATE_LIVE; +- wake_up(&module_wq); + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_LIVE, mod); + +@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + mod->init_ro_size = 0; + mod->init_text_size = 0; + mutex_unlock(&module_mutex); ++ wake_up_all(&module_wq); + + return 0; + } diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index d4d91c412..fe03ab28d 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=31 +pkgrel=32 epoch=1 _extramodules=extramodules-3.6-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 9d77543ce..cb0930c8c 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgname=parabola-keyring -pkgver=20121012 +pkgver=20121023 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -16,5 +16,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('386550a6b179ebd158bc7469362bf0b8' - '4794d17dd40d51069eca315c2243528b') +md5sums=('8a9036ae921c4f94fbadfaa264801a68' + '187123f4517f90ac325da8b58fc6e3e5') diff --git a/libre/parabolaweb-utils/parabolaweb-fcgi b/libre/parabolaweb-utils/parabolaweb-fcgi index 3dec02e10..e42aec3cd 100644 --- a/libre/parabolaweb-utils/parabolaweb-fcgi +++ b/libre/parabolaweb-utils/parabolaweb-fcgi @@ -3,9 +3,9 @@ set -e . /etc/conf.d/parabolaweb -[[ -e /srv/http/web/manage.py ]] +[[ -e ${WEBDIR}/manage.py ]] -sudo -u "${WEBUSER:-$USER}" python2 /srv/http/web/manage.py runfcgi \ +sudo -u "${WEBUSER:-$USER}" python2 "${WEBDIR}/manage.py" runfcgi \ host=${HOST} \ port=${PORT} \ --settings=settings \ diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update index e4d65c2d9..b8ac5bf5e 100644 --- a/libre/parabolaweb-utils/parabolaweb-update +++ b/libre/parabolaweb-utils/parabolaweb-update @@ -1,8 +1,11 @@ #!/bin/bash set -e -_install_dir=/srv/http -_gitname=web +. /etc/conf.d/parabolaweb + + +_install_dir=${WEBDIR%/*} +_gitname=${WEBDIR##*/} _gitroot=git://parabolagnulinux.org/parabolaweb.git _gitbranch=master diff --git a/libre/parabolaweb-utils/parabolaweb.conf b/libre/parabolaweb-utils/parabolaweb.conf index c53b19cb8..467e62e2c 100644 --- a/libre/parabolaweb-utils/parabolaweb.conf +++ b/libre/parabolaweb-utils/parabolaweb.conf @@ -1,3 +1,4 @@ HOST=127.0.0.1 PORT=8090 # 80 is nginx +WEBDIR=/srv/http/web WEBUSER=nobody diff --git a/libre/parabolaweb-utils/parabolaweb.rc b/libre/parabolaweb-utils/parabolaweb.rc index 087a3fcb0..5e310b01d 100644 --- a/libre/parabolaweb-utils/parabolaweb.rc +++ b/libre/parabolaweb-utils/parabolaweb.rc @@ -8,6 +8,7 @@ PIDFILE=/run/web/parabolaweb.pid case $1 in start) stat_busy "Starting ParabolaWeb" + install -dm777 ${PIDFILE%/*} if parabolaweb-fcgi pidfile=${PIDFILE}; then add_daemon parabolaweb stat_done diff --git a/libre/parabolaweb-utils/parabolaweb.service b/libre/parabolaweb-utils/parabolaweb.service index 4c3fb8c7f..a59d58512 100644 --- a/libre/parabolaweb-utils/parabolaweb.service +++ b/libre/parabolaweb-utils/parabolaweb.service @@ -5,8 +5,9 @@ Description=ParabolaWeb [Service] Type=forking -ExecStart=/usr/sbin/parabolaweb-fcgi pidfile=/run/web/parabolaweb.pid PIDFile=/run/web/parabolaweb.pid +ExecStartPre=/usr/bin/install -dm777 /run/web +ExecStart=/usr/sbin/parabolaweb-fcgi pidfile=/run/web/parabolaweb.pid [Install] WantedBy=multi-user.target diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index 91ae34864..18b474d64 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=9 +pkgrel=9.1 pkgdesc="linux-libre-lts modules for ThinkPad's SMAPI functionality" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 4c8910c2b..9db910c9e 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -11,7 +11,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=9 +pkgrel=10 pkgdesc="Modules for ThinkPad's SMAPI functionality" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index f35ba99c9..ba6448702 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.6-LIBRE -pkgrel=12 +pkgrel=13 pkgdesc="Kernel libre module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 7a95b4c7b..3067a780e 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.2 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 3fcbd7069..7c8a53bb5 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/staging/dvdauthor/PKGBUILD b/staging/dvdauthor/PKGBUILD new file mode 100644 index 000000000..1a5f8b6c4 --- /dev/null +++ b/staging/dvdauthor/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 169519 2012-10-23 00:56:41Z eric $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Travis Willard <travisw@wmpub.ca> +# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> +# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de> + +pkgname=dvdauthor +pkgver=0.7.1 +pkgrel=2 +pkgdesc="DVD authoring tools" +arch=('i686' 'x86_64') +url="http://dvdauthor.sourceforge.net/" +license=('GPL') +depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') +options=('!makeflags') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('2694a5a3ef460106ea3caf0f7f60ff80') + +build() { + cd "${srcdir}/${pkgname}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}" + + make DESTDIR="${pkgdir}" install +} diff --git a/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch new file mode 100644 index 000000000..2bb636380 --- /dev/null +++ b/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch @@ -0,0 +1,19 @@ +--- src/spuunmux.c ++++ src/spuunmux.c +@@ -39,6 +39,7 @@ + #include <netinet/in.h> + + #include <png.h> ++#include <zlib.h> + + #include "rgb.h" + #include "common.h" +@@ -610,7 +611,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return -1; + } /*if*/ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD index 5d569a314..ed87a8d3d 100644 --- a/staging/opencv/PKGBUILD +++ b/staging/opencv/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 161376 2012-06-10 12:41:40Z schiv $ +# $Id: PKGBUILD 169516 2012-10-22 21:28:51Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV -pkgver=2.4.1 -pkgrel=2 +pkgver=2.4.2 +pkgrel=5 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') -url="http://opencv.willowgarage.com/" -depends=('jasper' 'gstreamer0.10-base' 'openexr' - 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') -makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') +url="http://opencv.org/" +depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0' + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase>=1.0.3') +makedepends=('cmake' 'python2-numpy' 'eigen2') optdepends=('opencv-docs' 'opencv-samples' 'eigen2' 'python2-numpy: Python 2.x interface') options=('!libtool') source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2") -md5sums=('144aafa12260150490ce77d8debc1a23') +md5sums=('059ef86fc1724d69b75832a0d2929ff5') _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' '-D CMAKE_INSTALL_PREFIX=/usr' @@ -69,18 +69,11 @@ package_opencv() { cd "$pkgdir/usr/share" - # prepare FSH-friendly dirs - if [ -d OpenCV ]; then - mv opencv/samples OpenCV/ - rm -r opencv - mv OpenCV opencv - fi - # separate docs package; also be -R friendly - [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" + [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc" # separate samples package - [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples" + [ -d $_realname/samples ] && mv $_realname/samples "$srcdir/opencv-samples" } package_opencv-docs() { @@ -92,7 +85,7 @@ package_opencv-docs() { cd "$srcdir" mkdir -p "$pkgdir/usr/share/doc" - cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" + cp -r opencv-doc "$pkgdir/usr/share/doc/$_realname" # install license file install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ @@ -107,8 +100,8 @@ package_opencv-samples() { cd "$srcdir" - mkdir -p "$pkgdir/usr/share/opencv" - cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" + mkdir -p "$pkgdir/usr/share/$_realname" + cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples" # install license file install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ diff --git a/staging/psiconv/PKGBUILD b/staging/psiconv/PKGBUILD new file mode 100644 index 000000000..6936b4b7f --- /dev/null +++ b/staging/psiconv/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 169523 2012-10-23 01:05:39Z eric $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=psiconv +pkgver=0.9.8 +pkgrel=10 +pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" +arch=('i686' 'x86_64') +url="http://software.frodo.looijaard.name/psiconv/" +license=('GPL') +depends=('imagemagick') +makedepends=('bc') +backup=('etc/psiconv/psiconv.conf') +options=('!libtool') +source=("http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz") +md5sums=('8d7548e3c6b9cd408544736133728acd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD index 7084b14b5..951f174dc 100644 --- a/testing/cairo/PKGBUILD +++ b/testing/cairo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168100 2012-10-05 19:56:38Z andyrtr $ +# $Id: PKGBUILD 169506 2012-10-22 17:33:56Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo -pkgver=1.12.4 +pkgver=1.12.6 pkgrel=1 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) @@ -17,8 +17,9 @@ replaces=('cairo-xcb') options=('!libtool') source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz cairo-1.10.0-buggy_gradients.patch) -md5sums=('a64bb8774a1e476e5cdd69e635794dfb' - '9b323790dab003e228c6955633cb888e') +sha1sums=('a383c6cb4495e18848ea43e1031c294aa9417a43' + '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04') + build() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch @@ -37,7 +38,7 @@ build() { #check() { # cd "$srcdir/$pkgname-$pkgver" -# make -k check || /bin/true # 134 Passed, 355 Failed [5 crashed, 11 expected], 26 Skipped +# make -k check || /bin/true # 161 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped #} package() { diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD index 13e45bd3b..1c8bf72c9 100644 --- a/testing/gnome-control-center/PKGBUILD +++ b/testing/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169234 2012-10-18 19:27:19Z jgc $ +# $Id: PKGBUILD 169513 2012-10-22 21:13:34Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.6.1 +pkgver=3.6.2 pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b6e9530deac15408fee43c9c7a21200456bebf947e677856cd7345a79e2923d5') +sha256sums=('3ab5aa304b424006c9f38ce2ff50afbf38e167ca632c64509bf30aa3c786afb7') build() { cd $pkgname-$pkgver diff --git a/testing/gtkmm3/PKGBUILD b/testing/gtkmm3/PKGBUILD index b1feb945a..b49d4d70a 100644 --- a/testing/gtkmm3/PKGBUILD +++ b/testing/gtkmm3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169192 2012-10-18 19:24:25Z jgc $ +# $Id: PKGBUILD 169504 2012-10-22 14:39:10Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.5.13 +pkgver=3.6.0 pkgrel=1 arch=('i686' 'x86_64') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('2dcd3654f1e88cd80d1641e91bb9bceb10216ee74ec400c14f7bb7c5e4cecbfc') +sha256sums=('888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359') build() { cd "$_pkgbasename-$pkgver" diff --git a/testing/screen/PKGBUILD b/testing/screen/PKGBUILD new file mode 100644 index 000000000..e23d05c06 --- /dev/null +++ b/testing/screen/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 169508 2012-10-22 18:01:13Z thomas $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Committer: dorphell <dorphell@gmx.net> + +pkgname=screen +pkgver=4.0.3 +pkgrel=14 +_ptygroup=5 #the UID of our PTY/TTY group +pkgdesc="Full-screen window manager that multiplexes a physical terminal" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/screen/" +license=('GPL') +depends=('ncurses' 'pam') +backup=('etc/screenrc' 'etc/pam.d/screen') +options=('!makeflags') +install=screen.install +source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz + screen-4.0.3-long-term.patch + screen-4.0.3-caption-colors.patch + screen.pam) +md5sums=('8506fd205028a96c741e4037de6e3c42' + '2723c3e71d5a2e5a74b6ddbc5215ef0f' + '191b6ced695ce2ae3a65bf02c2d4220f' + '74f7919d7b65436cc2ea5341fa8ca374') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i $srcdir/screen-4.0.3-long-term.patch + patch -Np2 -i $srcdir/screen-4.0.3-caption-colors.patch + + ./configure --prefix=/usr --enable-pam \ + --with-sys-screenrc=/etc/screenrc --enable-colors256 \ + --enable-rxvt_osc --enable-telnet \ + --with-pty-group=$_ptygroup \ + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-socket-dir=/run/screens + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + install -Dm644 ${srcdir}/screen.pam ${pkgdir}/etc/pam.d/screen + + install -Dm644 etc/completer.zsh ${pkgdir}/usr/share/zsh/site-functions/screen + install -Dm644 etc/etcscreenrc ${pkgdir}/etc/screenrc + install -Dm644 etc/screenrc ${pkgdir}/etc/skel/.screenrc +} diff --git a/testing/screen/screen-4.0.3-caption-colors.patch b/testing/screen/screen-4.0.3-caption-colors.patch new file mode 100644 index 000000000..c92cb0c54 --- /dev/null +++ b/testing/screen/screen-4.0.3-caption-colors.patch @@ -0,0 +1,21 @@ +From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001 +From: Sadrul Habib Chowdhury <sadrul@users.sourceforge.net> +Date: Tue, 26 Jan 2010 20:17:26 +0000 +Subject: Accommodate more color changes in the caption. + +--- +diff --git a/src/screen.c b/src/screen.c +index b1c3dfb..2cceae0 100644 +--- a/src/screen.c ++++ b/src/screen.c +@@ -2204,7 +2204,7 @@ static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; + #endif + + static char winmsg_buf[MAXSTR]; +-#define MAX_WINMSG_REND 16 /* rendition changes */ ++#define MAX_WINMSG_REND 256 /* rendition changes */ + static int winmsg_rend[MAX_WINMSG_REND]; + static int winmsg_rendpos[MAX_WINMSG_REND]; + static int winmsg_numrend; +-- +cgit v0.8.3.4 diff --git a/testing/screen/screen-4.0.3-long-term.patch b/testing/screen/screen-4.0.3-long-term.patch new file mode 100644 index 000000000..3e66acda6 --- /dev/null +++ b/testing/screen/screen-4.0.3-long-term.patch @@ -0,0 +1,24 @@ +diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h +--- screen-4.0.3-orig//display.h 2003-07-02 00:01:42.000000000 +1000 ++++ screen-4.0.3/display.h 2010-12-03 20:19:23.826671689 +1000 +@@ -85,7 +85,7 @@ + struct win *d_other; /* pointer to other window */ + int d_nonblock; /* -1 don't block if obufmax reached */ + /* >0: block after nonblock secs */ +- char d_termname[20 + 1]; /* $TERM */ ++ char d_termname[40 + 1]; /* $TERM */ + char *d_tentry; /* buffer for tgetstr */ + char d_tcinited; /* termcap inited flag */ + int d_width, d_height; /* width/height of the screen */ +diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h +--- screen-4.0.3-orig//screen.h 2003-08-22 22:28:43.000000000 +1000 ++++ screen-4.0.3/screen.h 2010-12-03 20:19:43.163338333 +1000 +@@ -202,7 +202,7 @@ + char preselect[20]; + int esc; /* his new escape character unless -1 */ + int meta_esc; /* his new meta esc character unless -1 */ +- char envterm[20 + 1]; /* terminal type */ ++ char envterm[40 + 1]; /* terminal type */ + int encoding; /* encoding of display */ + } + attach; diff --git a/testing/screen/screen.install b/testing/screen/screen.install new file mode 100644 index 000000000..9340e6067 --- /dev/null +++ b/testing/screen/screen.install @@ -0,0 +1,21 @@ +infodir=usr/share/info +filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5) + +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/screen/screen.pam b/testing/screen/screen.pam new file mode 100644 index 000000000..07c42adb1 --- /dev/null +++ b/testing/screen/screen.pam @@ -0,0 +1 @@ +auth required pam_unix.so diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD index d1591ed7c..ed69bae3c 100644 --- a/testing/seahorse/PKGBUILD +++ b/testing/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169156 2012-10-18 19:22:42Z jgc $ +# $Id: PKGBUILD 169514 2012-10-22 21:16:04Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.6.1 +pkgver=3.6.2 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64) @@ -19,7 +19,7 @@ groups=(gnome-extra) install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('dcdd9681a7896a13a597cf02aa2d6718b5f0ab3b50ed81f8d24b8db296a9214b' +sha256sums=('cf3ffa48fdbd4c30fa3cc7ea9e8188c1325416e67e5985c9ce22af0a5fd7560b' '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index 073d99b15..1b295076f 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=194 -pkgrel=4 +pkgver=195 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -18,7 +18,7 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' 'use-split-usr-path.patch') -md5sums=('0ebb73aea444693b9b86f7a76f5df23c' +md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' @@ -86,10 +86,12 @@ package_systemd() { install -dm755 "$pkgdir/bin" ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - # move bash-completion and symlink for loginctl + # move bash-completion and symlink for *ctl's install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ "$pkgdir/usr/share/bash-completion/completions/systemctl" - ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" + for ctl in {login,journal,timedate,locale,hostname}ctl; do + ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl" + done rm -rf "$pkgdir/etc/bash_completion.d" # don't write units to /etc by default -- we'll enable this on post_install diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install index fa3e8f29a..5d6689c59 100644 --- a/testing/systemd/systemd.install +++ b/testing/systemd/systemd.install @@ -29,6 +29,14 @@ post_upgrade() { printf '==> journald now writes to /var/log/journal by default. This can be\n' printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n' fi + + # logind's protocol changed. kindly restart the daemon to avoid locking + # out further logins. + if [ "$(vercmp 195 "$2")" -eq 1 ]; then + if sd_booted; then + systemctl restart systemd-logind.service + fi + fi } # vim:set ts=2 sw=2 et: |