diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-14 20:24:23 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-14 20:24:23 +0000 |
| commit | f22a1b3d9c91a79cb565ab2ab2ca542bbc01248b (patch) | |
| tree | ecdc8237feb9f1c18853074129db8f4431f9248d /editors/openoffice-1.0 | |
| parent | add flounder 0.32a (diff) | |
Add a new rtld system patch to Makefile and pkg_message. The
symbol lookup order in rtld is not working as it should and
exceptions over dlopened libs are broken. The system patch
is a workaround for this issue.
While we are here, order the patches a bit and put them all in
the same download dir.
Submitted by: kan (rtld patch)
Notes
Notes:
svn path=/head/; revision=68056
Diffstat (limited to 'editors/openoffice-1.0')
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 19 | ||||
| -rw-r--r-- | editors/openoffice-1.0/pkg-message | 9 |
2 files changed, 22 insertions, 6 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index f05c1a88119b..ebcf88e7f937 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -14,7 +14,7 @@ MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \ - http://people.freebsd.org/~mbr/patches/:moz + http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz @@ -245,16 +245,23 @@ pre-fetch: @${ECHO} "kern.maxdsiz=\"1073741824\"" @${ECHO} "kern.maxssiz=\"268435456\"" .endif + @${ECHO} + @${ECHO} "REQUIRED SYSTEM PATCHES:" + @${ECHO} + @${ECHO} "OO.org can crash if you enter a non existing path" + @${ECHO} "or URL in the location bar. To fix these crashes" + @${ECHO} "you need a uncommitted system patch for rtld:" + @${ECHO} + @${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff" + @${ECHO} .if ${OSVERSION} < 460001 - @${ECHO} "SYSTEM PATCHES:" @${ECHO} @${ECHO} "OO setup is broken on STABLE < 4.6" @${ECHO} "including 4.6 RELEASE." @${ECHO} "You'll need a system patch to solve" - @${ECHO} @${ECHO} "this problem:" @${ECHO} - @${ECHO} "http://people.freebsd.org/~mbr/patches/rtld-elf.diff" + @${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff" @${ECHO} .endif .if ${OSVERSION} < 460002 @@ -262,7 +269,7 @@ pre-fetch: @${ECHO} "OO.org soffice binary can deadlock. You can work around" @${ECHO} "this problem with this patch:" @${ECHO} - @${ECHO} "http://people.freebsd.org/~mbr/patches/rtld-elf-patch2.diff" + @${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff" @${ECHO} .endif .if ${OSVERSION} < 500000 @@ -270,7 +277,7 @@ pre-fetch: @${ECHO} "OO.org build can deadlock in regmerge. You can work around" @${ECHO} "this problem with this patch:" @${ECHO} - @${ECHO} "http://people.freebsd.org/~mbr/patches/rtld-elf-patch3.diff" + @${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff" @${ECHO} .endif .if !exists(/usr/include/langinfo.h) diff --git a/editors/openoffice-1.0/pkg-message b/editors/openoffice-1.0/pkg-message index b227b043885d..15a812900a45 100644 --- a/editors/openoffice-1.0/pkg-message +++ b/editors/openoffice-1.0/pkg-message @@ -65,3 +65,12 @@ it's time to upgrade your FreeBSD system to the lastest version. You will encounter this bug only if your OS is older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and 4.6.2-RELEASE are still affected. + +5 Crashes in URL-location bar +----------------------------- + +OO.org can crash if you enter a non existing path +or URL in the location bar. To fix these crashes +you need a uncommitted system patch for rtld: + +http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff |