Date: Tue, 21 Apr 2015 23:26:57 +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: r384469 - in head/www: nginx nginx-devel nginx-devel/files nginx/files Message-ID: <201504212326.t3LNQv61020383@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Tue Apr 21 23:26:56 2015 New Revision: 384469 URL: https://svnweb.freebsd.org/changeset/ports/384469 Log: Upgrade to latest stable version 1.8.0. According to vendor's recommendations safely remove NGX_THREADS macro with some long unused code from some third-party modules. Merge changes from www/nginx-devel to www/nginx. Merge third-pary upstream_sticky module from www/nginx to www/nginx-devel. Remove outdated syslog support. Added: head/www/nginx-devel/files/extra-patch-ngx_http_lua_socket_udp.c (contents, props changed) head/www/nginx-devel/files/extra-patch-ngx_http_mogilefs_module.c (contents, props changed) head/www/nginx-devel/files/extra-patch-ngx_http_sflow_module.c (contents, props changed) head/www/nginx/files/extra-patch-ngx_http_lua_socket_udp.c (contents, props changed) head/www/nginx/files/extra-patch-ngx_http_mogilefs_module.c (contents, props changed) head/www/nginx/files/extra-patch-ngx_http_sflow_module.c (contents, props changed) Deleted: head/www/nginx-devel/files/extra-patch-syslog_support head/www/nginx/files/extra-patch-ngx_http_upstream.h head/www/nginx/files/extra-patch-syslog_support Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx/Makefile head/www/nginx/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Apr 21 22:51:16 2015 (r384468) +++ head/www/nginx-devel/Makefile Tue Apr 21 23:26:56 2015 (r384469) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.7.12 +PORTVERSION= 1.8.0 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 threads support WWW_DESC= Enable html sample files CACHE_PURGE_DESC= 3rd party cache_purge module CTPP2_DESC= 3rd party CT++ module @@ -419,6 +421,7 @@ 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 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_mogilefs_module-${NGINX_MOGILEFS_VERSION} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c .endif .if ${PORT_OPTIONS:MHTTP_MP4_H264} @@ -527,12 +530,11 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .endif .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} -IGNORE= HTTP_UPSTREAM_STICKY: update require USE_HTTP_SSL= yes -NGINX_UPSTREAM_STICKY_VERSION= 1.1 -MASTER_SITES+= http://nginx-sticky-module.googlecode.com/files/:upstreamsticky -DISTFILES+= nginx-sticky-module-${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky -CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sticky-module-${NGINX_UPSTREAM_STICKY_VERSION} +NGINX_UPSTREAM_STICKY_VERSION= 1.2.4 +MASTER_SITES+= https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/:upstreamsticky +DISTFILES+= ${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky +CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-c825ea7c5c91/ .endif .if ${PORT_OPTIONS:MHTTP_XSLT} @@ -602,6 +604,7 @@ GIT_LUA_VERSION= 0-g4388b1e MASTER_SITES+= https://github.com/openresty/lua-nginx-module/tarball/v${NGINX_LUA_VERSION}/:lua DISTFILES+= openresty-lua-nginx-module-v${NGINX_LUA_VERSION}-${GIT_LUA_VERSION}.tar.gz:lua CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_lua_socket_udp.c .endif .if ${PORT_OPTIONS:MMEMC} @@ -623,7 +626,7 @@ USE_GNOME= libxml2 MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION}/:modsecurity DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure .endif .if ${PORT_OPTIONS:MNAXSI} @@ -710,7 +713,8 @@ MASTER_SITES+= http://nginx-sflow-module DISTFILES+= nginx-sflow-module-${NGINX_SFLOW_VERSION}.tar.gz:sflow CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c \ - ${PATCHDIR}/extra-patch-ngx_http_sflow_config.h + ${PATCHDIR}/extra-patch-ngx_http_sflow_config.h \ + ${PATCHDIR}/extra-patch-ngx_http_sflow_module.c .endif .if ${PORT_OPTIONS:MSLOWFS_CACHE} @@ -738,9 +742,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .if ${PORT_OPTIONS:MSYSLOG_SUPPORT} IGNORE= SYSLOG: update require -NGINX_SYSLOG_SUPPORT_FACILITY?= LOG_DAEMON -CONFIGURE_ARGS+=--with-syslog --with-syslog-facility=${NGINX_SYSLOG_SUPPORT_FACILITY} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-syslog_support .endif .if ${PORT_OPTIONS:MTCP_PROXY} @@ -781,6 +782,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 Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Apr 21 22:51:16 2015 (r384468) +++ head/www/nginx-devel/distinfo Tue Apr 21 23:26:56 2015 (r384469) @@ -1,5 +1,5 @@ -SHA256 (nginx-1.7.12.tar.gz) = 22d1f0b6d064e125b01aeb2c6171682559d2488e1b102fc48ec564aa36e66897 -SIZE (nginx-1.7.12.tar.gz) = 831957 +SHA256 (nginx-1.8.0.tar.gz) = 23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5 +SIZE (nginx-1.8.0.tar.gz) = 832104 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 Added: head/www/nginx-devel/files/extra-patch-ngx_http_lua_socket_udp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-ngx_http_lua_socket_udp.c Tue Apr 21 23:26:56 2015 (r384469) @@ -0,0 +1,20 @@ +--- ../openresty-lua-nginx-module-4388b1e/src/ngx_http_lua_socket_udp.c.orig 2015-04-21 21:18:31.080702000 +0300 ++++ ../openresty-lua-nginx-module-4388b1e/src/ngx_http_lua_socket_udp.c 2015-04-21 21:18:47.449758000 +0300 +@@ -1400,17 +1400,6 @@ + + c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1); + +-#if (NGX_THREADS) +- +- /* TODO: lock event when call completion handler */ +- +- rev->lock = &c->lock; +- wev->lock = &c->lock; +- rev->own_lock = &c->lock; +- wev->own_lock = &c->lock; +- +-#endif +- + #if (NGX_HTTP_LUA_HAVE_SO_PASSCRED) + if (uc->sockaddr->sa_family == AF_UNIX) { + struct sockaddr addr; Added: head/www/nginx-devel/files/extra-patch-ngx_http_mogilefs_module.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-ngx_http_mogilefs_module.c Tue Apr 21 23:26:56 2015 (r384469) @@ -0,0 +1,12 @@ +--- ../nginx_mogilefs_module-1.0.4/ngx_http_mogilefs_module.c.orig 2015-04-21 21:16:22.251692000 +0300 ++++ ../nginx_mogilefs_module-1.0.4/ngx_http_mogilefs_module.c 2015-04-21 21:16:39.460724000 +0300 +@@ -316,9 +316,6 @@ + + u->peer.log = r->connection->log; + u->peer.log_error = NGX_ERROR_ERR; +-#if (NGX_THREADS) +- u->peer.lock = &r->connection->lock; +-#endif + + u->output.tag = (ngx_buf_tag_t) &ngx_http_mogilefs_module; + Added: head/www/nginx-devel/files/extra-patch-ngx_http_sflow_module.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-ngx_http_sflow_module.c Tue Apr 21 23:26:56 2015 (r384469) @@ -0,0 +1,60 @@ +--- ../nginx-sflow-module-0.9.7/ngx_http_sflow_module.c.orig 2015-04-21 21:21:17.020547000 +0300 ++++ ../nginx-sflow-module-0.9.7/ngx_http_sflow_module.c 2015-04-21 21:22:26.994714000 +0300 +@@ -8,10 +8,6 @@ + #include <ngx_http.h> + #include <nginx.h> + +-#if (NGX_THREADS) +-#include <ngx_thread.h> +-#endif +- + #include "ngx_http_sflow_api.h" + #include "ngx_http_sflow_config.h" + +@@ -42,18 +38,10 @@ + /* keep log ptr for callbacks */ + ngx_log_t *log; + +-#if (NGX_THREADS) +- ngx_mutex_t *mut; +-#define SFWB_LOCK(_s) ngx_mutex_lock((_s)->mut) +-#define SFWB_UNLOCK(_s) ngx_mutex_unlock((_s)->mut) +-#define SFWB_INC_CTR(_c) ngx_atomic_fetch_add(&(_c), 1) +-#define SFWB_COUNTDOWN(_c) (ngx_atomic_fetch_add(&(_c), -1) == 1) +-#else + #define SFWB_LOCK(_s) /* no-op */ + #define SFWB_UNLOCK(_s) /* no-op */ + #define SFWB_INC_CTR(_c) (_c)++ + #define SFWB_COUNTDOWN(_c) (--(_c) == 0) +-#endif + + /* delegate acquiring the sflow config */ + SFWBConfigManager *config_manager; +@@ -411,13 +399,8 @@ + static int32_t ngx_http_sflow_add_random_skip(SFWB *sm) + { + ngx_atomic_t next_skip = sfl_sampler_next_skip(sm->sampler); +-#if (NGX_THREADS) +- ngx_atomic_int_t test_skip = ngx_atomic_fetch_add(&sm->sflow_skip, next_skip); +- return (test_skip + next_skip); +-#else + sm->sflow_skip = next_skip; + return next_skip; +-#endif + } + + /*_________________---------------------------__________________ +@@ -528,13 +511,6 @@ + /* a pool to use for the agent so we can recycle the memory easily on a config change */ + sm->masterPool = ngx_create_pool(SFWB_POOL_SIZ, cf->log); + +-#if (NGX_THREADS) +- /* a mutex to lock the sFlow agent when taking a sample (only needed if there +- is more that one worker thread - right now it seems like threads are not even +- an option in the configure script) */ +- sm->mut = ngx_mutex_init(cf->log, 0); +-#endif +- + /* create and initialze the config_manager */ + sm->config_manager = ngx_pcalloc(cf->pool, sizeof(SFWBConfigManager)); + sfwb_config_init(sm->config_manager, cf->log); Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue Apr 21 22:51:16 2015 (r384468) +++ head/www/nginx/Makefile Tue Apr 21 23:26:56 2015 (r384469) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.6.3 +PORTVERSION= 1.8.0 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -29,6 +29,7 @@ OPTIONS_DEFINE= \ GOOGLE_PERFTOOLS \ HTTP \ HTTP_ADDITION \ + HTTP_AUTH_REQ \ HTTP_CACHE \ HTTP_DAV \ HTTP_FLV \ @@ -51,6 +52,7 @@ OPTIONS_DEFINE= \ MAIL_SMTP \ MAIL_SSL \ SPDY \ + THREADS \ WWW \ CACHE_PURGE \ CTPP2 \ @@ -61,7 +63,6 @@ OPTIONS_DEFINE= \ HTTP_AUTH_DIGEST \ HTTP_AUTH_LDAP \ HTTP_AUTH_PAM \ - HTTP_AUTH_REQ \ HTTP_DAV_EXT \ HTTP_EVAL \ HTTP_FANCYINDEX \ @@ -76,7 +77,6 @@ OPTIONS_DEFINE= \ HTTP_UPLOAD \ HTTP_UPLOAD_PROGRESS \ HTTP_UPSTREAM_FAIR \ - HTTP_UPSTREAM_HASH \ HTTP_UPSTREAM_STICKY \ HTTP_ZIP \ ARRAYVAR \ @@ -117,6 +117,7 @@ FILE_AIO_DESC= Enable file aio GOOGLE_PERFTOOLS_DESC= Enable google perftools module HTTP_DESC= Enable HTTP module HTTP_ADDITION_DESC= Enable http_addition module +HTTP_AUTH_REQ_DESC= Enable http_auth_request module HTTP_CACHE_DESC= Enable http_cache module HTTP_DAV_DESC= Enable http_webdav module HTTP_FLV_DESC= Enable http_flv module @@ -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 threads support WWW_DESC= Enable html sample files CACHE_PURGE_DESC= 3rd party cache_purge module CTPP2_DESC= 3rd party CT++ module @@ -150,7 +152,6 @@ HTTP_ACCESSKEY_DESC= 3rd party http_acc HTTP_AUTH_DIGEST_DESC= 3rd party http_authdigest module HTTP_AUTH_LDAP_DESC= 3rd party http_auth_ldap module HTTP_AUTH_PAM_DESC= 3rd party http_auth_pam module -HTTP_AUTH_REQ_DESC= 3rd party http_auth_request module HTTP_DAV_EXT_DESC= 3rd party webdav_ext module HTTP_EVAL_DESC= 3rd party eval module HTTP_FANCYINDEX_DESC= 3rd party http_fancyindex module @@ -166,7 +167,6 @@ HTTP_SUBS_FILTER_DESC= 3rd party subs f HTTP_UPLOAD_DESC= 3rd party upload module HTTP_UPLOAD_PROGRESS_DESC= 3rd party uploadprogress module HTTP_UPSTREAM_FAIR_DESC= 3rd party upstream fair module -HTTP_UPSTREAM_HASH_DESC= 3rd party upstream hash module HTTP_UPSTREAM_STICKY_DESC= 3rd party upstream sticky module HTTP_ZIP_DESC= 3rd party http_zip module ARRAYVAR_DESC= 3rd party array_var module @@ -313,10 +313,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .endif .if ${PORT_OPTIONS:MHTTP_AUTH_REQ} -NGINX_AUTH_REQ_VERSION= 0.2 -MASTER_SITES+= http://mdounin.ru/files/:auth_request -DISTFILES+= ngx_http_auth_request_module-${NGINX_AUTH_REQ_VERSION}.tar.gz:auth_request -CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_auth_request_module-${NGINX_AUTH_REQ_VERSION} +CONFIGURE_ARGS+=--with-http_auth_request_module .endif .if empty(PORT_OPTIONS:MHTTP_CACHE) @@ -424,6 +421,7 @@ 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 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_mogilefs_module-${NGINX_MOGILEFS_VERSION} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c .endif .if ${PORT_OPTIONS:MHTTP_MP4_H264} @@ -507,6 +505,7 @@ CONFIGURE_ARGS+=--with-http_sub_module .endif .if ${PORT_OPTIONS:MHTTP_UPLOAD} +IGNORE= UPLOAD: update require NGINX_UPLOAD_VERSION= 2.2.0 MASTER_SITES+= http://www.grid.net.ru/nginx/download/:upload DISTFILES+= nginx_upload_module-${NGINX_UPLOAD_VERSION}.tar.gz:upload @@ -530,14 +529,6 @@ DISTFILES+= nginx_upstream_fair-${NGINX_ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} .endif -.if ${PORT_OPTIONS:MHTTP_UPSTREAM_HASH} -NGINX_UPSTREAM_HASH_VERSION= 0.3.1 -MASTER_SITES+= http://wiki.nginx.org/images/1/11/:upstreamhash -DISTFILES+= Nginx_upstream_hash-${NGINX_UPSTREAM_HASH_VERSION}.tar.gz:upstreamhash -CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_hash-${NGINX_UPSTREAM_HASH_VERSION} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upstream.h -.endif - .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} USE_HTTP_SSL= yes NGINX_UPSTREAM_STICKY_VERSION= 1.2.4 @@ -613,6 +604,7 @@ GIT_LUA_VERSION= 0-g4388b1e MASTER_SITES+= https://github.com/openresty/lua-nginx-module/tarball/v${NGINX_LUA_VERSION}/:lua DISTFILES+= openresty-lua-nginx-module-v${NGINX_LUA_VERSION}-${GIT_LUA_VERSION}.tar.gz:lua CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_lua_socket_udp.c .endif .if ${PORT_OPTIONS:MMEMC} @@ -634,7 +626,7 @@ USE_GNOME= libxml2 MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION}/:modsecurity DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure .endif .if ${PORT_OPTIONS:MNAXSI} @@ -721,7 +713,8 @@ MASTER_SITES+= http://nginx-sflow-module DISTFILES+= nginx-sflow-module-${NGINX_SFLOW_VERSION}.tar.gz:sflow CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c \ - ${PATCHDIR}/extra-patch-ngx_http_sflow_config.h + ${PATCHDIR}/extra-patch-ngx_http_sflow_config.h \ + ${PATCHDIR}/extra-patch-ngx_http_sflow_module.c .endif .if ${PORT_OPTIONS:MSLOWFS_CACHE} @@ -740,6 +733,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MSUPERVISORD} +IGNORE= SUPERVISORD: update require NGINX_SUPERVISORD_VERSION= 1.4 MASTER_SITES+= http://labs.frickle.com/files/:supervisord DISTFILES+= ngx_supervisord-${NGINX_SUPERVISORD_VERSION}.tar.gz:supervisord @@ -747,11 +741,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .endif .if ${PORT_OPTIONS:MSYSLOG_SUPPORT} -#GIT_SYSLOG_PATCH_VERSION=3ca5ba65541637f74467038aa032e2586321d0cb -GIT_SYSLOG_PATCH_VERSION=3ca5ba6 -MASTER_SITES+= https://github.com/yaoweibin/nginx_syslog_patch/tarball/${GIT_SYSLOG_PATCH_VERSION}/:syslog_patch -DISTFILES+= nginx_syslog_patch-${GIT_SYSLOG_PATCH_VERSION}.tar.gz:syslog_patch -CONFIGURE_ARGS+= --add-module=${WRKDIR}/yaoweibin-nginx_syslog_patch-${GIT_SYSLOG_PATCH_VERSION} +IGNORE= SYSLOG: update require .endif .if ${PORT_OPTIONS:MTCP_PROXY} @@ -792,6 +782,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 @@ -933,10 +927,6 @@ post-patch: ${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}/ngx_http_sflow_config.h .endif .if ${PORT_OPTIONS:MSPDY} -.if ${PORT_OPTIONS:MDRIZZLE} - @${REINPLACE_CMD} '589d' \ - ${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/src/ngx_http_drizzle_util.c -.endif .if ${PORT_OPTIONS:MLUA} @${REINPLACE_CMD} '464d' \ ${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_socket_tcp.c @@ -955,11 +945,6 @@ post-patch: ${PATCH} -p1 < \ ${WRKDIR}/yaoweibin-nginx_tcp_proxy_module-${GIT_TCP_PROXY_VERSION:S/^0-g//}/tcp.patch ) .endif -.if ${PORT_OPTIONS:MSYSLOG_SUPPORT} - ( cd ${WRKSRC} && \ - ${PATCH} -p1 < \ - ${WRKDIR}/yaoweibin-nginx_syslog_patch-${GIT_SYSLOG_PATCH_VERSION}/syslog-1.5.6.patch ) -.endif .if ${PORT_OPTIONS:MICONV} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Tue Apr 21 22:51:16 2015 (r384468) +++ head/www/nginx/distinfo Tue Apr 21 23:26:56 2015 (r384469) @@ -1,5 +1,5 @@ -SHA256 (nginx-1.6.3.tar.gz) = 0a98e95b366e4d6042f331e1fa4d70e18fd1e49d8993e589008e70e742b7e757 -SIZE (nginx-1.6.3.tar.gz) = 805253 +SHA256 (nginx-1.8.0.tar.gz) = 23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5 +SIZE (nginx-1.8.0.tar.gz) = 832104 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 @@ -10,8 +10,6 @@ SHA256 (http_auth_ldap-c4dc7c9153.tar.gz SIZE (http_auth_ldap-c4dc7c9153.tar.gz) = 5323 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9 SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424 -SHA256 (ngx_http_auth_request_module-0.2.tar.gz) = eea5d0ec02bba93d0b204a034230cc61462b60497cbac6f581d7e008a9262ba4 -SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c SIZE (ngx_cache_purge-2.3.tar.gz) = 12248 SHA256 (ngx_ctpp2-0.5.tar.gz) = f8adfecc23e2c23af95df8549ef92fd52598b21506a9d9df2278b2605668d5a6 @@ -112,7 +110,3 @@ SHA256 (calio-form-input-nginx-module-v0 SIZE (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = 10580 SHA256 (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = e90a406a14d5f419bd500e19082da81390e8ba6040926857926f1a899a53379d SIZE (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = 12510 -SHA256 (1.2.4.tar.gz) = f79521a25322cb4f504547a0b0f76fd9d024c14440e5d790e26dda70ea4f701a -SIZE (1.2.4.tar.gz) = 120448 -SHA256 (nginx_syslog_patch-3ca5ba6.tar.gz) = 817a207f2cb18f3035f5535bd03942390010dbade03c4a5d3d0d97b55e1f3deb -SIZE (nginx_syslog_patch-3ca5ba6.tar.gz) = 94400 Added: head/www/nginx/files/extra-patch-ngx_http_lua_socket_udp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-ngx_http_lua_socket_udp.c Tue Apr 21 23:26:56 2015 (r384469) @@ -0,0 +1,20 @@ +--- ../openresty-lua-nginx-module-4388b1e/src/ngx_http_lua_socket_udp.c.orig 2015-04-21 21:18:31.080702000 +0300 ++++ ../openresty-lua-nginx-module-4388b1e/src/ngx_http_lua_socket_udp.c 2015-04-21 21:18:47.449758000 +0300 +@@ -1400,17 +1400,6 @@ + + c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1); + +-#if (NGX_THREADS) +- +- /* TODO: lock event when call completion handler */ +- +- rev->lock = &c->lock; +- wev->lock = &c->lock; +- rev->own_lock = &c->lock; +- wev->own_lock = &c->lock; +- +-#endif +- + #if (NGX_HTTP_LUA_HAVE_SO_PASSCRED) + if (uc->sockaddr->sa_family == AF_UNIX) { + struct sockaddr addr; Added: head/www/nginx/files/extra-patch-ngx_http_mogilefs_module.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-ngx_http_mogilefs_module.c Tue Apr 21 23:26:56 2015 (r384469) @@ -0,0 +1,12 @@ +--- ../nginx_mogilefs_module-1.0.4/ngx_http_mogilefs_module.c.orig 2015-04-21 21:16:22.251692000 +0300 ++++ ../nginx_mogilefs_module-1.0.4/ngx_http_mogilefs_module.c 2015-04-21 21:16:39.460724000 +0300 +@@ -316,9 +316,6 @@ + + u->peer.log = r->connection->log; + u->peer.log_error = NGX_ERROR_ERR; +-#if (NGX_THREADS) +- u->peer.lock = &r->connection->lock; +-#endif + + u->output.tag = (ngx_buf_tag_t) &ngx_http_mogilefs_module; + Added: head/www/nginx/files/extra-patch-ngx_http_sflow_module.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-ngx_http_sflow_module.c Tue Apr 21 23:26:56 2015 (r384469) @@ -0,0 +1,60 @@ +--- ../nginx-sflow-module-0.9.7/ngx_http_sflow_module.c.orig 2015-04-21 21:21:17.020547000 +0300 ++++ ../nginx-sflow-module-0.9.7/ngx_http_sflow_module.c 2015-04-21 21:22:26.994714000 +0300 +@@ -8,10 +8,6 @@ + #include <ngx_http.h> + #include <nginx.h> + +-#if (NGX_THREADS) +-#include <ngx_thread.h> +-#endif +- + #include "ngx_http_sflow_api.h" + #include "ngx_http_sflow_config.h" + +@@ -42,18 +38,10 @@ + /* keep log ptr for callbacks */ + ngx_log_t *log; + +-#if (NGX_THREADS) +- ngx_mutex_t *mut; +-#define SFWB_LOCK(_s) ngx_mutex_lock((_s)->mut) +-#define SFWB_UNLOCK(_s) ngx_mutex_unlock((_s)->mut) +-#define SFWB_INC_CTR(_c) ngx_atomic_fetch_add(&(_c), 1) +-#define SFWB_COUNTDOWN(_c) (ngx_atomic_fetch_add(&(_c), -1) == 1) +-#else + #define SFWB_LOCK(_s) /* no-op */ + #define SFWB_UNLOCK(_s) /* no-op */ + #define SFWB_INC_CTR(_c) (_c)++ + #define SFWB_COUNTDOWN(_c) (--(_c) == 0) +-#endif + + /* delegate acquiring the sflow config */ + SFWBConfigManager *config_manager; +@@ -411,13 +399,8 @@ + static int32_t ngx_http_sflow_add_random_skip(SFWB *sm) + { + ngx_atomic_t next_skip = sfl_sampler_next_skip(sm->sampler); +-#if (NGX_THREADS) +- ngx_atomic_int_t test_skip = ngx_atomic_fetch_add(&sm->sflow_skip, next_skip); +- return (test_skip + next_skip); +-#else + sm->sflow_skip = next_skip; + return next_skip; +-#endif + } + + /*_________________---------------------------__________________ +@@ -528,13 +511,6 @@ + /* a pool to use for the agent so we can recycle the memory easily on a config change */ + sm->masterPool = ngx_create_pool(SFWB_POOL_SIZ, cf->log); + +-#if (NGX_THREADS) +- /* a mutex to lock the sFlow agent when taking a sample (only needed if there +- is more that one worker thread - right now it seems like threads are not even +- an option in the configure script) */ +- sm->mut = ngx_mutex_init(cf->log, 0); +-#endif +- + /* create and initialze the config_manager */ + sm->config_manager = ngx_pcalloc(cf->pool, sizeof(SFWBConfigManager)); + sfwb_config_init(sm->config_manager, cf->log);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504212326.t3LNQv61020383>