summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-03-10 03:51:37 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-03-10 03:51:37 +0000
commitb7ad9e746ae50cb940e3ea21772049f46f7b2c0f (patch)
tree03e7305d9536250d432a52cf8bf43cf5becd8228 /extra
parent960a69922ae947c02b2502d7f7624a458d50cb8f (diff)
Mon Mar 10 03:48:16 UTC 2014
Diffstat (limited to 'extra')
-rw-r--r--extra/calligra/PKGBUILD7
-rw-r--r--extra/fping/PKGBUILD8
-rw-r--r--extra/libpng/PKGBUILD10
-rw-r--r--extra/libssh/CVE-2014-0017.patch67
-rw-r--r--extra/libssh/PKGBUILD11
-rw-r--r--extra/libva/PKGBUILD6
-rw-r--r--extra/mjpegtools/PKGBUILD16
-rw-r--r--extra/mono/PKGBUILD13
-rw-r--r--extra/qt-gstreamer/PKGBUILD6
-rw-r--r--extra/x265/PKGBUILD6
10 files changed, 108 insertions, 42 deletions
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index dada4afac..4a121ec95 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 206904 2014-03-05 18:05:36Z andrea $
+# $Id: PKGBUILD 207442 2014-03-09 11:52:34Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
@@ -19,7 +19,7 @@ pkgname=('calligra-braindump'
'calligra-stage'
'calligra-words')
pkgver=2.8.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
@@ -46,7 +46,8 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DBUILD_active=OFF
+ -DBUILD_active=OFF \
+ -DWITH_Soprano=OFF
make
}
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index 8a12a6a28..17872c4b6 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 200236 2013-11-23 17:36:41Z giovanni $
+# $Id: PKGBUILD 207456 2014-03-09 20:19:22Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=fping
-pkgver=3.8
-pkgrel=2
+pkgver=3.9
+pkgrel=1
pkgdesc="A utility to ping multiple hosts at once"
arch=('i686' 'x86_64')
url="http://www.fping.org/"
license=('custom')
depends=('glibc')
source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1e36467cc96a4ca959925ac167ea19af')
+md5sums=('7ad0313646681c33e975f7b946d8d283')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index 3cb1abe6f..c5fbad03b 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 206101 2014-02-17 13:12:04Z jgc $
+# $Id: PKGBUILD 207450 2014-03-09 13:38:52Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Travis Willard <travis@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=libpng
-pkgver=1.6.9
-_apngver=1.6.9
+pkgver=1.6.10
+_apngver=1.6.10
pkgrel=1
pkgdesc="A collection of routines used to create PNG format graphics files"
arch=('i686' 'x86_64')
@@ -15,9 +15,9 @@ license=('custom')
depends=('zlib' 'sh')
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz)
-md5sums=('14e037c5c9f1db16844760285ad5c2d6'
+md5sums=('5f414b20f683b1d96b163c89e3eff768'
'SKIP'
- 'd784762a28f6a6c697a162873807f479')
+ '3404257f66d4a118b26ccc3fc4788810')
prepare() {
cd $pkgname-$pkgver
diff --git a/extra/libssh/CVE-2014-0017.patch b/extra/libssh/CVE-2014-0017.patch
new file mode 100644
index 000000000..dd56a329d
--- /dev/null
+++ b/extra/libssh/CVE-2014-0017.patch
@@ -0,0 +1,67 @@
+diff -rupN a/include/libssh/wrapper.h b/include/libssh/wrapper.h
+--- a/include/libssh/wrapper.h 2013-07-26 06:39:39.000000000 +0000
++++ b/include/libssh/wrapper.h 2014-03-09 16:38:49.807812235 +0000
+@@ -44,5 +44,6 @@ int crypt_set_algorithms_server(ssh_sess
+ struct ssh_crypto_struct *crypto_new(void);
+ void crypto_free(struct ssh_crypto_struct *crypto);
+
++void ssh_reseed(void);
+
+ #endif /* WRAPPER_H_ */
+diff -rupN a/src/bind.c b/src/bind.c
+--- a/src/bind.c 2013-07-26 06:39:39.000000000 +0000
++++ b/src/bind.c 2014-03-09 16:39:00.571080087 +0000
+@@ -375,6 +375,7 @@ int ssh_bind_accept(ssh_bind sshbind, ss
+ session->dsa_key = dsa;
+ session->rsa_key = rsa;
+
++ ssh_reseed();
+ return SSH_OK;
+ }
+
+diff -rupN a/src/libcrypto.c b/src/libcrypto.c
+--- a/src/libcrypto.c 2013-07-26 06:39:39.000000000 +0000
++++ b/src/libcrypto.c 2014-03-09 16:40:07.807331327 +0000
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/time.h>
+
+ #include "libssh/priv.h"
+ #include "libssh/session.h"
+@@ -38,6 +39,8 @@
+ #include <openssl/rsa.h>
+ #include <openssl/hmac.h>
+ #include <openssl/opensslv.h>
++#include <openssl/rand.h>
++
+ #ifdef HAVE_OPENSSL_AES_H
+ #define HAS_AES
+ #include <openssl/aes.h>
+@@ -66,6 +69,12 @@ static int alloc_key(struct crypto_struc
+ return 0;
+ }
+
++void ssh_reseed(void) {
++ struct timeval tv;
++ gettimeofday(&tv, NULL);
++ RAND_add(&tv, sizeof(tv), 0.0);
++}
++
+ SHACTX sha1_init(void) {
+ SHACTX c = malloc(sizeof(*c));
+ if (c == NULL) {
+diff -rupN a/src/libgcrypt.c b/src/libgcrypt.c
+--- a/src/libgcrypt.c 2013-07-26 06:39:39.000000000 +0000
++++ b/src/libgcrypt.c 2014-03-09 16:40:51.730392881 +0000
+@@ -41,6 +41,9 @@ static int alloc_key(struct crypto_struc
+ return 0;
+ }
+
++void ssh_reseed(void) {
++ }
++
+ SHACTX sha1_init(void) {
+ SHACTX ctx = NULL;
+ gcry_md_open(&ctx, GCRY_MD_SHA1, 0);
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index 936b6403d..bd9c30295 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204549 2014-01-22 12:35:17Z andyrtr $
+# $Id: PKGBUILD 207452 2014-03-09 16:43:05Z bpiotrowski $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: ice-man <icemanf@gmail.com>
@@ -6,7 +6,7 @@
pkgname=libssh
pkgver=0.5.5
-pkgrel=2
+pkgrel=3
pkgdesc="Library for accessing ssh client services through C libraries"
url="http://www.libssh.org/"
license=('LGPL')
@@ -15,10 +15,12 @@ depends=('zlib' 'openssl')
makedepends=('cmake' 'doxygen')
source=(https://red.libssh.org/attachments/download/51/${pkgname}-${pkgver}.tar.gz
0004-reset-global-request-status.patch
- 0005-multi-reverse-fwd.patch)
+ 0005-multi-reverse-fwd.patch
+ CVE-2014-0017.patch)
md5sums=('bb308196756c7255c0969583d917136b'
'0d8c28906b07e31466157b1fda441f4a'
- '6fa3a1a4f448e85a7eb39360f4a72ce9')
+ '6fa3a1a4f448e85a7eb39360f4a72ce9'
+ '2eddf36e41adf62e4094f17b64d466e0')
prepare() {
cd ${pkgname}-${pkgver}
@@ -26,6 +28,7 @@ prepare() {
# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736231
patch -Np1 -i ${srcdir}/0004-reset-global-request-status.patch
patch -Np1 -i ${srcdir}/0005-multi-reverse-fwd.patch
+ patch -Np1 -i ${srcdir}/CVE-2014-0017.patch
}
build() {
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 5b8878025..295c7fa1a 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 198256 2013-10-30 13:45:51Z allan $
+# $Id: PKGBUILD 207458 2014-03-09 21:12:42Z lcarlier $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
pkgname=libva
pkgver=1.2.1
-pkgrel=1
+pkgrel=2
pkgdesc="Video Acceleration (VA) API for Linux"
arch=('i686' 'x86_64')
url="http://freedesktop.org/wiki/Software/vaapi"
license=('MIT')
-depends=('libegl' 'libgl' 'libdrm' 'libxfixes')
+depends=('libgl' 'libdrm' 'libxfixes')
makedepends=('mesa')
optdepends=('libva-vdpau-driver: vdpau back-end for nvidia'
'libva-intel-driver: back-end for intel cards')
diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index bc042e9fd..e73f1fd36 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199969 2013-11-20 11:33:02Z allan $
+# $Id: PKGBUILD 207448 2014-03-09 13:14:57Z bpiotrowski $
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Maintainer: Roberto Carvajal <roberto@archlinux.org>
pkgname=mjpegtools
-pkgver=2.0.0
-pkgrel=4
+pkgver=2.1.0
+pkgrel=1
pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
arch=('i686' 'x86_64')
license=('GPL')
@@ -14,17 +14,11 @@ makedepends=('gtk2' 'v4l-utils')
optdepends=('gtk2: glav GUI')
options=('!makeflags')
install=mjpegtools.install
-source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
- mjpegtools-v4l-2.6.38.patch
- mjpegtools-2.0.0-gcc470.patch)
-md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
- '44006d6f844017fe57aa123aa43f4508'
- '7c9b3d4a1f3a10e3263a6a110b0f55cc')
+source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz)
+md5sums=('57bf5dd78976ca9bac972a6511b236f3')
prepare() {
cd ${pkgname}-${pkgver}
- patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch"
- patch -Np1 -i "${srcdir}/mjpegtools-2.0.0-gcc470.patch"
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
}
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index ab930d5c2..93c7f5000 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 205609 2014-02-09 10:29:41Z andyrtr $
+# $Id: PKGBUILD 207447 2014-03-09 13:14:56Z bpiotrowski $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: Brice Carpentier <brice@dlfp.org>
pkgname=mono
-pkgver=3.2.3
-pkgrel=2
+pkgver=3.2.8
+pkgrel=1
pkgdesc="Free implementation of the .NET platform including runtime and compiler"
arch=(i686 x86_64)
license=('GPL' 'LGPL2.1' 'MPL' 'custom:MITX11')
@@ -16,18 +16,19 @@ conflicts=('monodoc')
source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
mono.binfmt.d
sgen_fix.patch)
-md5sums=('a66c6309fad071e21f77f4c6b67a0f10'
+md5sums=('1075f99bd8a69890af9e30309728e684'
'b9ef8a65fea497acf176cca16c1e2402'
'8a700b94bff7a913f920e95890d2fb4c')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
- patch -p1 < ../sgen_fix.patch
# build mono
./configure --prefix=/usr \
--sysconfdir=/etc \
--bindir=/usr/bin \
--sbindir=/usr/bin \
+ --disable-quiet-build \
+ --disable-system-aot \
--disable-static
make
@@ -51,7 +52,7 @@ package() {
#install license
mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
install -m644 mcs/MIT.X11 "${pkgdir}"/usr/share/licenses/${pkgname}/
-
+
#fix .pc file to be able to request mono on what it depends, fixes #go-oo build
sed -i -e "s:#Requires:Requires:" "${pkgdir}"/usr/lib/pkgconfig/mono.pc
}
diff --git a/extra/qt-gstreamer/PKGBUILD b/extra/qt-gstreamer/PKGBUILD
index 979876f9d..a9fe75893 100644
--- a/extra/qt-gstreamer/PKGBUILD
+++ b/extra/qt-gstreamer/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 207106 2014-03-06 13:51:27Z andrea $
+# $Id: PKGBUILD 207462 2014-03-09 21:20:10Z lcarlier $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: laloch <laloch@atlas.cz>
pkgname=qt-gstreamer
pkgver=0.10.3
-pkgrel=1
+pkgrel=2
pkgdesc="Qt4 bindings for GStreamer"
arch=('i686' 'x86_64')
url='http://gstreamer.freedesktop.org/modules/qt-gstreamer.html'
license=('LGPL2.1')
-depends=('qt4' 'gstreamer0.10-base' 'libgles')
+depends=('qt4' 'gstreamer0.10-base')
makedepends=('cmake' 'boost' 'mesa' 'doxygen')
source=("http://gstreamer.freedesktop.org/src/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('a5f73dfa50270a23a0b07af32304e162')
diff --git a/extra/x265/PKGBUILD b/extra/x265/PKGBUILD
index 01b0fb2e7..ca60bdbe6 100644
--- a/extra/x265/PKGBUILD
+++ b/extra/x265/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id$
+# $Id: PKGBUILD 207444 2014-03-09 12:24:58Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: kfgz <kfgz at interia pl>
pkgname=x265
-pkgver=0.7
+pkgver=0.8
pkgrel=1
pkgdesc='Open Source H265/HEVC video encoder'
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('gcc-libs')
makedepends=('yasm' 'cmake')
url='https://bitbucket.org/multicoreware/x265'
source=($url/get/$pkgver.tar.bz2)
-md5sums=('SKIP')
+md5sums=('0c690dfad024e87f6b617e6fc2f354eb')
build() {
cd multicoreware-x265-*/build/linux