diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-10 03:39:33 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-10 03:39:33 +0000 |
commit | 1fc4a2dbc11c7c17bea5b98d2924e148869cae7b (patch) | |
tree | 4bff3acc682f9294ac00f2ef0e26a96c56c84694 | |
parent | f578debfd17a7f06c6f4f8a0c2fde11e96b0afee (diff) |
Thu Jul 10 03:34:38 UTC 2014
28 files changed, 167 insertions, 164 deletions
diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD index 388a9cbb3..324617356 100644 --- a/community/calcurse/PKGBUILD +++ b/community/calcurse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 115305 2014-07-08 14:19:26Z lfleischer $ +# $Id: PKGBUILD 115334 2014-07-08 23:06:15Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: wain <wain.at.gmx.net> pkgname=calcurse -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc='A text-based personal organizer.' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('BSD') depends=('ncurses') install='calcurse.install' source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz"{,.asc}) -md5sums=('454a25c2adb54f76ea13f3603cc07c76' +md5sums=('427652c011bc5314c71c962233d59436' 'SKIP') build() { diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 636e22b38..08c38c0f6 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 103093 2013-12-26 11:56:21Z svenstaro $ +# $Id: PKGBUILD 115341 2014-07-09 04:51:26Z 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.8.3 -pkgrel=2 +pkgver=0.8.4 +_tag=0-8-4 +pkgrel=1 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') -url="http://crayzedsgui.sourceforge.net" +url="http://cegui.org.uk" license=("MIT") depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua51' 'silly' 'glfw') makedepends=('cmake' 'python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz' 'irrlicht' 'glm' 'mesa' 'mercurial' 'tolua++') @@ -17,15 +18,12 @@ optdepends=("python2: python bindings" "ogre: ogre module" "gtk2: gtk2 module" "irrlicht: irrlicht module") -source=("hg+ssh://hg@bitbucket.org/cegui/cegui#tag=v0-8-3" - "freetype.patch") -md5sums=('SKIP' - '4c5f81f109f36718045bb4ba5ba25602') +source=("hg+https://bitbucket.org/cegui/cegui#tag=v${_tag}") +md5sums=('SKIP') build() { cd "$srcdir/cegui" - patch -Np1 < "$srcdir/freetype.patch" sed -i "s/lib64/lib/g" CMakeLists.txt [[ -d build ]] && rm -r build @@ -34,8 +32,8 @@ build() { cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCEGUI_LIB_INSTALL_DIR=lib \ - -DCEGUI_BUILD_PYTHON_MODULES=OFF # currently broken :( - # -PYTHON_EXECUTABLE=/usr/bin/python2 + -DCEGUI_BUILD_PYTHON_MODULES=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 make make html @@ -46,5 +44,5 @@ package() { make DESTDIR="${pkgdir}" install - install -Dm644 ../doc/COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/dgen-sdl/PKGBUILD b/community/dgen-sdl/PKGBUILD index 2be9aafa1..06c2f41b5 100644 --- a/community/dgen-sdl/PKGBUILD +++ b/community/dgen-sdl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115317 2014-07-08 17:15:28Z jsteel $ +# $Id: PKGBUILD 115388 2014-07-09 22:02:49Z jsteel $ # Maintainer: Jonathan Steel <jsteel at aur.archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Jason Chu <jason@archlinux.org> @@ -6,12 +6,12 @@ pkgname=dgen-sdl pkgver=1.32 -pkgrel=3 +pkgrel=4 pkgdesc="An emulator for Sega Genesis/Mega Drive systems ported to SDL" arch=('i686' 'x86_64') url="http://dgen.sourceforge.net" license=('BSD') -depends=('sdl' 'mesa-libgl' 'libarchive') +depends=('sdl' 'libgl' 'libarchive') [[ $CARCH == i686 ]] && makedepends=('nasm') source=(http://downloads.sourceforge.net/dgen/$pkgname-$pkgver.tar.gz) md5sums=('81b6f1c4bd612e81a9b8663c38d51890') diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD index 978da2cc6..d170fcb3e 100644 --- a/community/elasticsearch/PKGBUILD +++ b/community/elasticsearch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112667 2014-06-04 14:29:20Z mtorromeo $ +# $Id: PKGBUILD 115378 2014-07-09 13:47:21Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost> # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer> pkgname=elasticsearch -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="Distributed RESTful search engine built on top of Lucene" arch=('i686' 'x86_64') @@ -16,12 +16,13 @@ source=( "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz" elasticsearch.service elasticsearch@.service - elasticsearch-tmpfile.conf elasticsearch-sysctl.conf + elasticsearch.default ) backup=('etc/elasticsearch/elasticsearch.yml' - 'etc/elasticsearch/logging.yml') + 'etc/elasticsearch/logging.yml' + 'etc/default/elasticsearch') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -40,18 +41,16 @@ prepare() { echo -e '\nJAVA_OPTS="$JAVA_OPTS -Des.path.conf=/etc/elasticsearch"' >> bin/elasticsearch.in.sh - sed -re 's/#\s*(path\.conf:).*$/\1 \/etc\/elasticsearch/' \ - -e '0,/#\s*(path\.data:).*$/s//\1 \/var\/lib\/elasticsearch/' \ - -e 's/#\s*(path\.work:).*$/\1 \/tmp\/elasticsearch/' \ - -e 's/#\s*(path\.logs:).*$/\1 \/var\/log\/elasticsearch/' \ + sed -re 's;#\s*(path\.conf:).*$;\1 /etc/elasticsearch;' \ + -e '0,/#\s*(path\.data:).*$/s;;\1 /var/lib/elasticsearch;' \ + -e 's;#\s*(path\.work:).*$;\1 /tmp/elasticsearch;' \ + -e 's;#\s*(path\.logs:).*$;\1 /var/log/elasticsearch;' \ -i config/elasticsearch.yml } package() { cd "$srcdir/$pkgname-$pkgver" install -dm755 "$pkgdir/etc/elasticsearch" - install -dm755 "$pkgdir/var/lib/elasticsearch" - install -dm755 "$pkgdir/var/log/elasticsearch" if [ $CARCH = 'x86_64' ]; then install -Dm644 lib/sigar/libsigar-amd64-linux.so "$pkgdir/usr/lib/elasticsearch/sigar/libsigar-amd64-linux.so" @@ -70,12 +69,14 @@ package() { install -Dm644 "$srcdir/elasticsearch.service" "$pkgdir/usr/lib/systemd/system/elasticsearch.service" install -Dm644 "$srcdir/elasticsearch@.service" "$pkgdir/usr/lib/systemd/system/elasticsearch@.service" - install -Dm644 "$srcdir/elasticsearch-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf" install -Dm644 "$srcdir/elasticsearch-sysctl.conf" "$pkgdir/usr/lib/sysctl.d/elasticsearch.conf" + install -Dm644 "$srcdir/elasticsearch.default" "$pkgdir/etc/default/elasticsearch" + + ln -s ../../../var/lib/elasticsearch "$pkgdir/usr/share/elasticsearch/data" } -sha256sums=('b2b270de2b520b4a2510454c75d3a6b9a9801b7d9a31754a731d2c0868cf9186' - 'ab13ccda28bf90a10b570e095afc47ddef68da7e45546b2d45e74722c9095f0a' - 'a04ac09172158611a03dda096b670fe6586ae11b6b3d4de7965ed2b90cb3319f' - '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f' - 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c') +sha256sums=('c833d000c7e29e17b4cc5df2e26020c159ee086cdf4ac19f661911cc9aedfbee' + '4b7c741c2fa2f856cff6b9e83693c2de9d8c00a73812b34133b4446bdcb2e4c8' + '0c6969af1ab91fc543d4c37fea8f3596872a143281c22a17801703490758ba0a' + 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c' + 'a0ee0761156a02d3f79db5ef295613c1a6d4267482c8db889d92a94b59feb497') diff --git a/community/elasticsearch/elasticsearch-tmpfile.conf b/community/elasticsearch/elasticsearch-tmpfile.conf deleted file mode 100644 index b2844a919..000000000 --- a/community/elasticsearch/elasticsearch-tmpfile.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/elasticsearch 0755 elasticsearch elasticsearch -
\ No newline at end of file diff --git a/community/elasticsearch/elasticsearch.default b/community/elasticsearch/elasticsearch.default new file mode 100644 index 000000000..b08b19966 --- /dev/null +++ b/community/elasticsearch/elasticsearch.default @@ -0,0 +1,11 @@ +# Heap Size (defaults to 256m min, 1g max) +#ES_HEAP_SIZE=1g + +# Heap new generation +#ES_HEAP_NEWSIZE= + +# max direct memory +#ES_DIRECT_SIZE= + +# Additional Java OPTS +#ES_JAVA_OPTS= diff --git a/community/elasticsearch/elasticsearch.install b/community/elasticsearch/elasticsearch.install index 82ff64dbb..915acfada 100644 --- a/community/elasticsearch/elasticsearch.install +++ b/community/elasticsearch/elasticsearch.install @@ -3,10 +3,6 @@ post_install() { getent passwd elasticsearch >/dev/null 2>&1 || useradd -u 114 -g elasticsearch -d /usr/share/elasticsearch -s /bin/false elasticsearch &>/dev/null chown -R elasticsearch:elasticsearch /usr/share/elasticsearch - chown -R elasticsearch:elasticsearch /var/lib/elasticsearch - chown -R elasticsearch:elasticsearch /var/log/elasticsearch - - usr/bin/systemd-tmpfiles --create elasticsearch.conf } post_upgrade(){ diff --git a/community/elasticsearch/elasticsearch.service b/community/elasticsearch/elasticsearch.service index 4121332af..f1f559625 100644 --- a/community/elasticsearch/elasticsearch.service +++ b/community/elasticsearch/elasticsearch.service @@ -4,11 +4,17 @@ Documentation=http://www.elasticsearch.org After=network.target [Service] -User=elasticsearch Type=forking -PIDFile=/run/elasticsearch/elasticsearch.pid +User=elasticsearch +Group=elasticsearch +ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/lib/elasticsearch +ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/log/elasticsearch ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid +EnvironmentFile=-/etc/default/elasticsearch +RuntimeDirectory=elasticsearch +PIDFile=/run/elasticsearch/elasticsearch.pid LimitNOFILE=65535 +LimitMEMLOCK=infinity TimeoutStopSec=20 Restart=on-failure diff --git a/community/elasticsearch/elasticsearch@.service b/community/elasticsearch/elasticsearch@.service index 093f7df59..45b3c3724 100644 --- a/community/elasticsearch/elasticsearch@.service +++ b/community/elasticsearch/elasticsearch@.service @@ -4,11 +4,17 @@ Documentation=http://www.elasticsearch.org After=network.target [Service] -User=elasticsearch Type=forking -PIDFile=/run/elasticsearch/%I.pid +User=elasticsearch +Group=elasticsearch +ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/lib/elasticsearch +ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/log/elasticsearch ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml +EnvironmentFile=-/etc/default/elasticsearch +RuntimeDirectory=elasticsearch +PIDFile=/run/elasticsearch/%I.pid LimitNOFILE=65535 +LimitMEMLOCK=infinity TimeoutStopSec=20 Restart=on-failure diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index ac7d337f1..01ed690ca 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 105914 2014-02-19 10:07:30Z spupykin $ +# $Id: PKGBUILD 115355 2014-07-09 10:05:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=flightgear pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) -depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') -makedepends=('boost' 'cmake' 'mesa' 'sharutils') +depends=('libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') +makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear') license=("GPL") url="http://www.flightgear.org" options=('!makeflags') diff --git a/community/fuseiso/PKGBUILD b/community/fuseiso/PKGBUILD index 39ee9bffc..08bb59a90 100644 --- a/community/fuseiso/PKGBUILD +++ b/community/fuseiso/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57911 2011-11-04 11:59:27Z lcarlier $ +# $Id: PKGBUILD 115373 2014-07-09 13:23:05Z fyan $ # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=fuseiso pkgver=20070708 -pkgrel=4 +pkgrel=5 pkgdesc="FUSE module to mount ISO filesystem images" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/fuseiso/" diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD index d93ab314e..a584bf076 100644 --- a/community/instead/PKGBUILD +++ b/community/instead/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 112557 2014-06-03 14:43:58Z spupykin $ +# $Id: PKGBUILD 115382 2014-07-09 15:57:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Peter Kosyh <p.kosyhgmail.com> pkgname=instead -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=1 pkgdesc="a quest interpreter" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua') optdepends=('instead-launcher: install and update INSTEAD games from net') source=(http://downloads.sourceforge.net/project/instead/instead/${pkgver}/instead_${pkgver}.tar.gz) -md5sums=('8ddc98ffb591298b7440311d8f23c864') +md5sums=('8f509ea247a23beeb53aed0bc3ae374e') build() { cd "${srcdir}/instead-${pkgver}" diff --git a/community/kaudiocreator/PKGBUILD b/community/kaudiocreator/PKGBUILD index 730b924da..d0f67e453 100644 --- a/community/kaudiocreator/PKGBUILD +++ b/community/kaudiocreator/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74831 2012-08-06 23:08:36Z andrea $ +# $Id: PKGBUILD 115371 2014-07-09 13:21:54Z fyan $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=kaudiocreator pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc="A program for ripping and encoding Audio-CDs, encoding files from disk" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php/KAudioCreator?content=107645" diff --git a/community/libalkimia/PKGBUILD b/community/libalkimia/PKGBUILD index 004c8d6fa..de57aedaf 100644 --- a/community/libalkimia/PKGBUILD +++ b/community/libalkimia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62859 2012-01-27 20:47:22Z lcarlier $ +# $Id: PKGBUILD 115367 2014-07-09 13:16:39Z fyan $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: gumper <gumper1034@gmail.com> pkgname=libalkimia pkgver=4.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC." depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD index 2ac2cd01e..efae8cae7 100644 --- a/community/minetest/PKGBUILD +++ b/community/minetest/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109869 2014-04-20 06:28:29Z lcarlier $ +# $Id: PKGBUILD 115353 2014-07-09 09:48:22Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Konsta Kokkinen <kray@tsundere.fi> pkgname=minetest -pkgver=0.4.9 -pkgrel=4 +pkgver=0.4.10 +pkgrel=1 pkgdesc='An Infiniminer/Minecraft inspired game' arch=('i686' 'x86_64') url='http://minetest.net/' @@ -13,18 +13,9 @@ depends=('sqlite' 'freetype2' 'leveldb' 'openal' 'libvorbis' 'curl' 'irrlicht' ' makedepends=('cmake') install=minetest.install source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver} - ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver} - optional-opengles.patch) -md5sums=('2a2629befa86ef72924bcc0e489730c7' - '097666443a71988cf2d41ebd9be31ec9' - '116de5a70e13dbd0e2419fc7fb59ee3b') - -prepare() { - cd "$srcdir"/minetest-minetest-* - - # Fix rendering with NVIDIA driver (FS#37918) - patch -Np1 -i "$srcdir"/optional-opengles.patch -} + ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver}) +sha256sums=('05d15c8e2c8e53ee9d3006e79c2b59200311a7b879220d8b6f6a6fd2acf806b6' + '7624a1e64124c4438256719ccecfc44fe5139733a076394aedad1f785e50019f') build() { cd "$srcdir"/minetest-minetest-* diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index dac8ca64b..441ba91e7 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 109034 2014-04-09 17:08:13Z spupykin $ +# $Id: PKGBUILD 115357 2014-07-09 10:06:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips -pkgver=1.10.1 +pkgver=1.11.2 pkgrel=1 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" @@ -25,7 +25,7 @@ install=opensips.install options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz opensips.service) -md5sums=('168d005f6c8706665877aa82f01afbae' +md5sums=('e1af6d4b4837562c0d4bb0fb92a6d8a4' '35cdcb3692f6925236fd5fe7e9484c58') prepare() { diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index b127488a3..648f1333f 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 110862 2014-05-08 18:59:03Z kkeen $ +# $Id: PKGBUILD 115343 2014-07-09 07:50:35Z kkeen $ # Maintainer: Kyle Keen <keenerd at gmail dot com> pkgbase=python-pyzmq pkgname=(python2-pyzmq python-pyzmq) -pkgver=14.3.0 +pkgver=14.3.1 pkgrel=1 pkgdesc="Python bindings for zeromq, written in Cython" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=(zeromq python) makedepends=(python python2 zeromq) #source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) source=(https://pypi.python.org/packages/source/p/pyzmq/pyzmq-$pkgver.tar.gz) -md5sums=('92e49cc9be92f0c95a6f790a85309df5') +md5sums=('7196b4a6fbf98022f17ffa924be3d68d') build() { cd "$srcdir" diff --git a/community/radeontool/PKGBUILD b/community/radeontool/PKGBUILD index 974ffc8fc..7a110a575 100644 --- a/community/radeontool/PKGBUILD +++ b/community/radeontool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79686 2012-11-11 05:31:16Z lcarlier $ +# $Id: PKGBUILD 115363 2014-07-09 12:36:21Z fyan $ # Maintainer : Laurent Carlier <lordheavym AT gmail DOT com> pkgname=radeontool pkgver=1.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Lowlevel tools to tweak register and dump state on radeon GPUs" url="http://airlied.livejournal.com/" arch=('i686' 'x86_64') diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD index 9ac9af3be..f24e02dfa 100644 --- a/community/uzbl/PKGBUILD +++ b/community/uzbl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80256 2012-11-18 14:26:45Z lcarlier $ +# $Id: PKGBUILD 115375 2014-07-09 13:28:03Z fyan $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Dieter Plaetinck <dieter@plaetinck.be> @@ -6,16 +6,16 @@ pkgbase=uzbl pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed') pkgver=2012.05.14 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.uzbl.org" license=('GPL3') -makedepends=('pkgconfig' 'libwebkit>=1.3.13') -source=(uzbl-$pkgver.tar.gz::https://github.com/Dieterbe/uzbl/tarball/$pkgver) -md5sums=('4c58653bddbcf1429f7275bbb7c664a9') +makedepends=('pkgconfig' 'webkitgtk2>=1.3.13') +source=(uzbl-$pkgver.tar.gz::https://github.com/uzbl/uzbl/archive/$pkgver.tar.gz) +md5sums=('8d644ecb28cb27fbc971c771156dee6f') build() { - cd "$srcdir"/Dieterbe-uzbl-* + cd "$srcdir"/uzbl-$pkgver # python2 fix for file in examples/data/scripts/uzbl*; do @@ -33,7 +33,7 @@ build() { package_uzbl-core() { pkgdesc="Webpage interface component meant for integration with other tools and scripts" - depends=('libwebkit>=1.3.13') + depends=('webkitgtk2>=1.3.13') optdepends=('socat: to interface with the socket' 'dmenu: to run some of the example scripts' 'zenity: to run some of the example scripts' 'python2: to run some of the example scripts' @@ -41,7 +41,7 @@ package_uzbl-core() { 'pygtk: for uzbl-tabbed') install=uzbl.install - cd "$srcdir"/Dieterbe-uzbl-* + cd "$srcdir"/uzbl-$pkgver make DESTDIR="$pkgdir" PREFIX=/usr install-uzbl-core } @@ -50,7 +50,7 @@ package_uzbl-browser() { pkgdesc="A complete browser experience based on uzbl-core" depends=("uzbl-core=$pkgver" 'socat' 'zenity' 'xclip' 'dmenu' 'python2') - cd "$srcdir"/Dieterbe-uzbl-* + cd "$srcdir"/uzbl-$pkgver make DESTDIR="$pkgdir" PREFIX=/usr install-uzbl-browser rm -r $pkgdir/usr/bin/uzbl-core $pkgdir/usr/share/uzbl/docs @@ -60,7 +60,7 @@ package_uzbl-tabbed() { pkgdesc="Tabbing manager providing multiple uzbl-browser instances in 1 window" depends=("uzbl-browser=$pkgver" 'pygtk') - cd "$srcdir"/Dieterbe-uzbl-* + cd "$srcdir"/uzbl-$pkgver make DESTDIR="$pkgdir" PREFIX=/usr install-uzbl-tabbed } diff --git a/community/vamps/PKGBUILD b/community/vamps/PKGBUILD index a949e9e95..35c71e5b2 100644 --- a/community/vamps/PKGBUILD +++ b/community/vamps/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83866 2013-02-05 22:51:15Z lcarlier $ +# $Id: PKGBUILD 115361 2014-07-09 11:00:13Z fyan $ # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=vamps pkgver=0.99.2 -pkgrel=10 +pkgrel=11 pkgdesc='Very fast requantisizing tool for backup DVDs' arch=('i686' 'x86_64') url='http://vamps.sourceforge.net' diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index fa0229dda..28ab56c32 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115321 2014-07-08 18:14:17Z bpiotrowski $ +# $Id: PKGBUILD 115351 2014-07-09 09:08:38Z fyan $ # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer @@ -6,7 +6,7 @@ pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') pkgver=4.3.12 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/wavegain/PKGBUILD b/community/wavegain/PKGBUILD index 183516e86..2b362a088 100644 --- a/community/wavegain/PKGBUILD +++ b/community/wavegain/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67386 2012-03-10 21:21:31Z lcarlier $ +# $Id: PKGBUILD 115359 2014-07-09 10:56:31Z fyan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=wavegain _realname=WaveGain pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="A command line tool to normalize sound files" arch=('i686' 'x86_64') url="http://rarewares.org/others.php" diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index bb983cef3..9567ab032 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 215163 2014-06-14 19:17:13Z andyrtr $ +# $Id: PKGBUILD 216747 2014-07-09 15:41:00Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -14,7 +14,7 @@ _JDK_UPDATE_VERSION=60 _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -111,7 +111,8 @@ build() { --with-langtools-src-zip="${srcdir}/langtools.tar.bz2" \ --enable-nss \ --with-rhino \ - --with-abs-install-dir=${_jvmdir} + --with-abs-install-dir=${_jvmdir} \ + --enable-infinality=no make } diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD index 41e3160d9..9f26ba63b 100644 --- a/extra/netpbm/PKGBUILD +++ b/extra/netpbm/PKGBUILD @@ -1,35 +1,30 @@ -# $Id: PKGBUILD 215266 2014-06-18 05:01:53Z eric $ +# $Id: PKGBUILD 216734 2014-07-09 02:07:36Z eric $ # Maintainer: pkgname=netpbm -pkgver=10.66.03 +pkgver=10.67.00 pkgrel=1 pkgdesc="A toolkit for manipulation of graphic images" arch=('i686' 'x86_64') license=('custom' 'BSD' 'GPL' 'LGPL') url="http://netpbm.sourceforge.net/" depends=('perl' 'libpng' 'libtiff' 'libxml2') -makedepends=('python2') +makedepends=('python2' 'jbigkit') options=('!makeflags') -source=(ftp://ftp.archlinux.org/other/packages/netpbm/${pkgname}-${pkgver}.tar.xz{,.sig} \ - ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig} \ +# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/ +source=(svn://svn.code.sf.net/p/netpbm/code/advanced + ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig} netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch) -sha1sums=('b396dfde402b6979a8b551cf60ba1030278a233d' - 'SKIP' +sha1sums=('SKIP' '25a58975bd8cd383238b4ae31f4405c60914faac' 'SKIP' 'b79cf9d42488fea065ba16262ed97694c47af08d' - '4213468c44a63c0575896f6781987a09cfcc2d30' + '4e9d91516d79d2099ba4bd47434e6bb12c52bcc4' 'c67a63c010353de3ecac3ad72ba76bbb85e4ed4c') -# source PKGBUILD && mksource -mksource() { -# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/ - svn checkout svn://svn.code.sf.net/p/netpbm/code/advanced advanced - _pkgver=$(grep MAJOR advanced/version.mk |cut -d ' ' -f 3).$(grep MINOR advanced/version.mk |cut -d ' ' -f 3).0$(grep POINT advanced/version.mk |cut -d ' ' -f 3) - tar -cf ${pkgname}-${_pkgver}.tar.xz advanced - gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${_pkgver}.tar.xz - rm -r advanced +pkgver() { + cd advanced + echo $(grep MAJOR version.mk |cut -d ' ' -f 3).$(grep MINOR version.mk |cut -d ' ' -f 3).0$(grep POINT version.mk |cut -d ' ' -f 3) } prepare() { @@ -48,6 +43,7 @@ prepare() { echo 'JPEGLIB = libjpeg.so' >> config.mk echo 'PNGLIB = libpng.so' >> config.mk echo 'ZLIB = libz.so' >> config.mk + echo 'JBIGLIB = /usr/lib/libjbig.a' >> config.mk sed -i 's|misc|share/netpbm|' common.mk sed -i 's|/link|/lib|' lib/Makefile diff --git a/extra/netpbm/netpbm-security-code.patch b/extra/netpbm/netpbm-security-code.patch index 5c2e0de35..348925a3d 100644 --- a/extra/netpbm/netpbm-security-code.patch +++ b/extra/netpbm/netpbm-security-code.patch @@ -151,26 +151,6 @@ diff -up netpbm-10.58.01/converter/other/pnmtorle.c.security-code netpbm-10.58.0 */ /* * pnmtorle - A program which will convert pbmplus (ppm or pgm) images -diff -up netpbm-10.58.01/converter/other/pnmtosgi.c.security-code netpbm-10.58.01/converter/other/pnmtosgi.c ---- netpbm-10.58.01/converter/other/pnmtosgi.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ netpbm-10.58.01/converter/other/pnmtosgi.c 2012-04-09 15:40:03.188619976 +0200 -@@ -254,6 +254,7 @@ build_channels(FILE * const ifp, int con - #endif - - if( storage != STORAGE_VERBATIM ) { -+ overflow2(channels, rows); - MALLOCARRAY_NOFAIL(table, channels * rows); - MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols)); - } -@@ -306,6 +307,8 @@ compress(ScanElem * temp, - break; - case STORAGE_RLE: - tabrow = chan_no * rows + row; -+ overflow2(chan_no, rows); -+ overflow_add(chan_no* rows, row); - len = rle_compress(temp, cols); /* writes result into rletemp */ - channel[chan_no][row].length = len; - MALLOCARRAY(p, len); diff -up netpbm-10.58.01/converter/other/rletopnm.c.security-code netpbm-10.58.01/converter/other/rletopnm.c --- netpbm-10.58.01/converter/other/rletopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 +++ netpbm-10.58.01/converter/other/rletopnm.c 2012-04-09 15:40:03.189619963 +0200 @@ -183,25 +163,6 @@ diff -up netpbm-10.58.01/converter/other/rletopnm.c.security-code netpbm-10.58.0 */ /* * rletopnm - A conversion program to convert from Utah's "rle" image format -diff -up netpbm-10.58.01/converter/other/sgitopnm.c.security-code netpbm-10.58.01/converter/other/sgitopnm.c ---- netpbm-10.58.01/converter/other/sgitopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ netpbm-10.58.01/converter/other/sgitopnm.c 2012-04-09 15:40:03.189619963 +0200 -@@ -359,10 +359,14 @@ readChannels(FILE * const ifP, - MALLOCARRAY_NOFAIL(image, head->ysize); - } else { - maxchannel = MIN(3, head->zsize); -+ overflow2(head->ysize, maxchannel); - MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel); - } -- if (table) -+ if (table) { -+ overflow2(head->xsize, 2); -+ overflow_add(head->xsize*2, 2); - MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize)); -+ } - - for (channel = 0; channel < maxchannel; ++channel) { - unsigned int row; diff -up netpbm-10.58.01/converter/other/sirtopnm.c.security-code netpbm-10.58.01/converter/other/sirtopnm.c --- netpbm-10.58.01/converter/other/sirtopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 +++ netpbm-10.58.01/converter/other/sirtopnm.c 2012-04-09 15:40:03.190619951 +0200 @@ -1658,3 +1619,40 @@ diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanar MALLOCARRAY_NOFAIL(table, oldmaxval + 1); for (i = 0; i <= oldmaxval; ++i) table[i] = ROUNDDIV(i * newmaxval, oldmaxval); +--- netpbm-10.58.01/converter/other/sgitopnm.c.orig 2014-07-08 16:57:30.878754976 -0400 ++++ netpbm-10.58.01/converter/other/sgitopnm.c 2014-07-08 17:07:52.727745725 -0400 +@@ -372,10 +372,14 @@ + MALLOCARRAY_NOFAIL(image, head->ysize); + } else { + maxchannel = 3; ++ overflow2(head->ysize, maxchannel); + MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel); + } +- if (table) ++ if (table) { ++ overflow2(head->xsize, 2); ++ overflow_add(head->xsize*2, 2); + MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize)); ++ } + + for (channel = 0; channel < maxchannel; ++channel) { + unsigned int row; +--- netpbm-10.58.01/converter/other/pnmtosgi.c.orig 2014-07-08 16:57:30.878754976 -0400 ++++ netpbm-10.58.01/converter/other/pnmtosgi.c 2014-07-08 17:11:55.164018919 -0400 +@@ -176,6 +176,8 @@ + break; + case STORAGE_RLE: { + unsigned int const tabrow = chanNum * rows + row; ++ overflow2(chanNum, rows); ++ overflow_add(chanNum* rows, row); + unsigned int const len = rleCompress(tempArg, cols); + /* writes result into rletemp */ + unsigned int i; +@@ -212,6 +214,7 @@ + ScanElem * temp; + + if (storage != STORAGE_VERBATIM) { ++ overflow2(channels, rows); + MALLOCARRAY_NOFAIL(table, channels * rows); + MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols)); + } else diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 5fa44ab88..03355b0ec 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua pkgname=tomcat-native -pkgver=1.1.30 +pkgver=1.1.31 pkgrel=1 pkgdesc='The Apache Tomcat Native Library' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('apr' 'openssl') makedepends=('java-environment') options=('!emptydirs') source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) -sha256sums=('0842c2a14163e2c16b8140d1855701bc3d7daba493d0193ec1bba0aa49aa8c11') +sha256sums=('f60c12895ce91f5e7711dbeaab526bf09bb98c5b23a76164d4d214ae5ff8c149') build() { cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" @@ -28,5 +28,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}-src/jni/native" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 7d68d94e8..f95181be0 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 213749 2014-05-29 01:09:31Z anatolik $ +# $Id: PKGBUILD 216758 2014-07-09 21:49:19Z anatolik $ # Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.83 -pkgrel=3 +pkgver=2.84 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt5-base' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz) -md5sums=('4620cfbfefee2ce55a6fa12c3ec330a7') +md5sums=('411aec1c418c14f6765710d89743ae42') build() { cd $pkgbase-$pkgver diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 8ee414778..97aef4b84 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 208911 2014-03-28 15:46:24Z bpiotrowski $ +# $Id: PKGBUILD 216742 2014-07-09 13:17:31Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.1.4 -pkgrel=2 +pkgver=2.1.5 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -58,7 +58,7 @@ options=('!emptydirs') install=vlc.install source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz" 'vlc-2.0.7-vaapi-compat.patch') -md5sums=('7ed67d22f7425011078772bfc62ac222' +md5sums=('3941b561f590cc95ca5e795213cba2f2' '6df10774bb7acf20e09d6139e5c7839e') prepare() { |