110430 fixed

Package-Manager: portage-2.0.53_rc6

8 files changed, 22 insertions, 120 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index c14adb8b3c6c..8ed82b98c8ad 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/skype
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.47 2005/09/22 23:17:34 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.48 2005/10/25 14:58:33 humpback Exp $
+
+*skype-1.2.0.18 (25 Oct 2005)
+
+  25 Oct 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  files/sDaemonWrapper-r1, -skype-1.2.0.11-r1.ebuild,
+  -skype-1.2.0.17.ebuild, +skype-1.2.0.18.ebuild:
+  Removed older versions with security issue, added new version that fixes sec
+  bug #110430
 
 *skype-1.2.0.17 (22 Sep 2005)
 
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 6f6db52bdc14..c01ca17b1965 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8a75c4f93287d4ab5bff2eedae1b23ba skype-1.2.0.11-r1.ebuild 2990
-MD5 771afda5ca1b1f9e5bfaaed08ad546a4 ChangeLog 8897
-MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
-MD5 2f6ef607e7da179897c9b4f5ad4f39ae skype-1.2.0.17.ebuild 2987
-MD5 ee77a8f132435fc5acd0d4291c24262e files/digest-skype-1.2.0.11-r1 211
+MD5 37cbe6c94cbd802461a0f3138ace5fcf ChangeLog 9183
+MD5 efa11b9d952f6902453fe3e143e6b660 files/digest-skype-1.2.0.18 212
+MD5 88c4b3d7e9d748c978aaa9e3ead55e71 files/sDaemonWrapper-r1 2023
 MD5 5105ec59acb037592219bdc10c0f09b7 files/skype.debus.config 436
-MD5 2f99781e0fd376273f0023b5320e56f1 files/sDaemonWrapper-r1 2019
-MD5 df859cafa798d45315db13f2037d07eb files/digest-skype-1.2.0.17 212
+MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
+MD5 3b11d9a8d3e8b52c24c5ae3754f6e622 skype-1.2.0.18.ebuild 2987
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDMztQ8zY1VwezZiERAt1cAKCjjXUr/QPaodBDuAkngX6cXA/wOACfW9lm
-HqnhbXJma37Kyx2iFLplyyo=
-=fUoR
+iD8DBQFDXkfk8zY1VwezZiERAqXvAJwPdd/WigHmyaTl26JS+zCLApyvkgCfajhm
+PYnioIzr322ltYUP6tCRDvY=
+=ZuqE
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/files/digest-skype-1.2.0.11-r1 b/net-im/skype/files/digest-skype-1.2.0.11-r1
deleted file mode 100644
index a392ac371c18..000000000000
--- a/net-im/skype/files/digest-skype-1.2.0.11-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763
-MD5 f37cc472615113fe8c58971b58aa4a54 skype-1.2.0.11.tar.bz2 6844323
-MD5 f54672340703ce8185cea2a0dd7bf60d skype_staticQT-1.2.0.11.tar.bz2 9605001
diff --git a/net-im/skype/files/digest-skype-1.2.0.17 b/net-im/skype/files/digest-skype-1.2.0.17
deleted file mode 100644
index d4f2c3d7bb52..000000000000
--- a/net-im/skype/files/digest-skype-1.2.0.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763
-MD5 bd1f5209b50cfa7f3e5f7f27fe73fc58 skype-1.2.0.17.tar.bz2 7921467
-MD5 5331a00f127e279f39d2143955de716e skype_staticQT-1.2.0.17.tar.bz2 10684112
diff --git a/net-im/skype/files/digest-skype-1.2.0.18 b/net-im/skype/files/digest-skype-1.2.0.18
new file mode 100644
index 000000000000..9d639c4d431b
--- /dev/null
+++ b/net-im/skype/files/digest-skype-1.2.0.18
@@ -0,0 +1,3 @@
+MD5 58f0d1fd5586c5c3b83ee5ba133deaa7 skype-1.2.0.18.tar.bz2 7915144
+MD5 5b3195993d01ed0d439a28b505665382 skype-avatars-1.0.tgz 377763
+MD5 bc05f6883e8c0350186e1a376940d5c8 skype_staticQT-1.2.0.18.tar.bz2 10678284
diff --git a/net-im/skype/files/sDaemonWrapper-r1 b/net-im/skype/files/sDaemonWrapper-r1
index 7a77aafe3617..ab9c935289f5 100644
--- a/net-im/skype/files/sDaemonWrapper-r1
+++ b/net-im/skype/files/sDaemonWrapper-r1
@@ -28,7 +28,7 @@ else
 	then
 		echo "Running artsd found"
 		echo "Starting artsd wrapped ${progname}" | tee --append "${logfile}"
-		skypecmd="MALLOC_CHECK_=0 artsdsp -m ${skypecmd}"
+		skypecmd="env MALLOC_CHECK_=0 artsdsp -m ${skypecmd}"
 	elif [[ ${wrapsound} == "yes" && ${shellcheck2} == /usr/bin/esd && -n ${esdcheck} ]]
 	then
 		echo "Running esd found"
diff --git a/net-im/skype/skype-1.2.0.11-r1.ebuild b/net-im/skype/skype-1.2.0.11-r1.ebuild
deleted file mode 100644
index 53902ca941c2..000000000000
--- a/net-im/skype/skype-1.2.0.11-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.2.0.11-r1.ebuild,v 1.1 2005/08/16 14:15:19 humpback Exp $
-
-inherit eutils qt3
-
-
-#If you want to know when this package will be marked stable please see the Changelog
-RESTRICT="nomirror"
-AVATARV="1.0"
-DESCRIPTION="${PN} is a P2P-VoiceIP client."
-HOMEPAGE="http://www.${PN}.com/"
-SRC_URI="http://dev.gentoo.org/~humpback/skype-avatars-${AVATARV}.tgz
-		!static? ( http://download.skype.com/linux/${P}.tar.bz2 )
-		static? ( http://download.skype.com/linux/${PN}_staticQT-${PV}.tar.bz2 )"
-LICENSE="skype-eula"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static arts esd"
-DEPEND="
-	amd64? ( app-emulation/emul-linux-x86-glibc
-		>=app-emulation/emul-linux-x86-xlibs-1.2
-		>=app-emulation/emul-linux-x86-baselibs-2.1.1
-		!static? ( >=app-emulation/emul-linux-x86-qtlibs-1.1 ) )
-	x86? ( !static? ( $(qt_min_version 3.2) )
-		>=sys-libs/glibc-2.3.2 )"
-RDEPEND="${DEPEND}
-	>=sys-apps/dbus-0.23.4"
-
-src_unpack() {
-	if use static;
-		then
-		unpack ${PN}_staticQT-${PV}.tar.bz2
-		mv ${PN}_staticQT-${PV} ${S}
-	else
-		unpack ${P}.tar.bz2
-	fi
-	cd ${P}
-	unpack skype-avatars-${AVATARV}.tgz
-}
-
-src_install() {
-	## Install the wrapper script
-	mv skype skype.bin
-	cp ${FILESDIR}/sDaemonWrapper-r1 skype
-
-	dodir /opt/${PN}
-	exeopts -m0755
-	exeinto /opt/${PN}
-	doexe skype
-	doexe skype.bin
-	doexe skype-callto-handler
-	insinto /opt/${PN}/sound
-	doins sound/*.wav
-
-	insinto /opt/${PN}/lang
-	doins lang/*.qm
-	#Skype still shows ALL languagues no matter what were installed
-	#for i in ${LINGUAS}; do
-	#	if [ -f lang/${PN}_${i}.qm ]; then
-	#		doins lang/${PN}_${i}.qm
-	#	fi;
-	#done;
-	insinto /etc/dbus-1/system.d
-	doins skype.conf
-
-	insinto /opt/${PN}/avatars
-	doins avatars/*.jpg
-
-	insinto /opt/${PN}
-	make_desktop_entry skype "Skype VoIP" skype
-	for SIZE in 16 32 48
-	do
-		insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
-		newins ${S}/icons/${PN}_${SIZE}_32.png ${PN}.png
-	done
-	fowners root:audio /opt/skype/skype.bin
-	fowners root:audio /opt/skype/skype
-	fowners root:audio /opt/skype/skype-callto-handler
-	dodir /usr/bin/
-	dosym /opt/skype/skype /usr/bin/skype
-	# Install the Documentation
-	dodoc README LICENSE
-
-	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
-}
-
-pkg_postinst() {
-	einfo "Have a look at ${PORTDIR}/licenses/${LICENSE} before running this software"
-	einfo "If you have sound problems please visit: "
-	einfo "http://forum.skype.com/bb/viewtopic.php?t=4489"
-	if ( use arts );
-	then
-		ewarn "Dont forget to configure your arts to work in Full-Duplex mode"
-		ewarn "Open controlcenter, go to \"Sound & Multimedia\"->\"Sound System\""
-		ewarn "On the \"Hardware\" tab, check the box next to \"Full duplex\"."
-	fi
-	##I do not know if this is true for this version. But will leave the note here
-	ewarn "If you are upgrading and skype does not autologin do a manual login"
-	ewarn "you will not lose your contacts."
-}
diff --git a/net-im/skype/skype-1.2.0.17.ebuild b/net-im/skype/skype-1.2.0.18.ebuild
index 6fe020b4d0f0..665b9b0d440e 100644
--- a/net-im/skype/skype-1.2.0.17.ebuild
+++ b/net-im/skype/skype-1.2.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.2.0.17.ebuild,v 1.1 2005/09/22 23:17:34 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.2.0.18.ebuild,v 1.1 2005/10/25 14:58:33 humpback Exp $
 
 inherit eutils qt3