summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/libtiff/PKGBUILD15
-rw-r--r--extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch18
-rw-r--r--extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch15
-rw-r--r--extra/pyqt4/PKGBUILD10
-rw-r--r--extra/refind-efi/PKGBUILD4
-rw-r--r--extra/sip/PKGBUILD8
-rw-r--r--extra/telepathy-kde-auth-handler/PKGBUILD6
7 files changed, 58 insertions, 18 deletions
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD
index fc3a2745d..2a76d717c 100644
--- a/extra/libtiff/PKGBUILD
+++ b/extra/libtiff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186503 2013-05-28 01:47:37Z eric $
+# $Id: PKGBUILD 193540 2013-08-22 21:13:54Z eric $
# Maintainer: Eric BĂ©langer <eric@archlinux.org>
pkgname=libtiff
pkgver=4.0.3
-pkgrel=2
+pkgrel=3
pkgdesc="Library for manipulation of TIFF images"
arch=('i686' 'x86_64')
url="http://www.remotesensing.org/libtiff/"
@@ -18,14 +18,18 @@ source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz
tiff-4.0.3-CVE-2013-1960.patch
tiff-4.0.3-CVE-2013-1961.patch
tiff-4.0.3-libjpeg-turbo.patch
- tiff-4.0.3-tiff2pdf-colors.patch)
+ tiff-4.0.3-tiff2pdf-colors.patch
+ tiff-4.0.3-CVE-2013-4231.patch
+ tiff-4.0.3-CVE-2013-4232.patch)
sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0'
'41be661638282dae0d07bd2788414cb6650f8981'
'6cb3d480908132335c05c769b5a51f951413725d'
'5903355afdd0bb27ea3746339e2196720f9fac9d'
'29a91870cca5d4cd9ca1c464f8074088eddc3fb8'
'02d57835df50d3f84587571ec52b36f5af838de2'
- '23443ad0bc130d70860b6cc6d19b69584ae7a6cc')
+ '23443ad0bc130d70860b6cc6d19b69584ae7a6cc'
+ '969f588e9da5991e7f17dddf69ae59424b05fa16'
+ '2a23c55d081bed74ac8dd99541a93d312cc72b64')
prepare() {
cd tiff-${pkgver}
@@ -35,6 +39,9 @@ prepare() {
patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch"
patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch"
patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch"
+ cd tools
+ patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4231.patch"
+ patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4232.patch"
}
build() {
diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch
new file mode 100644
index 000000000..3c2171829
--- /dev/null
+++ b/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch
@@ -0,0 +1,18 @@
+Index: gif2tiff.c
+===================================================================
+RCS file: /cvs/maptools/cvsroot/libtiff/tools/gif2tiff.c,v
+retrieving revision 1.12
+diff -u -r1.12 gif2tiff.c
+--- gif2tiff.c 15 Dec 2010 00:22:44 -0000 1.12
++++ gif2tiff.c 13 Aug 2013 08:25:38 -0000
+@@ -333,6 +333,10 @@
+ int status = 1;
+
+ datasize = getc(infile);
++
++ if (datasize > 12)
++ return 0;
++
+ clear = 1 << datasize;
+ eoi = clear + 1;
+ avail = clear + 2;
diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch
new file mode 100644
index 000000000..87673d91b
--- /dev/null
+++ b/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch
@@ -0,0 +1,15 @@
+Index: tiff2pdf.c
+===================================================================
+RCS file: /cvs/maptools/cvsroot/libtiff/tools/tiff2pdf.c,v
+retrieving revision 1.71
+diff -u -r1.71 tiff2pdf.c
+--- tiff2pdf.c 2 May 2013 14:54:08 -0000 1.71
++++ tiff2pdf.c 13 Aug 2013 04:45:40 -0000
+@@ -2462,6 +2462,7 @@
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+ _TIFFfree(buffer);
++ return(0);
+ } else {
+ buffer=samplebuffer;
+ t2p->tiff_datasize *= t2p->tiff_samplesperpixel;
diff --git a/extra/pyqt4/PKGBUILD b/extra/pyqt4/PKGBUILD
index 1bdd0f4a8..440015b85 100644
--- a/extra/pyqt4/PKGBUILD
+++ b/extra/pyqt4/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 188683 2013-06-17 19:05:53Z andrea $
+# $Id: PKGBUILD 193533 2013-08-22 14:50:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
pkgbase=pyqt4
pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4')
-pkgver=4.10.2
-pkgrel=2
+pkgver=4.10.3
+pkgrel=1
arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+url='http://www.riverbankcomputing.com/software/pyqt/intro'
license=('GPL')
makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('9257e12fec9b1b21e5a0d76d455d1691')
+md5sums=('8b13d2ab64e4d2fd0037b81b7e78c15c')
build() {
cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 1954b0992..1b919070b 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192314 2013-08-10 05:37:22Z tpowa $
+# $Id: PKGBUILD 193534 2013-08-22 15:56:50Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
@@ -17,7 +17,7 @@ _COMPILER="GCC46"
pkgname="refind-efi"
pkgver="0.7.3"
-pkgrel="1"
+pkgrel="2"
pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
url="http://www.rodsbooks.com/refind/index.html"
arch=('x86_64' 'i686')
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 69b7828ca..312a32bcc 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 188678 2013-06-17 18:06:55Z andrea $
+# $Id: PKGBUILD 193531 2013-08-22 14:49:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
pkgbase=sip
pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14.7
+pkgver=4.15
pkgrel=1
arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.com/software/sip/"
+url='http://www.riverbankcomputing.com/software/sip/intro'
license=('custom:"sip"')
makedepends=('python' 'python2')
source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('f5c8001f16ecffd711708de0e07d542f')
+md5sums=('8c1133c96c9ddec92c0ab429dec96fe6')
build() {
cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index bac348dc8..eb0810d88 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 192368 2013-08-10 11:00:07Z andrea $
+# $Id: PKGBUILD 193542 2013-08-22 21:22:10Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-auth-handler
_pkgname=ktp-auth-handler
pkgver=0.6.3
-pkgrel=1
+pkgrel=2
pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
arch=('i686' 'x86_64')
url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
license=('GPL')
-depends=('telepathy-kde-common-internals' 'qjson')
+depends=('telepathy-kde-common-internals' 'qjson' 'qca-ossl')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")