Add pic USE flag to fix libbonobo build failure on hardened systems (bug #312161, thanks to arackhaen and Magnus Granberg).

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 75 insertions, 14 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index d4f28930d8b1..1b1b590b3751 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.187 2013/02/13 02:13:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.188 2013/03/03 20:17:37 tetromino Exp $
+
+  03 Mar 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  orbit-2.14.19-r2.ebuild, +files/orbit-2.14.19-fPIC.patch, metadata.xml:
+  Add pic USE flag to fix libbonobo build failure on hardened systems (bug
+  #312161, thanks to arackhaen and Magnus Granberg).
 
   13 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   files/orbit-2.14.19-link_protocol_is_local.patch:
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index 4ec9f95040b8..23dabcb627dc 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX orbit-2.14.19-fPIC.patch 1650 SHA256 73eeeb598b1cd18f1d888a0f62f59b971ea1367995a3d7016a4e217968ca4923 SHA512 31915edd0998b4738a5c97a74b4e4f84ac80a7db5a04e1f205ff2a2ea181df9bf471a839f75bef8bc96644c0e3c731e3cf6c47bedbccd07ab7b10f27e8e19da8 WHIRLPOOL ef8eaea7640669aedb8b68fd397f7aced0165685969ba4c96bd78ab17b78611828fee7f7dc54ab4db8168de1fdbcb2566fbf2fc24901421136dde33f6cc1202c
 AUX orbit-2.14.19-link_protocol_is_local.patch 1006 SHA256 d173885258c5dfb2ddbc6238f239535a49955bbd633b0acf58efcb503af33c97 SHA512 f765686448db2d190bebb85c165b5e32bb3e29a30f5407b5f3236dfcc0b0c94f77715d136678ec9021a9e450b22fbd7c0dfed3e30d070f795d708244594de2a8 WHIRLPOOL 4231e42249a9a29a3a6ad51514ebb0585a112ac894aeae416e2540972b887264410e88a39dfaf9154bc059609c9c81f4b3d7ce566f97d8cced802aaf7f8e8c02
 DIST ORBit2-2.14.19.tar.bz2 764820 SHA256 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e WHIRLPOOL ed9dffba86ab5a5409fbdfcbe8017ae3251ca261aa57b3ee1089ddfad0422f73e848ed72d3881d664ffe88a3582a8c4652394517ab814c4f0983d446891a1306
 EBUILD orbit-2.14.19-r1.ebuild 2162 SHA256 4bd96c02bf169eb61960ceee0bd66f1c3ae7ef06f13ebbdb704d8f7058a9dfb8 SHA512 f7240b69f05434392eeb791746629391f0f1163385fdee4c3ebd001655721eb409ef9d682937e94b8941586939ea72ae3c9f4970cd1f647a29b4407f7e30a4c6 WHIRLPOOL 123acc04f4f9924410d9f97e4953f0b79f4cba282eddf4dd4daf62d2dc20654c1c5d4e299ec6a82a63ed538d95b171e9737e8d61a97ac56feecbc9e159786b98
-EBUILD orbit-2.14.19-r2.ebuild 2289 SHA256 d2f073ac9d09c2dc86e13b6b21ade9d019be1e246e501867e0bdadc1a5e93397 SHA512 d3de565b80b49bb267d189d9bbebcf6b810eea6d0ec63e24699ae3cafe2447ff5fccc33688a3682fba20c86e1110e6b6d383690490a14ec77da4bfdb210cc4f8 WHIRLPOOL 12b3269e5b1b04a1390b93e4040091baa0ed84b21419696d960a5bf456f568d476ec13df7aed65f8c8fd5aee518affb8089981fda3cf7a8f5e808b860e217c8c
-MISC ChangeLog 23649 SHA256 211b09b9e13aaa95533397547a1f79a123d0b3aa10982772ce41da13e4a9d4c5 SHA512 0caebb738f091fc6db95fdc1409283cd9531b2a2ac45eee5d199a00270d57d8ac27a0c66f7de546306c8cb0872a8bba52000d05131b5db5917f2a5e3d77c1816 WHIRLPOOL 1d0d8597f35eb8fc713bb2d425a4a237391303cf38d6a87e7ba9c4fcc2d617a9335aae7e4c953ab718795ff508ac89cf8e0b895945bfb96311e10656a6c1b943
-MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+EBUILD orbit-2.14.19-r2.ebuild 2450 SHA256 be75bc4ba8310a4433e3813dc3634c690599b1b587c571201f69fa813eb81321 SHA512 315cc2433a3d356bd14d03dfdeb9affd2a3e0772309e2371fa631cfac59c2453159104d00de81188b0d0ae112adddc3cb7c15922480ab127113deae0e7bb1c44 WHIRLPOOL 9cb9f9e0a1016b83580500b09ca3cc9eabd06856fd1a5f80f984d79216a13b3af4ce014fa844424d3be3f3cbca957a1e99bfd289dd0e9678e0588f285b3f0256
+MISC ChangeLog 23911 SHA256 0bf27f55e35b8e5e10ae166863d66228d4b11cf7bf2b3eb8db4b6c1dc09f02c0 SHA512 27631a4c07419f18fc01540b787c1c8b6d506f226cca837f02e918ba1bdc731ae16625a0a1f555a8b1afba627c95e760144c2e623f09f00de7dc2f1b9bdcd28a WHIRLPOOL 2e5eb9bd5900ec03e498f7d0a74d4345f74e49a0fc2f16124ab22f77952882e5cba8040202618a0c9565d16f2f1e75496b9b7a72b256632759533f40976fa984
+MISC metadata.xml 268 SHA256 49ba5aa4b4333b8056ead3fe610227e35114c61de761219361f4dbc3fc456e86 SHA512 0ee7a4fc951265814f32b99410ee92a4d63c2c0bc769ca5bbfb737d3951fef02352c0e9a4ab2ae04e9fbb1885b4b5b3d64c14c8d2b45c614bf2a07d741fcf48e WHIRLPOOL 0f5a33c5e0c8a4f725982d8800a0b654a2ea3e82db4323da714e04abc4d8459dc1e0a6a5e5dfba688cffb458f223cb5136e5f1da238f15daae12d13ed70042eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRGvbDAAoJEJ0WA1zPCt1h+REIAK+I2c/H44sgGzU1XjcsbBOS
-h52pIL2FF7erPBUmVcNseY5Z+7LtwNKndFSmVSYZB8SrBs+T2gZ+hAAE8CwEDijZ
-J8bvAcQpP2MxB7xgqx1a3i2+GCV0U0AOu9xJ3hUdjLZ0wI9fqXhNFjQ+T0XSsP68
-uV5yQpESn2HSKbo5tmUSVoQOmf+4ylwLaW1czhn65EgjufUY5oahEDl38hWsxgco
-ZHo48jGYS6QhujawaCeiQAhrOnG19lrjZSK2mXj4mggO5FbneoZYk52ENaWJFxcy
-CRfHoRlIYzgWPNWUgtzBNuOpC91ZIz4eC4ZoCDPbyldwmto6Hh7b7TQEIXJel70=
-=8pc0
+iQEcBAEBCAAGBQJRM6/iAAoJEJ0WA1zPCt1hIT4H+wXxvQSQQFI3rPRLDGeI1VIp
+qTRaWTGAj5bAYrPHRfwcxwXOXYpHHFvlkFabWXPSiMneX/oDpk8wHhh4xbrE4EjX
+vc4k6Dn/vRigtDr7t7apcIKvwaUkYZ/renkJJ2pwtRjpjPkkr4RC/RW/hyd43u+x
+ZsgxFYN7kZDrMwiCH5Jqd0oWOsyK8r5WAClZrq4VzAAR3eDXYH9xZmoyhAWlWwoL
+32a9U1JdXBr/TkXwGXkmem2MOS2lV1jfG6zmTYg5vQxakZ3wQUnqwssR8BArFZUU
+tJckn8a9RHeCQj2x4OKsP0WyMAL7/hA1aEEug3C//Kc+LTK/vb3EssNss/r82w0=
+=4CJL
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch b/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch
new file mode 100644
index 000000000000..394919f98568
--- /dev/null
+++ b/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch
@@ -0,0 +1,46 @@
+From 31236105deaa4b50a70aa256819bfc4790f705d8 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 3 Mar 2013 13:29:24 -0500
+Subject: [PATCH] Add an option to build libname-server-2.a's objects as PIC
+
+Needed for Gentoo hardened, see https://bugs.gentoo.org/show_bug.cgi?id=312161
+---
+ configure.in                  | 9 +++++++++
+ src/services/name/Makefile.am | 1 +
+ 2 files changed, 10 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 0879051..38b7b8b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -118,6 +118,15 @@ if test z$enable_purify = zyes; then
+ 	AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled])
+ fi
+ 
++AC_ARG_ENABLE([libname-server-pic],
++	[AS_HELP_STRING([--enable-libname-server-pic], [force libname-server-2.a to be built as PIC])])
++if test x$enable_libname_server_pic = xyes; then
++	LIBNAME_SERVER_PIC=$lt_prog_compiler_pic
++else
++	LIBNAME_SERVER_PIC=
++fi
++AC_SUBST(LIBNAME_SERVER_PIC)
++
+ AC_MSG_CHECKING(which idl compiler to use)
+ IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"
+ AC_ARG_WITH(idl-compiler,
+diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am
+index 7212557..21b7365 100644
+--- a/src/services/name/Makefile.am
++++ b/src/services/name/Makefile.am
+@@ -65,6 +65,7 @@ name_client_2_LDADD = $(LDADDS)
+ libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
+ 			   name-support.c name-support.h
+ libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
++libname_server_2_a_CFLAGS = $(INCLUDES) $(LIBNAME_SERVER_PIC)
+ 
+ orbit_name_server_2_SOURCES = boot.c
+ orbit_name_server_2_LDFLAGS = $(FLAGS)
+-- 
+1.8.1.5
+
diff --git a/gnome-base/orbit/metadata.xml b/gnome-base/orbit/metadata.xml
index da6fd63d0085..2965e3cff492 100644
--- a/gnome-base/orbit/metadata.xml
+++ b/gnome-base/orbit/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="pic">Force libname-server-2 to be built as PIC; needed on
+		hardened systems</flag>
+</use>
 </pkgmetadata>
diff --git a/gnome-base/orbit/orbit-2.14.19-r2.ebuild b/gnome-base/orbit/orbit-2.14.19-r2.ebuild
index 92b498ec6b8d..85c65ecc7ffb 100644
--- a/gnome-base/orbit/orbit-2.14.19-r2.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r2.ebuild,v 1.1 2013/02/12 06:53:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r2.ebuild,v 1.2 2013/03/03 20:17:37 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -16,7 +16,7 @@ HOMEPAGE="http://projects.gnome.org/ORBit2/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="static-libs test"
+IUSE="pic static-libs test"
 REQUIRED_USE="test? ( debug )"
 
 RDEPEND=">=dev-libs/glib-2.8:2
@@ -46,6 +46,9 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=693636
 	epatch "${FILESDIR}/${PN}-2.14.19-link_protocol_is_local.patch"
 
+	# Build libname-server-2.a with -fPIC on hardened, bug #312161
+	epatch "${FILESDIR}/${PN}-2.14.19-fPIC.patch"
+
 	eautoreconf
 	gnome2_src_prepare
 }
@@ -64,7 +67,9 @@ src_configure() {
 		[ -x /usr/bin/orbit-idl-2 ] || die "Please emerge ~${CATEGORY}/${P} on the host system first"
 		G2CONF="${G2CONF} --with-idl-compiler=/usr/bin/orbit-idl-2"
 	fi
-	gnome2_src_configure $(use_enable static-libs static)
+	gnome2_src_configure \
+		$(use_enable pic libname-server-pic) \
+		$(use_enable static-libs static)
 }
 
 src_compile() {