summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2006-01-28 23:42:58 +0000
committerAndreas Proschofsky <suka@gentoo.org>2006-01-28 23:42:58 +0000
commitf9bd8da1fdeefffc73a7694b17bb34b4c1aa22c2 (patch)
tree8810b10e3402e94ab64491188bf0bb4567108038 /app-office
parentversion bump. (diff)
downloadgentoo-2-f9bd8da1fdeefffc73a7694b17bb34b4c1aa22c2.tar.gz
gentoo-2-f9bd8da1fdeefffc73a7694b17bb34b4c1aa22c2.tar.bz2
gentoo-2-f9bd8da1fdeefffc73a7694b17bb34b4c1aa22c2.zip
Add some fixes for hardened, see bug #88588
(Portage version: 2.1_pre4)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog8
-rw-r--r--app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff11
-rw-r--r--app-office/openoffice/files/2.0.1/gentoo-pax.diff26
-rw-r--r--app-office/openoffice/openoffice-2.0.1.ebuild12
4 files changed, 55 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index b089dbe944be..d3bf90314647 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-office/openoffice
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.180 2006/01/28 19:28:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.181 2006/01/28 23:42:58 suka Exp $
+
+ 28 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
+ +files/2.0.1/gentoo-pax.diff, +files/2.0.1/gentoo-2.0.1.diff,
+ openoffice-2.0.1.ebuild:
+ Add some fixes for hardened, this also should remove the last TEXTRELS, see
+ bug #88588
28 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
openoffice-2.0.1.ebuild:
diff --git a/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff b/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff
new file mode 100644
index 000000000000..38db0e432933
--- /dev/null
+++ b/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff
@@ -0,0 +1,11 @@
+--- patches/src680/apply
++++ patches/src680/apply
+@@ -976,6 +976,8 @@
+ stlport-ppc-buildfix.diff
+ # Re-add DicOOo
+ gentoo-dicooo.diff
++# Allow build to proceed with PaX enabled
++gentoo-pax.diff
+
+ #
+ # NOTE: 64 bit OOo is work in progress!
diff --git a/app-office/openoffice/files/2.0.1/gentoo-pax.diff b/app-office/openoffice/files/2.0.1/gentoo-pax.diff
new file mode 100644
index 000000000000..e0b4700e6555
--- /dev/null
+++ b/app-office/openoffice/files/2.0.1/gentoo-pax.diff
@@ -0,0 +1,26 @@
+--- solenv/inc/unxlngi4.mk.orig 2005-10-29 17:09:48.000000000 +0200
++++ solenv/inc/unxlngi4.mk 2005-10-29 17:18:46.000000000 +0200
+@@ -138,8 +138,8 @@
+ LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
+
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
+--- solenv/inc/unxlngi6.mk.orig 2005-10-29 17:16:27.000000000 +0200
++++ solenv/inc/unxlngi6.mk 2005-10-29 17:19:08.000000000 +0200
+@@ -147,8 +147,8 @@
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
+
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild
index 59a5518c42bf..42ff5c150dc3 100644
--- a/app-office/openoffice/openoffice-2.0.1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.20 2006/01/28 19:28:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.21 2006/01/28 23:42:58 suka Exp $
inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
@@ -140,6 +140,8 @@ src_unpack() {
#Some fixes for our patchset
cd ${S}
epatch ${FILESDIR}/${PV}/alwayscrystal.diff
+ cp ${FILESDIR}/${PV}/gentoo-pax.diff ${S}/patches/src680/ || die
+ epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
#Use flag checks
use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
@@ -157,6 +159,14 @@ src_unpack() {
echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
echo "`use_enable gnome lockdown`" >> ${CONFFILE}
+ # Gentoo installs both static and dynamic libraries for Xinerama;
+ # Openoffice configure defaults to static if both are present,
+ # unless --with-dynamic-xinerama is specified. Without this,
+ # libvclplug_gen680li.so links to the static library causing
+ # unnecessary TEXTRELs. This option only takes effect when
+ # both libraries are present so it's safe to enable always.
+ echo "--with-dynamic-xinerama" >> ${CONFFILE}
+
}
src_compile() {