Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Feb 2016 22:17:35 +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: r408961 - in head/www/nginx: . files
Message-ID:  <201602152217.u1FMHZoH040741@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Mon Feb 15 22:17:35 2016
New Revision: 408961
URL: https://svnweb.freebsd.org/changeset/ports/408961

Log:
  Merge the upgrade for the following third-party modules to its
  latest revisions from www/nginx-devel:
  
  o) echo
  o) eval
  o) headers
  o) lua
  o) set
  
  Do not bump PORTREVISION.

Deleted:
  head/www/nginx/files/extra-patch-openresty-set-misc-nginx-module-config
Modified:
  head/www/nginx/Makefile
  head/www/nginx/distinfo

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Mon Feb 15 22:01:32 2016	(r408960)
+++ head/www/nginx/Makefile	Mon Feb 15 22:17:35 2016	(r408961)
@@ -389,18 +389,18 @@ USE_OPENSSL_PORT=	yes
 .endif
 
 .if ${PORT_OPTIONS:MECHO}
-NGINX_ECHO_VERSION=	0.57
+NGINX_ECHO_VERSION=	4f7aa50
 GH_ACCOUNT+=	openresty:echo
 GH_PROJECT+=	echo-nginx-module:echo
-GH_TAGNAME+=	v${NGINX_ECHO_VERSION}:echo
+GH_TAGNAME+=	${NGINX_ECHO_VERSION}:echo
 CONFIGURE_ARGS+=--add-module=${WRKSRC_echo}
 .endif
 
 .if ${PORT_OPTIONS:MHEADERS_MORE}
-NGINX_HEADERS_MORE_VERSION=	0.261
+NGINX_HEADERS_MORE_VERSION=	f5559ec
 GH_ACCOUNT+=	openresty:headers_more
 GH_PROJECT+=	headers-more-nginx-module:headers_more
-GH_TAGNAME+=	v${NGINX_HEADERS_MORE_VERSION}:headers_more
+GH_TAGNAME+=	${NGINX_HEADERS_MORE_VERSION}:headers_more
 CONFIGURE_ARGS+=--add-module=${WRKSRC_headers_more}
 .endif
 
@@ -419,8 +419,8 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_da
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_EVAL}
-NGINX_EVAL_VERSION=	1.0.3
-GH_ACCOUNT+=	vkholodkov:eval
+NGINX_EVAL_VERSION=	342c812
+GH_ACCOUNT+=	openresty:eval
 GH_PROJECT+=	nginx-eval-module:eval
 GH_TAGNAME+=	${NGINX_EVAL_VERSION}:eval
 CONFIGURE_ARGS+=--add-module=${WRKSRC_eval}
@@ -666,10 +666,10 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_le
 LIB_DEPENDS+=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
 CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
-NGINX_LUA_VERSION=	0.10.0
+NGINX_LUA_VERSION=	7410339
 GH_ACCOUNT+=	openresty:lua
 GH_PROJECT+=	lua-nginx-module:lua
-GH_TAGNAME+=	v${NGINX_LUA_VERSION}:lua
+GH_TAGNAME+=	${NGINX_LUA_VERSION}:lua
 CONFIGURE_ARGS+=--add-module=${WRKSRC_lua}
 .endif
 
@@ -768,12 +768,11 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_rt
 .endif
 
 .if ${PORT_OPTIONS:MSET_MISC}
-NGINX_SET_MISC_VERSION=	0.29
+NGINX_SET_MISC_VERSION=	6582fb4
 GH_ACCOUNT+=	openresty:setmisc
 GH_PROJECT+=	set-misc-nginx-module:setmisc
-GH_TAGNAME+=	v${NGINX_SET_MISC_VERSION}:setmisc
+GH_TAGNAME+=	${NGINX_SET_MISC_VERSION}:setmisc
 CONFIGURE_ARGS+=--add-module=${WRKSRC_setmisc}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-set-misc-nginx-module-config
 .endif
 
 .if ${PORT_OPTIONS:MSFLOW}

Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo	Mon Feb 15 22:01:32 2016	(r408960)
+++ head/www/nginx/distinfo	Mon Feb 15 22:17:35 2016	(r408961)
@@ -44,14 +44,14 @@ SHA256 (nginx-clojure-nginx-clojure-v0.4
 SIZE (nginx-clojure-nginx-clojure-v0.4.3_GH0.tar.gz) = 589270
 SHA256 (grahamedgecombe-nginx-ct-1790ac0_GH0.tar.gz) = df1006198fa0ce58b0353260cb37b0b7fa3636972bdb1ad9f442ac9b7af8172b
 SIZE (grahamedgecombe-nginx-ct-1790ac0_GH0.tar.gz) = 4107
-SHA256 (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 8467237ca0fae74ca7a32fbd34fc6044df307098415d48068214c9c235695a07
-SIZE (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 65073
-SHA256 (openresty-headers-more-nginx-module-v0.261_GH0.tar.gz) = 03d1f5fbecba8565f247d87a38f5e4b6440b0a56d752bdd2b29af2f1c4aea480
-SIZE (openresty-headers-more-nginx-module-v0.261_GH0.tar.gz) = 28022
+SHA256 (openresty-echo-nginx-module-4f7aa50_GH0.tar.gz) = 7b8bb5139001306a46f8e9ce0b7d09befff2f49741ecc6eb47299518764defcd
+SIZE (openresty-echo-nginx-module-4f7aa50_GH0.tar.gz) = 52144
+SHA256 (openresty-headers-more-nginx-module-f5559ec_GH0.tar.gz) = 422b12414a6f850cbb3ee96c225e5259eef4e949f70e63e27e6583ce3eb836ff
+SIZE (openresty-headers-more-nginx-module-f5559ec_GH0.tar.gz) = 27400
 SHA256 (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d
 SIZE (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = 6260
-SHA256 (vkholodkov-nginx-eval-module-1.0.3_GH0.tar.gz) = 849381433a9020ee1162fa6211b047369fde38dc1a8b5de79f03f8fff2407fe2
-SIZE (vkholodkov-nginx-eval-module-1.0.3_GH0.tar.gz) = 5724
+SHA256 (openresty-nginx-eval-module-342c812_GH0.tar.gz) = c45f6438474593f0cf5229160327d20c2f2d72e9c0b5c8cf9e0ef8d5295de177
+SIZE (openresty-nginx-eval-module-342c812_GH0.tar.gz) = 14183
 SHA256 (aperezdc-ngx-fancyindex-v0.3.6_GH0.tar.gz) = e73f1f0444f8c53601b51da8684b174c5ffd3b4ed6eb7956dd57f8b95485b68f
 SIZE (aperezdc-ngx-fancyindex-v0.3.6_GH0.tar.gz) = 17252
 SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f60c6e662862752f1920fc6e684f7a66bb2b3260692813
@@ -84,8 +84,8 @@ SHA256 (mongodb-mongo-c-driver-v0.3.1_GH
 SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
 SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270
 SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
-SHA256 (openresty-lua-nginx-module-v0.10.0_GH0.tar.gz) = cf31c64b107a54999fdf8b68e8b8d52d88a3c95d9307417f049c32c5687ed780
-SIZE (openresty-lua-nginx-module-v0.10.0_GH0.tar.gz) = 569372
+SHA256 (openresty-lua-nginx-module-7410339_GH0.tar.gz) = 1b78f243ea95efcfd6f5bda43fbe5849bff931b9620d22c75b3de6590e09c684
+SIZE (openresty-lua-nginx-module-7410339_GH0.tar.gz) = 574764
 SHA256 (openresty-memc-nginx-module-v0.16_GH0.tar.gz) = 24f3c3270831aed2d157c01ef74cb26eab26b832971fe7b9f42a03dbfac10ce4
 SIZE (openresty-memc-nginx-module-v0.16_GH0.tar.gz) = 38560
 SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5
@@ -100,8 +100,8 @@ SHA256 (openresty-redis2-nginx-module-v0
 SIZE (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = 28981
 SHA256 (arut-nginx-rtmp-module-v1.1.7_GH0.tar.gz) = 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3
 SIZE (arut-nginx-rtmp-module-v1.1.7_GH0.tar.gz) = 519735
-SHA256 (openresty-set-misc-nginx-module-v0.29_GH0.tar.gz) = 8d280fc083420afb41dbe10df9a8ceec98f1d391bd2caa42ebae67d5bc9295d8
-SIZE (openresty-set-misc-nginx-module-v0.29_GH0.tar.gz) = 35495
+SHA256 (openresty-set-misc-nginx-module-6582fb4_GH0.tar.gz) = cc325830477dfcdbb355fc7b19cbc2f4e55c179b3b56fdfe0613b5a7b926235e
+SIZE (openresty-set-misc-nginx-module-6582fb4_GH0.tar.gz) = 35961
 SHA256 (nginx-shib-nginx-http-shibboleth-v20150121_GH0.tar.gz) = e38a19bb4d30e5487c013c4b6b3e3d5b96de82d63b776471cc2c381a5d00374d
 SIZE (nginx-shib-nginx-http-shibboleth-v20150121_GH0.tar.gz) = 10106
 SHA256 (cubicdaiya-ngx_small_light-v0.6.9_GH0.tar.gz) = 5d4e3d4fec3968ee57a5fa066118649e2b994b3f3a293896e62bf690b726b7fb



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602152217.u1FMHZoH040741>