upgrade openresty to version 1.7.4.1

openresty/DESCR

@@ -0,0 +1,10 @@
+OpenResty (aka. ngx_openresty) is a full-fledged web application server by
+bundling the standard Nginx core, lots of 3rd-party Nginx modules, as well
+as most of their external dependencies.
+
+By taking advantage of various well-designed Nginx modules, OpenResty
+effectively turns the nginx server into a powerful web app server, in which
+the web developers can use the Lua programming language to script various
+existing nginx C modules and Lua modules and construct extremely
+high-performance web applications that are capable to handle 10K+ connections.
+

openresty/Makefile

@@ -1,32 +1,48 @@
 # $NetBSD$
 
-DISTNAME=	ngx_openresty-1.2.8.6
+DISTNAME=	ngx_openresty-1.7.4.1
 PKGNAME=	${DISTNAME:S/ngx_//}
 CATEGORIES=	wip
 MASTER_SITES=	http://openresty.org/download/
 
-MAINTAINER=	INSERT_YOUR_MAIL_ADDRESS_HERE
+MAINTAINER=	[email protected]
 HOMEPAGE=	http://openresty.org/download/
-COMMENT=	TODO: Short description of the package
-#LICENSE=	# TODO: (see mk/license.mk)
+COMMENT=	a fast web app server by extending nginx
+LICENSE=	2-clause-bsd
 
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake perl
 
+OPENRESTY_USER?=        openresty
+OPENRESTY_GROUP?=       openresty
+
 PKG_SYSCONFSUBDIR=	openresty
 OPENRESTY_LOG_DIR?=	${VARBASE}/log/openresty
 OPENRESTY_PID_DIR?=	${VARBASE}/run/openresty
 OPENRESTY_VAR_DIR?=	${VARBASE}/openresty
 CONFIG_SHELL=		${PERL5}
 
+PKG_USERS_VARS+=        OPENRESTY_USER
+PKG_GROUPS_VARS+=       OPENRESTY_GROUP
+PKG_GROUPS=             ${OPENRESTY_GROUP}
+PKG_USERS=              ${OPENRESTY_USER}:${OPENRESTY_GROUP}
+
+MAKE_DIRS+=             ${OPENRESTY_PID_DIR}
+OWN_DIRS=               ${OPENRESTY_LOG_DIR}
+OWN_DIRS_PERMS+=        ${OPENRESTY_VAR_DIR} ${OPENRESTY_USER} ${OPENRESTY_GROUP} 0700
+
+PKG_GECOS.${OPENRESTY_USER}=OpenResty server user
+PKG_HOME.${OPENRESTY_USER}= ${OPENRESTY_DATADIR}
+PKG_SHELL.${OPENRESTY_USER}=${NOLOGIN}
+
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--with-dtrace-probes
 CONFIGURE_ARGS+=	--with-http_ssl_module
 CONFIGURE_ARGS+=	--with-luajit
 CONFIGURE_ARGS+=	--with-pcre
 CONFIGURE_ARGS+=	--with-pcre-jit
-CONFIGURE_ARGS+=	--sbin-path=${PREFIX}/bin//openresty
+CONFIGURE_ARGS+=	--sbin-path=${PREFIX}/sbin/openresty
 CONFIGURE_ARGS+=	--conf-path=${PKG_SYSCONFDIR}/nginx.conf
 CONFIGURE_ARGS+=	--error-log-path=${OPENRESTY_LOG_DIR}/error.log
 CONFIGURE_ARGS+=	--http-log-path=${OPENRESTY_LOG_DIR}/access.log

openresty/PLIST

@@ -1,5 +1,5 @@
 @comment $NetBSD$
-bin/openresty
+bin/resty
 etc/openresty/fastcgi.conf
 etc/openresty/fastcgi.conf.default
 etc/openresty/fastcgi_params
@@ -15,33 +15,52 @@ etc/openresty/scgi_params.default
 etc/openresty/uwsgi_params
 etc/openresty/uwsgi_params.default
 etc/openresty/win-utf
-luajit/bin/luajit
-luajit/bin/luajit-2.0.2
-luajit/include/luajit-2.0/lauxlib.h
-luajit/include/luajit-2.0/lua.h
-luajit/include/luajit-2.0/lua.hpp
-luajit/include/luajit-2.0/luaconf.h
-luajit/include/luajit-2.0/luajit.h
-luajit/include/luajit-2.0/lualib.h
+luajit/bin/luajit-2.1.0-alpha
+luajit/include/luajit-2.1/lauxlib.h
+luajit/include/luajit-2.1/lua.h
+luajit/include/luajit-2.1/lua.hpp
+luajit/include/luajit-2.1/luaconf.h
+luajit/include/luajit-2.1/luajit.h
+luajit/include/luajit-2.1/lualib.h
 luajit/lib/libluajit-5.1.a
 luajit/lib/pkgconfig/luajit.pc
-luajit/share/luajit-2.0.2/jit/bc.lua
-luajit/share/luajit-2.0.2/jit/bcsave.lua
-luajit/share/luajit-2.0.2/jit/dis_arm.lua
-luajit/share/luajit-2.0.2/jit/dis_mips.lua
-luajit/share/luajit-2.0.2/jit/dis_mipsel.lua
-luajit/share/luajit-2.0.2/jit/dis_ppc.lua
-luajit/share/luajit-2.0.2/jit/dis_x64.lua
-luajit/share/luajit-2.0.2/jit/dis_x86.lua
-luajit/share/luajit-2.0.2/jit/dump.lua
-luajit/share/luajit-2.0.2/jit/v.lua
-luajit/share/luajit-2.0.2/jit/vmdef.lua
+luajit/share/luajit-2.1.0-alpha/jit/bc.lua
+luajit/share/luajit-2.1.0-alpha/jit/bcsave.lua
+luajit/share/luajit-2.1.0-alpha/jit/dis_arm.lua
+luajit/share/luajit-2.1.0-alpha/jit/dis_mips.lua
+luajit/share/luajit-2.1.0-alpha/jit/dis_mipsel.lua
+luajit/share/luajit-2.1.0-alpha/jit/dis_ppc.lua
+luajit/share/luajit-2.1.0-alpha/jit/dis_x64.lua
+luajit/share/luajit-2.1.0-alpha/jit/dis_x86.lua
+luajit/share/luajit-2.1.0-alpha/jit/dump.lua
+luajit/share/luajit-2.1.0-alpha/jit/p.lua
+luajit/share/luajit-2.1.0-alpha/jit/v.lua
+luajit/share/luajit-2.1.0-alpha/jit/vmdef.lua
+luajit/share/luajit-2.1.0-alpha/jit/zone.lua
 luajit/share/man/man1/luajit.1
 lualib/cjson.so
 lualib/rds/parser.so
 lualib/redis/parser.so
 lualib/resty/aes.lua
+lualib/resty/core.lua
+lualib/resty/core/base.lua
+lualib/resty/core/base64.lua
+lualib/resty/core/ctx.lua
+lualib/resty/core/exit.lua
+lualib/resty/core/hash.lua
+lualib/resty/core/misc.lua
+lualib/resty/core/regex.lua
+lualib/resty/core/request.lua
+lualib/resty/core/response.lua
+lualib/resty/core/shdict.lua
+lualib/resty/core/time.lua
+lualib/resty/core/uri.lua
+lualib/resty/core/var.lua
+lualib/resty/core/worker.lua
 lualib/resty/dns/resolver.lua
+lualib/resty/lock.lua
+lualib/resty/lrucache.lua
+lualib/resty/lrucache/pureffi.lua
 lualib/resty/md5.lua
 lualib/resty/memcached.lua
 lualib/resty/mysql.lua
@@ -55,7 +74,12 @@ lualib/resty/sha384.lua
 lualib/resty/sha512.lua
 lualib/resty/string.lua
 lualib/resty/upload.lua
+lualib/resty/upstream/healthcheck.lua
+lualib/resty/websocket/client.lua
+lualib/resty/websocket/protocol.lua
+lualib/resty/websocket/server.lua
 nginx/html/50x.html
 nginx/html/index.html
+sbin/openresty
 @pkgdir luajit/share/lua/5.1
 @pkgdir luajit/lib/lua/5.1

openresty/distinfo

@@ -1,5 +1,5 @@
 $NetBSD$
 
-SHA1 (ngx_openresty-1.2.8.6.tar.gz) = 4b47862a77577d06447d17c935e94dc935c279e5
-RMD160 (ngx_openresty-1.2.8.6.tar.gz) = 9fe744473d4b16b460072449dd7fc976bc624cdf
-Size (ngx_openresty-1.2.8.6.tar.gz) = 3031112 bytes
+SHA1 (ngx_openresty-1.7.4.1.tar.gz) = a19f95f71e9f98cc8a1f9138737c60f97e50e43c
+RMD160 (ngx_openresty-1.7.4.1.tar.gz) = 5766129318a444059801e6bb937c0158e52d92a7
+Size (ngx_openresty-1.7.4.1.tar.gz) = 3337472 bytes

openresty/files/smf/manifest.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="@SMF_NAME@">
+  <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+    <create_default_instance enabled="false" />
+    <single_instance />
+    <dependency name='network' grouping='require_all' restart_on='error' type='service'>
+      <service_fmri value='svc:/milestone/network:default' />
+    </dependency>
+    <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/local:default' />
+    </dependency>
+    <method_context>
+      <method_environment>
+        <envvar name="LD_PRELOAD_32" value="/usr/lib/extendedFILE.so.1" />
+      </method_environment>
+    </method_context>
+    <exec_method type="method" name="start" exec="@PREFIX@/sbin/openresty -c %{config_file}" timeout_seconds="60" />
+    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
+    <exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60" />
+    <property_group name="startd" type="framework">
+      <propval name="duration" type="astring" value="contract" />
+      <propval name="ignore_error" type="astring" value="core,signal" />
+    </property_group>
+    <property_group name="application" type="application">
+      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/nginx.conf" />
+    </property_group>
+    <stability value="Evolving" />
+    <template>
+      <common_name>
+        <loctext xml:lang="C">OpenResty HTTP daemon</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>
+