Add patch (and export) to make use of non-lazy bindings on artswrapper as that can be marked setuid, see bug #113934. Also use test-flags instead of test_flag as this one is deprecated.

Package-Manager: portage-2.0.53

4 files changed, 38 insertions, 13 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 83a908083370..e3eb73a549ae 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.195 2005/12/06 05:29:47 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.196 2005/12/09 01:40:28 flameeyes Exp $
+
+  09 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/arts-1.5.0-bindnow.patch, arts-3.5.0.ebuild:
+  Add patch (and export) to make use of non-lazy bindings on artswrapper as
+  that can be marked setuid, see bug #113934. Also use test-flags instead of
+  test_flag as this one is deprecated.
 
   06 Dec 2005; Joseph Jezak <josejx@gentoo.org> arts-3.4.3.ebuild:
   Marked ppc stable for bug #112842.
diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index 2ee55b31d460..59f5c2bad2cc 100644
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0f0a691d28d0f7a6e13c4638fc130361 ChangeLog 24897
+MD5 923db70d2ad76c441b3da678438dc3ed ChangeLog 25200
 MD5 b36369fdd08721cbc99d9fd94fc36f8b arts-1.3.2-r1.ebuild 2639
 MD5 2a34bacb418d79b24ba8824d8b5ead47 arts-1.3.2.ebuild 2764
 MD5 9780af748959ac2da43677dd72a313f0 arts-3.4.1-r2.ebuild 2854
 MD5 db0f7cdd6d695cdf6af189655f4758d5 arts-3.4.2.ebuild 2941
 MD5 bfa832d2ef2a8bbdc1cb9ed468d65b9f arts-3.4.3.ebuild 2937
-MD5 6b4cf13b25246828c74fc42c7fc31cb3 arts-3.5.0.ebuild 3069
+MD5 ad7ec1a9b9085bf4d82fe297852418f8 arts-3.5.0.ebuild 3019
 MD5 68ec6c8e74dfea13c3bb54575b1c51d4 files/1.3.0-jack-configure.in.in.patch 694
 MD5 22eaa23f91c114995e7b8ae286c3ac2c files/arts-1.3.2-alsa-bigendian.patch 571
 MD5 64df5930253711053181dcdbba96f42b files/arts-1.3.2-mcopidl.patch 418
 MD5 196311c78bda3759d3d92a450fcf12ea files/arts-1.4-mcopidl.patch 448
+MD5 075bf36b46babf9e79102028402d85a4 files/arts-1.5.0-bindnow.patch 795
 MD5 c0838be4fcac1f2a9f9efd922b4b6d8d files/arts-3.4.1-configure.patch 4429
 MD5 5fa50e6520e137f4731eea03a5a644ea files/arts-3.4.1-cpu-overload.patch 1371
 MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2 63
@@ -24,7 +25,7 @@ MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDlSHbcsIHjyDViGQRAiSeAJ90kHMEkVWv4OXFok+EmN2o5EhbugCg0TNA
-YSa3NyjWaqbC2im/tsAhnIo=
-=0RX3
+iD8DBQFDmOCjAiZjviIA2XgRAupjAJ9T0plIFG+EpFr+ecoMJqzjRustaQCg0xgV
+dV0Umsk0X0brSyFVbzky040=
+=8B44
 -----END PGP SIGNATURE-----
diff --git a/kde-base/arts/arts-3.5.0.ebuild b/kde-base/arts/arts-3.5.0.ebuild
index f4e40264da5a..2f05164c528d 100644
--- a/kde-base/arts/arts-3.5.0.ebuild
+++ b/kde-base/arts/arts-3.5.0.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/kde-base/arts/arts-3.5.0.ebuild,v 1.3 2005/11/30 00:44:19 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.0.ebuild,v 1.4 2005/12/09 01:40:28 flameeyes Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.5
@@ -32,7 +32,8 @@ RDEPEND="$(qt_min_version 3.3)
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch"
+PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch
+	${FILESDIR}/arts-1.5.0-bindnow.patch"
 
 src_unpack() {
 	kde_src_unpack
@@ -41,11 +42,7 @@ src_unpack() {
 	# before trying to use them, for non-GCC, vanilla GCC or GCC 4.1 compilers
 	local nosspflags
 
-	[[ -n $(test_flag -fno-stack-protector) ]] && \
-		nosspflags="${nosspflags} -fno-stack-protector"
-	[[ -n $(test_flag -fno-stack-protector-all) ]] && \
-		nosspflags="${nosspflags} -fno-stack-protector-all"
-
+	nosspflags="$(test-flags -fno-stack-protector -fno-stack-protector-all)"
 	sed -i -e "s:KDE_CXXFLAGS =\(.*\):KDE_CXXFLAGS = \1 ${nosspflags}:" \
 		${S}/mcopidl/Makefile.am
 }
@@ -62,6 +59,8 @@ src_compile() {
 	#fix bug 41980
 	use sparc && filter-flags -fomit-frame-pointer
 
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
 	kde_src_compile
 }
 
diff --git a/kde-base/arts/files/arts-1.5.0-bindnow.patch b/kde-base/arts/files/arts-1.5.0-bindnow.patch
new file mode 100644
index 000000000000..aab9b4bb5868
--- /dev/null
+++ b/kde-base/arts/files/arts-1.5.0-bindnow.patch
@@ -0,0 +1,19 @@
+Add support for BINDNOW_FLAGS to build artswrapper with non-lazy bindings, to
+improve security and fix installation on FEATURES=stricter.
+See bug #113934.
+
+Requires the ebuild to export BINDNOW_FLAGS="$(bindnow-flags)".
+
+Index: arts-1.5.0/soundserver/Makefile.am
+===================================================================
+--- arts-1.5.0.orig/soundserver/Makefile.am
++++ arts-1.5.0/soundserver/Makefile.am
+@@ -78,7 +78,7 @@ artswrapper_SOURCES = artswrapper.c
+ artswrapper_CFLAGS = $(KDE_USE_FPIE)
+ artswrapper_INCLUDES = -I$(top_builddir) -DEXECUTE=\"$(artsdpath)\"
+ artswrapper_LDADD = $(LIBPOSIX4)
+-artswrapper_LDFLAGS = $(KDE_USE_PIE)
++artswrapper_LDFLAGS = $(KDE_USE_PIE) $(BINDNOW_FLAGS)
+ 
+ artsshell_LDADD = libsoundserver_idl.la $(LIBPTHREAD)
+ artsshell_LDFLAGS = $(USE_THREADS)