Date: Thu, 31 Aug 2023 21:29:45 GMT From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 99dd0e5bc285 - main - */*unit*: update NGINX Unit: 1.30.0 -> 1.31.0 Message-ID: <202308312129.37VLTjMc030350@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=99dd0e5bc285af5e0a0351efc9c731bd6f5852ca commit 99dd0e5bc285af5e0a0351efc9c731bd6f5852ca Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2023-08-31 21:28:31 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2023-08-31 21:28:31 +0000 */*unit*: update NGINX Unit: 1.30.0 -> 1.31.0 Add www/unit-wasm port, connect to build. <ChangeLog> *) Change: if building with njs, version 0.8.0 or later is now required. *) Feature: technology preview of WebAssembly application module. *) Feature: "response_headers" option to manage headers in the action and fallback. *) Feature: HTTP response header variables. *) Feature: ASGI lifespan state support. Thanks to synodriver. *) Bugfix: ensure that $uri variable is not cached. *) Bugfix: deprecated options were unavailable. *) Bugfix: ASGI applications inaccessible over IPv6. </ChangeLog> --- devel/libunit/Makefile | 4 +++- www/Makefile | 1 + www/unit-java/Makefile | 6 +++--- www/unit-java/distinfo | 58 +++++++++++++++++++++++++------------------------- www/unit-wasm/Makefile | 38 +++++++++++++++++++++++++++++++++ www/unit/Makefile | 1 - www/unit/distinfo | 6 +++--- www/unit/version.mk | 2 +- www/unitc/distinfo | 6 +++--- 9 files changed, 81 insertions(+), 41 deletions(-) diff --git a/devel/libunit/Makefile b/devel/libunit/Makefile index 5dbb6e8683fd..656112c590cd 100644 --- a/devel/libunit/Makefile +++ b/devel/libunit/Makefile @@ -22,6 +22,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --ld-opt="-L${LOCALBASE}/lib" \ + --pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ --no-regex PLIST_FILES+= include/nxt_auto_config.h \ @@ -34,7 +35,8 @@ PLIST_FILES+= include/nxt_auto_config.h \ include/nxt_unit.h \ include/nxt_version.h \ include/nxt_websocket_header.h \ - lib/libunit.a + lib/libunit.a \ + libdata/pkgconfig/unit.pc do-build: @cd ${WRKSRC} && ${MAKE} build/lib/libunit.a diff --git a/www/Makefile b/www/Makefile index 3ce635b484c4..76eb80e0305a 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2386,6 +2386,7 @@ SUBDIR += unit-php SUBDIR += unit-python SUBDIR += unit-ruby + SUBDIR += unit-wasm SUBDIR += unitc SUBDIR += uwebsockets SUBDIR += uwsgi diff --git a/www/unit-java/Makefile b/www/unit-java/Makefile index 12c03440c1dd..6430636ec5ce 100644 --- a/www/unit-java/Makefile +++ b/www/unit-java/Makefile @@ -39,10 +39,10 @@ COMMENT= Java module for NGINX Unit RUN_DEPENDS= unitd:www/unit UNIT_MODNAME= java${JAVA_PORT_VERSION} -CLASSGRAPH_VERSION= 4.8.151 +CLASSGRAPH_VERSION= 4.8.158 ECJ_VERSION= 3.26.0 -JETTY_VERSION= 9.4.49.v20220914 -TOMCAT_VERSION= 9.0.70 +JETTY_VERSION= 9.4.51.v20230217 +TOMCAT_VERSION= 9.0.75 PLIST_FILES= %%JAVAJARDIR%%/classgraph-${CLASSGRAPH_VERSION}.jar \ %%JAVAJARDIR%%/ecj-${ECJ_VERSION}.jar \ diff --git a/www/unit-java/distinfo b/www/unit-java/distinfo index 46a8fb8fc501..7c5cb406466c 100644 --- a/www/unit-java/distinfo +++ b/www/unit-java/distinfo @@ -1,31 +1,31 @@ -TIMESTAMP = 1683838848 -SHA256 (unit-1.30.0.tar.gz) = 129ba1b3c4e33dfadbd38683f0634152d8ecf770cacf3af50ee50b5683dc498b -SIZE (unit-1.30.0.tar.gz) = 894843 -SHA256 (classgraph-4.8.151.jar) = 4541dde48ed085345efaa5734f7bc7495c5843589a9c0a4cb9594d9c81735cec -SIZE (classgraph-4.8.151.jar) = 559654 +TIMESTAMP = 1693513582 +SHA256 (unit-1.31.0.tar.gz) = 268b1800bc4e030667e67967d052817437dff03f780ac0a985909aa225de61ed +SIZE (unit-1.31.0.tar.gz) = 905152 +SHA256 (classgraph-4.8.158.jar) = fb99167dc45bf34f9e40141069f68583a53104c45ffca410642255d1ca81343f +SIZE (classgraph-4.8.158.jar) = 564035 SHA256 (ecj-3.26.0.jar) = ac0ba5876eaf7ebb47749a0d1be179c51f194b9dd0b875d1c09e1b530f5a2db5 SIZE (ecj-3.26.0.jar) = 3133846 -SHA256 (jetty-http-9.4.49.v20220914.jar) = c39bfec2941a45396bd67da1aea53ea587c97ca31fdcee0d8ea4351b9f043704 -SIZE (jetty-http-9.4.49.v20220914.jar) = 234751 -SHA256 (jetty-server-9.4.49.v20220914.jar) = 06ae86baded124f81935a0701ed6af7b9e7ce33ee8ef58a87b779bb0a6b23dc4 -SIZE (jetty-server-9.4.49.v20220914.jar) = 732226 -SHA256 (jetty-util-9.4.49.v20220914.jar) = 679313e158f334135e0e80ac200fd6dea605cde73fd7bf255aaaf47773d2f801 -SIZE (jetty-util-9.4.49.v20220914.jar) = 583155 -SHA256 (tomcat-api-9.0.70.jar) = 59f97f4bb338ff53ff70c31918a81be121aed96b6c9390dcdb61d05db1af0a6e -SIZE (tomcat-api-9.0.70.jar) = 11514 -SHA256 (tomcat-el-api-9.0.70.jar) = 4b1057e805b61b378e9256b3d9071484bdb02cad489f3a5575729ea43cecc661 -SIZE (tomcat-el-api-9.0.70.jar) = 87879 -SHA256 (tomcat-jsp-api-9.0.70.jar) = aa0a51943ed8cebc462d58a93ec06f818150cd7b28d243c1fbfdd32d08c4b56d -SIZE (tomcat-jsp-api-9.0.70.jar) = 63722 -SHA256 (tomcat-jasper-9.0.70.jar) = 7409f97694d5a9c896886367b125b8da3719a5b5506dfdb0873b21d5cf8dea2e -SIZE (tomcat-jasper-9.0.70.jar) = 567914 -SHA256 (tomcat-jasper-el-9.0.70.jar) = 831b2dd939d53546e58156056d32099584cea0d336ba7156a6cd70ba46149fa7 -SIZE (tomcat-jasper-el-9.0.70.jar) = 172382 -SHA256 (tomcat-juli-9.0.70.jar) = 6db7f072da766976f1bce87d8792f393113c2053680bbdf9bc8d7de32e4a5521 -SIZE (tomcat-juli-9.0.70.jar) = 49000 -SHA256 (tomcat-servlet-api-9.0.70.jar) = 78c044a9676e84b656e18bc79fe116532a0dfa63b88f46a6965106317e89b99c -SIZE (tomcat-servlet-api-9.0.70.jar) = 284594 -SHA256 (tomcat-util-9.0.70.jar) = 4d9b07a772072027ffa7a09f5e73fc5af34137d15fd2d6c9e945315b2453a847 -SIZE (tomcat-util-9.0.70.jar) = 216907 -SHA256 (tomcat-util-scan-9.0.70.jar) = 6996d3f28dcf8cb68bce8717f1c718b5a42023f2e7cc3e6b10693ff818b22c71 -SIZE (tomcat-util-scan-9.0.70.jar) = 224944 +SHA256 (jetty-http-9.4.51.v20230217.jar) = 924d254a7e4dcbb699b722940b005bfe1bd4a68a8d44d7dcf3e0a935faafbba2 +SIZE (jetty-http-9.4.51.v20230217.jar) = 235225 +SHA256 (jetty-server-9.4.51.v20230217.jar) = 72f19a7f88e91244d5170045d7d44143508845b01196f87b2a1b56a5ad16d378 +SIZE (jetty-server-9.4.51.v20230217.jar) = 736865 +SHA256 (jetty-util-9.4.51.v20230217.jar) = 9fac4168b1ae543c5c29f48008cd118c70779aa701d60f37f52b57c104b6536e +SIZE (jetty-util-9.4.51.v20230217.jar) = 583590 +SHA256 (tomcat-api-9.0.75.jar) = 098bd878785c1de70a379ca164c3edd89f4f97ef6c16dd258100de1086399c5f +SIZE (tomcat-api-9.0.75.jar) = 11517 +SHA256 (tomcat-el-api-9.0.75.jar) = 022682f6964ed31c81b262fa3990f0718ba4845b1f03054a9ae10a9c5f977917 +SIZE (tomcat-el-api-9.0.75.jar) = 88006 +SHA256 (tomcat-jsp-api-9.0.75.jar) = 3b1a321c03f3d78f0021e350e6c0343132240991ae7a29a68c651fe1f8ebca63 +SIZE (tomcat-jsp-api-9.0.75.jar) = 63660 +SHA256 (tomcat-jasper-9.0.75.jar) = d6a345560c4eab0ca18a67265aa616362c0c157cf586be580c0cea19030be7c3 +SIZE (tomcat-jasper-9.0.75.jar) = 568141 +SHA256 (tomcat-jasper-el-9.0.75.jar) = b28d837c0c59009a952c5cfd109b0a87feb51bbecc3045a456b7fb91d7199622 +SIZE (tomcat-jasper-el-9.0.75.jar) = 172408 +SHA256 (tomcat-juli-9.0.75.jar) = 9e72c08c3e81964f7833644d5b3098ca5548cd6e6c87ae7e75173ed6b4b23865 +SIZE (tomcat-juli-9.0.75.jar) = 48970 +SHA256 (tomcat-servlet-api-9.0.75.jar) = d9029d4da9c3c3201a969e353250155c64add905611127e2d98867f4dd179894 +SIZE (tomcat-servlet-api-9.0.75.jar) = 284810 +SHA256 (tomcat-util-9.0.75.jar) = 2c4c9364ebb65ca4589807b057af4719c2ea49b25afc1326084746b6dcf39ad2 +SIZE (tomcat-util-9.0.75.jar) = 218301 +SHA256 (tomcat-util-scan-9.0.75.jar) = 7ef34d01fbf27044ec2fa122bf8c19346a815995a8ba152919f3218e964f8976 +SIZE (tomcat-util-scan-9.0.75.jar) = 224900 diff --git a/www/unit-wasm/Makefile b/www/unit-wasm/Makefile new file mode 100644 index 000000000000..7dc4e2c28bdb --- /dev/null +++ b/www/unit-wasm/Makefile @@ -0,0 +1,38 @@ +PKGNAMESUFFIX= -${UNIT_MODNAME} + +UNIT_MODNAME= wasm + +COMMENT= WASM module for NGINX Unit + +PLIST_FILES= libexec/unit/modules/${UNIT_MODNAME}.unit.so + +RUN_DEPENDS= unitd:www/unit + +LIB_DEPENDS= libwasmtime.so:devel/libwasmtime + +USE_RC_SUBR?= # reset to empty + +MASTERDIR= ${.CURDIR}/../unit + +post-configure: + cd ${CONFIGURE_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} wasm \ + --module=${UNIT_MODNAME} \ + --include-path=${PREFIX}/include \ + --lib-path=${PREFIX}/lib + +do-build: + cd ${CONFIGURE_WRKSRC} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ + ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME} + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ + ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \ + ${STAGEDIR}${PREFIX}/libexec/unit/modules/ + +# Overwrite the target in the ${MASTERDIR}/Makefile +post-install: + @${DO_NADA} + +.include "${MASTERDIR}/Makefile" diff --git a/www/unit/Makefile b/www/unit/Makefile index d283d5a06a57..018e336e7b0f 100644 --- a/www/unit/Makefile +++ b/www/unit/Makefile @@ -1,6 +1,5 @@ PORTNAME= unit PORTVERSION= ${UNIT_VERSION} -PORTREVISION= 1 CATEGORIES= www MASTER_SITES?= https://unit.nginx.org/download/ diff --git a/www/unit/distinfo b/www/unit/distinfo index 1f2da79c10fb..3c39f7922b67 100644 --- a/www/unit/distinfo +++ b/www/unit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683828429 -SHA256 (unit-1.30.0.tar.gz) = 129ba1b3c4e33dfadbd38683f0634152d8ecf770cacf3af50ee50b5683dc498b -SIZE (unit-1.30.0.tar.gz) = 894843 +TIMESTAMP = 1693512212 +SHA256 (unit-1.31.0.tar.gz) = 268b1800bc4e030667e67967d052817437dff03f780ac0a985909aa225de61ed +SIZE (unit-1.31.0.tar.gz) = 905152 diff --git a/www/unit/version.mk b/www/unit/version.mk index 9b269d2d71b3..cd0159d38cca 100644 --- a/www/unit/version.mk +++ b/www/unit/version.mk @@ -2,6 +2,6 @@ UNITVERSION_MK= defined # Define NGINX Unit's version. -UNIT_VERSION= 1.30.0 +UNIT_VERSION= 1.31.0 .endif # UNITVERSION_MK diff --git a/www/unitc/distinfo b/www/unitc/distinfo index 2a373c720e8f..e2f033b79a09 100644 --- a/www/unitc/distinfo +++ b/www/unitc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683845953 -SHA256 (unit-1.30.0.tar.gz) = 129ba1b3c4e33dfadbd38683f0634152d8ecf770cacf3af50ee50b5683dc498b -SIZE (unit-1.30.0.tar.gz) = 894843 +TIMESTAMP = 1693517200 +SHA256 (unit-1.31.0.tar.gz) = 268b1800bc4e030667e67967d052817437dff03f780ac0a985909aa225de61ed +SIZE (unit-1.31.0.tar.gz) = 905152
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308312129.37VLTjMc030350>