projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1cffe8c)
[media-libs/tiff-compat] Drop unneded patches
authorAlexey Shvetsov <alexxy@gentoo.org>
Fri, 2 Sep 2011 08:39:56 +0000 (08:39 +0000)
committerAlexey Shvetsov <alexxy@gentoo.org>
Fri, 2 Sep 2011 08:39:56 +0000 (08:39 +0000)
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

media-libs/tiff-compat/ChangeLog patch | blob | history
media-libs/tiff-compat/Manifest patch | blob | history
media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-0192.patch [deleted file] patch | blob | history
media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-1167.patch [deleted file] patch | blob | history
media-libs/tiff-compat/tiff-compat-3.9.5.ebuild patch | blob | history

diff --git a/media-libs/tiff-compat/ChangeLog b/media-libs/tiff-compat/ChangeLog
index d158ec088015b077a93ce3bf2474e740592d8122..2ce331a8a5d6b02aa2e0064bbf9ccd797b986109 100644 (file)
--- a/media-libs/tiff-compat/ChangeLog
+++ b/media-libs/tiff-compat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/tiff-compat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff-compat/ChangeLog,v 1.2 2011/08/31 15:14:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff-compat/ChangeLog,v 1.3 2011/09/02 08:39:56 alexxy Exp $
+
+  02 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org>
+  -files/tiff-3.9.4-CVE-2011-0192.patch, -files/tiff-3.9.4-CVE-2011-1167.patch,
+  tiff-compat-3.9.5.ebuild:
+  Drop already included patches
 
 *tiff-compat-3.9.5 (31 Aug 2011)
 
diff --git a/media-libs/tiff-compat/Manifest b/media-libs/tiff-compat/Manifest
index 9ca19d22a9219a644b766ff639e55ce84d3d0d13..ac4024d5c89f8b54228f63aee02825d6e6a7545d 100644 (file)
--- a/media-libs/tiff-compat/Manifest
+++ b/media-libs/tiff-compat/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tiff-3.9.4-CVE-2011-0192.patch 439 RMD160 8d57853f8b9a3312b6d4ec9dbef5058372b4cb41 SHA1 062f1dc95ec4f844aaf49930041016995ceef686 SHA256 10e4cbc100538f43dde12cd2378af20e51ab954c6508d5e5aea6ed3075940bbc
-AUX tiff-3.9.4-CVE-2011-1167.patch 1924 RMD160 b5cc360a86f986728e6834c3a79ac9ace31c85de SHA1 494977ffe25a2374ca2b4f378454f88d5b3a6f0c SHA256 7198ae383a617cfae8034eccaf63ff7de897f8217aa6aa77c67f95443ac6deb1
 DIST tiff-3.9.5.tar.gz 1455502 RMD160 c67742bf6b9b10ca0700e69ce575007d40c4f89c SHA1 f40aab20fb2f609b5cbc1171c40b66a1445e3773 SHA256 ecf2e30582698dbc61d269203bbd1e701a1a50fb26c87d709e10d89669badb33
-EBUILD tiff-compat-3.9.5.ebuild 1854 RMD160 7a634ac042125df6064dc5e2e264bd72d8e7ffd2 SHA1 544283dff3dff6c6a73c69ebeb80b859911335ea SHA256 f1c8fc967f0b0aeebfed4e0db0a97e59f59bfd3fe7b6255bf10c73789ddeaa56
-MISC ChangeLog 861 RMD160 ff47773be26cb4db3ed39d7bf2d044d0b1e1c414 SHA1 c75ce972479ae9210874c035bbdb8c7a403edfad SHA256 0c1c37e4016fb29e51df7d4a1b86777dd833bf941307b9bd7d6898d4d3e29311
+EBUILD tiff-compat-3.9.5.ebuild 1712 RMD160 2755ae4f1c382bfa1f7376baab66578a3d5fe7bd SHA1 21ea327f4075a07ff1502ae389cce5e9d23a635a SHA256 283eadf0c2b188f2a9cbb0af2b1fcda4fe48fd3407d87dac4557450bfd29a2b7
+MISC ChangeLog 1053 RMD160 3f781c9608b58a9feccfc16be17cadf7fa3c1c73 SHA1 7aa52676783bef5202d6047ca0ab4e605ac23194 SHA256 08fdbcb8a9f16cef84401526fe34f90abbe4acc0e5f80f40b91fce33f524b195
 MISC metadata.xml 254 RMD160 36f08026a27e194b54bb4ba6b4ef56e2b5c05392 SHA1 f1876a388d1436f9f1f2152eb192c9a732fb723c SHA256 09099514c957e28a4c5603195461c055b15dfe57be4a5bd287734315e64da7c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOXk+nAAoJEOf+E+/4L5LmpzgP/jxcgA5A53dexTdw8VthHJd2
-SskPP/4jYXla4mCm4GHwSPWVDdJlHe67m+OhgK1t4JbkJ3JDAtWaAFaBSXpL7Oq9
-N+YqjM0VPgA3LyU7rpfWVjcvz+eH+mUArfN63Z5uS41pCWQM0wYt0S5Cvo68BVWY
-5cbLfsPu90b1nqmo6Hb3mgtN3KQnnVKGJZ6ya2Z/nGsRRyZZUNiMDYUF/9pp9P4T
-q0t2V+XZ2xYDcbrHw56hx4vgW0UoPr27pXwf6CQDagYAZXp5TN23vmeIX4QVPX22
-chO6ETVx2XJg01IwVbYh7oDnNJhDlEx73f71Ax/Wm5hC2sBhdj/SR5U9Twmb68sT
-0CIJ927A7+YH14KZgKy70XauIMaqnUq/sDfEWktWYKMAzntjqkRZJ0XmJP34jx++
-/ZvDXfo05DtqSDfYAplp4ZgEZl1SD+qtPoqdBVe2QSbvir0zvVNF2JHQBQxn4/tx
-4Q13QQSAoxfSB4OT4TRNYTi+1pXbjSULz3ZDFKuNDUMHtK7bmNUM/PTvcLdszqWe
-KPsAAjffD3pzm5iONVPhGcYcrcmbGXNjRtStnyTqGCHLiWw3j1lPqNvG4jOijhfh
-alOyhjlayfi2LQIxo1zZl3iO0wujr+dRKWibi4GuD0BIuWRmyR07g1V080ykXYlM
-ScxXcDkx52PGuAAGTS9Z
-=jz5B
+iQIcBAEBCAAGBQJOYJZMAAoJEOf+E+/4L5LmEUEP/1sYo2RJ8Nc04wuKQgZYerVj
+uGgY3j+47M6FLVvSQAPUHPx2vsZ68J1wfEbDRJxh5nP12woT1Z/+jLLlChcZxzd8
+8xnK9csp2vbtc3QwJAzjwitBCuUh7lhouFlgTAQc8O3bCWl1BMZNcTVryJ8ufm2c
+WEWqviFTTZtCGUsqoAe7aIxXId9rbuIVYEj6ZD1Bs8ACJM2847zZ5YZy4QHONOYy
+o2zX7HG3JIxzwdNuKYVbD2NaP9HenlIQHTeBbKF8IapTNsettdX7oMzbw/Ah7pO3
+taSMDXA+n/tBKQ7k7eYU5R84JA6D46UyZmk48Ie9C63ahx+ojVwo2uGCdvYIAwyd
+oCDzu0YhZ6Fi+jLDSKKvJkfrIrqqyKXc29DN8zmuStMix5sNqGCbSvsaZ3Y399yD
+CXvy25BMkQpYiz8qnf5lqAydj6pwHWGM5bynIiM6DFVq0lWn1L5mnGGmb1ITnTma
+nvx13yvYdtyk3w7vRF5VCWk7+QMrENWIJiy38Smk6cioaMCo6JHz6arFkk0BbYeW
+Xkg7143eZt1xFMjMcj4YWTb7YQ0IH2sqe+SKsF62LA3fLEX8gI16PJrFoAE32E86
+j2X08MVk9Uj9xJyMm/w/kGu7RqZyrAJlU7zqJdNYhBLxL0JUSXO7GenEZ5KAmeJ0
+BX41Ce9SmISkm9xEWomh
+=ck6n
 -----END PGP SIGNATURE-----
diff --git a/media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-0192.patch b/media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-0192.patch
deleted file mode 100644 (file)
index dbeb882..0000000
--- a/media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-0192.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libtiff/tif_fax3.h
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.h,v
-retrieving revision 1.7
-retrieving revision 1.9
-diff -r1.7 -r1.9
-480a481,486
->          if (b1 <= (int) (a0 + TabEnt->Param)) {                     \
->              if (b1 < (int) (a0 + TabEnt->Param) || pa != thisrun) { \
->                  unexpected("VL", a0);                               \
->                  goto eol2d;                                         \
->              }                                                       \
->          }                                                           \
diff --git a/media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-1167.patch b/media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-1167.patch
deleted file mode 100644 (file)
index 5783a2b..0000000
--- a/media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-1167.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: ChangeLog
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/ChangeLog,v
-retrieving revision 1.602.2.130
-diff -r1.602.2.130 ChangeLog
-0a1,7
-> 2011-03-12  Frank Warmerdam  <warmerdam@pobox.com>
-> 
->      * libtiff/tif_thunder.c: Correct potential buffer overflow with 
->      thunder encoded files with wrong bitspersample set.  The libtiff 
->      development team would like to thank Marin Barbella and TippingPoint's
->      Zero Day Initiative for reporting this vulnerability (ZDI-CAN-1004).
-> 
-Index: libtiff/tif_thunder.c
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_thunder.c,v
-retrieving revision 1.5.2.1
-diff -r1.5.2.1 tif_thunder.c
-27a28
-> #include <assert.h>
-58,62c59,65
-< #define      SETPIXEL(op, v) { \
-<      lastpixel = (v) & 0xf; \
-<      if (npixels++ & 1) \
-<          *op++ |= lastpixel; \
-<      else \
----
-> #define      SETPIXEL(op, v) {                     \
->      lastpixel = (v) & 0xf;                \
->         if ( npixels < maxpixels )         \
->         {                                     \
->        if (npixels++ & 1)                  \
->          *op++ |= lastpixel;               \
->        else                                \
-63a67,84
->         }                                     \
-> }
-> 
-> static int
-> ThunderSetupDecode(TIFF* tif)
-> {
->      static const char module[] = "ThunderSetupDecode";
-> 
->         if( tif->tif_dir.td_bitspersample != 4 )
->         {
->                 TIFFErrorExt(tif->tif_clientdata, module,
->                              "Wrong bitspersample value (%d), Thunder decoder only supports 4bits per sample.",
->                              (int) tif->tif_dir.td_bitspersample );
->                 return 0;
->         }
->         
-> 
->      return (1);
-145c166,167
-<      return (1);
----
-> 
->         return (1);
-153a176
->         tif->tif_setupdecode = ThunderSetupDecode;
-165a189
-> 
diff --git a/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild b/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild
index 8cbca6e74b6d8555ac9b3af71fc5050128fb1388..859a7f0ad09475ce1e3871d7d06a9f488eba01e5 100644 (file)
--- a/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild
+++ b/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild,v 1.1 2011/08/31 15:14:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild,v 1.2 2011/09/02 08:39:56 alexxy Exp $
 
 EAPI=3
 inherit eutils libtool
@@ -25,12 +25,6 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${P/-compat}
 
-src_prepare() {
-       epatch "${FILESDIR}"/${P/-compat}-CVE-2011-0192.patch
-       epatch "${FILESDIR}"/${P/-compat}-CVE-2011-1167.patch
-       elibtoolize
-}
-
 src_configure() {
        econf \
                --disable-dependency-tracking \
Unnamed repository; edit this file 'description' to name the repository.