Fix for bug #135970.

(Portage version: 2.1)

8 files changed, 354 insertions, 1 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index f49a41d5c4a0..21821d9e9074 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.218 2006/06/03 09:51:34 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.219 2006/06/11 13:14:57 carlo Exp $
+
+*arts-3.5.3-r1 (11 Jun 2006)
+*arts-3.5.2-r1 (11 Jun 2006)
+*arts-3.4.3-r1 (11 Jun 2006)
+
+  11 Jun 2006; Carsten Lohrke <carlo@gentoo.org> +files/arts-1.2.x.diff,
+  +arts-3.4.3-r1.ebuild, +arts-3.5.2-r1.ebuild, +arts-3.5.3-r1.ebuild:
+  Fix for bug #135970.
 
   03 Jun 2006; Guy Martin <gmsoft@gentoo.org> arts-3.5.2.ebuild:
   Stable on hppa.
diff --git a/kde-base/arts/arts-3.4.3-r1.ebuild b/kde-base/arts/arts-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..49dd60e77ddd
--- /dev/null
+++ b/kde-base/arts/arts-3.4.3-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.4.3-r1.ebuild,v 1.1 2006/06/11 13:14:57 carlo Exp $
+
+inherit kde flag-o-matic eutils
+set-kdedir 3.4
+
+MY_PV=${PV/#3/1}
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager"
+HOMEPAGE="http://multimedia.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${MY_PV}.tar.bz2"
+
+RESTRICT="test"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.4"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa esd artswrappersuid jack mp3 nas hardened vorbis"
+
+RDEPEND="$(qt_min_version 3.3)
+	>=dev-libs/glib-2
+	alsa? ( media-libs/alsa-lib )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	esd? ( media-sound/esound )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
+	mp3? ( media-libs/libmad )
+	nas? ( media-libs/nas )
+	media-libs/audiofile"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch
+	${FILESDIR}/arts-1.2.x.diff"
+
+src_unpack() {
+	kde_src_unpack
+
+	if (is-flag -fstack-protector || is-flag -fstack-protector-all || use hardened); then
+		epatch ${FILESDIR}/arts-1.4-mcopidl.patch
+	fi
+
+	# Fix amd64 cpu overload & crash bug, kde bug 88474. Applied for 3.5.
+	epatch "$FILESDIR/arts-3.4.1-cpu-overload.patch"
+
+	# Configure patch. Applied for 3.5.
+	epatch "${FILESDIR}/arts-3.4.1-configure.patch"
+
+	# for the configure patch
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	myconf="$(use_enable alsa) $(use_enable vorbis)
+	        $(use_enable mp3 libmad) $(use_with jack)
+	        $(use_with esd) $(use_with nas)
+		--with-audiofile --without-mas"
+
+	#fix bug 13453
+	filter-flags -foptimize-sibling-calls
+
+	#fix bug 41980
+	use sparc && filter-flags -fomit-frame-pointer
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# moved here from kdelibs so that when arts is installed
+	# without kdelibs it's still in the path.
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${PREFIX}/${libdir}"
+	done
+
+	dodir /etc/env.d
+echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+CONFIG_PROTECT=\"${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown\"" > ${D}/etc/env.d/46kdepaths-3.4 # number goes down with version upgrade
+
+	# used for realtime priority, but off by default as it is a security hazard
+	use artswrappersuid && chmod u+s ${D}/${PREFIX}/bin/artswrapper
+}
+
+pkg_postinst() {
+	if ! use artswrappersuid ; then
+		einfo "Run chmod u+s ${PREFIX}/bin/artswrapper to let artsd use realtime priority"
+		einfo "and so avoid possible skips in sound. However, on untrusted systems this"
+		einfo "creates the possibility of a DoS attack that'll use 100% cpu at realtime"
+		einfo "priority, and so is off by default. See bug #7883."
+		einfo "Or, you can set the local artswrappersuid USE flag to make the ebuild do this."
+	fi
+}
diff --git a/kde-base/arts/arts-3.5.2-r1.ebuild b/kde-base/arts/arts-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..26d5ee5e6c79
--- /dev/null
+++ b/kde-base/arts/arts-3.5.2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.2-r1.ebuild,v 1.1 2006/06/11 13:14:57 carlo Exp $
+
+inherit kde flag-o-matic eutils
+set-kdedir 3.5
+
+MY_PV=1.5.2
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RESTRICT="test"
+
+DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager"
+HOMEPAGE="http://multimedia.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${MY_PV}.tar.bz2"
+#SRC_URI="mirror://kde/stable/3.5/src/${PN}-${MY_PV}.tar.bz2"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa esd artswrappersuid jack mp3 nas vorbis"
+
+RDEPEND="$(qt_min_version 3.3)
+	>=dev-libs/glib-2
+	alsa? ( media-libs/alsa-lib )
+	vorbis? ( media-libs/libogg
+	          media-libs/libvorbis )
+	esd? ( media-sound/esound )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
+	mp3? ( media-libs/libmad )
+	nas? ( media-libs/nas )
+	media-libs/audiofile"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch
+	${FILESDIR}/arts-1.5.0-bindnow.patch
+	${FILESDIR}/arts-1.2.x.diff"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Alternative to arts-1.4-mcopidl.patch, make sure that flags are supported
+	# before trying to use them, for non-GCC, vanilla GCC or GCC 4.1 compilers
+	local nosspflags
+
+	nosspflags="$(test-flags -fno-stack-protector -fno-stack-protector-all)"
+	sed -i -e "s:KDE_CXXFLAGS =\(.*\):KDE_CXXFLAGS = \1 ${nosspflags}:" \
+		${S}/mcopidl/Makefile.am
+
+	# Fix libao/gaim problems with aRTs. See bug #116290.
+	epatch "${FILESDIR}/arts-1.5.0-check_tmp_dir.patch"
+}
+
+src_compile() {
+	myconf="$(use_enable alsa) $(use_enable vorbis)
+	        $(use_enable mp3 libmad) $(use_with jack)
+	        $(use_with esd) $(use_with nas)
+		--with-audiofile --without-mas"
+
+	#fix bug 13453
+	filter-flags -foptimize-sibling-calls
+
+	# breaks otherwise <gustavoz>
+	use sparc && export CFLAGS="-O1" && export CXXFLAGS="-O1"
+
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# moved here from kdelibs so that when arts is installed
+	# without kdelibs it's still in the path.
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${PREFIX}/${libdir}"
+	done
+
+	dodir /etc/env.d
+echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+CONFIG_PROTECT=\"${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown\"" > ${D}/etc/env.d/45kdepaths-3.5 # number goes down with version upgrade
+
+	# used for realtime priority, but off by default as it is a security hazard
+	use artswrappersuid && chmod u+s ${D}/${PREFIX}/bin/artswrapper
+}
+
+pkg_postinst() {
+	if ! use artswrappersuid ; then
+		einfo "Run chmod u+s ${PREFIX}/bin/artswrapper to let artsd use realtime priority"
+		einfo "and so avoid possible skips in sound. However, on untrusted systems this"
+		einfo "creates the possibility of a DoS attack that'll use 100% cpu at realtime"
+		einfo "priority, and so is off by default. See bug #7883."
+		einfo "Or, you can set the local artswrappersuid USE flag to make the ebuild do this."
+	fi
+}
diff --git a/kde-base/arts/arts-3.5.3-r1.ebuild b/kde-base/arts/arts-3.5.3-r1.ebuild
new file mode 100644
index 000000000000..861d370f5593
--- /dev/null
+++ b/kde-base/arts/arts-3.5.3-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.3-r1.ebuild,v 1.1 2006/06/11 13:14:57 carlo Exp $
+
+inherit kde flag-o-matic eutils
+set-kdedir 3.5
+
+MY_PV=1.5.3
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RESTRICT="test"
+
+DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager"
+HOMEPAGE="http://multimedia.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${MY_PV}.tar.bz2"
+#SRC_URI="mirror://kde/stable/3.5/src/${PN}-${MY_PV}.tar.bz2"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa esd artswrappersuid jack mp3 nas vorbis"
+
+RDEPEND="$(qt_min_version 3.3)
+	>=dev-libs/glib-2
+	alsa? ( media-libs/alsa-lib )
+	vorbis? ( media-libs/libogg
+	          media-libs/libvorbis )
+	esd? ( media-sound/esound )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
+	mp3? ( media-libs/libmad )
+	nas? ( media-libs/nas )
+	media-libs/audiofile"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch
+	${FILESDIR}/arts-1.5.0-bindnow.patch
+	${FILESDIR}/arts-1.2.x.diff"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Alternative to arts-1.4-mcopidl.patch, make sure that flags are supported
+	# before trying to use them, for non-GCC, vanilla GCC or GCC 4.1 compilers
+	local nosspflags
+
+	nosspflags="$(test-flags -fno-stack-protector -fno-stack-protector-all)"
+	sed -i -e "s:KDE_CXXFLAGS =\(.*\):KDE_CXXFLAGS = \1 ${nosspflags}:" \
+		${S}/mcopidl/Makefile.am
+
+	# Fix libao/gaim problems with aRTs. See bug #116290.
+	epatch "${FILESDIR}/arts-1.5.0-check_tmp_dir.patch"
+}
+
+src_compile() {
+	myconf="$(use_enable alsa) $(use_enable vorbis)
+	        $(use_enable mp3 libmad) $(use_with jack)
+	        $(use_with esd) $(use_with nas)
+		--with-audiofile --without-mas"
+
+	#fix bug 13453
+	filter-flags -foptimize-sibling-calls
+
+	# breaks otherwise <gustavoz>
+	use sparc && export CFLAGS="-O1" && export CXXFLAGS="-O1"
+
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# moved here from kdelibs so that when arts is installed
+	# without kdelibs it's still in the path.
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${PREFIX}/${libdir}"
+	done
+
+	dodir /etc/env.d
+echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+CONFIG_PROTECT=\"${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown\"" > ${D}/etc/env.d/45kdepaths-3.5 # number goes down with version upgrade
+
+	# used for realtime priority, but off by default as it is a security hazard
+	use artswrappersuid && chmod u+s ${D}/${PREFIX}/bin/artswrapper
+}
+
+pkg_postinst() {
+	if ! use artswrappersuid ; then
+		einfo "Run chmod u+s ${PREFIX}/bin/artswrapper to let artsd use realtime priority"
+		einfo "and so avoid possible skips in sound. However, on untrusted systems this"
+		einfo "creates the possibility of a DoS attack that'll use 100% cpu at realtime"
+		einfo "priority, and so is off by default. See bug #7883."
+		einfo "Or, you can set the local artswrappersuid USE flag to make the ebuild do this."
+	fi
+}
diff --git a/kde-base/arts/files/arts-1.2.x.diff b/kde-base/arts/files/arts-1.2.x.diff
new file mode 100644
index 000000000000..377fecb704c1
--- /dev/null
+++ b/kde-base/arts/files/arts-1.2.x.diff
@@ -0,0 +1,33 @@
+Index: soundserver/artswrapper.c
+===================================================================
+--- soundserver/artswrapper.c	(revision 546970)
++++ soundserver/artswrapper.c	(working copy)
+@@ -95,6 +95,10 @@ int main(int argc, char **argv)
+ #else
+ 		setreuid(-1, getuid());
+ #endif
++		if (geteuid() != getuid()) {
++			perror("setuid()");
++			return 2;
++		}
+ 	}
+ 
+ 	if(argc == 0)
+Index: soundserver/crashhandler.cc
+===================================================================
+--- soundserver/crashhandler.cc	(revision 546970)
++++ soundserver/crashhandler.cc	(working copy)
+@@ -196,7 +196,12 @@ CrashHandler::defaultCrashHandler (int s
+           argv[i++] = NULL;
+ 
+           setgid(getgid());
+-          setuid(getuid());
++          if (getuid() != geteuid())
++            setuid(getuid());
++          if (getuid() != geteuid()) {
++	    perror("setuid()");
++            exit(255);
++          }
+ 
+           execvp(crashApp, argv);
+ 
diff --git a/kde-base/arts/files/digest-arts-3.4.3-r1 b/kde-base/arts/files/digest-arts-3.4.3-r1
new file mode 100644
index 000000000000..e6f2055686d6
--- /dev/null
+++ b/kde-base/arts/files/digest-arts-3.4.3-r1
@@ -0,0 +1,3 @@
+MD5 58585969a9a33784601122c77bd15a1e arts-1.4.3.tar.bz2 945025
+RMD160 2c55aaa189fca2ea99854c00d31367fe8b437d72 arts-1.4.3.tar.bz2 945025
+SHA256 aaa82ee26cff7991c755437fd8885aa4845a45de56b39571760ef4df63971e35 arts-1.4.3.tar.bz2 945025
diff --git a/kde-base/arts/files/digest-arts-3.5.2-r1 b/kde-base/arts/files/digest-arts-3.5.2-r1
new file mode 100644
index 000000000000..2c8f7ab02d28
--- /dev/null
+++ b/kde-base/arts/files/digest-arts-3.5.2-r1
@@ -0,0 +1,3 @@
+MD5 e1eb7969ea16aab2bdd9d1a9736d6af3 arts-1.5.2.tar.bz2 967088
+RMD160 cf4fcdffdaada6b79ef1ec7139b1f60ff125ced2 arts-1.5.2.tar.bz2 967088
+SHA256 f2b8fe00d5273fe20ced3cc8cae83f28036655f2d8f65f88583c97b3b17938f2 arts-1.5.2.tar.bz2 967088
diff --git a/kde-base/arts/files/digest-arts-3.5.3-r1 b/kde-base/arts/files/digest-arts-3.5.3-r1
new file mode 100644
index 000000000000..2a7a25ff1b25
--- /dev/null
+++ b/kde-base/arts/files/digest-arts-3.5.3-r1
@@ -0,0 +1,3 @@
+MD5 1707ce44708a70acecd7a50ef05d365e arts-1.5.3.tar.bz2 966680
+RMD160 1c21508bf83ff587d0a3a04cc32300f37c053f1a arts-1.5.3.tar.bz2 966680
+SHA256 9aeda5f799a1edda0f687098d4e22688a8ef5fca80e051367b8d5eef58527032 arts-1.5.3.tar.bz2 966680