diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-27 12:44:19 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-27 12:44:19 +0200 |
| commit | 830afd54d0d990fdb982292bed4c97f577dc195d (patch) | |
| tree | 5c081214c4d28eae5e46c33094131ecc555b4a8f /extra/libtiff/PKGBUILD | |
| parent | 06dc337f60287526f4db95ce79a2ea506023bffa (diff) | |
| parent | 5ea071a53492ec9512f8d08a8b8ff8e08499209d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/collectd/PKGBUILD
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/libgexiv2/PKGBUILD
community/monica/PKGBUILD
community/neatx/PKGBUILD
community/qstardict/PKGBUILD
community/shell-fm/PKGBUILD
core/isl/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/kdetoys/PKGBUILD
extra/pkgfile/PKGBUILD
extra/pyqt4/PKGBUILD
extra/sip/PKGBUILD
extra/sqlite/PKGBUILD
Diffstat (limited to 'extra/libtiff/PKGBUILD')
| -rw-r--r-- | extra/libtiff/PKGBUILD | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index cf529d757..bca83965b 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' 'mips64el') 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() { |