Tue Mar 23 15:20:09 2010 UTC ()
Apply patch to fix the issue reported in
<http://redmine.lighttpd.net/issues/2157>.  Without this patch,
lighttpd 1.4.26 will fail to start if built with the pkgsrc OpenSSL
and configured to serve HTTPS.  Bump PKGREVISION.


(gson)
diff -r1.24 -r1.25 pkgsrc/www/lighttpd/Makefile
diff -r1.17 -r1.18 pkgsrc/www/lighttpd/distinfo
cvs diff -r1.24 -r1.25 pkgsrc/www/lighttpd/Makefile (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/Makefile 2010/02/08 14:47:54 1.24
+++ pkgsrc/www/lighttpd/Makefile 2010/03/23 15:20:09 1.25
@@ -1,27 +1,32 @@ @@ -1,27 +1,32 @@
1# $NetBSD: Makefile,v 1.24 2010/02/08 14:47:54 joerg Exp $ 1# $NetBSD: Makefile,v 1.25 2010/03/23 15:20:09 gson Exp $
2 2
3DISTNAME= lighttpd-1.4.26 3DISTNAME= lighttpd-1.4.26
 4PKGREVISION= 1
4CATEGORIES= www 5CATEGORIES= www
5MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/ 6MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/
6 7
7MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
8HOMEPAGE= http://www.lighttpd.net/ 9HOMEPAGE= http://www.lighttpd.net/
9COMMENT= Fast, light-footprint HTTP server 10COMMENT= Fast, light-footprint HTTP server
10 11
11#PATCHFILES= fix-2147-in-1.4.x.patch 12#PATCHFILES= fix-2147-in-1.4.x.patch
12#PATCH_SITES= http://redmine.lighttpd.net/attachments/download/1091/ 13#PATCH_SITES= http://redmine.lighttpd.net/attachments/download/1091/
13#PATCH_DIST_STRIP.fix-2147-in-1.4.x.patch= -p1 14#PATCH_DIST_STRIP.fix-2147-in-1.4.x.patch= -p1
14 15
 16PATCHFILES= 08-ssl-retval-fix.patch
 17PATCH_SITES= http://redmine.lighttpd.net/attachments/download/1095/
 18PATCH_DIST_STRIP.08-ssl-retval-fix.patch= -p1
 19
15PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
16 21
17USE_LIBTOOL= yes 22USE_LIBTOOL= yes
18SHLIBTOOL_OVERRIDE= # empty 23SHLIBTOOL_OVERRIDE= # empty
19 24
20GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
21CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE} 26CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE}
22CONFIGURE_ARGS+= --with-pcre 27CONFIGURE_ARGS+= --with-pcre
23 28
24DOCDIR= ${PREFIX}/share/doc/${PKGBASE} 29DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
25EGDIR= ${PREFIX}/share/examples/${PKGBASE} 30EGDIR= ${PREFIX}/share/examples/${PKGBASE}
26PKG_SYSCONFSUBDIR= ${PKGBASE} 31PKG_SYSCONFSUBDIR= ${PKGBASE}
27 32
cvs diff -r1.17 -r1.18 pkgsrc/www/lighttpd/distinfo (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/distinfo 2010/02/08 14:47:54 1.17
+++ pkgsrc/www/lighttpd/distinfo 2010/03/23 15:20:09 1.18
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
1$NetBSD: distinfo,v 1.17 2010/02/08 14:47:54 joerg Exp $ 1$NetBSD: distinfo,v 1.18 2010/03/23 15:20:09 gson Exp $
2 2
 3SHA1 (08-ssl-retval-fix.patch) = fb8fc92f8af7225a5f33839d5fe7b298aac3b532
 4RMD160 (08-ssl-retval-fix.patch) = 98a74fc65f27766bdd378d0c57e7f00a57db9b31
 5Size (08-ssl-retval-fix.patch) = 580 bytes
3SHA1 (lighttpd-1.4.26.tar.gz) = c22642dc3616043293fb895b9f049b9270dbb2a0 6SHA1 (lighttpd-1.4.26.tar.gz) = c22642dc3616043293fb895b9f049b9270dbb2a0
4RMD160 (lighttpd-1.4.26.tar.gz) = 0b073d66405efb8b2a2ba89dff08ae5813771065 7RMD160 (lighttpd-1.4.26.tar.gz) = 0b073d66405efb8b2a2ba89dff08ae5813771065
5Size (lighttpd-1.4.26.tar.gz) = 780352 bytes 8Size (lighttpd-1.4.26.tar.gz) = 780352 bytes