Add support for non-lazy-bindings non setuid executables. See bug #113937.

Package-Manager: portage-2.0.53

4 files changed, 49 insertions, 7 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 4d1eaf6a04a7..c1840be8d0b9 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.293 2005/12/06 05:31:07 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.294 2005/12/09 09:10:28 flameeyes Exp $
+
+  09 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdelibs-3.5.0-bindnow.patch, kdelibs-3.5.0.ebuild:
+  Add support for non-lazy-bindings non setuid executables. See bug #113937.
 
   06 Dec 2005; Joseph Jezak <josejx@gentoo.org> kdelibs-3.4.3.ebuild:
   Marked ppc stable for bug #112842.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 1c25c4210ed0..a01623ca7393 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1b39f38d3d151070327e722bba32fb71 ChangeLog 46742
+MD5 42700bc24d61c0025ebfe1003d9cdb92 ChangeLog 46936
 MD5 e8b51d92930950619b2139c22d4e1407 files/digest-kdelibs-3.3.2-r10 517
 MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r1 68
 MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r2 68
@@ -18,6 +18,7 @@ MD5 b291a4a134cac9072ad1140a78eee9ce files/kdelibs-3.4.1-kntlm.patch 1323
 MD5 4d3faaf48564cde79aac52957f7e6278 files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
 MD5 4f827df22c4b05fdb50535c985ff5cb1 files/kdelibs-3.4.2-gmail-fix.patch 724
 MD5 b0a18256a9bb33e81f45573f07a341e1 files/kdelibs-3.4.3-inttypes.patch 365
+MD5 15d3d3042e0bb2c9b640e8993aa234b1 files/kdelibs-3.5.0-bindnow.patch 1363
 MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
 MD5 138c3252883171d55ec24ed0318950fd files/post-3.3.2-kdelibs-kate.diff 2212
 MD5 a0a423eb46bcca9f140b0a97645a0177 kdelibs-3.3.2-r10.ebuild 4318
@@ -26,12 +27,12 @@ MD5 b75b773aa95374e55799e86e678173d6 kdelibs-3.4.1-r2.ebuild 3364
 MD5 12b3f3cc444cc940ed50e352054ccb7f kdelibs-3.4.2-r1.ebuild 3341
 MD5 2fd53a7c014e4527505ec32ec5425575 kdelibs-3.4.2.ebuild 3346
 MD5 3a91361b67450f615d3231102c812016 kdelibs-3.4.3.ebuild 3384
-MD5 a0a9becbff1619699a4801a0fcb8e51a kdelibs-3.5.0.ebuild 3412
+MD5 2e6153a989a7907a5b971a363789809b kdelibs-3.5.0.ebuild 3496
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDlSIrcsIHjyDViGQRAuBXAJ9isaITzPW+A4/jSYMM+fTCUjxqVACeM8U9
-J31s0OcMPBqh9lkjm0Pa3jw=
-=wtLD
+iD8DBQFDmUoYAiZjviIA2XgRAvWFAJ0YXhL5pKtSiwCYpxKiKfHP14V6wwCghbhw
+5sElbMuWT4yw5zPYGput7B8=
+=V8yG
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.0-bindnow.patch b/kde-base/kdelibs/files/kdelibs-3.5.0-bindnow.patch
new file mode 100644
index 000000000000..3a7e1133a5d7
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.0-bindnow.patch
@@ -0,0 +1,33 @@
+Add support for BINDNOW_FLAGS to build kgrantpty and kpac_dhcp_helper with
+non-lazy bindings, to improve security and fix installation on
+FEATURES=stricter.
+See bug #113937.
+
+Requires the ebuild to export BINDNOW_FLAGS="$(bindnow-flags)".
+
+Index: kdelibs-3.5.0/kdecore/Makefile.am
+===================================================================
+--- kdelibs-3.5.0.orig/kdecore/Makefile.am
++++ kdelibs-3.5.0/kdecore/Makefile.am
+@@ -169,7 +169,7 @@ kde_config_LDFLAGS = $(KDE_RPATH) $(KDE_
+ 
+ kgrantpty_SOURCES = kgrantpty.c
+ kgrantpty_CFLAGS= $(KDE_USE_FPIE)
+-kgrantpty_LDFLAGS = $(KDE_USE_PIE) $(KDE_RPATH) $(all_libraries)
++kgrantpty_LDFLAGS = $(KDE_USE_PIE) $(KDE_RPATH) $(all_libraries) $(BINDNOW_FLAGS)
+ kgrantpty_LDADD = ./libkdefakes.la
+ 
+ # kgrantpty needs to be installed setuid root
+Index: kdelibs-3.5.0/kio/misc/kpac/Makefile.am
+===================================================================
+--- kdelibs-3.5.0.orig/kio/misc/kpac/Makefile.am
++++ kdelibs-3.5.0/kio/misc/kpac/Makefile.am
+@@ -14,7 +14,7 @@ kded_proxyscout_la_LIBADD = $(LIB_KIO) $
+ 
+ kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
+ kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
+-kpac_dhcp_helper_LDFLAGS = $(KDE_USE_PIE)
++kpac_dhcp_helper_LDFLAGS = $(KDE_USE_PIE) $(BINDNOW_FLAGS)
+ kpac_dhcp_helper_LDADD = $(LIBSOCKET)
+ 
+ noinst_HEADERS = proxyscout.h script.h downloader.h discovery.h
diff --git a/kde-base/kdelibs/kdelibs-3.5.0.ebuild b/kde-base/kdelibs/kdelibs-3.5.0.ebuild
index 93389a81f646..70fb06fed5da 100644
--- a/kde-base/kdelibs/kdelibs-3.5.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-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/kdelibs/kdelibs-3.5.0.ebuild,v 1.3 2005/12/01 15:20:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.0.ebuild,v 1.4 2005/12/09 09:10:28 flameeyes Exp $
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
 
@@ -46,6 +46,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/pkgconfig"
 
+PATCHES="${FILESDIR}/${P}-bindnow.patch"
+
 src_compile() {
 	myconf="--with-distribution=Gentoo
 	        --enable-libfam $(use_enable kernel_linux dnotify)
@@ -69,6 +71,8 @@ src_compile() {
 	# closer look... - corsair
 	use ppc64 && append-flags "-mminimal-toc"
 
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
 	kde_src_compile
 
 	if use doc; then