Sun Oct 29 00:34:30 2017 UTC ()
Fix building without IPv6 and packaging without SSL.


(schmonz)
diff -r1.64 -r1.65 pkgsrc/www/lighttpd/Makefile
diff -r1.14 -r1.15 pkgsrc/www/lighttpd/PLIST
diff -r1.40 -r1.41 pkgsrc/www/lighttpd/distinfo
diff -r1.17 -r1.18 pkgsrc/www/lighttpd/options.mk
diff -r0 -r1.1 pkgsrc/www/lighttpd/patches/patch-src_network.c
cvs diff -r1.64 -r1.65 pkgsrc/www/lighttpd/Makefile (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/Makefile 2017/10/24 07:27:34 1.64
+++ pkgsrc/www/lighttpd/Makefile 2017/10/29 00:34:29 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.64 2017/10/24 07:27:34 adam Exp $ 1# $NetBSD: Makefile,v 1.65 2017/10/29 00:34:29 schmonz Exp $
2 2
3DISTNAME= lighttpd-1.4.47 3DISTNAME= lighttpd-1.4.47
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/ 5MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.lighttpd.net/ 9HOMEPAGE= http://www.lighttpd.net/
10COMMENT= Fast, light-footprint HTTP server 10COMMENT= Fast, light-footprint HTTP server
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14SHLIBTOOL_OVERRIDE= # empty 14SHLIBTOOL_OVERRIDE= # empty
@@ -48,27 +48,27 @@ PKG_USERS_VARS+= LIGHTTPD_USER @@ -48,27 +48,27 @@ PKG_USERS_VARS+= LIGHTTPD_USER
48INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} ${EGDIR}/conf.d ${EGDIR}/vhosts.d 48INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} ${EGDIR}/conf.d ${EGDIR}/vhosts.d
49OWN_DIRS= ${PKG_SYSCONFDIR}/conf.d 49OWN_DIRS= ${PKG_SYSCONFDIR}/conf.d
50OWN_DIRS+= ${PKG_SYSCONFDIR}/vhosts.d 50OWN_DIRS+= ${PKG_SYSCONFDIR}/vhosts.d
51OWN_DIRS_PERMS= ${LIGHTTPD_LOGDIR} ${LIGHTTPD_USER} ${LIGHTTPD_GROUP} 0755 51OWN_DIRS_PERMS= ${LIGHTTPD_LOGDIR} ${LIGHTTPD_USER} ${LIGHTTPD_GROUP} 0755
52OWN_DIRS+= ${LIGHTTPD_STATEDIR} 52OWN_DIRS+= ${LIGHTTPD_STATEDIR}
53 53
54SUBST_CLASSES+= path 54SUBST_CLASSES+= path
55SUBST_MESSAGE.path= Fixing config file paths 55SUBST_MESSAGE.path= Fixing config file paths
56SUBST_STAGE.path= pre-configure 56SUBST_STAGE.path= pre-configure
57SUBST_FILES.path= doc/config/lighttpd.conf 57SUBST_FILES.path= doc/config/lighttpd.conf
58SUBST_VARS.path= LIGHTTPD_LOGDIR LIGHTTPD_STATEDIR LIGHTTPD_USER \ 58SUBST_VARS.path= LIGHTTPD_LOGDIR LIGHTTPD_STATEDIR LIGHTTPD_USER \
59 LIGHTTPD_GROUP PKG_SYSCONFDIR 59 LIGHTTPD_GROUP PKG_SYSCONFDIR
60 60
61PLIST_VARS+= gdbm geoip gssapi ldap lua mysql 61PLIST_VARS+= gdbm geoip gssapi ldap lua mysql ssl
62 62
63post-install: 63post-install:
64 set -e; cd ${WRKSRC}/doc; \ 64 set -e; cd ${WRKSRC}/doc; \
65 for f in *.css outdated/*.dot outdated/*.txt; do \ 65 for f in *.css outdated/*.dot outdated/*.txt; do \
66 ${INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}; \ 66 ${INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}; \
67 done; \ 67 done; \
68 for f in config/*.conf scripts/*.sh; do \ 68 for f in config/*.conf scripts/*.sh; do \
69 ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}; \ 69 ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}; \
70 done; \ 70 done; \
71 for f in config/conf.d/*.conf config/conf.d/mod.*; do \ 71 for f in config/conf.d/*.conf config/conf.d/mod.*; do \
72 ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/conf.d; \ 72 ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/conf.d; \
73 done; \ 73 done; \
74 ${INSTALL_DATA} config/vhosts.d/*.template ${DESTDIR}${EGDIR}/vhosts.d 74 ${INSTALL_DATA} config/vhosts.d/*.template ${DESTDIR}${EGDIR}/vhosts.d
cvs diff -r1.14 -r1.15 pkgsrc/www/lighttpd/PLIST (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/PLIST 2017/10/24 07:27:34 1.14
+++ pkgsrc/www/lighttpd/PLIST 2017/10/29 00:34:29 1.15
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1@comment $NetBSD: PLIST,v 1.14 2017/10/24 07:27:34 adam Exp $ 1@comment $NetBSD: PLIST,v 1.15 2017/10/29 00:34:29 schmonz Exp $
2lib/lighttpd/mod_access.la 2lib/lighttpd/mod_access.la
3lib/lighttpd/mod_accesslog.la 3lib/lighttpd/mod_accesslog.la
4lib/lighttpd/mod_alias.la 4lib/lighttpd/mod_alias.la
5lib/lighttpd/mod_auth.la 5lib/lighttpd/mod_auth.la
6lib/lighttpd/mod_authn_file.la 6lib/lighttpd/mod_authn_file.la
7${PLIST.gssapi}lib/lighttpd/mod_authn_gssapi.la 7${PLIST.gssapi}lib/lighttpd/mod_authn_gssapi.la
8${PLIST.ldap}lib/lighttpd/mod_authn_ldap.la 8${PLIST.ldap}lib/lighttpd/mod_authn_ldap.la
9${PLIST.mysql}lib/lighttpd/mod_authn_mysql.la 9${PLIST.mysql}lib/lighttpd/mod_authn_mysql.la
10lib/lighttpd/mod_cgi.la 10lib/lighttpd/mod_cgi.la
11${PLIST.lua}lib/lighttpd/mod_cml.la 11${PLIST.lua}lib/lighttpd/mod_cml.la
12lib/lighttpd/mod_compress.la 12lib/lighttpd/mod_compress.la
13lib/lighttpd/mod_deflate.la 13lib/lighttpd/mod_deflate.la
14lib/lighttpd/mod_dirlisting.la 14lib/lighttpd/mod_dirlisting.la
15lib/lighttpd/mod_evasive.la 15lib/lighttpd/mod_evasive.la
16lib/lighttpd/mod_evhost.la 16lib/lighttpd/mod_evhost.la
17lib/lighttpd/mod_expire.la 17lib/lighttpd/mod_expire.la
18lib/lighttpd/mod_extforward.la 18lib/lighttpd/mod_extforward.la
19lib/lighttpd/mod_fastcgi.la 19lib/lighttpd/mod_fastcgi.la
20lib/lighttpd/mod_flv_streaming.la 20lib/lighttpd/mod_flv_streaming.la
21${PLIST.geoip}lib/lighttpd/mod_geoip.la 21${PLIST.geoip}lib/lighttpd/mod_geoip.la
22lib/lighttpd/mod_indexfile.la 22lib/lighttpd/mod_indexfile.la
23${PLIST.lua}lib/lighttpd/mod_magnet.la 23${PLIST.lua}lib/lighttpd/mod_magnet.la
24${PLIST.mysql}lib/lighttpd/mod_mysql_vhost.la 24${PLIST.mysql}lib/lighttpd/mod_mysql_vhost.la
25lib/lighttpd/mod_openssl.la 25${PLIST.ssl}lib/lighttpd/mod_openssl.la
26lib/lighttpd/mod_proxy.la 26lib/lighttpd/mod_proxy.la
27lib/lighttpd/mod_redirect.la 27lib/lighttpd/mod_redirect.la
28lib/lighttpd/mod_rewrite.la 28lib/lighttpd/mod_rewrite.la
29lib/lighttpd/mod_rrdtool.la 29lib/lighttpd/mod_rrdtool.la
30lib/lighttpd/mod_scgi.la 30lib/lighttpd/mod_scgi.la
31lib/lighttpd/mod_secdownload.la 31lib/lighttpd/mod_secdownload.la
32lib/lighttpd/mod_setenv.la 32lib/lighttpd/mod_setenv.la
33lib/lighttpd/mod_simple_vhost.la 33lib/lighttpd/mod_simple_vhost.la
34lib/lighttpd/mod_ssi.la 34lib/lighttpd/mod_ssi.la
35lib/lighttpd/mod_staticfile.la 35lib/lighttpd/mod_staticfile.la
36lib/lighttpd/mod_status.la 36lib/lighttpd/mod_status.la
37${PLIST.gdbm}lib/lighttpd/mod_trigger_b4_dl.la 37${PLIST.gdbm}lib/lighttpd/mod_trigger_b4_dl.la
38lib/lighttpd/mod_uploadprogress.la 38lib/lighttpd/mod_uploadprogress.la
cvs diff -r1.40 -r1.41 pkgsrc/www/lighttpd/distinfo (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/distinfo 2017/10/25 14:27:20 1.40
+++ pkgsrc/www/lighttpd/distinfo 2017/10/29 00:34:29 1.41
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.40 2017/10/25 14:27:20 fhajny Exp $ 1$NetBSD: distinfo,v 1.41 2017/10/29 00:34:29 schmonz Exp $
2 2
3SHA1 (lighttpd-1.4.47.tar.xz) = 57dcbdcc42d52f113bd46e09b3fb895e2a076b4f 3SHA1 (lighttpd-1.4.47.tar.xz) = 57dcbdcc42d52f113bd46e09b3fb895e2a076b4f
4RMD160 (lighttpd-1.4.47.tar.xz) = 8cadb881745f4deae5101c5227c208e4b12f429c 4RMD160 (lighttpd-1.4.47.tar.xz) = 8cadb881745f4deae5101c5227c208e4b12f429c
5SHA512 (lighttpd-1.4.47.tar.xz) = 9fac3acc428d9faf69fca2768578dca619f778889e8a3779c429038eec7aff6b3dd497d5437152a070df850861fe2132042fa4418e31c1aab89df23a1c544f99 5SHA512 (lighttpd-1.4.47.tar.xz) = 9fac3acc428d9faf69fca2768578dca619f778889e8a3779c429038eec7aff6b3dd497d5437152a070df850861fe2132042fa4418e31c1aab89df23a1c544f99
6Size (lighttpd-1.4.47.tar.xz) = 703012 bytes 6Size (lighttpd-1.4.47.tar.xz) = 703012 bytes
7SHA1 (patch-doc_config_lighttpd.conf) = de14fd0aa0ed2cac5846d810b5c89af4036f1b70 7SHA1 (patch-doc_config_lighttpd.conf) = de14fd0aa0ed2cac5846d810b5c89af4036f1b70
8SHA1 (patch-src_fdevent__solaris__port.c) = c31f457dd6f25dba01710faf34c45a636519320f 8SHA1 (patch-src_fdevent__solaris__port.c) = c31f457dd6f25dba01710faf34c45a636519320f
 9SHA1 (patch-src_network.c) = ad982b124f00f35ed06f6f45f77e4aca17f2e0fb
cvs diff -r1.17 -r1.18 pkgsrc/www/lighttpd/options.mk (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/options.mk 2017/06/22 03:06:26 1.17
+++ pkgsrc/www/lighttpd/options.mk 2017/10/29 00:34:29 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.17 2017/06/22 03:06:26 schmonz Exp $ 1# $NetBSD: options.mk,v 1.18 2017/10/29 00:34:29 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.lighttpd 3PKG_OPTIONS_VAR= PKG_OPTIONS.lighttpd
4PKG_SUPPORTED_OPTIONS= bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav 4PKG_SUPPORTED_OPTIONS= bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav
5PKG_OPTIONS_LEGACY_OPTS+= memcache:memcached 5PKG_OPTIONS_LEGACY_OPTS+= memcache:memcached
6PKG_SUGGESTED_OPTIONS= inet6 ssl 6PKG_SUGGESTED_OPTIONS= inet6 ssl
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10### 10###
11### Allow using bzip2 as a compression method in the "compress" module. 11### Allow using bzip2 as a compression method in the "compress" module.
12### 12###
13.if !empty(PKG_OPTIONS:Mbzip2) 13.if !empty(PKG_OPTIONS:Mbzip2)
14. include "../../archivers/bzip2/buildlink3.mk" 14. include "../../archivers/bzip2/buildlink3.mk"
@@ -77,26 +77,27 @@ CONFIGURE_ARGS+= --with-memcache @@ -77,26 +77,27 @@ CONFIGURE_ARGS+= --with-memcache
77.if !empty(PKG_OPTIONS:Mmysql) 77.if !empty(PKG_OPTIONS:Mmysql)
78. include "../../mk/mysql.buildlink3.mk" 78. include "../../mk/mysql.buildlink3.mk"
79MYSQL_CONFIG?= ${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config 79MYSQL_CONFIG?= ${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config
80CONFIGURE_ARGS+= --with-mysql=${MYSQL_CONFIG:Q} 80CONFIGURE_ARGS+= --with-mysql=${MYSQL_CONFIG:Q}
81PLIST.mysql= yes 81PLIST.mysql= yes
82.endif 82.endif
83 83
84### 84###
85### HTTPS support 85### HTTPS support
86### 86###
87.if !empty(PKG_OPTIONS:Mssl) 87.if !empty(PKG_OPTIONS:Mssl)
88. include "../../security/openssl/buildlink3.mk" 88. include "../../security/openssl/buildlink3.mk"
89CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 89CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
 90PLIST.ssl= yes
90.endif 91.endif
91 92
92### 93###
93### GeoIP support 94### GeoIP support
94### 95###
95.if !empty(PKG_OPTIONS:Mgeoip) 96.if !empty(PKG_OPTIONS:Mgeoip)
96. include "../../net/GeoIP/buildlink3.mk" 97. include "../../net/GeoIP/buildlink3.mk"
97CONFIGURE_ARGS+= --with-geoip 98CONFIGURE_ARGS+= --with-geoip
98PLIST.geoip= yes 99PLIST.geoip= yes
99.endif 100.endif
100 101
101### 102###
102### gssapi 103### gssapi
File Added: pkgsrc/www/lighttpd/patches/Attic/patch-src_network.c
$NetBSD: patch-src_network.c,v 1.1 2017/10/29 00:34:30 schmonz Exp $

Fix build without IPv6 (from https://redmine.lighttpd.net/issues/2832).

--- src/network.c.orig	2017-10-22 20:09:57.000000000 +0000
+++ src/network.c
@@ -77,9 +77,13 @@ static void network_host_normalize_addr_
     if (addr->plain.sa_family == AF_INET6)
         buffer_append_string_len(host, CONST_STR_LEN("]"));
     if (addr->plain.sa_family != AF_UNIX) {
+      #ifdef HAVE_IPV6
         unsigned short port = (addr->plain.sa_family == AF_INET)
           ? ntohs(addr->ipv4.sin_port)
           : ntohs(addr->ipv6.sin6_port);
+      #else
+        unsigned short port = ntohs(addr->ipv4.sin_port);
+      #endif
         buffer_append_string_len(host, CONST_STR_LEN(":"));
         buffer_append_int(host, (int)port);
     }