From a4111d7e955b56d51181adc90eb77f8e4903cb64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Mon, 14 Jul 2014 03:35:11 +0000 Subject: Mon Jul 14 03:32:14 UTC 2014 --- community/gqrx/PKGBUILD | 54 +++++++++++++++++++++ community/gqrx/gqrx.desktop | 10 ++++ community/gqrx/gqrx.png | Bin 0 -> 3466 bytes community/haskell-tar/PKGBUILD | 46 ------------------ community/haskell-tar/haskell-tar.install | 24 --------- community/lsdvd/PKGBUILD | 29 ++++++----- community/qlandkartegt/PKGBUILD | 6 ++- community/qlandkartegt/qlandkartegt.changelog | 3 ++ community/uwsgi/PKGBUILD | 6 +-- community/zramctl/PKGBUILD | 23 +++++++++ extra/elfutils/CVE-2014-0172.patch | 37 -------------- extra/elfutils/PKGBUILD | 24 +++------ .../fix-run-backtrace-native-core-test.patch | 43 ---------------- 13 files changed, 120 insertions(+), 185 deletions(-) create mode 100644 community/gqrx/PKGBUILD create mode 100644 community/gqrx/gqrx.desktop create mode 100644 community/gqrx/gqrx.png delete mode 100644 community/haskell-tar/PKGBUILD delete mode 100644 community/haskell-tar/haskell-tar.install create mode 100644 community/zramctl/PKGBUILD delete mode 100644 extra/elfutils/CVE-2014-0172.patch delete mode 100644 extra/elfutils/fix-run-backtrace-native-core-test.patch diff --git a/community/gqrx/PKGBUILD b/community/gqrx/PKGBUILD new file mode 100644 index 000000000..11f84a1dd --- /dev/null +++ b/community/gqrx/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 115635 2014-07-12 22:23:39Z kkeen $ +# Maintainer: Kyle Keen +# Contributor: Dominik Heidler + +pkgname=gqrx +pkgver=2.2.0 +pkgrel=1 +pkgdesc="Interactive SDR receiver waterfall for many devices." +arch=('i686' 'x86_64') +url="http://gqrx.dk/" +license=('GPL') +depends=('qt5-svg' 'libpulse' 'gnuradio-osmosdr' 'libxkbcommon-x11') +makedepends=('boost') +source=("https://github.com/csete/gqrx/archive/v$pkgver.tar.gz" + "$pkgname.png" + "$pkgname.desktop") +md5sums=('ff771b9c31ee17f704859398362b8cc0' + 'f7032a8883c89bd80e0d0fd36f861c59' + '810f89195231c18f32af92522aade721') + +prepare() { + cd "$srcdir" + cp -r gqrx-2.2.0 gqrx-2.2.0-alsa + cd gqrx-2.2.0-alsa + sed -i 's/AUDIO_BACKEND = pulse/#&/' gqrx.pro +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + rm -rf build + mkdir build + cd build + qmake PREFIX=/usr/ .. + make + cd "$srcdir/$pkgname-$pkgver-alsa" + rm -rf build + mkdir build + cd build + qmake PREFIX=/usr/ .. + make +} + +package() { + cd "$srcdir" + install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + + cd "$srcdir/$pkgname-$pkgver/build" + make install INSTALL_ROOT="$pkgdir" + + cd "$srcdir/$pkgname-$pkgver-alsa/build" + install -Dm755 gqrx "$pkgdir/usr/bin/gqrx-alsa" +} + diff --git a/community/gqrx/gqrx.desktop b/community/gqrx/gqrx.desktop new file mode 100644 index 000000000..1094d7c12 --- /dev/null +++ b/community/gqrx/gqrx.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=GQRX SDR +GenericName=Funcube SDR Software +Comment=Controller application for the Funcube Dongle and operating application. +Exec=gqrx +Icon=gqrx +Terminal=false +Type=Application +Categories=AudioVideo;Audio;HamRadio; +StartupNotify=false diff --git a/community/gqrx/gqrx.png b/community/gqrx/gqrx.png new file mode 100644 index 000000000..dc86b7a46 Binary files /dev/null and b/community/gqrx/gqrx.png differ diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD deleted file mode 100644 index 45e8d8427..000000000 --- a/community/haskell-tar/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 110633 2014-05-04 13:55:12Z td123 $ -# Maintainer: Alexander Rødseth -# Contributor: Arch Haskell Team - -pkgname=haskell-tar -pkgver=0.4.0.1 -pkgrel=8 -pkgdesc='Reading, writing and manipulating tar archive files' -url='http://hackage.haskell.org/package/tar' -license=('custom:BSD3') -arch=('x86_64' 'i686') -depends=('ghc=7.8.2-2') -source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") -install=haskell-tar.install -sha256sums=('a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d') -options=('staticlibs') - -build() { - cd "tar-$pkgver" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "tar-$pkgver" - - install -Dm 744 register.sh \ - $pkgdir/usr/share/haskell/$pkgname/register.sh - install -m 744 unregister.sh \ - $pkgdir/usr/share/haskell/$pkgname/unregister.sh - install -dm 755 $pkgdir/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/$pkgname/html \ - $pkgdir/usr/share/doc/ghc/html/libraries/tar - runhaskell Setup copy --destdir=$pkgdir - install -Dm 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - rm -f $pkgdir/usr/share/doc/$pkgname/LICENSE -} - -# vim:set ts=2 sw=2 et: diff --git a/community/haskell-tar/haskell-tar.install b/community/haskell-tar/haskell-tar.install deleted file mode 100644 index 7e0383621..000000000 --- a/community/haskell-tar/haskell-tar.install +++ /dev/null @@ -1,24 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-tar - -post_install() { - ${HS_DIR}/register.sh - post_remove -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - post_install -} - -pre_remove() { - pre_upgrade -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -# vim:set ts=2 sw=2 et: diff --git a/community/lsdvd/PKGBUILD b/community/lsdvd/PKGBUILD index 69fca75c9..0bb721b95 100644 --- a/community/lsdvd/PKGBUILD +++ b/community/lsdvd/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 76873 2012-10-01 14:53:57Z bisson $ -# Maintainer: Aaron Griffin +# $Id: PKGBUILD 115655 2014-07-13 16:11:47Z jsteel $ +# Maintainer: Jonathan Steel +# Contributor: Aaron Griffin +# Contributor: Mathieu Clabaut pkgname=lsdvd pkgver=0.16 -pkgrel=6 -pkgdesc="A C application for reading the contents of a DVD and printing the contents to your terminal" +pkgrel=7 +pkgdesc="Console application that displays the content of a DVD" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lsdvd/" -depends=('libdvdread') license=('GPL2') -#Special thanks to Mathieu Clabaut for patches -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'stdint_usage.patch') +depends=('libdvdread') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + stdint_usage.patch) md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7' '6cbcbfde873f894bd3c784f65141b2fc') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/stdint_usage.patch" + cd "$srcdir"/$pkgname-$pkgver + + patch -Np1 -i "$srcdir"/stdint_usage.patch + ./configure --prefix=/usr --mandir=/usr/share/man + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir"/ install } diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 1cacf37df..3bf1d5b3a 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106093 2014-02-22 12:16:01Z jlichtblau $ +# $Id: PKGBUILD 115652 2014-07-13 13:45:22Z jlichtblau $ # Maintainer: Jaroslav Lichtblau # Contributor: Matthias Maennich # Contributor: pkgname=qlandkartegt -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') @@ -40,3 +40,5 @@ package(){ install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" } +sha256sums=('0b0d659bef580bff7c6aabd563ad9bf0cf2d32467fe11e613ceaab58be7363d0' + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index cad9bb592..a9239bbbb 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2014-07-13 Jaroslav Lichtblau + * qlandkartegt 1.7.7-1 + 2014-02-22 Jaroslav Lichtblau * qlandkartegt 1.7.6-1 diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD index d3194706a..92a7868e2 100644 --- a/community/uwsgi/PKGBUILD +++ b/community/uwsgi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112985 2014-06-10 20:27:23Z dwallace $ +# $Id: PKGBUILD 115665 2014-07-13 20:09:27Z dwallace $ # Maintainer: Daniel Wallace # Contributor: Valentin Hăloiu # Contributor: Angel Velasquez @@ -24,7 +24,7 @@ pkgname=(uwsgi ) #uwsgi-plugin-erlang #uwsgi-plugin-admin -pkgver=2.0.5.1 +pkgver=2.0.6 pkgrel=1 arch=(i686 x86_64) url="http://projects.unbit.it/$pkgbase" @@ -46,7 +46,7 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz emperor.uwsgi.service emperor.uwsgi.socket) -md5sums=('9c89a1d411719b205f4709abe166efe9' +md5sums=('50e9657ebbf52dd3bcd57b565f6b65a5' 'a0749da07b545efcbb0276f52be22652' '752475ee32286acfbafa49b898616817' 'c54a60431d8d81c1a65b9f4b271ac718' diff --git a/community/zramctl/PKGBUILD b/community/zramctl/PKGBUILD new file mode 100644 index 000000000..8b4b5f26c --- /dev/null +++ b/community/zramctl/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 113760 2014-06-29 16:15:23Z fyan $ +# Maintainer: Felix Yan + +pkgname=zramctl +pkgver=0.1 +pkgrel=1 +pkgdesc="Tool to control zram devices" +arch=('i686' 'x86_64') +url="https://github.com/Nefelim4ag/zramctl" +license=('GPL3') +depends=('gcc-libs') +makedepends=('git') +source=("git+https://github.com/Nefelim4ag/zramctl.git#tag=$pkgver") +md5sums=('SKIP') + +build() { + cd zramctl + ./compile.sh +} + +package() { + install -Dm755 zramctl/zramctl "$pkgdir/usr/bin/zramctl" +} diff --git a/extra/elfutils/CVE-2014-0172.patch b/extra/elfutils/CVE-2014-0172.patch deleted file mode 100644 index 5f9541d68..000000000 --- a/extra/elfutils/CVE-2014-0172.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7f1eec317db79627b473c5b149a22a1b20d1f68f Mon Sep 17 00:00:00 2001 -From: Mark Wielaard -Date: Wed, 9 Apr 2014 11:33:23 +0200 -Subject: [PATCH] CVE-2014-0172 Check for overflow before calling malloc to - uncompress data. - -https://bugzilla.redhat.com/show_bug.cgi?id=1085663 - -Reported-by: Florian Weimer -Signed-off-by: Mark Wielaard -diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c -index 79daeac..34ea373 100644 ---- a/libdw/dwarf_begin_elf.c -+++ b/libdw/dwarf_begin_elf.c -@@ -1,5 +1,5 @@ - /* Create descriptor from ELF descriptor for processing file. -- Copyright (C) 2002-2011 Red Hat, Inc. -+ Copyright (C) 2002-2011, 2014 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper , 2002. - -@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn *scn, bool inscngrp) - memcpy (&size, data->d_buf + 4, sizeof size); - size = be64toh (size); - -+ /* Check for unsigned overflow so malloc always allocated -+ enough memory for both the Elf_Data header and the -+ uncompressed section data. */ -+ if (unlikely (sizeof (Elf_Data) + size < size)) -+ break; -+ - Elf_Data *zdata = malloc (sizeof (Elf_Data) + size); - if (unlikely (zdata == NULL)) - break; --- -1.9.2 - diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 89072cf87..51f667579 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 213311 2014-05-19 16:22:02Z lcarlier $ +# $Id: PKGBUILD 216850 2014-07-13 10:59:11Z lcarlier $ # Maintainer: Stéphane Gaudreault # Contributor: Andrej Gelenberg pkgname=elfutils -pkgver=0.158 -pkgrel=3 +pkgver=0.159 +pkgrel=1 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information" arch=('i686' 'x86_64') url="https://fedorahosted.org/elfutils/" @@ -13,22 +13,10 @@ depends=('gcc-libs' 'zlib' 'bzip2' 'xz') provides=('libelf') replaces=('libelf') conflicts=('libelf') -source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig} - fix-run-backtrace-native-core-test.patch - CVE-2014-0172.patch) +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}) options=('staticlibs') -sha1sums=('09adbbf0f3a35bb1bcb77c2eaa40de8d3443af4d' - 'SKIP' - '8ecef640f3d1229cdf45ffda016a69848c18e61b' - '3e776c07d6ca2c7604a384d266f79c3ece1fb179') - -prepare() { - cd ${pkgname}-${pkgver} - - patch -Np1 -i ../fix-run-backtrace-native-core-test.patch - # merged upstream - patch -Np1 -i ../CVE-2014-0172.patch -} +sha1sums=('4ff214cdb95a10b03cf413f3d018393a838f98fc' + 'SKIP') build() { cd ${pkgname}-${pkgver} diff --git a/extra/elfutils/fix-run-backtrace-native-core-test.patch b/extra/elfutils/fix-run-backtrace-native-core-test.patch deleted file mode 100644 index 5088ea579..000000000 --- a/extra/elfutils/fix-run-backtrace-native-core-test.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e922ec4e3bcd7c164a9ce424accac4394e7d5afd Mon Sep 17 00:00:00 2001 -From: Matthias Klose -Date: Tue, 07 Jan 2014 09:25:29 +0000 -Subject: tests: backtrace-subr.sh (check_native_core) should check core file name. - -Needed when /proc/sys/kernel/core_uses_pid is set to 0. Try to rename -the core file, and if it does still fail, skip the test. - -Signed-off-by: Mark Wielaard ---- -diff --git a/tests/ChangeLog b/tests/ChangeLog -index 63b7bed..7e9dcf4 100644 ---- a/tests/ChangeLog -+++ b/tests/ChangeLog -@@ -1,3 +1,9 @@ -+2014-01-07 Matthias Klose -+ -+ * backtrace-subr.sh (check_native_core): Check to see if core file -+ was created without ".PID" extension, if so mv core to core.PID. -+ Skip test if no core file was created or could be found. -+ - 2014-01-04 Mark Wielaard - - * backtrace-data.c (main): Don't assert if raise returns. -diff --git a/tests/backtrace-subr.sh b/tests/backtrace-subr.sh -index e7ece91..62b873c 100644 ---- a/tests/backtrace-subr.sh -+++ b/tests/backtrace-subr.sh -@@ -111,6 +111,11 @@ check_native_core() - - # Skip the test if we cannot adjust core ulimit. - core="core.`ulimit -c unlimited || exit 77; set +ex; testrun ${abs_builddir}/$child --gencore; true`" -+ # see if /proc/sys/kernel/core_uses_pid is set to 0 -+ if [ -f core ]; then -+ mv core "$core" -+ fi -+ if [ ! -f "$core" ]; then exit 77; fi - - if [ "x$SAVED_VALGRIND_CMD" != "x" ]; then - VALGRIND_CMD="$SAVED_VALGRIND_CMD" --- -cgit v0.9.2 - -- cgit v1.2.3