diff options
| author | fhajny <fhajny> | 2013-01-11 11:00:02 +0000 |
|---|---|---|
| committer | fhajny <fhajny> | 2013-01-11 11:00:02 +0000 |
| commit | 9dcfab1287d94a0b38687a46a7cf1ac43b765a64 (patch) | |
| tree | 3170780c64995115f908c355b1a6ff78ddf7446f /www | |
| parent | db18753d9115b422a109f44389e0ffb06fa05b96 (diff) | |
| download | pkgsrc-9dcfab1287d94a0b38687a46a7cf1ac43b765a64.tar.gz | |
Fix dynamic extension loading on SunOS, where successful dlopen() may
return non-NULL too and lighttpd was evaluating as failure.
Bump PKGREVISION.
Diffstat (limited to 'www')
| -rw-r--r-- | www/lighttpd/Makefile | 4 | ||||
| -rw-r--r-- | www/lighttpd/distinfo | 3 | ||||
| -rw-r--r-- | www/lighttpd/patches/patch-src_plugin.c | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index f9bd09a978b..d14c466022d 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2012/12/16 01:52:38 obache Exp $ +# $NetBSD: Makefile,v 1.37 2013/01/11 11:00:02 fhajny Exp $ DISTNAME= lighttpd-1.4.32 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/ EXTRACT_SUFX= .tar.bz2 diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo index 3f54b141542..36506d81ed8 100644 --- a/www/lighttpd/distinfo +++ b/www/lighttpd/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.23 2012/11/23 13:12:49 drochner Exp $ +$NetBSD: distinfo,v 1.24 2013/01/11 11:00:02 fhajny Exp $ SHA1 (lighttpd-1.4.32.tar.bz2) = 61930d88aa5a5ebb4a4b539099e9577694e61185 RMD160 (lighttpd-1.4.32.tar.bz2) = 39f040b986f5d4556370650319a76aea241749d0 Size (lighttpd-1.4.32.tar.bz2) = 681065 bytes SHA1 (patch-doc_config_lighttpd.conf) = 1f5d884ec3cc9ee1ec18b51f0d25ca2a7aae0b8c +SHA1 (patch-src_plugin.c) = 27b7a193c1f5867b5a1d2e2c5b289a0bf6368b39 diff --git a/www/lighttpd/patches/patch-src_plugin.c b/www/lighttpd/patches/patch-src_plugin.c new file mode 100644 index 00000000000..e5a180cfe19 --- /dev/null +++ b/www/lighttpd/patches/patch-src_plugin.c @@ -0,0 +1,20 @@ +$NetBSD: patch-src_plugin.c,v 1.1 2013/01/11 11:00:02 fhajny Exp $ + +On SunOS, dlopen() may return non-NULL on success too. +--- src/plugin.c.orig 2010-08-17 09:04:38.000000000 +0000 ++++ src/plugin.c +@@ -205,12 +205,14 @@ int plugins_load(server *srv) { + #else + *(void **)(&init) = dlsym(p->lib, srv->tmp_buf->ptr); + #endif ++#if !defined(__sun) + if ((error = dlerror()) != NULL) { + log_error_write(srv, __FILE__, __LINE__, "s", error); + + plugin_free(p); + return -1; + } ++#endif + + #endif + if ((*init)(p)) { |