Date: Mon, 31 Oct 2016 20:07:34 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425022 - in branches/2016Q4: . www www/lighttpd www/lighttpd-mod_geoip www/lighttpd/files Message-ID: <201610312007.u9VK7YRT058046@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Mon Oct 31 20:07:34 2016 New Revision: 425022 URL: https://svnweb.freebsd.org/changeset/ports/425022 Log: MFH: r424396 r425017 - Update lighttpd to 1.4.42 [1] - Convert WEBDAV option to option helpers [1] - Remove MYSQLAUTH option, upstream integrated their own solution in MYSQL support [1] - Add GEOIP option to main port [1] - Fix sorting in pkg-plist [1] - Remove lighttpd-mod_geoip port, it's beeen integrated in the main port [2] PR: 213568 [1], 213569 [2] Sumitted by: Piotr Kubaj <pkubaj@anongoth.pl> (maintainer) Fix this port at runtime on 9.3. PR: 213848 Submitted by: cedric@precidata.com Approved by: pkubaj@anongoth.pl (maintainer) Approved by: ports-secteam (feld) Added: branches/2016Q4/www/lighttpd/files/patch-src_mod__cgi.c - copied unchanged from r425017, head/www/lighttpd/files/patch-src_mod__cgi.c Deleted: branches/2016Q4/www/lighttpd-mod_geoip/ branches/2016Q4/www/lighttpd/files/README.mysqlauth branches/2016Q4/www/lighttpd/files/extra-patch-src_Makefile.am branches/2016Q4/www/lighttpd/files/extra-patch-src_Makefile.in branches/2016Q4/www/lighttpd/files/extra-patch-src_http__auth.c branches/2016Q4/www/lighttpd/files/extra-patch-src_http__auth.h branches/2016Q4/www/lighttpd/files/extra-patch-src_mod__auth.c branches/2016Q4/www/lighttpd/files/mysql_auth.sql branches/2016Q4/www/lighttpd/files/patch-src_mod__fastcgi.c branches/2016Q4/www/lighttpd/files/patch-src_mod__proxy.c branches/2016Q4/www/lighttpd/files/patch-src_mod__scgi.c Modified: branches/2016Q4/MOVED branches/2016Q4/www/Makefile branches/2016Q4/www/lighttpd/Makefile branches/2016Q4/www/lighttpd/distinfo branches/2016Q4/www/lighttpd/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/MOVED ============================================================================== --- branches/2016Q4/MOVED Mon Oct 31 18:17:42 2016 (r425021) +++ branches/2016Q4/MOVED Mon Oct 31 20:07:34 2016 (r425022) @@ -8663,3 +8663,4 @@ databases/postgresql91-pltcl||2016-10-02 databases/postgresql91-docs||2016-10-02|Has expired: End-of-life is near www/mediawiki125||2016-10-02|Has expired: EOL upstream multimedia/kvazaar-devel|multimedia/kvazaar|2016-10-05|Out of date: use multimedia/kvazaar for now +www/lighttpd-mod_geoip|www/lighttpd|2016-10-21|Integrated into www/lighttpd Modified: branches/2016Q4/www/Makefile ============================================================================== --- branches/2016Q4/www/Makefile Mon Oct 31 18:17:42 2016 (r425021) +++ branches/2016Q4/www/Makefile Mon Oct 31 20:07:34 2016 (r425022) @@ -358,7 +358,6 @@ SUBDIR += libxul SUBDIR += lightsquid SUBDIR += lighttpd - SUBDIR += lighttpd-mod_geoip SUBDIR += lighttpd-mod_h264_streaming SUBDIR += lilurl SUBDIR += limesurvey Modified: branches/2016Q4/www/lighttpd/Makefile ============================================================================== --- branches/2016Q4/www/lighttpd/Makefile Mon Oct 31 18:17:42 2016 (r425021) +++ branches/2016Q4/www/lighttpd/Makefile Mon Oct 31 20:07:34 2016 (r425022) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= lighttpd -PORTVERSION= 1.4.41 +PORTVERSION= 1.4.42 PORTREVISION= 1 CATEGORIES?= www MASTER_SITES?= http://download.lighttpd.net/lighttpd/releases-1.4.x/ @@ -19,6 +19,7 @@ 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 @@ -30,7 +31,7 @@ INSTALL_TARGET= install-strip .if !defined(_BUILDING_LIGHTTPD_MODULE) USE_RC_SUBR= lighttpd -OPTIONS_DEFINE= ATTR BZIP2 DOCS FAM GDBM IPV6 LIBEV LUA MEMCACHED MYSQL MYSQLAUTH \ +OPTIONS_DEFINE= ATTR BZIP2 DOCS FAM GDBM GEOIP IPV6 LIBEV LUA MEMCACHED MYSQL \ LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV OPTIONS_DEFAULT= OPENSSL @@ -43,7 +44,6 @@ LIBEV_DESC= Fast events support via libe LUA_DESC= lua support (mod_cml, mod_magnet) MEMCACHED_DESC= memcached storage (mod_trigger_b4_dl) MYSQL_DESC= MySQL support (mod_mysql_vhost) -MYSQLAUTH_DESC= MySQL authentication SPAWNFCGI_DESC= Depend on spawn-fcgi utility VALGRIND_DESC= valgrind support WEBDAV_DESC= WebDAV support @@ -55,6 +55,8 @@ 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 LIBEV_CONFIGURE_WITH= libev=${LOCALBASE} LIBEV_LIB_DEPENDS= libev.so:devel/libev @@ -63,7 +65,6 @@ 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 -MYSQLAUTH_IMPLIES= MYSQL OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl OPENSSL_CONFIGURE_ON= --with-openssl-includes=${OPENSSLINC} --with-openssl-libs=${OPENSSLLIB} @@ -71,6 +72,10 @@ SPAWNFCGI_RUN_DEPENDS= spawn-fcgi:www/sp 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 @@ -113,28 +118,12 @@ CONFIGURE_ARGS+= --with-mysql _REQUIRE+= mysql .endif -.if ${PORT_OPTIONS:MMYSQLAUTH} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_Makefile.am \ - ${FILESDIR}/extra-patch-src_Makefile.in \ - ${FILESDIR}/extra-patch-src_http__auth.c \ - ${FILESDIR}/extra-patch-src_http__auth.h \ - ${FILESDIR}/extra-patch-src_mod__auth.c -PORTDOCS+= README.mysqlauth mysql_auth.sql -.endif - .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap _REQUIRE+= slapd .endif -.if ${PORT_OPTIONS:MWEBDAV} -USE_GNOME+= libxml2 -LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid \ - libsqlite3.so:databases/sqlite3 -CONFIGURE_ARGS+= --with-webdav-props --with-webdav-locks -.endif - SUB_LIST+= REQUIRE="${_REQUIRE}" post-patch: @@ -182,12 +171,6 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE} . endfor -post-install-MYSQLAUTH-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -. for FILE in README.mysqlauth mysql_auth.sql - ${INSTALL_DATA} ${FILESDIR}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE} -. endfor - test: build @cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \ Modified: branches/2016Q4/www/lighttpd/distinfo ============================================================================== --- branches/2016Q4/www/lighttpd/distinfo Mon Oct 31 18:17:42 2016 (r425021) +++ branches/2016Q4/www/lighttpd/distinfo Mon Oct 31 20:07:34 2016 (r425022) @@ -1,7 +1,5 @@ -TIMESTAMP = 1470040166 -SHA256 (lighttpd-1.4.41.tar.xz) = 4bcc383ef6d6dc7b284f68882d71a178e2986c83c4e85eeb3c8f3b882e346b6c -SIZE (lighttpd-1.4.41.tar.xz) = 623480 -SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 4e6768af32ce16033fcb0c70b12c55b40082ca105a36f258b0bbf30d64e9dad3 -SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242458 -SHA256 (lighttpd-1.4.26_mod_geoip.patch) = 2858036310b778852d9f039a81629902edffc368658e13bf4779f3642ee1a5ba -SIZE (lighttpd-1.4.26_mod_geoip.patch) = 15173 +TIMESTAMP = 1476712210 +SHA256 (lighttpd-1.4.42.tar.xz) = b2c9069ed0bade9362c27b469a9b884641786aea1c3d686f9fd9f01d15e2a15f +SIZE (lighttpd-1.4.42.tar.xz) = 652140 +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 Copied: branches/2016Q4/www/lighttpd/files/patch-src_mod__cgi.c (from r425017, head/www/lighttpd/files/patch-src_mod__cgi.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/lighttpd/files/patch-src_mod__cgi.c Mon Oct 31 20:07:34 2016 (r425022, copy of r425017, head/www/lighttpd/files/patch-src_mod__cgi.c) @@ -0,0 +1,19 @@ +--- src/mod_cgi.c.orig 2016-10-16 10:48:26 UTC ++++ src/mod_cgi.c +@@ -32,13 +32,14 @@ + #include <signal.h> + #include <ctype.h> + #include <assert.h> ++#include <sys/param.h> + + #include <stdio.h> + #include <fcntl.h> + +-#ifdef O_CLOEXEC ++#if defined(O_CLOEXEC) && __FreeBSD_version >= 1000032 + #define pipe_cloexec(pipefd) pipe2((pipefd), O_CLOEXEC) +-#elif defined FD_CLOEXEC ++#elif defined(FD_CLOEXEC) + #define pipe_cloexec(pipefd) \ + ( 0 == pipe(pipefd) \ + && 0 == fcntl(pipefd[0], F_SETFD, FD_CLOEXEC) \ Modified: branches/2016Q4/www/lighttpd/pkg-plist ============================================================================== --- branches/2016Q4/www/lighttpd/pkg-plist Mon Oct 31 18:17:42 2016 (r425021) +++ branches/2016Q4/www/lighttpd/pkg-plist Mon Oct 31 20:07:34 2016 (r425022) @@ -2,8 +2,8 @@ @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/cml.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 @@ -28,9 +28,14 @@ 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 +lib/lighttpd/mod_authn_gssapi.so +lib/lighttpd/mod_authn_ldap.so +lib/lighttpd/mod_authn_mysql.so lib/lighttpd/mod_cgi.so 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 @@ -38,6 +43,7 @@ lib/lighttpd/mod_expire.so lib/lighttpd/mod_extforward.so lib/lighttpd/mod_fastcgi.so lib/lighttpd/mod_flv_streaming.so +lib/lighttpd/mod_geoip.so lib/lighttpd/mod_indexfile.so lib/lighttpd/mod_magnet.so lib/lighttpd/mod_mysql_vhost.so @@ -53,6 +59,7 @@ lib/lighttpd/mod_ssi.so lib/lighttpd/mod_staticfile.so lib/lighttpd/mod_status.so 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_webdav.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610312007.u9VK7YRT058046>