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

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

2 files changed, 128 insertions, 1 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/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; }