Date: Wed, 8 Apr 2015 00:43:43 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383552 - head/www/nginx-devel Message-ID: <201504080043.t380hhsw059386@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Wed Apr 8 00:43:42 2015 New Revision: 383552 URL: https://svnweb.freebsd.org/changeset/ports/383552 Log: Upgrade from 1.7.11 to 1.7.12. Temporary disable following third-party modules: o) arrayvar o) echo o) headers_more o) http_mogilefs o) drizzle o) encryptsession o) forminput o) iconv o) let o) lua o) memc o) modsecurity o) rds_csv o) rds_json o) redis2 o) set_misc o) sflow o) srcache o) xrid_header o) xss <ChangeLog> *) Feature: now the "tcp_nodelay" directive works with backend SSL connections. *) Feature: now thread pools can be used to read cache file headers. *) Bugfix: in the "proxy_request_buffering" directive. *) Bugfix: a segmentation fault might occur in a worker process when using thread pools on Linux. *) Bugfix: in error handling when using the "ssl_stapling" directive. Thanks to Filipe da Silva. *) Bugfix: in the ngx_http_spdy_module. </ChangeLog> Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Apr 7 23:48:04 2015 (r383551) +++ head/www/nginx-devel/Makefile Wed Apr 8 00:43:42 2015 (r383552) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.7.11 +PORTVERSION= 1.7.12 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= ${MASTER_SITE_LOCAL} @@ -52,6 +52,7 @@ OPTIONS_DEFINE= \ MAIL_SMTP \ MAIL_SSL \ SPDY \ + THREADS \ WWW \ CACHE_PURGE \ CTPP2 \ @@ -140,6 +141,7 @@ MAIL_POP3_DESC= Enable POP3 proxy modu MAIL_SMTP_DESC= Enable SMTP proxy module MAIL_SSL_DESC= Enable mail_ssl module SPDY_DESC= Enable SPDY protocol support (SSL req.) +THREADS_DESC= Enable thread pool support WWW_DESC= Enable html sample files CACHE_PURGE_DESC= 3rd party cache_purge module CTPP2_DESC= 3rd party CT++ module @@ -335,6 +337,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .endif .if ${PORT_OPTIONS:MECHO} +IGNORE= ECHO: update require NGINX_ECHO_VERSION= 0.51 GIT_ECHO_VERSION= 0-g44c92a5 MASTER_SITES+= https://github.com/openresty/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo @@ -343,6 +346,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MHEADERS_MORE} +IGNORE= HEADERS_MORE: update require NGINX_HEADERS_MORE_VERSION= 0.25 GIT_HEADERS_MORE_VERSION= 0-g0c6e05d MASTER_SITES+= https://github.com/openresty/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more @@ -415,6 +419,7 @@ CONFIGURE_ARGS+=--with-http_mp4_module .endif .if ${PORT_OPTIONS:MHTTP_MOGILEFS} +IGNORE= HTTP_MOGILEFS: update require NGINX_MOGILEFS_VERSION= 1.0.4 MASTER_SITES+= http://www.grid.net.ru/nginx/download/:mogilefs DISTFILES+= nginx_mogilefs_module-${NGINX_MOGILEFS_VERSION}.tar.gz:mogilefs @@ -548,6 +553,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/m .endif .if ${PORT_OPTIONS:MDRIZZLE} +IGNORE= DRIZZLE: update require LIB_DEPENDS+= libdrizzle.so:${PORTSDIR}/databases/libdrizzle NGINX_DRIZZLE_VERSION= 0.1.8 GIT_DRIZZLE_VERSION= 0-gfba80cf @@ -566,6 +572,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/s .endif .if ${PORT_OPTIONS:MENCRYPTSESSION} +IGNORE= ENCRYPTSESSION: update require NGINX_ENCRYPTSESSION_VERSION= 0.03 GIT_ENCRYPTSESSION_VERSION= 0-g49d741b MASTER_SITES+= https://github.com/openresty/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession @@ -586,6 +593,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/m .endif .if ${PORT_OPTIONS:MLET} +IGNORE= LET: update require NGINX_LET_VERSION= 0.0.4 GIT_LET_VERSION= 0-ga5e1dc5 MASTER_SITES+= https://github.com/arut/nginx-let-module/tarball/v${NGINX_LET_VERSION}/:let @@ -594,6 +602,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a .endif .if ${PORT_OPTIONS:MLUA} +IGNORE= LUA: update require LIB_DEPENDS+= libluajit-5.1.so:${PORTSDIR}/lang/luajit CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0" CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib" @@ -605,6 +614,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MMEMC} +IGNORE= MEMC: update require NGINX_MEMC_VERSION= 0.14 GIT_MEMC_VERSION= 0-gde4cf86 MASTER_SITES+= https://github.com/openresty/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc @@ -613,6 +623,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MMODSECURITY} +IGNORE= MODSECURITY: update require NGINX_MODSECURITY_VERSION= 2.9.0 LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ libapr-1.so:${PORTSDIR}/devel/apr1 \ @@ -665,6 +676,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch- .endif .if ${PORT_OPTIONS:MRDS_CSV} +IGNORE= RDS_CSV: update require NGINX_RDS_CSV_VERSION= 0.05 GIT_RDS_CSV_VERSION= 0-g607e26b MASTER_SITES+= https://github.com/openresty/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv @@ -673,6 +685,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MRDS_JSON} +IGNORE= RDS_JSON: update require NGINX_RDS_JSON_VERSION= 0.13 GIT_RDS_JSON_VERSION= 0-g8292070 MASTER_SITES+= https://github.com/openresty/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson @@ -681,6 +694,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MREDIS2} +IGNORE= REDIS2: update require NGINX_REDIS2_VERSION= 0.10 GIT_REDIS2_VERSION= 0-g78a7622 MASTER_SITES+= https://github.com/openresty/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2 @@ -696,6 +710,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .endif .if ${PORT_OPTIONS:MSET_MISC} +IGNORE= SET_MISC: update require NGINX_SET_MISC_VERSION= 0.24 GIT_SET_MISC_VERSION= 0-g36fd035 MASTER_SITES+= https://github.com/openresty/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc @@ -705,6 +720,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch- .endif .if ${PORT_OPTIONS:MSFLOW} +IGNORE= SFLOW: update require NGINX_SFLOW_VERSION= 0.9.7 MASTER_SITES+= http://nginx-sflow-module.googlecode.com/files/:sflow DISTFILES+= nginx-sflow-module-${NGINX_SFLOW_VERSION}.tar.gz:sflow @@ -721,6 +737,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .endif .if ${PORT_OPTIONS:MSRCACHE} +IGNORE= SRCACHE: update require NGINX_SRCACHE_VERSION= 0.25 GIT_SRCACHE_VERSION= 0-gf25fe90 MASTER_SITES+= https://github.com/openresty/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache @@ -761,6 +778,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch- .endif .if ${PORT_OPTIONS:MXRID_HEADER} +IGNORE= XRID_HEADER: update require GIT_XRID_VERSION= 0daa3cc MASTER_SITES+= https://github.com/gabor/nginx-x-rid-header/tarball/master/:xrid DISTFILES+= gabor-nginx-x-rid-header-${GIT_XRID_VERSION}.tar.gz:xrid @@ -768,6 +786,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/g .endif .if ${PORT_OPTIONS:MXSS} +IGNORE= XSS: update require NGINX_XSS_VERSION= 0.04 GIT_XSS_VERSION= 0-g7e37038 MASTER_SITES+= https://github.com/openresty/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss @@ -781,6 +800,10 @@ USE_HTTP_SSL= yes CONFIGURE_ARGS+=--with-http_spdy_module .endif +.if ${PORT_OPTIONS:MTHREADS} +CONFIGURE_ARGS+=--with-threads +.endif + .if ${PORT_OPTIONS:MWWW} PLIST_SUB+= WWWDATA="" .else @@ -815,6 +838,7 @@ CONFIGURE_ARGS+=--with-http_ssl_module .endif .if ${PORT_OPTIONS:MARRAYVAR} +IGNORE= ARRAYVAR: update require NGINX_ARRAYVAR_VERSION= 0.03 GIT_ARRAYVAR_VERSION= 0-g4676747 MASTER_SITES+= https://github.com/openresty/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar @@ -823,6 +847,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MFORMINPUT} +IGNORE= FORMINPUT: update require NGINX_FORMINPUT_VERSION= 0.07 GIT_FORMINPUT_VERSION= 0-g78de845 MASTER_SITES+= https://github.com/calio/form-input-nginx-module/tarball/v${NGINX_FORMINPUT_VERSION}/:forminput @@ -831,6 +856,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/c .endif .if ${PORT_OPTIONS:MICONV} +IGNORE= ICONV: update require USES+= iconv NGINX_ICONV_VERSION= 0.10 GIT_ICONV_VERSION= 0-gb37efb5 Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Apr 7 23:48:04 2015 (r383551) +++ head/www/nginx-devel/distinfo Wed Apr 8 00:43:42 2015 (r383552) @@ -1,5 +1,5 @@ -SHA256 (nginx-1.7.11.tar.gz) = dad9d740210e638bfd480536910083ed13f04c04775eedf877984e1c61a69695 -SIZE (nginx-1.7.11.tar.gz) = 831490 +SHA256 (nginx-1.7.12.tar.gz) = 22d1f0b6d064e125b01aeb2c6171682559d2488e1b102fc48ec564aa36e66897 +SIZE (nginx-1.7.12.tar.gz) = 831957 SHA256 (giom-nginx_accept_language_module-2f69842.tar.gz) = fbcdf792160a1eff7b9549aeb5209d6e76716ff8e86b05e42c90b2d2f858e011 SIZE (giom-nginx_accept_language_module-2f69842.tar.gz) = 3399 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504080043.t380hhsw059386>