Index: head/www/lighttpd/Makefile =================================================================== --- head/www/lighttpd/Makefile (revision 452715) +++ head/www/lighttpd/Makefile (revision 452716) @@ -1,170 +1,169 @@ # Created by: k@123.org # $FreeBSD$ PORTNAME?= lighttpd -PORTVERSION= 1.4.45 -PORTREVISION= 1 +PORTVERSION= 1.4.47 CATEGORIES?= www MASTER_SITES?= http://download.lighttpd.net/lighttpd/releases-1.4.x/ MAINTAINER= pkubaj@anongoth.pl COMMENT?= Secure, fast, compliant, and flexible Web Server .if !defined(_BUILDING_LIGHTTPD_MODULE) LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING .endif LIB_DEPENDS+= libpcre.so:devel/pcre GNU_CONFIGURE= yes USES= autoreconf gmake libtool localbase pkgconfig tar:xz USE_CSTD= gnu99 .if !defined(_BUILDING_LIGHTTPD_MODULE) USES+= cpe .endif CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/lighttpd INSTALL_TARGET= install-strip .if !defined(_BUILDING_LIGHTTPD_MODULE) PORTDOCS= AUTHORS COPYING INSTALL NEWS README USE_RC_SUBR= lighttpd REQUIRE= DAEMON OPTIONS_DEFINE= ATTR BZIP2 DOCS FAM GDBM GEOIP IPV6 KRB5 LIBEV LUA MEMCACHED \ MYSQL LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV OPTIONS_DEFAULT= LUA OPENSSL OPTIONS_SUB= yes ATTR_DESC= extended attributes support BZIP2_DESC= bzip2 support (mod_compress) GDBM_DESC= gdbm storage (mod_trigger_b4_dl) KRB5_DESC= Kerberos authentication (mod_authn_gssapi) LDAP_DESC= LDAP authentication (mod_authn_ldap) LIBEV_DESC= Fast events support via libev (disables kqueue) LUA_DESC= lua support (mod_cml, mod_magnet) MEMCACHED_DESC= memcached storage (mod_trigger_b4_dl) MYSQL_DESC= MySQL support (mod_authn_mysql, mod_mysql_vhost) SPAWNFCGI_DESC= Depend on spawn-fcgi utility VALGRIND_DESC= valgrind support WEBDAV_DESC= WebDAV support ATTR_CONFIGURE_WITH= attr BZIP2_CONFIGURE_WITH= bzip2 FAM_USES= fam FAM_CONFIGURE_ON= --with-fam FAM_CONFIGURE_ENV= FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib" GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= gdbm GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP GEOIP_CONFIGURE_WITH= geoip IPV6_CONFIGURE_OFF= --disable-ipv6 KRB5_CONFIGURE_WITH= krb5 KRB5_CPPFLAGS= ${GSSAPICPPFLAGS} KRB5_LDFLAGS= ${GSSAPILDFLAGS} KRB5_LIBS= ${GSSAPILIBS} KRB5_USES= gssapi:mit LDAP_CONFIGURE_WITH= ldap LDAP_USE= openldap=yes LDAP_VARS= REQUIRE+=slapd LIBEV_CONFIGURE_WITH= libev=${LOCALBASE} LIBEV_LIB_DEPENDS= libev.so:devel/libev LUA_USES= lua LUA_CONFIGURE_WITH= lua LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHED_CONFIGURE_WITH=memcached MYSQL_CONFIGURE_WITH= mysql MYSQL_USES= mysql MYSQL_VARS= REQUIRE+=mysql OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl OPENSSL_CONFIGURE_ON= --with-openssl-includes=${OPENSSLINC} --with-openssl-libs=${OPENSSLLIB} SPAWNFCGI_RUN_DEPENDS= spawn-fcgi:www/spawn-fcgi VALGRIND_BUILD_DEPENDS= valgrind:devel/valgrind VALGRIND_RUN_DEPENDS= valgrind:devel/valgrind VALGRIND_CONFIGURE_WITH=valgrind WEBDAV_USE= GNOME=libxml2 WEBDAV_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libsqlite3.so:databases/sqlite3 WEBDAV_CONFIGURE_WITH= webdav-props webdav-locks LIGHTTPD_CONF_FILES= lighttpd.conf modules.conf LIGHTTPD_CONF_D_FILES= access_log.conf \ auth.conf cgi.conf cml.conf \ compress.conf debug.conf dirlisting.conf \ evhost.conf expire.conf fastcgi.conf \ magnet.conf mime.conf mysql_vhost.conf proxy.conf \ rrdtool.conf scgi.conf secdownload.conf \ simple_vhost.conf ssi.conf status.conf \ trigger_b4_dl.conf userdir.conf webdav.conf LOGROOT= /var/log/lighttpd PLIST_SUB= LOGROOT="${LOGROOT}" .endif # !defined(_BUILDING_LIGHTTPD_MODULE) .include .if !defined(_BUILDING_LIGHTTPD_MODULE) SUB_LIST= REQUIRE="${REQUIRE}" post-patch: @${REINPLACE_CMD} -e 's|-std=gnu99||' \ ${WRKSRC}/configure ${WRKSRC}/configure.ac @${REINPLACE_CMD} -E -e \ 's|^(server.document-root.*=).*|\1 "${PREFIX}/www/data/"|' \ -e "s|/etc/lighttpd|${PREFIX}/etc/lighttpd|g" \ -e 's|^(server.event-handler.*=).*|\1 "freebsd-kqueue"|' \ -e 's|^(server.network-backend.*=).*|\1 "writev"|' \ -e "s|^(server.username.*=).*|\1 \"${LIGHTTPD_USER}\"|" \ -e "s|^(server.groupname.*=).*|\1 \"${LIGHTTPD_GROUP}\"|" \ -e "s|^(var.log_root.*=).*|\1 \"${LIGHTTPD_LOGROOT}\"|" \ -e "s|^(var.home_dir.*=).*|\1 \"/var/spool/lighttpd\"|" \ -e "s|^(var.server_root.*=).*|\1 \"${LIGHTTPD_WEBROOT}\"|" \ ${WRKSRC}/doc/config/lighttpd.conf @${REINPLACE_CMD} -e "s|/etc/lighttpd|${PREFIX}/etc/lighttpd|g" \ ${WRKSRC}/doc/config/conf.d/auth.conf @${REINPLACE_CMD} -e "s|/usr/bin/python|${LOCALBASE}/bin/python|" \ ${WRKSRC}/doc/config/conf.d/cgi.conf \ ${WRKSRC}/tests/*.conf @${ECHO} >> ${WRKSRC}/doc/config/lighttpd.conf @${ECHO} "# IPv4 listening socket" >> \ ${WRKSRC}/doc/config/lighttpd.conf @${ECHO} "\$$SERVER[\"socket\"] == \"0.0.0.0:80\" { }" >> \ ${WRKSRC}/doc/config/lighttpd.conf post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d ${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d .for FILE in ${LIGHTTPD_CONF_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/config/${FILE} \ ${STAGEDIR}${PREFIX}/etc/lighttpd/${FILE}.sample .endfor .for FILE in ${LIGHTTPD_CONF_D_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/${FILE} \ ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/${FILE}.sample .endfor ${INSTALL_DATA} ${WRKSRC}/doc/config/vhosts.d/vhosts.template \ ${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d/vhosts.template @${MKDIR} -m 0700 ${STAGEDIR}${LOGROOT} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) test: build @cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \ check-TESTS regression-test: test .endif # !defined(_BUILDING_LIGHTTPD_MODULE) .include Index: head/www/lighttpd/distinfo =================================================================== --- head/www/lighttpd/distinfo (revision 452715) +++ head/www/lighttpd/distinfo (revision 452716) @@ -1,5 +1,5 @@ -TIMESTAMP = 1484502366 -SHA256 (lighttpd-1.4.45.tar.xz) = 1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f -SIZE (lighttpd-1.4.45.tar.xz) = 660432 -SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 716cd4f8d371e12c115a2204e649aafe2ebad42d0099777b1361c0e2cc8a1612 -SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242456 +TIMESTAMP = 1508711398 +SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 250c67a2808276799c373f0f41cdefbbcfd11c125c0299d952bc9508130117fd +SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242474 +SHA256 (lighttpd-1.4.47.tar.xz) = e47e64a9cc2b824c45792a6b1a5542945956e77ede3454845f42548495946c1c +SIZE (lighttpd-1.4.47.tar.xz) = 703012 Index: head/www/lighttpd/files/patch-src_fdevent__freebsd__kqueue.c =================================================================== --- head/www/lighttpd/files/patch-src_fdevent__freebsd__kqueue.c (revision 452715) +++ head/www/lighttpd/files/patch-src_fdevent__freebsd__kqueue.c (nonexistent) @@ -1,19 +0,0 @@ ---- src/fdevent_freebsd_kqueue.c.orig 2017-02-11 19:44:05 UTC -+++ src/fdevent_freebsd_kqueue.c -@@ -75,14 +75,14 @@ static int fdevent_freebsd_kqueue_event_ - if (events == oevents) return fd; - - if (addevents & FDEVENT_IN) { -- EV_SET(&kev[n], fd, EVFILT_READ, EV_ADD|EV_CLEAR, 0, 0, NULL); -+ EV_SET(&kev[n], fd, EVFILT_READ, EV_ADD, 0, 0, NULL); - n++; - } else if (delevents & FDEVENT_IN) { - EV_SET(&kev[n], fd, EVFILT_READ, EV_DELETE, 0, 0, NULL); - n++; - } - if (addevents & FDEVENT_OUT) { -- EV_SET(&kev[n], fd, EVFILT_WRITE, EV_ADD|EV_CLEAR, 0, 0, NULL); -+ EV_SET(&kev[n], fd, EVFILT_WRITE, EV_ADD, 0, 0, NULL); - n++; - } else if (delevents & FDEVENT_OUT) { - EV_SET(&kev[n], fd, EVFILT_WRITE, EV_DELETE, 0, 0, NULL); Property changes on: head/www/lighttpd/files/patch-src_fdevent__freebsd__kqueue.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/lighttpd/pkg-plist =================================================================== --- head/www/lighttpd/pkg-plist (revision 452715) +++ head/www/lighttpd/pkg-plist (revision 452716) @@ -1,70 +1,75 @@ @sample etc/lighttpd/lighttpd.conf.sample @sample etc/lighttpd/modules.conf.sample @sample etc/lighttpd/conf.d/access_log.conf.sample @sample etc/lighttpd/conf.d/auth.conf.sample @sample etc/lighttpd/conf.d/cgi.conf.sample @sample etc/lighttpd/conf.d/cml.conf.sample @sample etc/lighttpd/conf.d/compress.conf.sample @sample etc/lighttpd/conf.d/debug.conf.sample @sample etc/lighttpd/conf.d/dirlisting.conf.sample @sample etc/lighttpd/conf.d/evhost.conf.sample @sample etc/lighttpd/conf.d/expire.conf.sample @sample etc/lighttpd/conf.d/fastcgi.conf.sample @sample etc/lighttpd/conf.d/magnet.conf.sample @sample etc/lighttpd/conf.d/mime.conf.sample @sample etc/lighttpd/conf.d/mysql_vhost.conf.sample @sample etc/lighttpd/conf.d/proxy.conf.sample @sample etc/lighttpd/conf.d/rrdtool.conf.sample @sample etc/lighttpd/conf.d/scgi.conf.sample @sample etc/lighttpd/conf.d/secdownload.conf.sample @sample etc/lighttpd/conf.d/simple_vhost.conf.sample @sample etc/lighttpd/conf.d/ssi.conf.sample @sample etc/lighttpd/conf.d/status.conf.sample @sample etc/lighttpd/conf.d/trigger_b4_dl.conf.sample @sample etc/lighttpd/conf.d/userdir.conf.sample @sample etc/lighttpd/conf.d/webdav.conf.sample etc/lighttpd/vhosts.d/vhosts.template lib/lighttpd/mod_access.so lib/lighttpd/mod_accesslog.so lib/lighttpd/mod_alias.so lib/lighttpd/mod_auth.so lib/lighttpd/mod_authn_file.so %%KRB5%%lib/lighttpd/mod_authn_gssapi.so %%LDAP%%lib/lighttpd/mod_authn_ldap.so %%MYSQL%%lib/lighttpd/mod_authn_mysql.so lib/lighttpd/mod_cgi.so %%LUA%%lib/lighttpd/mod_cml.so lib/lighttpd/mod_compress.so lib/lighttpd/mod_deflate.so lib/lighttpd/mod_dirlisting.so lib/lighttpd/mod_evasive.so lib/lighttpd/mod_evhost.so lib/lighttpd/mod_expire.so lib/lighttpd/mod_extforward.so lib/lighttpd/mod_fastcgi.so lib/lighttpd/mod_flv_streaming.so %%GEOIP%%lib/lighttpd/mod_geoip.so lib/lighttpd/mod_indexfile.so %%LUA%%lib/lighttpd/mod_magnet.so %%MYSQL%%lib/lighttpd/mod_mysql_vhost.so +%%OPENSSL%%lib/lighttpd/mod_openssl.so lib/lighttpd/mod_proxy.so lib/lighttpd/mod_redirect.so lib/lighttpd/mod_rewrite.so lib/lighttpd/mod_rrdtool.so lib/lighttpd/mod_scgi.so lib/lighttpd/mod_secdownload.so lib/lighttpd/mod_setenv.so lib/lighttpd/mod_simple_vhost.so lib/lighttpd/mod_ssi.so lib/lighttpd/mod_staticfile.so lib/lighttpd/mod_status.so %%MEMCACHED%%lib/lighttpd/mod_trigger_b4_dl.so lib/lighttpd/mod_uploadprogress.so lib/lighttpd/mod_userdir.so lib/lighttpd/mod_usertrack.so +lib/lighttpd/mod_vhostdb.so +%%LDAP%%lib/lighttpd/mod_vhostdb_ldap.so +%%MYSQL%%lib/lighttpd/mod_vhostdb_mysql.so lib/lighttpd/mod_webdav.so +lib/lighttpd/mod_wstunnel.so man/man8/lighttpd.8.gz %%KRB5%%man/man8/lighttpd-angel.8.gz sbin/lighttpd sbin/lighttpd-angel @dir(www,www,700) %%LOGROOT%%