Version bump the static version to 2.2.0.99 for security (vulnerable copy of bundled media-libs/libpng) wrt #415985 by Markos Chandras and Julian Ospald

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

3 files changed, 139 insertions, 16 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index c312995c109f..26e042c8bca9 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/skype
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.122 2012/04/12 22:59:09 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.123 2012/05/21 12:08:01 ssuominen Exp $
+
+*skype-2.2.0.35-r99 (21 May 2012)
+
+  21 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +skype-2.2.0.35-r99.ebuild:
+  Version bump the static version to 2.2.0.99 for security (vulnerable copy of
+  bundled media-libs/libpng) wrt #415985 by Markos Chandras and Julian Ospald
 
   12 Apr 2012; Davide Pesavento <pesa@gentoo.org> -skype-2.1.0.81.ebuild:
   Remove old version which inherits deprecated qt4.eclass.
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index b2e1541cc27b..ec7e93c01dbb 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,28 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST skype-2.2.0.25.tar.bz2 23057633 RMD160 eb794cef43f0c30ea5cd5dd7a015f77bb1cc1a80 SHA1 1b7e969ca3fdb4b4dc2ed0d674149cf016fd55c3 SHA256 09065baed79dbd22325e9f0d79bf26b169010b9c84beeed599aa9350e8f1f9a5
 DIST skype-2.2.0.35.tar.bz2 23079739 RMD160 70c9af95f2b41c0ab4bf4d50842f9845f4305bfe SHA1 c3a93e3fd0f5ff30e65afe4632e04b05e9f453b1 SHA256 b56b7170e218da1e2d52d63f8519d365c54296d294a32ab605788910d950eb94
 DIST skype_static-2.2.0.25.tar.bz2 30882910 RMD160 833b77599112447c28ecfdfa0d60f897a55336b7 SHA1 9fd37a0cfb28aa7ebe3b8ce4b8961f437e05924e SHA256 1025952445bd7ce97bafdb0f74decc66d217ff183ee06621eaa3a033cb910e44
 DIST skype_static-2.2.0.35.tar.bz2 30885960 RMD160 25acdad5d4ad974d169a8b4de89bc901171187f1 SHA1 bdf5d18dd09151bb4382f7002724cf38d1bb30aa SHA256 4f5bf7f2029fcd90d6d5f8477ac3e9a87fac9fd4cb08c0634747c435e985167d
+DIST skype_static-2.2.0.99.tar.bz2 34592774 RMD160 2f9e2e75ff26ebde5d0852b8bebbd42c5b1531ed SHA1 0277b886d722e64480a9bc65befa432bcb571625 SHA256 a9fa7744cb86060397597013a0ec44d21f72d30e42c5a6a28cd3ec33c0b5d955
 EBUILD skype-2.2.0.25.ebuild 2770 RMD160 89d0195733d4a6294084809bab9fba384c5d8397 SHA1 26047792437c7304862b7a3a9f4e3cb91eae1831 SHA256 ff50a4e57267470ba1662303eb8529bac5f17b126e929e3086a76a3d5ef94fe5
 EBUILD skype-2.2.0.35-r1.ebuild 3134 RMD160 2ce7506b9f412785c6103068adb5e686ea3257a5 SHA1 07e161bd49588b24b70619ba7a1db9c0528815ba SHA256 b4ad4798a779d717c7b6575d89687aef346f7a7344d6fa57041eae2e998d57d7
-MISC ChangeLog 21827 RMD160 1e98dd981b971d0bb7f9626cf7d7a3ce14818005 SHA1 dd1221d03a6c82fe086ae115f764698046d9be15 SHA256 787620a1d3e7488d7f99f52c746e60a80a37389967ada7eec08dd0e4c21e4e38
+EBUILD skype-2.2.0.35-r99.ebuild 3050 RMD160 34eb5095f5bbcd641cf0311e35e100c27f7a90b0 SHA1 6b81a695aaeeb9e62592c076ea080730cf54d73a SHA256 6ab58566b944fcc8339b71fdaf953146ff6374583288142196e2a530e0cfee9a
+MISC ChangeLog 22109 RMD160 92a5f7eb9ec4da1daf84b0cee276e68d282a7bd1 SHA1 fd29f141a815b094361c4d14f9cb1d6cf344ff1b SHA256 4f8e4af025841260922c55d71160f2c5db3f1217870f9e749f4f3ddaf119e8c3
 MISC metadata.xml 642 RMD160 05610ec2a61b34d7899522e0ee386c1b0a058a00 SHA1 6cc7fcf1828878901c9a2f6bacc4a0a31ff5fbb1 SHA256 7e34a5faa64f3044b7557d03e9fd1b67d6e72cc24e9cf7263c6bf467240c0c1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPh15EAAoJENXLsxwXqFxyNTEP/iOPFIARefFYErmhLZM2WmZo
-dXVJSrXAlmDZ+S0ng75F7JGmRlZW44dmScPgft2rOLyDJ30yhjPFdo1mcoge0vds
-pOeJ5GEfcO7fKQ0S4pQHL9pDgycdTTdSKauoDetHp7aZ10ZqFsxWs4Nu/et2dl7a
-59/h2Sd5VMR/kxUYT2p39sZw6Lj/SJHAL999XZWwbPBcpL8h+O3yJ59lMBSSOLMb
-s2GekybtgZqys65Vowjv/uCKCv3h2Bt1tbH5q+56AwsFah3yCO5HfdsaHrLSWq8j
-Sk7y+WoA0FKYp2A8b7ZpI4RrqbD5Ha//R0yZkxwNLPElXJ3ePOLkGeJH2/oynZJE
-CHTss3ncq3//Bwl7sNRHGmzMeQczvDk1qSEizInV/wTSaWVi7kPndMCcohWf7s68
-B0nojpb9fYyczy6H/FUVgrH/POoa/y6Gbuk+FYQnRr7JbpPTqTNc1nxLC+RsI0AK
-oxb+5IO0HRVOJ9gZ4AkxyAA3Ruaid6Dy93rCW55ffK7LaPLtMAWHe7SAL77mzqTz
-1JpLtAIYpVpzzxOkbaAhFtn2SkuGZjCM+uQXoGxo3wpTCP5sHhbvDvBg4y/Nig5h
-pXe6AyPINP3yV5aWneVILfrm/9b5c1LLCeDRI5B9SROQKXgcjUlpRyryZrxI05Ad
-1j3U0fJtU/XPMm/AEVxM
-=9lzp
+iQEcBAEBAgAGBQJPui9tAAoJEEdUh39IaPFN27oH/3c23jRCISKcNORkjyWXqwRW
+kw3KIGTNMQa9uWhpugb0qoP70rN3/X7a6YDI0hWU1IdTPaT4/weordk5ro9U62zU
+iAr40fpSRQRSFpGVzoWpKPeSCljqBOG3TglvQOZHCQK/Ewe7TTbdD8xARoJbRN1f
+3pZwKWijtzbwzb2qFOwMGMcU1QjLbdj0nvFldbar7i3LYcEx+HxM0ABvxl7eqwr2
+RCQri8DKXTnWaXgjFMgdF22IFxG0m2zdF7CntlG/nkEF7F3xlR13NFKiYO79bk2C
+/oLJkIPb5Dcdzei29HXhHUChG7z7CRbaX+fwCAwR71Q3NDbBU4mYwRrlfcqhcSI=
+=/WI/
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/skype-2.2.0.35-r99.ebuild b/net-im/skype/skype-2.2.0.35-r99.ebuild
new file mode 100644
index 000000000000..f9452a70d9d5
--- /dev/null
+++ b/net-im/skype/skype-2.2.0.35-r99.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r99.ebuild,v 1.1 2012/05/21 12:08:01 ssuominen Exp $
+
+EAPI=4
+inherit eutils gnome2-utils qt4-r2 pax-utils
+
+SVERSION=2.2.0.99
+SFILENAME=${PN}_static-${SVERSION}.tar.bz2
+DVERSION=${PV}
+DFILENAME=${PN}-${DVERSION}.tar.bz2
+
+DESCRIPTION="An P2P Internet Telephony (VoiceIP) client"
+HOMEPAGE="http://www.skype.com/"
+SRC_URI="qt-static? ( http://download.skype.com/linux/${SFILENAME} )
+	!qt-static? ( http://download.skype.com/linux/${DFILENAME} )"
+
+LICENSE="skype-eula"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel qt-static"
+
+RESTRICT="mirror strip" #299368
+EMUL_VER=20120520
+
+RDEPEND="
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-${EMUL_VER}
+		>=app-emulation/emul-linux-x86-opengl-${EMUL_VER}
+		>=app-emulation/emul-linux-x86-soundlibs-${EMUL_VER}
+		>=app-emulation/emul-linux-x86-xlibs-${EMUL_VER}
+		!qt-static? ( >=app-emulation/emul-linux-x86-qtlibs-${EMUL_VER} )
+		)
+	x86? (
+		>=media-libs/alsa-lib-1.0.24.1
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXScrnSaver
+		x11-libs/libXv
+		qt-static? (
+			=dev-libs/glib-2*
+			media-libs/fontconfig
+			>=media-libs/freetype-2
+			>=media-libs/tiff-3.9.5-r3:3
+			sys-libs/zlib
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXrender
+			)
+		!qt-static? (
+			x11-libs/qt-core:4
+			x11-libs/qt-dbus:4
+			x11-libs/qt-gui:4[accessibility,dbus]
+			) 
+		)
+	virtual/ttf-fonts"
+
+# Required to get `lrelease` command for src_install()
+DEPEND="!qt-static? ( x11-libs/qt-core:4 )"
+
+QA_EXECSTACK="opt/skype/skype"
+QA_WX_LOAD="opt/skype/skype"
+QA_DT_HASH="opt/skype/skype"
+
+pkg_setup() { :; }
+
+src_unpack() {
+	unpack ${A}
+	[[ -d ${S} ]] || { mv skype* "${S}" || die; }
+}
+
+src_install() {
+	exeinto /opt/skype
+	doexe skype
+	fowners root:audio /opt/skype/skype
+	make_wrapper skype ./skype /opt/skype /opt/skype
+
+	insinto /opt/skype/sounds
+	doins sounds/*.wav
+
+	if ! use qt-static; then
+		insinto /etc/dbus-1/system.d
+		doins skype.conf
+	fi
+
+	if ! use qt-static; then
+		lrelease lang/*.ts
+	fi
+
+	insinto /opt/skype/lang
+	doins lang/*.qm
+
+	insinto /opt/skype/avatars
+	doins avatars/*.png
+
+	local res
+	for res in 16 32 48; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps
+		newins icons/SkypeBlue_${res}x${res}.png skype.png
+	done
+
+	dodoc README
+
+	make_desktop_entry skype "Skype VoIP" skype "Network;InstantMessaging;Telephony"
+
+	dosym /opt/skype /usr/share/skype # Fix for disabled sound notification
+
+	if use pax_kernel; then
+		pax-mark Cm "${ED}"/opt/skype/skype || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "skype under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the skype binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that skype is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }