diff options
38 files changed, 546 insertions, 424 deletions
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index 86f0b2110..40ef9c1f1 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 103687 2014-01-09 16:14:18Z jelle $ +# $Id: PKGBUILD 106398 2014-03-02 12:48:38Z jelle $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck -pkgver=1.63.1 -pkgrel=2 +pkgver=1.64 +pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64') url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') depends=('qt5-base') -makedepends=('docbook-xsl') +makedepends=('docbook-xsl' 'qt5-tools') source=(https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz) -sha1sums=('19ad7251603356a82dc75a836dfad9629a3d12a0') +sha1sums=('feaa8b3333c20f950a38026461ff407de4ef1ba0') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -19,9 +19,8 @@ build() { make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl man cd gui - export HAVE_RULES=yes - qmake - make + qmake HAVE_RULES=yes CFGDIR=/usr/share/cppcheck/cfg + make CFGDIR=/usr/share/cppcheck/cfg } package() { diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD index f353194ca..47b873400 100644 --- a/community/dart/PKGBUILD +++ b/community/dart/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105737 2014-02-14 17:58:11Z arodseth $ +# $Id: PKGBUILD 106382 2014-03-01 23:40:44Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: T. Jameson Little <t.jameson.little at gmail dot com> # Contributor: Usagi Ito <usagi@WonderRabbitProject.net> @@ -6,7 +6,7 @@ # Contributor: Julien Nicoulaud <julien.nicoulaud@gmail.com> pkgname=dart -pkgver=1.1.3 +pkgver=1.2 pkgrel=1 pkgdesc='The dart programming language SDK' arch=('x86_64' 'i686') @@ -17,15 +17,11 @@ makedepends=('setconf') options=('!strip') if [[ $CARCH == x86_64 ]]; then - source=("$pkgname-$pkgver-64.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip" - 'license.html::https://code.google.com/intl/no/google_bsd_license.html') - sha256sums=('5019225dd58ffba9ae726f100993345e2801f7b59f6b49edbb5020ec3621e67a' - 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650') + source=("$pkgname-$pkgver-64.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip") + sha256sums=('d288122e9413710da1ec5b8966c8027073f5c64b83a9a90c61125aa90b30c4ec') else - source=("$pkgname-$pkgver-32.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip" - 'license.html::https://code.google.com/intl/no/google_bsd_license.html') - sha256sums=('de33b20167727d50903c1cf33d86320472d728f93641ec37a541a233e377acc4' - 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650') +source=("$pkgname-$pkgver-32.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip") + sha256sums=('beb0f817870f76308beb446c87b2918495bd7735fad8291cec127dcf641f6c52') fi prepare() { @@ -39,12 +35,17 @@ prepare() { setconf dart2js BIN_DIR "/opt/$pkgname-sdk/bin" setconf dart2js PROG_NAME "/opt/$pkgname-sdk/bin/dart2js" setconf dartanalyzer SCRIPT_DIR "/opt/$pkgname-sdk/bin" - setconf dartdoc BIN_DIR "/opt/$pkgname-sdk/bin" + setconf docgen BIN_DIR "/opt/$pkgname-sdk/bin" setconf pub BIN_DIR "/opt/$pkgname-sdk/bin" setconf pub SDK_DIR "/opt/$pkgname-sdk/" + setconf dartfmt BIN_DIR "/opt/$pkgname-sdk/bin" + setconf dartfmt SDK_DIR "/opt/$pkgname-sdk/" # Fix missing "fi" and missing newline echo -e "fi\n" >> pub + + # Extract license (AUTHORS and LICENSE files are missing + head -n5 "../include/dart_api.h" > ../../LICENSE } package() { @@ -55,7 +56,7 @@ package() { cp -a "$pkgname-sdk/"* "$pkgdir/opt/$pkgname-sdk/" # Set up symbolic links for the executables - for f in dart dart2js dartanalyzer dartdoc pub; do + for f in dart dart2js dartanalyzer docgen pub dartfmt; do ln -s "/opt/$pkgname-sdk/bin/$f" "$pkgdir/usr/bin/$f" done @@ -65,8 +66,8 @@ package() { done # BSD License - install -Dm644 license.html \ - "$pkgdir/usr/share/licenses/$pkgname/license.html" + install -Dm644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index 134e8cb69..819ecb157 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106170 2014-02-24 17:34:53Z dicebot $ +# $Id: PKGBUILD 106417 2014-03-02 21:15:14Z dicebot $ # Maintainer: Mihails Strasunse <public@dicebot.lv> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> @@ -6,21 +6,19 @@ # Contributor: Anders Bergh <anders1@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> -pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools') +pkgname=('dmd' 'libphobos-devel' 'libphobos') groups=('dlang' 'dlang-dmd') pkgbase=dmd pkgver=2.065.0 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.dlang.org" makedepends=('git' 'gcc' 'make') source=("git+http://github.com/D-Programming-Language/dmd.git#tag=v$pkgver" "git+http://github.com/D-Programming-Language/druntime.git#tag=v$pkgver" - "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver" - "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver") + "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver") sha1sums=('SKIP' 'SKIP' - 'SKIP' 'SKIP') [[ $CARCH == "x86_64" ]] && _archbits="64" @@ -35,22 +33,16 @@ build() { cd $srcdir/phobos make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 - - cd $srcdir/tools - - # rdmd is used to build others - $srcdir/dmd/src/dmd -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-rdmd rdmd.d - - for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do - ./dtools-rdmd --compiler=$srcdir/dmd/src/dmd --build-only -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-`basename $tool` $tool.d - done } package_dmd() { pkgdesc="The D programming language reference compiler" backup=('etc/dmd.conf') - depends=('gcc') - optdepends=('dtools: collection of useful utilities for development in D' 'libphobos-devel: standard library, development package') + depends=('gcc' 'libphobos-devel') + optdepends=( + 'dtools: collection of useful utilities for development in D' 'libphobos-devel: standard library, development package' + 'libphobos: standard D library, Phobos; shared library' + ) provides=("d-compiler=$pkgver") license=('custom') backup=('etc/dmd.conf') @@ -79,7 +71,6 @@ package_dmd() { package_libphobos-devel() { pkgdesc="The Phobos standard library for D programming language. Modules and static library." - depends=("dmd") options=("staticlibs") provides=("d-runtime=$pkgver" "d-stdlib=$pkgver") license=("custom") @@ -104,23 +95,3 @@ package_libphobos() { install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.so $pkgdir/usr/lib/libphobos2.so install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE } - -package_dtools() { - pkgdesc="Ancilliary tools for the D programming language compiler" - depends=("curl") - license=("custom") - - cd $srcdir/tools - - mkdir -p $pkgdir/usr/bin - for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do - install -m755 -t $pkgdir/usr/bin $pkgname-$tool - done - - cd $pkgdir - ln -s dtools-rdmd usr/bin/rdmd - ln -s dtools-dustmite usr/bin/dustmite - - # same Boost license as Phobos - install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE -} diff --git a/community/dstep/PKGBUILD b/community/dstep/PKGBUILD index cc1e93ea4..a3319f99e 100644 --- a/community/dstep/PKGBUILD +++ b/community/dstep/PKGBUILD @@ -1,33 +1,38 @@ # Maintainer: Dicebot <public@dicebot.lv> pkgname=dstep pkgver=0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Automatic C header to D module translator" arch=('i686' 'x86_64') groups=('dlang') url="https://github.com/jacob-carlborg/dstep" license=('custom') depends=('clang') -makedepends=('git' 'dmd' 'libphobos-devel' 'dtools') +makedepends=('git' 'd-compiler' 'd-stdlib' 'dtools') source=( "git+https://github.com/jacob-carlborg/dstep.git#tag=v$pkgver" "tango::git+https://github.com/SiegeLord/Tango-D2.git" + "git+https://github.com/Dicebot/Arch-PKGBUILDs.git" "http://www.boost.org/LICENSE_1_0.txt" ) sha1sums=( 'SKIP' 'SKIP' + 'SKIP' '3cba29011be2b9d59f6204d6fa0a386b1b2dbd90' ) build () { + DMD=`$srcdir/Arch-PKGBUILDs/d-compiler.sh` + cd $srcdir/tango - ARCH=$CARCH make -f build/Makefile + make -f build/Makefile DC=$DMD ARCH=$CARCH COMPILER=$(basedir $DMD) + mv libtango-* libtango.a cd $srcdir/dstep git submodule update --init --recursive - rdmd --build-only -debug -gc -ofbin/dstep -Idstack/mambo -Idstack -I$srcdir/tango -L-L$srcdir/tango -I/usr/include/dlang -L-lclang -L-ltango-dmd dstep/driver/DStep.d + rdmd --compiler=$DMD --build-only -debug -gc -ofbin/dstep -Idstack/mambo -Idstack -I$srcdir/tango -L-L$srcdir/tango -I/usr/include/dlang -L-lclang -L-ltango dstep/driver/DStep.d } package () diff --git a/community/dtools/PKGBUILD b/community/dtools/PKGBUILD new file mode 100644 index 000000000..86e350d53 --- /dev/null +++ b/community/dtools/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Mihails Strasunse <public@dicebot.lv> + +pkgname=('dtools') +pkgver=2.065.0 +pkgrel=3 +pkgdesc="Ancilliary tools for the D programming language compiler" +license=("custom") +groups=('dlang' 'dlang-dmd') +arch=('i686' 'x86_64') +url="http://www.dlang.org" +depends=("curl") +makedepends=('git' 'gcc' 'make' 'd-compiler') +source=( + "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver" + "git+https://github.com/Dicebot/Arch-PKGBUILDs.git" + "http://www.boost.org/LICENSE_1_0.txt" +) +sha1sums=( + 'SKIP' + 'SKIP' + '3cba29011be2b9d59f6204d6fa0a386b1b2dbd90' +) + +build() +{ + DMD=`$srcdir/Arch-PKGBUILDs/d-compiler.sh` + + cd $srcdir/tools + + # rdmd is used to build others + $DMD -od. -ofdtools-rdmd rdmd.d + + for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do + ./dtools-rdmd --compiler=$DMD --build-only -od. -ofdtools-`basename $tool` $tool.d + done +} + +package() +{ + cd $srcdir/tools + + mkdir -p $pkgdir/usr/bin + for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do + install -m755 -t $pkgdir/usr/bin $pkgname-$tool + done + + cd $pkgdir + ln -s dtools-rdmd usr/bin/rdmd + ln -s dtools-dustmite usr/bin/dustmite + + install -Dm644 $srcdir/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE +} diff --git a/community/dub/PKGBUILD b/community/dub/PKGBUILD index a3c876a20..8351e773b 100644 --- a/community/dub/PKGBUILD +++ b/community/dub/PKGBUILD @@ -2,26 +2,33 @@ # Contributor: Moritz Maxeiner <moritz@ucworks.org> pkgname=dub pkgver=0.9.21 -pkgrel=1 +pkgrel=2 pkgdesc="Developer package manager for D programming language" arch=('i686' 'x86_64') url="https://github.com/rejectedsoftware/dub" license=('MIT') -makedepends=('dmd' 'libphobos-devel' 'git') +makedepends=('d-compiler' 'd-stdlib' 'git') depends=('d-compiler' 'd-runtime' 'curl') conflicts=('dub-git') -source=("git+http://github.com/rejectedsoftware/dub.git#tag=v$pkgver") -sha256sums=('SKIP') +source=( + "git+http://github.com/rejectedsoftware/dub.git#tag=v$pkgver" + "git+https://github.com/Dicebot/Arch-PKGBUILDs.git" +) +sha256sums=( + 'SKIP' + 'SKIP' +) build() { + DMD=`$srcdir/Arch-PKGBUILDs/d-compiler.sh` cd "${srcdir}/${pkgname}" echo Generating version file... GITVER=$(git describe) || GITVER=unknown echo "module dub.version_; enum dubVersion = \"$GITVER\";" > source/dub/version_.d - dmd -ofbin/dub -g -debug -w -version=DubUseCurl -Isource -L-lcurl @build-files.txt + $DMD -ofbin/dub -g -debug -w -version=DubUseCurl -Isource -L-lcurl @build-files.txt } package() diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD index aa61d89c7..55163296f 100644 --- a/community/homebank/PKGBUILD +++ b/community/homebank/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 105296 2014-02-04 18:24:40Z jlichtblau $ +# $Id: PKGBUILD 106400 2014-03-02 14:11:46Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=homebank -pkgver=4.5.5 +pkgver=4.5.6 pkgrel=1 pkgdesc="Free, easy, personal accounting for everyone" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('intltool') install=$pkgname.install changelog=$pkgname.changelog source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz) -sha256sums=('6f3a26075c4da67cf3521a407e90685be9aac2ef3e41614cfece2c8d4f226416') +sha256sums=('dbff6282a8a81d9dd6ff47dff950f164d69da81147e7d94a516230c23de8a5e8') build() { cd "${srcdir}"/$pkgname-$pkgver diff --git a/community/homebank/homebank.changelog b/community/homebank/homebank.changelog index 8eddc34ad..7a2c25a32 100644 --- a/community/homebank/homebank.changelog +++ b/community/homebank/homebank.changelog @@ -1,3 +1,6 @@ +2014-03-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * homebank 4.5.6-1 + 2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * homebank 4.5.5-1 diff --git a/community/kcm-touchpad/PKGBUILD b/community/kcm-touchpad/PKGBUILD index bb2592777..e26b3d2d1 100644 --- a/community/kcm-touchpad/PKGBUILD +++ b/community/kcm-touchpad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 106129 2014-02-23 16:02:33Z andrea $ +# $Id: PKGBUILD 106384 2014-03-01 23:58:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: A Rojas < nqn1976 @ gmail.com > # Contributor: Alexander Mezin <mezin.alexander@gmail.com> pkgname=kcm-touchpad -pkgver=0.9 -pkgrel=2 +pkgver=0.99 +pkgrel=1 pkgdesc='KCM, daemon and applet for touchpad' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/playground/utils/kcm-touchpad' @@ -14,7 +14,7 @@ depends=('kdebase-workspace' 'xf86-input-synaptics') makedepends=('cmake' 'automoc4' 'xorg-server-devel') install="${pkgname}.install" source=("https://github.com/sanya-m/kde-touchpad-config/archive/v${pkgver}.tar.gz") -md5sums=('2d60b154b60a745a931ded129a6297d6') +md5sums=('3a7ab88eef4cd7c93e9d0783179cf852') prepare() { mkdir build diff --git a/community/kshutdown/PKGBUILD b/community/kshutdown/PKGBUILD index 01108ab54..5bde9df87 100644 --- a/community/kshutdown/PKGBUILD +++ b/community/kshutdown/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93787 2013-07-10 09:09:23Z arodseth $ +# $Id: PKGBUILD 106386 2014-03-02 00:23:09Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kshutdown -pkgver=3.0 +pkgver=3.2 pkgrel=1 pkgdesc='Shutdown Utility for KDE' arch=('x86_64' 'i686') @@ -13,11 +13,11 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') install="$pkgname.install" source=("http://downloads.sourceforge.net/$pkgname/$pkgname-source-$pkgver.zip") -sha256sums=('71295e88e30538e6bc9aceb0ba2d60c2bb6c47739a97ee76f7f1f767044493ee') +sha256sums=('8be6c2a15bb539919f94ec0caf20f00b144185f996b7663c464fbf7ce8f4a39f') build() { - mkdir "$srcdir/build" - cd "$srcdir/build" + mkdir build + cd build cmake "../$pkgname-$pkgver" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr @@ -25,8 +25,7 @@ build() { } package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install + make -C build DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 5fcea7099..f7431fd08 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101888 2013-12-02 15:58:18Z dicebot $ +# $Id: PKGBUILD 106423 2014-03-02 22:29:17Z dicebot $ # Maintainer: Mihails Strasuns <public@dicebot.lv> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=('ldc' 'liblphobos-devel') groups=('dlang' 'dlang-ldc') pkgver=0.12.1 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') url="https://github.com/ldc-developers/ldc" @@ -35,7 +35,7 @@ build() { } package_ldc() { - optdepends=("liblphobos-devel: standard library, static one + imports, LDC version") + depends=('liblphobos-devel') backup=("etc/ldc2.conf" "etc/ldc2.rebuild.conf" ) @@ -57,7 +57,6 @@ package_ldc() { } package_liblphobos-devel() { - depends=("ldc") provides=("d-runtime" "d-stdlib") options=("staticlibs") diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD index 64d451ab4..6a9d0880b 100644 --- a/community/metapixel/PKGBUILD +++ b/community/metapixel/PKGBUILD @@ -1,35 +1,34 @@ -# $Id: PKGBUILD 94928 2013-08-01 07:01:23Z bpiotrowski $ +# $Id: PKGBUILD 106408 2014-03-02 18:09:48Z schuay $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de> pkgname=metapixel pkgver=1.0.2 -pkgrel=5 +pkgrel=6 pkgdesc='A program for generating photomosaics.' arch=('i686' 'x86_64') url='http://www.complang.tuwien.ac.at/schani/metapixel/' license=('GPL') -depends=('giflib' 'libjpeg' 'libpng' 'perl') -source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz" - 'metapixel-1.0.2-libpng-1.5.patch' - 'metapixel-1.0.2-giflib-5.0.patch') -md5sums=('af5d77d38826756af213a08e3ada9941' - '1832a79790b07402735bfeb9f71f36e9' - 'f16abb33c545734eea36ec16c92a05e8') +depends=('giflib' 'libjpeg' 'libpng' 'perl' 'glib2') +makedepends=('git' 'docbook-xsl') +source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82") +md5sums=('SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" - patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch - patch -p0 -i ../metapixel-1.0.2-giflib-5.0.patch + git submodule init + git submodule update - make + # Build librwimg first, make dependencies seem to be bugged. + make librwimg + make MANPAGE_XSL="/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" install -dm0755 "${pkgdir}/usr/share/man/man1" - make PREFIX="${pkgdir}/usr" install + make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man/man1" install } diff --git a/community/metapixel/metapixel-1.0.2-giflib-5.0.patch b/community/metapixel/metapixel-1.0.2-giflib-5.0.patch deleted file mode 100644 index d9d4b9065..000000000 --- a/community/metapixel/metapixel-1.0.2-giflib-5.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rwimg/rwgif.c.orig 2013-07-30 13:21:57.733602922 +0200 -+++ rwimg/rwgif.c 2013-07-30 13:21:01.827421262 +0200 -@@ -54,7 +54,7 @@ open_gif_file (const char *filename, int - - assert(data != 0); - -- data->file = DGifOpenFileName(filename); -+ data->file = DGifOpenFileName(filename, NULL); - - assert(data->file !=0); - diff --git a/community/metapixel/metapixel-1.0.2-libpng-1.5.patch b/community/metapixel/metapixel-1.0.2-libpng-1.5.patch deleted file mode 100644 index ed787452f..000000000 --- a/community/metapixel/metapixel-1.0.2-libpng-1.5.patch +++ /dev/null @@ -1,174 +0,0 @@ ---- metapixel-1.0.2.orig/rwimg/rwpng.c -+++ metapixel-1.0.2/rwimg/rwpng.c -@@ -57,19 +57,39 @@ - data->end_info = png_create_info_struct(data->png_ptr); - assert(data->end_info != 0); - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - -- png_init_io(data->png_ptr, data->file); -- -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_init_io(data->png_ptr, data->file); -+ png_read_info(data->png_ptr, data->info_ptr); -+#else -+ png_init_io(data->png_ptr, data->file); - png_read_info(data->png_ptr, data->info_ptr); -+#endif - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ *width = png_get_image_width(data->png_ptr, data->info_ptr); -+ *height = png_get_image_height(data->png_ptr, data->info_ptr); -+ { -+ png_byte value = png_get_bit_depth(data->png_ptr, data->info_ptr); -+ assert(value == 8 || value == 16); -+ value = png_get_color_type(data->png_ptr, data->info_ptr); -+ assert(value == PNG_COLOR_TYPE_RGB || value == PNG_COLOR_TYPE_RGB_ALPHA); -+ value = png_get_interlace_type(data->png_ptr, data->info_ptr); -+ assert(value == PNG_INTERLACE_NONE); -+ } -+#else - *width = data->info_ptr->width; - *height = data->info_ptr->height; -- - assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16); - assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA); - assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE); -+#endif - - data->have_read = 0; - -@@ -81,32 +101,51 @@ - { - png_data_t *data = (png_data_t*)_data; - int i; -- int bps, spp; -+ int bps, spp, width; - unsigned char *row; - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if(png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB) -+#else - if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB) -+#endif - spp = 3; - else - spp = 4; - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if(png_get_bit_depth(data->png_ptr, data->info_ptr) == 16) -+#else - if (data->info_ptr->bit_depth == 16) -+#endif - bps = 2; - else - bps = 1; - -- row = (unsigned char*)malloc(data->info_ptr->width * spp * bps); -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ width = png_get_image_width(data->png_ptr, data->info_ptr); -+#else -+ width = data->info_ptr->width: -+#endif -+ -+ row = (unsigned char*)malloc(width * spp * bps); - - for (i = 0; i < num_lines; ++i) - { - int j, channel; - - png_read_row(data->png_ptr, (png_bytep)row, 0); -- for (j = 0; j < data->info_ptr->width; ++j) -+ for (j = 0; j < width; ++j) - for (channel = 0; channel < 3; ++channel) -- lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps]; -+ lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps]; - } - - free(row); -@@ -119,7 +158,11 @@ - { - png_data_t *data = (png_data_t*)_data; - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - - if (data->have_read) -@@ -148,7 +191,11 @@ - data->info_ptr = png_create_info_struct(data->png_ptr); - assert(data->info_ptr != 0); - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - - if (pixel_stride == 4) -@@ -156,6 +203,16 @@ - - png_init_io(data->png_ptr, data->file); - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_set_IHDR(data->png_ptr, data->info_ptr, -+ width, height, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, -+ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); -+ -+ /* Maybe does not need following. */ -+ png_set_tRNS(data->png_ptr, data->info_ptr, NULL, 0, NULL); -+ png_set_PLTE(data->png_ptr, data->info_ptr, NULL, 0); -+ png_set_invalid(data->png_ptr, data->info_ptr, 0); -+#else - data->info_ptr->width = width; - data->info_ptr->height = height; - data->info_ptr->valid = 0; -@@ -168,6 +225,7 @@ - data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT; - data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT; - data->info_ptr->interlace_type = PNG_INTERLACE_NONE; -+#endif - - png_write_info(data->png_ptr, data->info_ptr); - -@@ -182,7 +240,11 @@ - png_data_t *data = (png_data_t*)_data; - int i; - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - - for (i = 0; i < num_lines; ++i) -@@ -194,7 +256,11 @@ - { - png_data_t *data = (png_data_t*)_data; - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - - png_write_end(data->png_ptr, data->info_ptr); diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD index c94e0936f..2f4d2877b 100644 --- a/community/python-sqlalchemy/PKGBUILD +++ b/community/python-sqlalchemy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 105348 2014-02-05 18:51:35Z angvp $ +# $Id: PKGBUILD 106390 2014-03-02 04:42:29Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-sqlalchemy pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=1 arch=('i686' 'x86_64') # python2 package contain .so url="http://www.sqlalchemy.org/" license=('custom: MIT') makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-nose' 'python2-nose') source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz") -md5sums=('c36a958e46a8514583be82523785269d') +md5sums=('a27989b9d4b3f14ea0b1600aa45559c4') build() { cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD index cb3989c18..db96c9ee6 100644 --- a/extra/gcr/PKGBUILD +++ b/extra/gcr/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 203572 2014-01-13 17:12:02Z andyrtr $ +# $Id: PKGBUILD 206588 2014-03-02 16:00:41Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gcr pkgver=3.10.1 -pkgrel=2 +pkgrel=3 pkgdesc="A library for bits of crypto UI and parsing" arch=(i686 x86_64) url="http://www.gnome.org" license=('GPL2') -depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt') +depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt' + 'p11-kit') makedepends=('intltool' 'gobject-introspection' 'python' 'vala') install=gcr.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 80b0943fd..03e6389e5 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 205558 2014-02-07 00:40:00Z bisson $ +# $Id: PKGBUILD 206590 2014-03-02 16:53:57Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.18.8 +pkgver=0.18.9 pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' @@ -18,7 +18,7 @@ makedepends=('doxygen') source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig} 'tmpfiles.d' 'conf') -sha1sums=('04e6c657e9b5b7330c2ab4af2fb361d7d1e294d8' 'SKIP' +sha1sums=('70e96857d68c0191bbf721aa08a8b5f4ec8120c7' 'SKIP' 'f4d5922abb69abb739542d8e93f4dfd748acdad7' '67c145c046cddd885630d72ce8ebe71f8321ff3b') diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 5f867ca5d..e0b658181 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 205479 2014-02-05 18:47:19Z angvp $ +# $Id: PKGBUILD 206583 2014-03-02 05:03:16Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') -pkgver=3.3.0 +pkgver=3.3.1 pkgrel=1 arch=('i686' 'x86_64') license=('BSD' 'custom') url="http://lxml.de/" makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -md5sums=('ca2f02fd762f3614a1930c568847052b' +md5sums=('09401c787d9b2660b0d76c4c6baec0f3' 'SKIP') # Temporary commented due a conflict with devtools and lxml diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index e17657146..8f83b01e3 100644 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206177 2014-02-20 22:43:41Z thomas $ +# $Id: PKGBUILD 206252 2014-02-22 22:54:25Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,12 +10,12 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -_sublevel=4 +_sublevel=5 _grsecver=3.0 -_timestamp=201402221308 +_timestamp=201402241943 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -46,8 +46,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'known-exploit-detection.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '3659d30b1d06dd5b7874ae04c946863b' - '0022d89a923e5e871ba53db1f969e46e' + '6e59a1e4b891ca5fa8b03d488fa64e04' + '810f3caa18b89eda5b41a2cff5821a4a' '21da34d98cc007a78a11660863537c0d' 'd4b95575b9cc32b7ba4ad8624972ddf9' '5f66bed97a5c37e48eb2f71b2d354b9a' @@ -67,7 +67,7 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' 'f93ef6157fbb23820bd5ae08fd3f451e' '0db7629711f4ed76bd1f9da9f97bc4ea' 'cb789bf97bc65fd4cf240d99df9c24c0' - 'ac92b702b8497d2be14f96e077a7f48f') + '5fcb6203b54aaf7dcbdf6e2c6f159b14') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 02863ff53..edb795663 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -9,12 +9,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_releasever=11 -_rtpatchver=rt17 +_releasever=12 +_rtpatchver=rt19 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.12 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -40,8 +40,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - '8d78b7fe81e226b022b331e8a1da74b7' - '5c46965799741357e7a48c2c32735929' + 'a763ffc196d8ffa49c676a43448d75a4' + '97e5652f6039a48544897129c8adaf98' 'e40789b1e59136235827a3b3bf40c121' 'bf542c4038d3e7d0da4c92bac0466198' '82496e68851d1960543a07ba51cdb44a' @@ -56,7 +56,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'cec0bb8981936eab2943b2009b7a6fff' '88d9cddf9e0050a76ec4674f264fb2a1' 'cb9016630212ef07b168892fbcfd4e5d' - '5a595801584a112426ccc0fe3753aa06') + 'a9a0ee57377ed6e55957f9671eead03a') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 5535d43b8..cd2b63bc8 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -13,7 +13,7 @@ _basekernel=3.13 _sublevel=5 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -59,7 +59,7 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' '1ae4ec847f41fa1b6d488f956e94c893' 'e6fa278c092ad83780e2dd0568e24ca6' '93dbf73af819b77f03453a9c6de2bb47' - '0dba32ae551acd285da1c1dcfee5b966') + '5fcb6203b54aaf7dcbdf6e2c6f159b14') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD index 824c7da2b..2e40800bd 100644 --- a/libre/webmin/PKGBUILD +++ b/libre/webmin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 195997 2013-10-07 10:38:56Z tpowa $ +# $Id: PKGBUILD 206573 2014-03-01 18:15:00Z bpiotrowski $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.660 -pkgrel=1.1 +pkgver=1.670 +pkgrel=1 pkgdesc="a web-based interface for system administration (Parabola rebranded)" arch=(i686 x86_64 mips64el) license=('custom:webmin') @@ -83,17 +83,17 @@ backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/confi 'etc/webmin/pserver/config' \ 'etc/webmin/dnsadmin/config' ) install=webmin.install -source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz - ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 - ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 - webmin.service) +source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz + ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 + ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 + webmin.service) options=(!strip) package() { # NOTE: USE --asroot build option to avoid fakeroot error! cd "$srcdir"/$pkgname-$pkgver # add patches from webmin.com - #for i in ../*.wbm + #for i in ../*.wbm #do tar xvf $i #done #for i in ../*.wbt @@ -103,13 +103,13 @@ package() { rm -f mount/freebsd-mounts* rm -f mount/openbsd-mounts* rm -f mount/macos-mounts* - + # remove modules we do not support rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin} - + #remove config files from other distros rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*') - + # remove caldera theme rm -rf caldera @@ -124,27 +124,27 @@ package() { rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi} # remove modules add because we don't want files installed without pacman control - rm -f webmin/{install_mod.cgi,delete_mod.cgi} + rm -f webmin/{install_mod.cgi,delete_mod.cgi} # setting perl path (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - - + # create dirs mkdir -p "$pkgdir"/opt/webmin mkdir -p "$pkgdir"/var/log/webmin mkdir -p "$pkgdir"/etc/webmin - + # install pam stuff install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin - + # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work! rm os_list.txt echo 'Parabola GNU/linux-libre Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt - + # Add rc.conf support to boot and shutdown menu and lock editing of this module cd init/ sed -i -e 's:^local_down=.*:local_down=Parabola GNU/Linux-libre RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') - sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') + sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') sed -i -e 's:^index_downscript=.*:index_downscript=Parabola GNU/Linux-libre RC.CONF:g' lang/* sed -i -e 's:^index_script=.*:index_script=Parabola GNU/Linux-libre RC.LOCAL:g' lang/* sed -i -e 's:^noconfig=0:noconfig=1:g' defaultacl @@ -184,18 +184,18 @@ package() { atbootyn=n tempdir="$pkgdir"/tmp export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn - + # Fix setup.sh sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh "$pkgdir"/opt/webmin/setup.sh - + # Fixup the config files to use their real locations sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf - find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; - + find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; + # make it only accessible by localhost echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf - + # install pacman menu cd "$srcdir"/webmin-pacman/config cp -rfp * "$pkgdir"/etc/webmin/pacman @@ -210,7 +210,7 @@ package() { # install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } -md5sums=('56a685a665b864470eeb7ce6b97961d8' +md5sums=('db2edf10ad1eb0cc8d80849a61dafd3a' 'b0b3e3fb231a12e60165b6b4d604dcfa' 'c86518037449e0fc0c60fc24537ea038' 'fc29ecb6a5cd8c278abe054e60381095') diff --git a/pcr/command-not-found/PKGBUILD b/pcr/command-not-found/PKGBUILD index e2131a3d5..60aaa4fd5 100644 --- a/pcr/command-not-found/PKGBUILD +++ b/pcr/command-not-found/PKGBUILD @@ -5,7 +5,7 @@ pkgname=command-not-found pkgver=0.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="In case a command could not be found this utility searches for packages containing this or a similar command (bash,zsh)." arch=('i686' 'x86_64') url="http://github.com/metti/command-not-found" @@ -14,7 +14,9 @@ depends=('boost-libs' 'tdb' 'libarchive' 'wget') makedepends=('boost' 'cmake') install='install' -source=("libre://$pkgname-$pkgver.tar.gz") +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('cceea11367dd1847f08c94212f380ea5') + mksource=("$pkgname-$pkgver::git+https://github.com/metti/$pkgname.git#tag=v${pkgver}") mkmd5sums=('SKIP') @@ -28,5 +30,3 @@ package(){ cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } - -md5sums=('c055522251b2c58b9c6e0d0f0df481c0') diff --git a/pcr/hiredis/ChangeLog b/pcr/hiredis/ChangeLog index fbe55643a..b804e1b67 100644 --- a/pcr/hiredis/ChangeLog +++ b/pcr/hiredis/ChangeLog @@ -1,3 +1,13 @@ +2013-12-11 Vladimir Tsanev <tsachev@gamil.com> + + * 0.11.0-3 : + Tests enabled thanks to Massimiliano Torromeo. + +2013-11-23 Vladimir Tsanev <tsachev@gamil.com> + + * 0.11.0-2 : + added i686 arch. + 2013-06-07 Vladimir Tsanev <tsachev@gamil.com> * 0.11.0-1 : diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD index 29762e87e..a6ad20868 100644 --- a/pcr/hiredis/PKGBUILD +++ b/pcr/hiredis/PKGBUILD @@ -1,33 +1,43 @@ -# Maintainer: Vladimir Tsanev <tsachev@gmail.com> +# Maintainer: orphan +# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar> +# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (AUR): Vladimir Tsanev <tsachev@gmail.com> +# Contributor (AUR): Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=hiredis pkgver=0.11.0 -pkgrel=1 -pkgdesc='minimalistic C client library for Redis' +pkgrel=3 +pkgdesc='Minimalistic C client library for Redis' arch=('x86_64' 'i686') url="https://github.com/redis/hiredis/" -license=('BSD') +license=('BSD3') depends=('glibc') +checkdepends=('redis') changelog='ChangeLog' -source=(https://codeload.github.com/redis/${pkgname}/tar.gz/v${pkgver}) -md5sums=('e2ac29509823ccc96990b6fe765b5d46') +source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/redis/$pkgname/tar.gz/v$pkgver + hiredis-fix-tests.patch) +md5sums=('e2ac29509823ccc96990b6fe765b5d46' + 'ddcc73042a8ec278aca6cc2b2d26bc03') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i ../hiredis-fix-tests.patch +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make + cd "$srcdir/$pkgname-$pkgver" + make } -# -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# make test check c -#} +check() { + cd "$srcdir/$pkgname-$pkgver" + sed -r 's|echo \\|echo -e \\|' -i Makefile + make check +} package() { - - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX="$pkgdir/usr" clean dep install - - install -Dm 644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/COPYING" + cd "$srcdir/$pkgname-$pkgver" + make PREFIX="$pkgdir/usr" install + install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/pcr/hiredis/hiredis-fix-tests.patch b/pcr/hiredis/hiredis-fix-tests.patch new file mode 100644 index 000000000..51e49bf71 --- /dev/null +++ b/pcr/hiredis/hiredis-fix-tests.patch @@ -0,0 +1,11 @@ +diff -ru hiredis-0.11.0.orig/test.c hiredis-0.11.0/test.c +--- hiredis-0.11.0.orig/test.c 2012-08-28 02:55:52.000000000 -0400 ++++ hiredis-0.11.0/test.c 2014-03-02 17:49:24.396739767 -0500 +@@ -286,6 +286,7 @@ + c = redisConnect((char*)"idontexist.local", 6379); + test_cond(c->err == REDIS_ERR_OTHER && + (strcmp(c->errstr,"Name or service not known") == 0 || ++ strcmp(c->errstr,"Temporary failure in name resolution") == 0 || + strcmp(c->errstr,"Can't resolve: idontexist.local") == 0)); + redisFree(c); + diff --git a/pcr/nginx-passenger/PKGBUILD b/pcr/nginx-passenger/PKGBUILD new file mode 100644 index 000000000..b6badd8aa --- /dev/null +++ b/pcr/nginx-passenger/PKGBUILD @@ -0,0 +1,113 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net +# Maintainer (AUR): Tom Richards <tom@tomrichards.net> +# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Maintainer (Arch): Sébastien Luttringer +# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor (Arch): Miroslaw Szot <mss@czlug.icis.pcz.pl> + +pkgname=nginx-passenger +_nginxver=1.4.5 +_passengerver=4.0.37 +pkgver=$_nginxver +pkgrel=1 +pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' +pkgdesc+=" (with Passenger module)" +arch=('i686' 'x86_64') +url='http://nginx.org' +license=('custom') +depends=('pcre' 'zlib' 'openssl') +depends+=("passenger=$_passengerver") +depends+=('ruby' 'ruby-rack' 'curl') +conflicts=('nginx') +provides=("nginx=$_nginxver") +backup=('etc/nginx/fastcgi.conf' + 'etc/nginx/fastcgi_params' + 'etc/nginx/koi-win' + 'etc/nginx/koi-utf' + 'etc/nginx/mime.types' + 'etc/nginx/nginx.conf' + 'etc/nginx/scgi_params' + 'etc/nginx/uwsgi_params' + 'etc/nginx/win-utf' + 'etc/logrotate.d/nginx') +install=nginx.install +source=($url/download/nginx-$_nginxver.tar.gz + passenger-$_passengerver.tar.gz::https://github.com/phusion/passenger/archive/release-$_passengerver.tar.gz + service + logrotate) +md5sums=('1a635e9543570f0c881b8ec9db0c6898' + '7040af5314fe19a420f38732c6bd4f5b' + 'ce9a06bcaf66ec4a3c4eb59b636e0dfd' + '3441ce77cdd1aab6f0ab7e212698a8a7') + +build() { + cd "$srcdir/passenger-release-$_passengerver" + _nginx_addon_dir=$(bin/passenger-config --nginx-addon-dir) + + cd "$srcdir/nginx-$_nginxver" + ./configure \ + --prefix=/etc/nginx \ + --conf-path=/etc/nginx/nginx.conf \ + --sbin-path=/usr/bin/nginx \ + --pid-path=/run/nginx.pid \ + --lock-path=/run/lock/nginx.lock \ + --user=http \ + --group=http \ + --http-log-path=/var/log/nginx/access.log \ + --error-log-path=stderr \ + --http-client-body-temp-path=/var/lib/nginx/client-body \ + --http-proxy-temp-path=/var/lib/nginx/proxy \ + --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ + --http-scgi-temp-path=/var/lib/nginx/scgi \ + --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \ + --with-imap \ + --with-imap_ssl_module \ + --with-ipv6 \ + --with-pcre-jit \ + --with-file-aio \ + --with-http_dav_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_realip_module \ + --with-http_spdy_module \ + --with-http_ssl_module \ + --with-http_stub_status_module \ + --with-http_addition_module \ + --with-http_degradation_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_secure_link_module \ + --with-http_sub_module \ + --add-module="$_nginx_addon_dir" + + make +} + +package() { + cd "$srcdir/nginx-$_nginxver" + make DESTDIR="$pkgdir" install + + sed -e 's|\<user\s\+\w\+;|user html;|g' \ + -e '44s|html|/usr/share/nginx/html|' \ + -e '54s|html|/usr/share/nginx/html|' \ + -i "$pkgdir"/etc/nginx/nginx.conf + + rm "$pkgdir"/etc/nginx/*.default + + install -d "$pkgdir"/var/lib/nginx + install -dm700 "$pkgdir"/var/lib/nginx/proxy + + chmod 750 "$pkgdir"/var/log/nginx + chown http:log "$pkgdir"/var/log/nginx + + install -d "$pkgdir"/usr/share/nginx + mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx + + install -Dm644 ../logrotate "$pkgdir"/etc/logrotate.d/nginx + install -Dm644 ../service "$pkgdir"/usr/lib/systemd/system/nginx.service + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + + rmdir "$pkgdir/run" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/nginx-passenger/logrotate b/pcr/nginx-passenger/logrotate new file mode 100644 index 000000000..e0fa9ec4c --- /dev/null +++ b/pcr/nginx-passenger/logrotate @@ -0,0 +1,9 @@ +/var/log/nginx/*log { + missingok + create 640 http log + sharedscripts + compress + postrotate + test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/pcr/nginx-passenger/nginx.install b/pcr/nginx-passenger/nginx.install new file mode 100644 index 000000000..dfad9a034 --- /dev/null +++ b/pcr/nginx-passenger/nginx.install @@ -0,0 +1,17 @@ +post_upgrade() { + if (( $(vercmp $2 1.2.7-4) <= 0 )); then + chmod 750 var/log/nginx + chown http:log var/log/nginx + fi + if (( $(vercmp $2 1.2.1-2) <= 0 )); then + echo ' >>> Since 1.2.1-2 several changes has been made in package:' + echo ' - *.conf files have been moved to /etc/nginx' + echo ' - /etc/conf.d/nginx has been removed' + echo ' Main configuration file is set to /etc/nginx/nginx.conf' + echo ' - access.log and error.log can be found in /var/log/nginx by default' + echo ' - bundled *.html files have been moved to /usr/share/nginx/html' + echo ' - /etc/nginx/{html,logs} symbolic links and *.default files have been removed' + fi +} + +# vim:set ts=4 sw=4 et: diff --git a/pcr/nginx-passenger/service b/pcr/nginx-passenger/service new file mode 100644 index 000000000..29d3aa877 --- /dev/null +++ b/pcr/nginx-passenger/service @@ -0,0 +1,14 @@ +[Unit] +Description=A high performance web server and a reverse proxy server +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/nginx.pid +ExecStartPre=/usr/bin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecReload=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload +ExecStop=/usr/bin/nginx -g 'pid /run/nginx.pid;' -s quit + +[Install] +WantedBy=multi-user.target diff --git a/pcr/qt-at-spi-git/PKGBUILD b/pcr/qt-at-spi-git/PKGBUILD index d69e670c6..fb42af603 100644 --- a/pcr/qt-at-spi-git/PKGBUILD +++ b/pcr/qt-at-spi-git/PKGBUILD @@ -13,15 +13,18 @@ license=('LGPL') provides=("$_pkgname=$_pkgver") -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') depends=('at-spi2-core' 'qt4>=4.8' 'kdelibs>=4.8') makedepends=('cmake' 'automoc4') -source=("libre://$pkgname-$pkgver.tar.gz" 'qt-accessibility.sh') +source=("https://repo.parabolagnulinux.org/other/$_pkgname/$pkgname-$pkgver.tar.gz" 'qt-accessibility.sh') +md5sums=('688accf9c2f517a526885733aad821a4' + 'f0c8551ed54f5d4e5daf7ddac9189aaa') mkdepends=('git') mksource=("$pkgname-$pkgver::git://anongit.kde.org/qtatspi#$_gitver") +mkmd5sums=('SKIP') mksource() { cd "$srcdir/$pkgname-$pkgver" rm -f examples/tabbar/{simple,tabbar} @@ -39,7 +42,3 @@ package() { install -D -m755 "$srcdir/qt-accessibility.sh" "$pkgdir/etc/profile.d/qt-accessibility.sh" } - -mkmd5sums=('SKIP') -md5sums=('d48fbf6d429260f7b279964972b7ab25' - 'f0c8551ed54f5d4e5daf7ddac9189aaa') diff --git a/pcr/rfc5766-turn-server/ChangeLog b/pcr/rfc5766-turn-server/ChangeLog index 5accefa5b..fd52b6d89 100644 --- a/pcr/rfc5766-turn-server/ChangeLog +++ b/pcr/rfc5766-turn-server/ChangeLog @@ -1,5 +1,89 @@ +2014-02-24 Vladimir Tsanev <tsachev@gmail.com> + * 3.2.2.8-1 : + New upstream release. +2014-02-18 Vladimir Tsanev <tsachev@gmail.com> + * 3.2.2.7-1 : + New upstream release. + +2014-02-12 Vladimir Tsanev <tsachev@gmail.com> + * 3.2.2.6-1 : + New upstream release. + +2014-02-04 Vladimir Tsanev <tsachev@gmail.com> + * 3.2.2.5-1 : + New upstream release and PKGBUILD cleanup. + +2014-01-31 Vladimir Tsanev <tsachev@gmail.com> + * 3.2.2.4-1 : + New upstream release. New download site. + +2013-12-11 Vladimir Tsanev <tsachev@gamil.com> + * 3.1.2.2-1 : + New upstream release. + +2013-11-23 Vladimir Tsanev <tsachev@gamil.com> + * 3.0.0.0-1 : + New upstream release. + +2013-10-22 Vladimir Tsanev <tsachev@gamil.com> + * 2.6.6.0-1 : + New upstream release. --disable-rpath flag added to configure + +2013-10-16 Vladimir Tsanev <tsachev@gamil.com> + * 2.6.5.2-1 : + New upstream release. + +2013-09-07 Vladimir Tsanev <tsachev@gamil.com> + * 2.6.2.1-1 : + New upstream release. + Trivial PKGBUILD fixes. + +2013-08-09 Vladimir Tsanev <tsachev@gamil.com> + * 2.6.1.4-1 : + New upstream release. + +2013-08-09 Vladimir Tsanev <tsachev@gamil.com> + * 2.6.1.1-1 : + New upstream release. + +2013-07-19 Vladimir Tsanev <tsachev@gamil.com> + * 2.5.1.2-1 : + New upstream release. + +2013-07-19 Vladimir Tsanev <tsachev@gamil.com> + * 2.1.1.1-1 : + New upstream release. + +2013-07-16 Vladimir Tsanev <tsachev@gamil.com> + * 2.0.0.0-1 : + New upstream release. + +2013-06-24 Vladimir Tsanev <tsachev@gamil.com> + * 1.8.7.0-2 : + More packaging cleanup. + + * 1.8.7.0-1 : + New upstream release and package cleanup. + +2013-06-12 Vladimir Tsanev <tsachev@gamil.com> + + * 1.8.6.3-1 : + Upstream release. + +2013-06-07 Vladimir Tsanev <tsachev@gamil.com> + + * 1.8.6.1-3 : + 'postgresql-libs' 'libmysqlclient' and 'hiredis' cannot be optional. + +2013-06-06 Vladimir Tsanev <tsachev@gamil.com> + + * 1.8.6.1-2 : + Added systemd service. Fixed redis support. + + * 1.8.6.1-1 : + New upstream release. + 2013-06-05 Vladimir Tsanev <tsachev@gamil.com> * 1.8.6.0-1 : Initial package created. - diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD index c070ad309..fc14b4a76 100644 --- a/pcr/rfc5766-turn-server/PKGBUILD +++ b/pcr/rfc5766-turn-server/PKGBUILD @@ -1,64 +1,59 @@ -# Maintainer: Vladimir Tsanev <tsachev@gmail.com> +# Maintainer: orphan +# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar> +# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: Michał Masłowski <mtjm@mtjm.eu> +# Maintainer (AUR): Vladimir Tsanev <tsachev@gmail.com> pkgname=rfc5766-turn-server _portname=turnserver -pkgver=2.6.2.1 +pkgver=3.2.2.8 pkgrel=1 pkgdesc="STUN and TURN Relay Server for VoIP and WebRTC" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/rfc5766-turn-server/" -license=('custom:BSDNew') +license=('BSD3') depends=('libevent' 'postgresql-libs' 'libmysqlclient' 'hiredis') -optdepends=('postgresql-client: to use postgresql' - 'mariadb: mariadb backend' - 'redis: redis backend') +install="$_portname.install" backup=("etc/turnserver.conf" "etc/turnuserdb.conf") -changelog=ChangeLog -source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz - turn.service stun.service) +changelog='ChangeLog' +source=(http://$_portname.open-sys.org/downloads/v$pkgver/$_portname-$pkgver.tar.gz $_portname.service $_portname.tmpfiles.d) +md5sums=('c16ff9ced1ba0797fbd16a66161dca2c' + 'bf568b614a17ee439e831b8f8aa7236a' + 'aa7bf422a9dfba7febb56dc172feb1cf') +sha1sums=('0faa1514f6819827f3ad0cffe2dc7bc6eef257cc' + '0c5b348e793bd52ce0ee38d420b26c9b2a2e2ca5' + '445e9982549d7ed018bc1fb6176a730313ae3d26') build() { - cd "${srcdir}/$_portname-${pkgver}" - - ./configure --prefix=/usr \ - --manprefix=/usr/share \ - --examplesdir="/usr/share/$_portname/examples" + cd "$srcdir/$_portname-$pkgver" + ./configure --prefix=/usr --manprefix=/usr/share --examplesdir="/usr/share/$_portname/examples" --disable-rpath make } check() { - cd "${srcdir}/$_portname-${pkgver}" + cd "$srcdir/$_portname-$pkgver" make check } package() { - cd "${srcdir}/$_portname-${pkgver}" + cd "$srcdir/$_portname-$pkgver" make DESTDIR="$pkgdir" install - - install -D "$pkgdir/usr/share/$_portname/examples/etc/turnserver.conf" \ - "$pkgdir/etc/turnserver.conf" - install -D "$pkgdir/usr/share/$_portname/examples/etc/turnuserdb.conf" \ - "$pkgdir/etc/turnuserdb.conf" - install -D "$srcdir/stun.service" \ - "$pkgdir/usr/lib/systemd/system/stun.service" - install -D "$srcdir/turn.service" \ - "$pkgdir/usr/lib/systemd/system/turn.service" - rm -r "$pkgdir/usr/etc" - chmod 644 "$pkgdir/usr/lib/libturnclient.a" - install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - install -dm 755 "$pkgdir/var/log/$_portname" + mv "$pkgdir/usr/etc" "$pkgdir/etc" + local file + for file in "$pkgdir/etc"/*.default; do + mv "$file" "${file%.default}" + chmod 644 "${file%.default}" + done + sed -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \ + -e '/^#pidfile="\/var\/run\/turnserver.pid"$/c pidfile="\/var\/run\/turnserver\/turnserver.pid"' \ + -i "$pkgdir/etc/turnserver.conf" + + install -Dm644 "../$_portname.service" "$pkgdir/usr/lib/systemd/system/$_portname.service" + install -Dm644 "../$_portname.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/$_portname.conf" - sed \ - -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \ - -i "${pkgdir}"/etc/turnserver.conf + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha1sums=('d7f01e6fadbe56fe4535d67a7d178a9cfba110b8' - '0c5b348e793bd52ce0ee38d420b26c9b2a2e2ca5' - 'b12805c049787cd1433181afaba4111f89740e63') -sha256sums=('4d131f353aadb15901d175755075af65abf2a0e820d7281c9c164285642ff9c1' - '319030c1916d353bfc3375626cc7f60d6eeca762fe4fce354f010212902c49dc' - '63198e4f802c7b4b44e671e0fcaebca36589ebb11405e51ab9f36c80327ac4d9') diff --git a/pcr/rfc5766-turn-server/stun.service b/pcr/rfc5766-turn-server/stun.service deleted file mode 100644 index bddb6168a..000000000 --- a/pcr/rfc5766-turn-server/stun.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=STUN Server -After=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/turnserver --stun-only - -[Install] -WantedBy=multi-user.target diff --git a/pcr/rfc5766-turn-server/turn.service b/pcr/rfc5766-turn-server/turn.service deleted file mode 100644 index 54cc5f01a..000000000 --- a/pcr/rfc5766-turn-server/turn.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=TURN Server -After=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/turnserver - -[Install] -WantedBy=multi-user.target diff --git a/pcr/rfc5766-turn-server/turnserver.install b/pcr/rfc5766-turn-server/turnserver.install new file mode 100644 index 000000000..84f31ca7f --- /dev/null +++ b/pcr/rfc5766-turn-server/turnserver.install @@ -0,0 +1,17 @@ +post_install() { + id turnserver &>/dev/null || \ + useradd -g daemon -M -s /usr/bin/false turnserver + + install -dm 755 "/var/log/turnserver" + chown -R turnserver:daemon /var/log/turnserver + + systemd-tmpfiles --create turnserver.conf +} + +post_upgrade() { + post_install +} + +pre_remove() { + userdel turnserver +} diff --git a/pcr/rfc5766-turn-server/turnserver.service b/pcr/rfc5766-turn-server/turnserver.service new file mode 100644 index 000000000..8e267b2e0 --- /dev/null +++ b/pcr/rfc5766-turn-server/turnserver.service @@ -0,0 +1,11 @@ +[Unit] +Description=STUN and TURN Relay Server for VoIP and WebRTC +After=network.target + +[Service] +Type=forking +User=turnserver +ExecStart=/usr/bin/turnserver -c /etc/turnserver.conf -o -v + +[Install] +WantedBy=multi-user.target diff --git a/pcr/rfc5766-turn-server/turnserver.tmpfiles.d b/pcr/rfc5766-turn-server/turnserver.tmpfiles.d new file mode 100644 index 000000000..ec1a89758 --- /dev/null +++ b/pcr/rfc5766-turn-server/turnserver.tmpfiles.d @@ -0,0 +1 @@ +d /run/turnserver 0755 turnserver daemon - |