From nobody Sat Mar 19 19:18:46 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7373A1A1EA79; Sat, 19 Mar 2022 19:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KLVzV2mFhz4rsf; Sat, 19 Mar 2022 19:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647717526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBBuNOOWwYyfaQM80f4spN3MwLqC62Lbn3nnuni/z5s=; b=mKfFdaoTdpHShgd2Shznx0Gi8pek10YiMqPz5z4jKUyA0AWdrNBaDRCKk2xF8rqhrIGXGO 7dziHEu+/rEHfhhwn/lg1uHon4+uRc2NaAxFpk8csnzPLTcoY3cQ92O5lntK5yQ7RlL5w3 /KtW41o0vBk46oel2pGUEJ87iuMv2p8Sonj6t3AT+iEAfu4Ohs9XQRuJfu8XZb3XXUfGRO Stq9WovAs2nL3iIHomXY38Hi5CwLMBmW7kMfpkpB2P58ujVP44H0uqVjxUvmo4o22jaYfS LXWZZ0b9yLtsxZ1TUlCAICJKJS/vzSCdWAuVckkryNXUY3kHuhMxbBNsuYRXYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AD2E1900E; Sat, 19 Mar 2022 19:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22JJIk4w013659; Sat, 19 Mar 2022 19:18:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22JJIk1S013658; Sat, 19 Mar 2022 19:18:46 GMT (envelope-from git) Date: Sat, 19 Mar 2022 19:18:46 GMT Message-Id: <202203191918.22JJIk1S013658@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 6dc88933b03c - main - www/openresty: OpenResty is a dynamic web platform List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dc88933b03c93b07f7dac3dcacd82d8860d35fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647717526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBBuNOOWwYyfaQM80f4spN3MwLqC62Lbn3nnuni/z5s=; b=X6e7TdL5xMF9kCPcuxrjN7f46PWh4NusPtJgflU7Ccv3ED9kO0GpOSwR/XwI//Gq7STDdi kQWnQp/O22lwfPFu5JXYN9ymDY5fCjAWn8PJ6qBuxkn2oNfD79o9wPUKx4w5/wfkCS6CMx CYXTN6QSqhjYSNFI5qBe5Vi9YBYjwEC2C2oCcGjTRZ/N1RLsbSYb0onKdK3hentU7oYXHb PULT3Kj0eNOyqk6GDpHixVLPa0Ba4z6eT2W3fq4IZO6pcdoF+kk4eero94csK15EsNLvS1 fcuYr0iLpnnDl3ENseBfpwFbh4pONm/aZmeF3PUTtfRBCUrL74BsiUYlG8KlEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647717526; a=rsa-sha256; cv=none; b=Sxr6UxyJ/pPywAkhO3naWMphiFfCZZZro6OB4KbB2DiJAPvK1ZEGynVNXlKYM+lYK9mfF9 jPSxDKmA+lamVCjkXCF8ESfGcMPyw9Xez4TfQHyYTRir+4Jf5vUFB6AMwlj5xYUwSSyE7k mcDPvIYcGN80oIkAxolwGuaYY/+UGvOKvXSLPvY1VLU5T0TqMrWs42l94WeyOlW6fu+gvn kmoDh1WgUr0Gt9RsTxirxvwz2N1wgkNRWq+OH8rln9hpnrQYGte1ugX7GH6nfOqVzgVQcE t3SvuA5ctEnZW0DcPydvT0Lgvp0sH0tJeNodPOoi7VPxBhnjftcfXUEHtqIT1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=6dc88933b03c93b07f7dac3dcacd82d8860d35fd commit 6dc88933b03c93b07f7dac3dcacd82d8860d35fd Author: Jochen Neumeister AuthorDate: 2022-03-19 19:12:33 +0000 Commit: Jochen Neumeister CommitDate: 2022-03-19 19:18:40 +0000 www/openresty: OpenResty is a dynamic web platform OpenResty is a full-fledged web platform that integrates our enhanced version of the Nginx core, our enhanced version of LuaJIT, many carefully written Lua libraries, lots of high quality 3rd-party Nginx modules, and most of their external dependencies. It is designed to help developers easily build scalable web applications, web services, and dynamic web gateways. WWW: https://openresty.org/ Sponsored by: Netzkommune GmbH --- www/Makefile | 1 + www/openresty/Makefile | 101 +++++++ www/openresty/distinfo | 3 + .../files/patch-bundle__LuaJIT-20220310__Makefile | 36 +++ www/openresty/files/patch-configure | 12 + www/openresty/files/pkg-message.in | 9 + www/openresty/pkg-descr | 8 + www/openresty/pkg-plist | 295 +++++++++++++++++++++ 8 files changed, 465 insertions(+) diff --git a/www/Makefile b/www/Makefile index 2b7fdb4c383e..c21bc44b1b64 100644 --- a/www/Makefile +++ b/www/Makefile @@ -483,6 +483,7 @@ SUBDIR += onlyoffice-documentserver SUBDIR += openarc SUBDIR += opencart + SUBDIR += openresty SUBDIR += orangehrm SUBDIR += osrm-backend SUBDIR += osticket diff --git a/www/openresty/Makefile b/www/openresty/Makefile new file mode 100644 index 000000000000..d61f79c1b4c6 --- /dev/null +++ b/www/openresty/Makefile @@ -0,0 +1,101 @@ +# Created by: Jochen Neumeister + +PORTNAME= openresty +PORTVERSION= 1.21.4.1rc2 +CATEGORIES= www +MASTER_SITES= https://openresty.org/download/ + +MAINTAINER= joneum@FreeBSD.org +COMMENT= OpenResty a powerful web app server by extending nginx + +LICENSE= BSD2CLAUSE MIT +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/COPYRIGHT + +LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty \ + libpcre.so:devel/pcre + +USES= gmake perl5 ssl + +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --group=${WWWGRP} \ + --prefix=${PREFIX} \ + --user=${WWWOWN} \ + --with-cc-opt="-I ${LOCALBASE}/include" \ + --with-ld-opt="-L ${LOCALBASE}/lib" \ + --with-luajit=${LOCALBASE} + +OPTIONS_DEFINE= ARRAYVAR AUTHREQ COOLKIT DRIZZLE ECHO ENCSESSION \ + HEADERSMORE ICONV LUACJSON LUARDS LUAREDISPARS \ + LUARESTYDNS LUARESTYMEM LUARESTYMYSQL LUARESTYREDIS \ + LUARESTYSTRING LUARESTYUPLOAD MEMC MISC NDK POSTGRES \ + RDSCSV RDSJSON REDIS REDIS2 SRCACHE XSS +OPTIONS_DEFAULT= ARRAYVAR AUTHREQ COOLKIT ECHO ENCSESSION HEADERMORE \ + ICONV MEMC MISC NDK PORTGRES RDSCSV RDSJSON REDIS \ + REDIS2 SRCACHE XSS + +OPTIONS_SUB= yes + +ARRAYVAR_DESC= Add support for array variables to config +AUTHREQ_DESC= Auth request module +COOLKIT_DESC= Collection of small and useful nginx add-ons +DRIZZLE_DESC= Module for talking to MySQL and Drizzle +ECHO_DESC= Brings echo/sleep/time and more shell-style +ENCSESSION_DESC= Encrypt and decrypt nginx variable values +HEADERSMORE_DESC= Set and clear input and output headers +ICONV_DESC= Iconv support +LUACJSON_DESC= Lua cjson library +LUARDS_DESC= Lua rds library +LUAREDISPARS_DESC= Lua redis parser library +LUARESTYDNS_DESC= Lua resty dns library +LUARESTYMEM_DESC= Lua resty memcached library +LUARESTYMYSQL_DESC= Lua resty mysql library +LUARESTYREDIS_DESC= Lua resty redis library +LUARESTYSTRING_DESC= Lua resty string library +LUARESTYUPLOAD_DESC= Lua resty upload library +MEMC_DESC= An extended memcached module +MISC_DESC= Various set_xxx directives added +NDK_DESC= Nginx Development Kit +POSTGRES_DESC= Module for talking to Postgeres +RDSCSV_DESC= Output filter module to convert CSV +RDSJSON_DESC= An output filter that formats Resty +REDIS2_DESC= Module for the Redis 2.0 protocol +REDIS_DESC= HTTP redis module +SRCACHE_DESC= Transparent subrequest-based caching layout +XSS_DESC= Native cross-site scripting support in nginx + +ARRAYVAR_CONFIGURE_OFF= --without-http_array_var_module +AUTHREQ_CONFIGURE_ON= --with-http_auth_request_module +COOLKIT_CONFIGURE_OFF= --without-http_coolkit_module +DRIZZLE_LIB_DEPENDS= libdrizzle.so:databases/libdrizzle +DRIZZLE_CONFIGURE_ON= --with-http_drizzle_module +ECHO_CONFIGURE_OFF= --without-http_echo_module +ENCSESSION_CONFIGURE_OFF= --without-http_encrypted_session_module +HEADERSMORE_CONFIGURE_OFF= --without-http_headers_more_module +ICONV_CONFIGURE_ON= --with-http_iconv_module +LUACJSON_CONFIGURE_OFF= --without-lua_cjson +LUARDS_CONFIGURE_OFF= --without-lua_rds_parser +LUAREDISPARS_CONFIGURE_OFF= --without-lua_redis_parser +LUARESTYDNS_CONFIGURE_OFF= --without-lua_resty_dns +LUARESTYMEM_CONFIGURE_OFF= --without-lua_resty_memcached +LUARESTYMYSQL_CONFIGURE_OFF= --without-lua_resty_mysql +LUARESTYREDIS_CONFIGURE_OFF= --without-lua_resty_redis +LUARESTYSTRING_CONFIGURE_OFF= --without-lua_resty_string +LUARESTYUPLOAD_CONFIGURE_OFF= --without-lua_resty_upload +MEMC_CONFIGURE_OFF= --without-http_memc_module +MISC_CONFIGURE_OFF= --without-http_set_misc_module +NDK_CONFIGURE_OFF= --without-ngx_devel_kit_module +POSTGRES_USES= pgsql +POSTGRES_CONFIGURE_ON= --with-http_postgres_module +RDSCSV_CONFIGURE_OFF= --without-http_rds_csv_module +RDSJSON_CONFIGURE_OFF= --without-http_rds_json_module +REDIS2_CONFIGURE_OFF= --without-http_redis2_module +REDIS_CONFIGURE_OFF= --without-http_redis_module +SRCACHE_CONFIGURE_OFF= --without-http_srcache_module +XSS_CONFIGURE_OFF= --without-http_xss_module + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/nginx/sbin/nginx + ${FIND} ${STAGEDIR}${PREFIX} -name '*.so' -exec ${STRIP_CMD} {} + + +.include diff --git a/www/openresty/distinfo b/www/openresty/distinfo new file mode 100644 index 000000000000..99ddd87cd522 --- /dev/null +++ b/www/openresty/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1647258171 +SHA256 (openresty-1.21.4.1rc2.tar.gz) = a7b4df4611823ad714ca64923922009b1ad86ff3dfc5355d3eda803b3eca29bc +SIZE (openresty-1.21.4.1rc2.tar.gz) = 5344208 diff --git a/www/openresty/files/patch-bundle__LuaJIT-20220310__Makefile b/www/openresty/files/patch-bundle__LuaJIT-20220310__Makefile new file mode 100644 index 000000000000..27ca5ec50f9d --- /dev/null +++ b/www/openresty/files/patch-bundle__LuaJIT-20220310__Makefile @@ -0,0 +1,36 @@ +--- bundle/LuaJIT-2.1-20220310/Makefile.orig 2022-03-14 20:29:23.421490000 +0100 ++++ bundle/LuaJIT-2.1-20220310/Makefile 2022-03-14 20:34:47.983935000 +0100 +@@ -41,8 +41,6 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua + INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) + INSTALL_CMODD= $(INSTALL_LIB)/lua + INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) +-INSTALL_MAN= $(INSTALL_SHARE)/man/man1 +-INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig + + INSTALL_TNAME= luajit-$(VERSION) + INSTALL_TSYMNAME= luajit +@@ -63,7 +61,7 @@ INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) + INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) + INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) + +-INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ ++INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) \ + $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) + UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \ + $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) +@@ -82,7 +80,6 @@ SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ + FILE_T= luajit + FILE_A= libluajit.a + FILE_SO= libluajit.so +-FILE_MAN= luajit.1 + FILE_PC= luajit.pc + FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h + FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \ +@@ -124,7 +121,6 @@ install: $(INSTALL_DEP) + ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \ + $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ + $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : +- cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) + cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \ + $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \ + $(RM) $(FILE_PC).tmp diff --git a/www/openresty/files/patch-configure b/www/openresty/files/patch-configure new file mode 100644 index 000000000000..65c4bdae6fea --- /dev/null +++ b/www/openresty/files/patch-configure @@ -0,0 +1,12 @@ +--- configure.orig 2012-08-08 11:10:58.575960219 +0400 ++++ configure 2012-08-08 11:11:38.950486311 +0400 +@@ -157,6 +157,9 @@ + } elsif ($opt eq '--without-lua_redis_parser') { + $resty_opts{no_lua_redis_parser} = 1; + ++ } elsif ($opt eq '--without-lua_resty_dns') { ++ $resty_opts{no_lua_resty_dns} = 1; ++ + } elsif ($opt eq '--without-lua_resty_memcached') { + $resty_opts{no_lua_resty_memcached} = 1; + diff --git a/www/openresty/files/pkg-message.in b/www/openresty/files/pkg-message.in new file mode 100644 index 000000000000..e7af2f8bc875 --- /dev/null +++ b/www/openresty/files/pkg-message.in @@ -0,0 +1,9 @@ +[ +{ type: install + message: <