Fri Jan 11 11:00:03 2013 UTC ()
Fix dynamic extension loading on SunOS, where successful dlopen() may
return non-NULL too and lighttpd was evaluating as failure.
Bump PKGREVISION.


(fhajny)
diff -r1.36 -r1.37 pkgsrc/www/lighttpd/Makefile
diff -r1.23 -r1.24 pkgsrc/www/lighttpd/distinfo
diff -r0 -r1.1 pkgsrc/www/lighttpd/patches/patch-src_plugin.c
cvs diff -r1.36 -r1.37 pkgsrc/www/lighttpd/Makefile (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/Makefile 2012/12/16 01:52:38 1.36
+++ pkgsrc/www/lighttpd/Makefile 2013/01/11 11:00:02 1.37
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.36 2012/12/16 01:52:38 obache Exp $ 1# $NetBSD: Makefile,v 1.37 2013/01/11 11:00:02 fhajny Exp $
2 2
3DISTNAME= lighttpd-1.4.32 3DISTNAME= lighttpd-1.4.32
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/ 6MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://www.lighttpd.net/ 10HOMEPAGE= http://www.lighttpd.net/
11COMMENT= Fast, light-footprint HTTP server 11COMMENT= Fast, light-footprint HTTP server
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15SHLIBTOOL_OVERRIDE= # empty 15SHLIBTOOL_OVERRIDE= # empty
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17GNU_CONFIGURE_LIBSUBDIR=${PKGBASE} 17GNU_CONFIGURE_LIBSUBDIR=${PKGBASE}
cvs diff -r1.23 -r1.24 pkgsrc/www/lighttpd/distinfo (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/distinfo 2012/11/23 13:12:49 1.23
+++ pkgsrc/www/lighttpd/distinfo 2013/01/11 11:00:02 1.24
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.23 2012/11/23 13:12:49 drochner Exp $ 1$NetBSD: distinfo,v 1.24 2013/01/11 11:00:02 fhajny Exp $
2 2
3SHA1 (lighttpd-1.4.32.tar.bz2) = 61930d88aa5a5ebb4a4b539099e9577694e61185 3SHA1 (lighttpd-1.4.32.tar.bz2) = 61930d88aa5a5ebb4a4b539099e9577694e61185
4RMD160 (lighttpd-1.4.32.tar.bz2) = 39f040b986f5d4556370650319a76aea241749d0 4RMD160 (lighttpd-1.4.32.tar.bz2) = 39f040b986f5d4556370650319a76aea241749d0
5Size (lighttpd-1.4.32.tar.bz2) = 681065 bytes 5Size (lighttpd-1.4.32.tar.bz2) = 681065 bytes
6SHA1 (patch-doc_config_lighttpd.conf) = 1f5d884ec3cc9ee1ec18b51f0d25ca2a7aae0b8c 6SHA1 (patch-doc_config_lighttpd.conf) = 1f5d884ec3cc9ee1ec18b51f0d25ca2a7aae0b8c
 7SHA1 (patch-src_plugin.c) = 27b7a193c1f5867b5a1d2e2c5b289a0bf6368b39
File Added: pkgsrc/www/lighttpd/patches/Attic/patch-src_plugin.c
$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)) {