[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/

[Alexandre Restovtsev]

commit:     26a4d843313d00ba269b64e217f29e16224ac973
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 02:57:15 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Mar  5 03:02:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=26a4d843

www-client/epiphany: PaX fixes

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.

---
 ...any-3.3.90.ebuild => epiphany-3.3.90-r1.ebuild} |   15 +++++++++++-
 www-client/epiphany/epiphany-9999.ebuild           |   15 +++++++++++-
 .../epiphany-3.3.90-paxctl-introspection.patch     |   24 ++++++++++++++++++++
 www-client/epiphany/files/paxctl.sh                |   24 ++++++++++++++++++++
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.90.ebuild b/www-client/epiphany/epiphany-3.3.90-r1.ebuild
similarity index 84%
rename from www-client/epiphany/epiphany-3.3.90.ebuild
rename to www-client/epiphany/epiphany-3.3.90-r1.ebuild
index 7196555..5b5ecf5 100644
--- a/www-client/epiphany/epiphany-3.3.90.ebuild
+++ b/www-client/epiphany/epiphany-3.3.90-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2 versionator virtualx
+inherit autotools eutils gnome2 pax-utils versionator virtualx
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -58,6 +58,14 @@ pkg_setup() {
 		$(use_enable test tests)"
 }
 
+src_prepare() {
+	# Build-time segfaults under PaX with USE=introspection
+	epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
+	cp "${FILESDIR}/paxctl.sh" "${S}/" || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_test() {
 	# Tests require gsettings schemas from >=epiphany-3.3.5 to be installed
 	local v=$(best_version www-client/epiphany)
@@ -69,3 +77,8 @@ src_test() {
 		ewarn "installed on the system."
 	fi
 }
+
+src_install() {
+	gnome2_src_install
+	pax-mark m "${ED}usr/bin/epiphany"
+}

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 1377caf..fccc78e 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2 versionator virtualx
+inherit autotools eutils gnome2 pax-utils versionator virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -65,6 +65,14 @@ pkg_setup() {
 		$(use_enable test tests)"
 }
 
+src_prepare() {
+	# Build-time segfaults under PaX with USE=introspection
+	epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
+	cp "${FILESDIR}/paxctl.sh" "${S}/" || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_test() {
 	# Tests require gsettings schemas from >=epiphany-3.3.5 to be installed
 	local v=$(best_version www-client/epiphany)
@@ -76,3 +84,8 @@ src_test() {
 		ewarn "installed on the system."
 	fi
 }
+
+src_install() {
+	gnome2_src_install
+	pax-mark m "${ED}usr/bin/epiphany"
+}

diff --git a/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch b/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch
new file mode 100644
index 0000000..f9e0616
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch
@@ -0,0 +1,24 @@
+From 1eee9260eba23a7fc17df49c5a0e24a99f88482a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@g.o>
+Date: Sun, 4 Mar 2012 21:55:20 -0500
+Subject: [PATCH] Add PaX marking to allow building introspection under PaX
+
+---
+ src/Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d6bf77f..ce52591 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -277,6 +277,7 @@ EPHY_GIR_C_FILES = \
+ 
+ Epiphany-$(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/paxctl.sh b/www-client/epiphany/files/paxctl.sh
new file mode 100755
index 0000000..bb1b6e0
--- /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