Symlink libtiff.so.3 to libtiff.so.4 because Debian upgraded SONAME with custom patch which got used by net-im/skype wrt #415985

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

3 files changed, 74 insertions, 5 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 34af5ba19ba8..c433c1f7ad85 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.195 2012/04/26 20:36:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.196 2012/05/14 20:18:02 ssuominen Exp $
+
+*tiff-3.9.5-r3 (14 May 2012)
+
+  14 May 2012; Samuli Suominen <ssuominen@gentoo.org> +tiff-3.9.5-r3.ebuild:
+  Symlink libtiff.so.3 to libtiff.so.4 because Debian upgraded SONAME with
+  custom patch which got used by net-im/skype wrt #415985
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> tiff-4.0.1-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 7388f94ce90a..744655afbf16 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -6,13 +6,18 @@ AUX tiff-4.0.1-CVE-2012-1173.patch 1609 RMD160 fa13df7f17541d568c6a92074ae9d8ae8
 DIST tiff-3.9.5.tar.gz 1455502 RMD160 c67742bf6b9b10ca0700e69ce575007d40c4f89c SHA1 f40aab20fb2f609b5cbc1171c40b66a1445e3773 SHA256 ecf2e30582698dbc61d269203bbd1e701a1a50fb26c87d709e10d89669badb33
 DIST tiff-4.0.1.tar.gz 1991580 RMD160 abf98ab277edaee302b432dbcecfe68061dd91dc SHA1 8baf382231c9051a1b3eb294581289aa21447171 SHA256 9a7a039e516c37478038740f1642818250bfb1414cf404cc8b569e5f9d4bf2f0
 EBUILD tiff-3.9.5-r2.ebuild 1520 RMD160 3b4ac1609507f873d5f94390bc1c5a106cc69f33 SHA1 d8abe2ba211ca4aa8d16d8a33fcfa081a16de112 SHA256 69f1dd7fe1c4c0f7850bd6decebe99fa6e4c2059f9591dc1c13820f699e2dad4
+EBUILD tiff-3.9.5-r3.ebuild 1798 RMD160 e17f5203f9d8815f6a6c17db0fc1a529839b3e9c SHA1 a315315a89a30f8e69026cfa7e769f8e15bf9111 SHA256 756fbd44567d906fda4c6dc957fc6632f1a599ee1d1a5339c4ee8b6797dabcfd
 EBUILD tiff-4.0.1-r1.ebuild 1391 RMD160 2f0ee912b494c12b4559a439b57cfb6bfff00684 SHA1 00b1a6b48003c74b3f3da1557752e35f79bed6ff SHA256 cd26ae3bc7885b6ceb1b5fe7e382cd9fa8e8ffd432d30137c886bd77f1b25bbb
-MISC ChangeLog 27264 RMD160 d78e1a1fe38f11a177923e327644e607f14a8fb5 SHA1 57034df39b547d8149264812a29480a48382c398 SHA256 1009941283e09be718371b25cbd0276a8644ae16bb030a74997ec201566d4cd2
+MISC ChangeLog 27506 RMD160 99f5a068f3eed4d3bb8c81f2e472d31c223893b8 SHA1 8f2449b7feb22f8ff748479e8a36345926e35465 SHA256 e096b962a8215d7eb34dd7caff8d7760dac1da531782750dda708ad20573abf3
 MISC metadata.xml 448 RMD160 0419f91f1f20efdc94d3894f6a4fc6471f22d0a1 SHA1 d743d16f4afb124bbe57a45b217b92f71b515f20 SHA256 61b04082cf0ccec1f58146fab271f88e56009277edee28b3f297eafb0562f4c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ZsfAACgkQvFcC4BYPU0oRPwCdHFoA2qzsw0XfL/Bun3H+fU7B
-sx8An3Q59EYFUcA2Ifv3xMrrZUFundOd
-=9YRu
+iQEcBAEBAgAGBQJPsWfcAAoJEEdUh39IaPFN4lAH/iRjSwTWhT31WzNzubH5dCG5
+sBzB/v2UZZBMtG9I5o/cpIE1RYmhwptxFgVIPOJQkx/uvm2nLrQ5QWYYEIP8u79U
+wuMW2qq+/ARcxB6MNrip639xnP844cKlQK5s5XRmFqJertEv1AXVX4FmDGG+EMYc
+O4wgxwGD7lPtrADxlWxG0ExM2bNEcz36Kj1x0n4ViCW77p2XbKX2lSCW64GiK3QX
+ycomzCp0vpYORx34AdOEhytPMa+qMzkTdTf0dQoMDSb39qFQiemNyHahihIHNACz
+hVBLeqTLcT4RwWDbXiKtqdTw9B7J0d6QBBouhKbN9a12GZKQ1T4YmIAnUHOXf6o=
+=P/qv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/tiff/tiff-3.9.5-r3.ebuild b/media-libs/tiff/tiff-3.9.5-r3.ebuild
new file mode 100644
index 000000000000..36a3c949ceb5
--- /dev/null
+++ b/media-libs/tiff/tiff-3.9.5-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.5-r3.ebuild,v 1.1 2012/05/14 20:18:02 ssuominen Exp $
+
+# this ebuild is only for the libtiff.so.3 (+ 4) and libtiffxx.so.3 (+ 4) SONAME for ABI compat
+
+EAPI=4
+inherit eutils libtool multilib
+
+DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images"
+HOMEPAGE="http://www.remotesensing.org/libtiff/"
+SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx jbig jpeg zlib"
+
+RDEPEND="jpeg? ( virtual/jpeg )
+	jbig? ( media-libs/jbigkit )
+	zlib? ( sys-libs/zlib )
+	!media-libs/tiff-compat
+	!=media-libs/tiff-3*:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-*.patch
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--libdir=/libdir \
+		--disable-static \
+		$(use_enable cxx) \
+		$(use_enable zlib) \
+		$(use_enable jpeg) \
+		$(use_enable jbig) \
+		--without-x
+}
+
+src_install() {
+	# Let `make install` and libtool handle insecure runpath(s)
+	dodir tmp
+	emake DESTDIR="${D}/tmp" install
+
+	# .so.3 (upstream) is used by sci-chemistry/icm
+	# .so.4 (Debian) is used by net-im/skype
+	exeinto /usr/$(get_libdir)
+	doexe "${ED}"/tmp/libdir/libtiff$(get_libname 3)
+	dosym libtiff$(get_libname 3) /usr/$(get_libdir)/libtiff$(get_libname 4)
+	if use cxx; then
+		doexe "${ED}"/tmp/libdir/libtiffxx$(get_libname 3)
+		dosym libtiffxx$(get_libname 3) /usr/$(get_libdir)/libtiffxx$(get_libname 4)
+	fi
+
+	rm -rf "${ED}"/tmp
+}