cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add patch from #650772 after lengthy bikeshedding. On OpenBSD, the

Browse Source 
.so.x.y passed to PR_LoadLibrary() is never the same as the one on
linux, since the portstree controls the .x.y, so if the first dlopen()
fails, let's strip what's after .so and retry, since ld.so is clever
enough to open the correct lib if asked for libfoo.so. Allows me to
remove smth like 40 patches in all mozilla ports. Take maintainership
while here.
discussed with deraadt@
This commit is contained in:
landry 2011-10-03 17:54:23 +00:00
parent 81b6201ee7
commit 4b417acf04
2 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/nspr/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2011/08/23 20:07:08 landry Exp $
# $OpenBSD: Makefile,v 1.36 2011/10/03 17:54:23 landry Exp $
# $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13 21:30:19 peter Exp $
ONLY_FOR_ARCHS= alpha amd64 arm i386 mips64 mips64el powerpc sparc sparc64 hppa
@ -9,6 +9,7 @@ COMMENT-docs= HTML Documentation for NSPR
VER= 4.8.9
DISTNAME= nspr-${VER}
PKGNAME-main= ${DISTNAME}
REVISION-main = 0
PKGNAME-docs= nspr-docs-${VER}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
nspr-reference${EXTRACT_SUFX}:0
@ -22,7 +23,7 @@ CATEGORIES= devel
HOMEPAGE= http://www.mozilla.org/projects/nspr/index.html
MAINTAINER= Martynas Venckus <martynas@openbsd.org>
MAINTAINER= Landry Breuil <landry@openbsd.org>
WANTLIB-main= c

58
devel/nspr/patches/patch-mozilla_nsprpub_pr_src_linking_prlink_c Normal file
View File

@ -0,0 +1,58 @@
$OpenBSD: patch-mozilla_nsprpub_pr_src_linking_prlink_c,v 1.3 2011/10/03 17:54:23 landry Exp $
If dlopen() fails, retry with everything stripped after .so
https://bugzilla.mozilla.org/show_bug.cgi?id=650772
--- mozilla/nsprpub/pr/src/linking/prlink.c.orig Wed May 4 22:02:19 2011
+++ mozilla/nsprpub/pr/src/linking/prlink.c Wed May 4 22:33:45 2011
@@ -44,6 +44,10 @@
#include <image.h>
#endif
+#if defined(OpenBSD)
+#include <sys/param.h> /* for MAXPATHLEN */
+#endif
+
#if defined(XP_MACOSX) && defined(USE_MACH_DYLD)
#include <Carbon/Carbon.h>
#include <CoreFoundation/CoreFoundation.h>
@@ -810,6 +814,10 @@ pr_LoadLibraryByPathname(const char *name, PRIntn flag
#else
int dl_flags = 0;
#endif
+#if defined(OpenBSD)
+ char sname[MAXPATHLEN];
+ char *c;
+#endif
void *h = NULL;
if (flags & PR_LD_LAZY) {
@@ -834,7 +842,18 @@ pr_LoadLibraryByPathname(const char *name, PRIntn flag
}
#else
h = dlopen(name, dl_flags);
+#if defined(OPENBSD)
+ /* On OpenBSD, we don't know what can be major.minor in libfoo.so.major.minor */
+ /* but ld.so is smart enough to open the correct lib when asked for libfoo.so */
+ /* so if the previous dlopen() failed, let's strip what's after .so and retry */
+ strncpy(sname, name, MAXPATHLEN);
+ if (!h) {
+ if ((c = strstr(sname,".so")) != NULL)
+ c[3] = '\0';
+ h = dlopen(sname, dl_flags);
+ }
#endif
+#endif
#elif defined(USE_HPSHL)
int shl_flags = 0;
shl_t h;
@@ -865,7 +884,11 @@ pr_LoadLibraryByPathname(const char *name, PRIntn flag
PR_DELETE(lm);
goto unlock;
}
+#if defined(OPENBSD)
+ lm->name = strdup(sname);
+#else
lm->name = strdup(name);
+#endif
lm->dlh = h;
lm->next = pr_loadmap;
pr_loadmap = lm;