[arch-commits] Commit in libtiff/trunk (3 files)

[Eric Bélanger]

    Date: Tuesday, April 12, 2011 @ 10:21:49
  Author: eric
Revision: 119577

upgpkg: libtiff 3.9.5-1
Upstream update, Removed old patch and ChangeLog

Modified:
  libtiff/trunk/PKGBUILD
Deleted:
  libtiff/trunk/ChangeLog
  libtiff/trunk/libtiff-CVE-2009-2285.patch

-----------------------------+
 ChangeLog                   |   35 -----------------------------------
 PKGBUILD                    |   21 +++++++++------------
 libtiff-CVE-2009-2285.patch |   22 ----------------------
 3 files changed, 9 insertions(+), 69 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-04-12 13:37:35 UTC (rev 119576)
+++ ChangeLog	2011-04-12 14:21:49 UTC (rev 119577)
@@ -1,35 +0,0 @@
-2010-06-20  Eric Belanger  <eric at archlinux.org>
-
-	* libtiff 3.9.4-1
-	* Upstream update
-
-2009-11-05  Eric Belanger  <eric at archlinux.org>
-
-	* libtiff 3.9.2-1
-	* Upstream update
-
-2009-08-28  Eric Belanger  <eric at archlinux.org>
-
-	* libtiff 3.9.1-1
-	* Upstream update
-
-2009-08-26  Eric Belanger  <eric at archlinux.org>
-
-	* libtiff 3.9.0-1
-	* Upstream update
-	* Updated url
-	* Updated patches
-
-2009-08-14  Eric Belanger  <eric at archlinux.org>
-
-	* libtiff 3.8.2-6
-	* Added security fixes (close FS#15931)
-
-2008-09-05  Eric Belanger  <eric at archlinux.org>
-
-	* libtiff 3.8.2-4
-	* Applied patch to fix buffer underflow in LZW decoding	(tiff-3.8.2-CVE-2008-2327.patch)
-	* Added license
-	* Added freeglut optdepends
-	* FHS man pages
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-12 13:37:35 UTC (rev 119576)
+++ PKGBUILD	2011-04-12 14:21:49 UTC (rev 119577)
@@ -1,9 +1,8 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=libtiff
-pkgver=3.9.4
+pkgver=3.9.5
 pkgrel=1
 pkgdesc="Library for manipulation of TIFF images"
 arch=('i686' 'x86_64')
@@ -13,20 +12,18 @@
 makedepends=('libgl' 'freeglut' 'libxmu' 'libxi')
 optdepends=('freeglut: for using tiffgt')
 options=('!libtool')
-source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz \
-        libtiff-CVE-2009-2285.patch)
-md5sums=('2006c1bdd12644dbf02956955175afd6' 'ff61077408727a82281f77a94f555e2a')
-sha1sums=('a4e32d55afbbcabd0391a9c89995e8e8a19961de' 'eadce8c8bd72ea9c74f35300bf299131813b0c8b')
+source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
+md5sums=('8fc7ce3b4e1d0cc8a319336967815084')
+sha1sums=('f40aab20fb2f609b5cbc1171c40b66a1445e3773')
 
 build() {
   cd "${srcdir}/tiff-${pkgver}"
-  patch -p1 < ../libtiff-CVE-2009-2285.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man || return 1
-  make || return 1
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
   cd "${srcdir}/tiff-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: libtiff-CVE-2009-2285.patch
===================================================================
--- libtiff-CVE-2009-2285.patch	2011-04-12 13:37:35 UTC (rev 119576)
+++ libtiff-CVE-2009-2285.patch	2011-04-12 14:21:49 UTC (rev 119577)
@@ -1,22 +0,0 @@
-Index: tiff-3.8.2/libtiff/tif_lzw.c
-===================================================================
---- tiff-3.8.2.orig/libtiff/tif_lzw.c
-+++ tiff-3.8.2/libtiff/tif_lzw.c
-@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize
- 			NextCode(tif, sp, bp, code, GetNextCode);
- 			if (code == CODE_EOI)
- 				break;
--			if (code == CODE_CLEAR) {
-+			if (code >= CODE_CLEAR) {
- 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 				"LZWDecode: Corrupted LZW table at scanline %d",
- 				tif->tif_row);
-@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0,
- 			NextCode(tif, sp, bp, code, GetNextCodeCompat);
- 			if (code == CODE_EOI)
- 				break;
--			if (code == CODE_CLEAR) {
-+			if (code >= CODE_CLEAR) {
- 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 				"LZWDecode: Corrupted LZW table at scanline %d",
- 				tif->tif_row);