Fix build problems on PaX with USE=introspection and mark /usr/bin/epiphany so that it runs on PaX when webkit-gtk was built with USE=jit.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

6 files changed, 183 insertions, 5 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 06b149b3fb79..fd324633a624 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.277 2012/02/14 04:19:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.278 2012/03/05 03:03:09 tetromino Exp $
+
+*epiphany-3.2.1-r1 (05 Mar 2012)
+
+  05 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +epiphany-3.2.1-r1.ebuild, +files/epiphany-3.2.1-paxctl-introspection.patch,
+  +files/gir-paxctl-lt-wrapper, +files/paxctl.sh:
+  Fix build problems on PaX with USE=introspection and mark /usr/bin/epiphany
+  so that it runs on PaX when webkit-gtk was built with USE=jit.
 
   14 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   epiphany-3.2.1.ebuild:
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 8ba7c34ddb9d..d824002ef7fb 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -7,16 +7,20 @@ AUX epiphany-2.30.6-introspection-prefix.patch 710 RMD160 54c07f6d720310058bcbfc
 AUX epiphany-2.30.6-libnotify-0.7.patch 1048 RMD160 3607af827a5732561f2e89d9065f3549e14fcdb0 SHA1 2257b0ecd8916657402374265936706e42a1c9c6 SHA256 c1a59a9df78db07c2cf23d47d881d8d4edf6e55af3d655f8ec9870adf9255390
 AUX epiphany-2.30.6-mime-handler.patch 844 RMD160 ffb3e2295084184bd4cb623f48d94cb7de26e083 SHA1 b8c171d993ddeae3be517e06c465ac0b680df9c7 SHA256 768a092f315c905f18c554616a07eb5595c7d512289c280ea435ea482f0820aa
 AUX epiphany-3.2.0-optional-networkmanager.patch 2729 RMD160 1f95db1db426d8be1ef85dc2c7c36178077b546b SHA1 0b1849ed500a46dbebf52fbe14959e650ef8d828 SHA256 a992b9d25b77f404d8af7435e7ac2b84da2e08a0a99eb6ae212a0302e935b661
+AUX epiphany-3.2.1-paxctl-introspection.patch 1578 RMD160 ad6452469ec8f31f5d3f04708c1717b6eaf4330a SHA1 d5077a8b1ca0703f96839103ac5b244824812b3c SHA256 54d57bddaa6384e19cb455edf0b6c609d6767061dcd6accc8189f21cf22c90ce
+AUX gir-paxctl-lt-wrapper 276 RMD160 72bf56b9999cef815cee76ec836b90ee1d05ab84 SHA1 84cf6a5e197d16c307dcce1624611ee51d210622 SHA256 28569b4c59e620bc2ed11fa8c8adc553c7bae98d32d4fc2cd8b2780aee52c090
+AUX paxctl.sh 787 RMD160 1944c6ad29d556674a2aab18115d06c2e4842216 SHA1 45475a30566efbe674eeed341dc8e2932b3c732e SHA256 f55473f2b044d25598195b6676175bad9531d4374fff65505d7c717d90d0897e
 DIST epiphany-2.30.6.tar.bz2 5927938 RMD160 60f2c7d699dd8728dc79cce012475972943c4007 SHA1 a4bde975f9b2b97d6aad14b4b8a715b40d19a155 SHA256 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
 DIST epiphany-3.2.1.tar.xz 5101156 RMD160 96831872603b51860e315c184285549d886ac93e SHA1 bb82f9890bc27374139305a41952974826a9dab8 SHA256 5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe
 EBUILD epiphany-2.30.6-r1.ebuild 2565 RMD160 37b586ea0001f7092921c4f4cd477836c072c624 SHA1 040e17647470419d0db3d34208fda25d2ed62992 SHA256 125d9a92954dc608ce7726b41f69775da340e85ff6d40d437f82107336f7712e
+EBUILD epiphany-3.2.1-r1.ebuild 2705 RMD160 1658ee747640a29ec4a930ee707721a74797c51a SHA1 580b35711042bd64383ea6cdcd12097e58b54011 SHA256 47ef464a28df35f3a724106a6a71f0c846cf23aa8d6a80d0d2c6ef69c6f1436f
 EBUILD epiphany-3.2.1.ebuild 2339 RMD160 e2007a7eede475ef2feddc5e3f1d31fa62d5ff24 SHA1 8cb2a39938b4e59aef42823531e5754820ef44f1 SHA256 06a39bb3be3a9088c85e0e0a66b85e17ea0b1ba59fa5e1142354497beeeee0f9
-MISC ChangeLog 54342 RMD160 d959c5601b544cdfdd61a1fc34850226e7e24823 SHA1 8ad91e8b10f12b4038eb7e2e90e65255ddc6ce78 SHA256 577d710e6c2ecdc3a6ade21a38a9f92ed402ead740f3f08cd4064dbf5f1c7420
+MISC ChangeLog 54708 RMD160 26aadb0318723a85b2c021a86eff99e6a0003910 SHA1 4d76bb2a0ff2ce11ac629f6cc72210a974b7f010 SHA256 75f3cc283b2534bbd8ec50f794a5bf3e8ea1518c3f3e334a422940f1d6d0925d
 MISC metadata.xml 375 RMD160 4b38d1fe16a065d10967f7f17d768dc02bf1fae8 SHA1 96a760f61a9e0bb73120bb75a53b2247b84e9f14 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk854N0ACgkQdjK8w9WeBnC/YQD/bv1oRz4EB0RrbANeiozYD3Z8
-g6MX/ZJ0jrqOPgM/BdUA+wUKXOAfFt+zDfyuKZMZ91VSBg//XUJxFzXwUixgxIpV
-=0OST
+iF4EAREIAAYFAk9ULPMACgkQdjK8w9WeBnAzTgD/ROUCBYl6a5D7yD0iTUPsfzoQ
+OaiHB3K1r7eiIwRLFCAA/jmvej+TPMdVGggYUxxMi4SKxIiSZe3j8FgfZ5kv2sbu
+=F/1n
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-3.2.1-r1.ebuild b/www-client/epiphany/epiphany-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..fdd0d2f3af50
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.2.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1-r1.ebuild,v 1.1 2012/03/05 03:03:09 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2 pax-utils
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="http://projects.gnome.org/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="avahi doc +introspection +networkmanager +nss test"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# XXX: Should we add seed support? Seed seems to be unmaintained now.
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
+	>=x11-libs/gtk+-3.0.2:3[introspection?]
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	>=app-text/iso-codes-0.35
+	>=net-libs/webkit-gtk-1.6.1:3[introspection?]
+	>=net-libs/libsoup-gnome-2.33.1:2.4
+	>=gnome-base/gnome-keyring-2.26.0
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+	>=x11-libs/libnotify-0.5.1
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+
+	app-misc/ca-certificates
+	x11-themes/gnome-icon-theme
+
+	avahi? ( >=net-dns/avahi-0.6.22 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	nss? ( dev-libs/nss )"
+# networkmanager is used purely via dbus
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+	networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
+DEPEND="${COMMON_DEPEND}
+	app-text/gnome-doc-utils
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+	G2CONF="${G2CONF}
+		--enable-shared
+		--disable-schemas-compile
+		--disable-scrollkeeper
+		--disable-static
+		--with-distributor-name=Gentoo
+		--with-ca-file=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
+		$(use_enable avahi zeroconf)
+		$(use_enable introspection)
+		$(use_enable nss)
+		$(use_enable test tests)"
+	# Upstream no longer makes networkmanager optional, but we still want
+	# to make it possible for prefix users to use epiphany
+	use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORK_MANAGER"
+}
+
+src_prepare() {
+	# Make networkmanager optional for prefix people
+	epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
+	# Build-time segfaults under PaX with USE=introspection
+	epatch "${FILESDIR}/${PN}-3.2.1-paxctl-introspection.patch"
+	cp "${FILESDIR}/gir-paxctl-lt-wrapper" \
+		"${FILESDIR}/paxctl.sh" "${S}/" || die
+	sed -e "s:@S@:${S}:" -i gir-paxctl-lt-wrapper || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	pax-mark m "${ED}usr/bin/epiphany"
+}
diff --git a/www-client/epiphany/files/epiphany-3.2.1-paxctl-introspection.patch b/www-client/epiphany/files/epiphany-3.2.1-paxctl-introspection.patch
new file mode 100644
index 000000000000..ba5eab47ef0b
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.2.1-paxctl-introspection.patch
@@ -0,0 +1,41 @@
+From f9ba4d6428f06f717eb16e83a728f82b314383f1 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 4 Mar 2012 19:47:17 -0500
+Subject: [PATCH] Add libtool wrapper for building introspection under PaX
+
+---
+ src/Makefile.am |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c46160c..2aa94d1 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -299,7 +299,7 @@ EPHY_GIR_C_FILES = \
+ 
+ EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
+ 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+-	$(INTROSPECTION_SCANNER) -v --warn-all \
++	LIBTOOL="$(LIBTOOL)" $(INTROSPECTION_SCANNER) -v --warn-all \
+ 		--identifier-prefix=Egg \
+ 		--symbol-prefix=egg \
+ 		--namespace=EphyEgg \
+@@ -307,6 +307,7 @@ EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
+ 		--include=Gtk-3.0 \
+ 		--include=libxml2-2.0 \
+ 		--library=$(top_builddir)/lib/egg/libegg.la \
++		--libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper -m" \
+ 		--pkg=gtk+-3.0 \
+ 		--pkg=libxml-2.0 \
+ 		--output=$@ \
+@@ -318,6 +319,7 @@ EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
+ 
+ Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
+                                       $(EPHY_GIR_C_FILES) epiphany
++	bash $(top_srcdir)/paxctl.sh -m ./epiphany
+ 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+ 	$(INTROSPECTION_SCANNER) -v --warn-all \
+ 		--identifier-prefix=Ephy \
+-- 
+1.7.8.5
+
diff --git a/www-client/epiphany/files/gir-paxctl-lt-wrapper b/www-client/epiphany/files/gir-paxctl-lt-wrapper
new file mode 100755
index 000000000000..c0e606be2c67
--- /dev/null
+++ b/www-client/epiphany/files/gir-paxctl-lt-wrapper
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
+# generated by g-ir-scanner.
+
+flags=${1//-}; shift
+
+echo ${LIBTOOL} "$@"
+${LIBTOOL} "$@"
+
+retval=$?
+
+bash "@S@/paxctl.sh" "${flags}" $(find . -path "*tmp-introspect*/.libs/*")
+
+exit ${retval}
diff --git a/www-client/epiphany/files/paxctl.sh b/www-client/epiphany/files/paxctl.sh
new file mode 100755
index 000000000000..bb1b6e072f21
--- /dev/null
+++ b/www-client/epiphany/files/paxctl.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# PaX marking code stolen from pax-utils.eclass
+
+flags=${1//-}; shift
+
+if type -p paxctl > /dev/null; then
+	echo "PT PaX marking -${flags} $@"
+	for f in "$@"; do
+		# First, try modifying the existing PAX_FLAGS header
+		paxctl -q${flags} "${f}" && continue
+		# Second, try stealing the (unused under PaX) PT_GNU_STACK header
+		paxctl -qc${flags} "${f}" && continue
+		# Third, try pulling the base down a page, to create space and
+		# insert a PT_GNU_STACK header (works on ET_EXEC)
+		paxctl -qC${flags} "${f}" && continue
+	done
+elif type -p scanelf > /dev/null; then
+	# Try scanelf, the Gentoo swiss-army knife ELF utility
+	# Currently this sets PT if it can, no option to control what it does.
+	echo "Fallback PaX marking -${flags} $@"
+	scanelf -Xxz ${flags} "$@"
+fi
+
+exit 0