diff --git a/www/unit-java/Makefile b/www/unit-java/Makefile index c55b50af14f8..12c03440c1dd 100644 --- a/www/unit-java/Makefile +++ b/www/unit-java/Makefile @@ -1,103 +1,103 @@ MASTER_SITES= https://unit.nginx.org/download/:unit \ https://repo1.maven.org/maven2/io/github/classgraph/classgraph/${CLASSGRAPH_VERSION}/:classgraph \ https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-api/${TOMCAT_VERSION}/:api \ https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-el-api/${TOMCAT_VERSION}/:elapi \ https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jasper/${TOMCAT_VERSION}/:jasper \ https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/${TOMCAT_VERSION}/:jasperel \ https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jsp-api/${TOMCAT_VERSION}/:jsp \ https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-juli/${TOMCAT_VERSION}/:juli \ https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-servlet-api/${TOMCAT_VERSION}/:servlet \ https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-util/${TOMCAT_VERSION}/:tutil \ https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-util-scan/${TOMCAT_VERSION}/:utilscan \ https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/${ECJ_VERSION}/:ecj \ https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/${JETTY_VERSION}/:http \ https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/${JETTY_VERSION}/:server \ https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/${JETTY_VERSION}/:jutil PKGNAMESUFFIX= -${UNIT_MODNAME} DISTFILES= unit-${UNIT_VERSION}.tar.gz:unit \ classgraph-${CLASSGRAPH_VERSION}.jar:classgraph \ ecj-${ECJ_VERSION}.jar:ecj \ jetty-http-${JETTY_VERSION}.jar:http \ jetty-server-${JETTY_VERSION}.jar:server \ jetty-util-${JETTY_VERSION}.jar:jutil \ tomcat-api-${TOMCAT_VERSION}.jar:api \ tomcat-el-api-${TOMCAT_VERSION}.jar:elapi \ tomcat-jsp-api-${TOMCAT_VERSION}.jar:jsp \ tomcat-jasper-${TOMCAT_VERSION}.jar:jasper \ tomcat-jasper-el-${TOMCAT_VERSION}.jar:jasperel \ tomcat-juli-${TOMCAT_VERSION}.jar:juli \ tomcat-servlet-api-${TOMCAT_VERSION}.jar:servlet \ tomcat-util-${TOMCAT_VERSION}.jar:tutil \ tomcat-util-scan-${TOMCAT_VERSION}.jar:utilscan EXTRACT_ONLY= unit-${UNIT_VERSION}.tar.gz DISTINFO_FILE= ${.CURDIR}/distinfo PATCHDIR= ${.CURDIR}/files COMMENT= Java module for NGINX Unit RUN_DEPENDS= unitd:www/unit UNIT_MODNAME= java${JAVA_PORT_VERSION} -CLASSGRAPH_VERSION= 4.8.112 +CLASSGRAPH_VERSION= 4.8.151 ECJ_VERSION= 3.26.0 -JETTY_VERSION= 9.4.43.v20210629 -TOMCAT_VERSION= 9.0.52 +JETTY_VERSION= 9.4.49.v20220914 +TOMCAT_VERSION= 9.0.70 PLIST_FILES= %%JAVAJARDIR%%/classgraph-${CLASSGRAPH_VERSION}.jar \ %%JAVAJARDIR%%/ecj-${ECJ_VERSION}.jar \ %%JAVAJARDIR%%/jetty-http-${JETTY_VERSION}.jar \ %%JAVAJARDIR%%/jetty-server-${JETTY_VERSION}.jar \ %%JAVAJARDIR%%/jetty-util-${JETTY_VERSION}.jar \ %%JAVAJARDIR%%/nginx-unit-jsc-java${JAVA_PORT_VERSION}-${UNIT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-api-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-el-api-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-jasper-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-jasper-el-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-jsp-api-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-juli-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-servlet-api-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-util-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-util-scan-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/websocket-api-java${JAVA_PORT_VERSION}-${UNIT_VERSION}.jar \ libexec/unit/modules/${UNIT_MODNAME}.unit.so USE_JAVA= yes JAVA_VERSION= 8+ #JAVA_VERSION= 8 11 12 13 14 15 USE_RC_SUBR?= # reset to empty MASTERDIR= ${.CURDIR}/../unit # Do not run the sha512 checker because: # - it tries to create a checksum file in ${DISTDIR} and in case # of failure build also fails; # - the checker can be useful when the NGINX Unit Java module # downloads those jars by itself. post-extract: ${CP} /dev/null ${WRKSRC}/auto/modules/java_chk_sha512 post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} java \ --module=${UNIT_MODNAME} \ --local-repo=${DISTDIR} \ --jars=${JAVAJARDIR} do-build: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME} do-install: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} \ ${UNIT_MODNAME}-install DESTDIR=${STAGEDIR} # Overwrite the target in the ${MASTERDIR}/Makefile post-install: @${DO_NADA} .include "${MASTERDIR}/Makefile" diff --git a/www/unit-java/distinfo b/www/unit-java/distinfo index f5a1ffb53c1b..6d419e066e00 100644 --- a/www/unit-java/distinfo +++ b/www/unit-java/distinfo @@ -1,31 +1,31 @@ -TIMESTAMP = 1663075958 -SHA256 (unit-1.28.0.tar.gz) = 69779208ed2d1687b5d26f8c4e0f8460444eb285fb6ced2443652e0c584a80b0 -SIZE (unit-1.28.0.tar.gz) = 878878 -SHA256 (classgraph-4.8.112.jar) = 67804d0bf709131d7ce7e7aaf4b944d4f3e71f36b0359e4c2bbb394d9832dae6 -SIZE (classgraph-4.8.112.jar) = 535546 +TIMESTAMP = 1671139548 +SHA256 (unit-1.29.0.tar.gz) = 1ddb4d7c67c2da25c4bacbcace9061d417f86f55002ff6c409483feb9aea57d9 +SIZE (unit-1.29.0.tar.gz) = 903909 +SHA256 (classgraph-4.8.151.jar) = 4541dde48ed085345efaa5734f7bc7495c5843589a9c0a4cb9594d9c81735cec +SIZE (classgraph-4.8.151.jar) = 559654 SHA256 (ecj-3.26.0.jar) = ac0ba5876eaf7ebb47749a0d1be179c51f194b9dd0b875d1c09e1b530f5a2db5 SIZE (ecj-3.26.0.jar) = 3133846 -SHA256 (jetty-http-9.4.43.v20210629.jar) = bcbf228fed3984962be41910193fb8d6fe3fbaa8a39b8cc6bc7c20e1e82e0937 -SIZE (jetty-http-9.4.43.v20210629.jar) = 224668 -SHA256 (jetty-server-9.4.43.v20210629.jar) = 7b64a7e1cbd249c0e510d6cda545dbf9393d41d9a904f9243fdaf64f98cc60e8 -SIZE (jetty-server-9.4.43.v20210629.jar) = 716996 -SHA256 (jetty-util-9.4.43.v20210629.jar) = 62786c3f838354a35fa7b66c8e9e7be968185ade18ed6b81c17f0e2e1ea225a0 -SIZE (jetty-util-9.4.43.v20210629.jar) = 575509 -SHA256 (tomcat-api-9.0.52.jar) = f40113e51e9a225f5b9a3e6cc03257b0d98183c80c22cc107a98996b5b8aa650 -SIZE (tomcat-api-9.0.52.jar) = 11515 -SHA256 (tomcat-el-api-9.0.52.jar) = b488a95b10de6f89edd014f37d8f3c05149cd38c8be81559bc06b5e28f1ada64 -SIZE (tomcat-el-api-9.0.52.jar) = 89218 -SHA256 (tomcat-jsp-api-9.0.52.jar) = 6f5cf3957542344a10c5a62898af046499e776503ff2617fe0da8d5414f9d1e8 -SIZE (tomcat-jsp-api-9.0.52.jar) = 63637 -SHA256 (tomcat-jasper-9.0.52.jar) = 2c9c98cfb9784e1a3bf3cc5149ea4c96497ebb88a3b5639e458810729d188bcc -SIZE (tomcat-jasper-9.0.52.jar) = 570429 -SHA256 (tomcat-jasper-el-9.0.52.jar) = f44533f3dadb5ae6239a5caa8442eeed41ddf214222a8a553b14fe77a7d42cf7 -SIZE (tomcat-jasper-el-9.0.52.jar) = 170895 -SHA256 (tomcat-juli-9.0.52.jar) = 03a4c17854acfab6d9654e1a239c1cbca002f5bd08773bf5c8518237260d3e84 -SIZE (tomcat-juli-9.0.52.jar) = 46615 -SHA256 (tomcat-servlet-api-9.0.52.jar) = 823d6b8eb03b855095b2705097785c2270bf9aeaef59d7103c3a432cc9eb0d4c -SIZE (tomcat-servlet-api-9.0.52.jar) = 284382 -SHA256 (tomcat-util-9.0.52.jar) = 456806c046e32bed3f30192a3d83e7639a83bff6e55cdcbc039e8e200cec2e83 -SIZE (tomcat-util-9.0.52.jar) = 211252 -SHA256 (tomcat-util-scan-9.0.52.jar) = 12ad14093950d2b397096810ac5e92fc81a28caed1314ccc4f1de70b25e84796 -SIZE (tomcat-util-scan-9.0.52.jar) = 224087 +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 diff --git a/www/unit-php/Makefile b/www/unit-php/Makefile index 0e43d341ce9f..08e2431f6a96 100644 --- a/www/unit-php/Makefile +++ b/www/unit-php/Makefile @@ -1,38 +1,37 @@ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} UNIT_MODNAME= php${PHP_VER} COMMENT= PHP module for NGINX Unit PLIST_FILES= libexec/unit/modules/${UNIT_MODNAME}.unit.so RUN_DEPENDS= unitd:www/unit USES= php:build,embed,flavors -IGNORE_WITH_PHP= 82 USE_RC_SUBR= # reset to empty MASTERDIR= ${.CURDIR}/../unit post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} php \ --lib-path=${LOCALBASE}/lib \ --module=${UNIT_MODNAME} 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/${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-python/Makefile b/www/unit-python/Makefile index 22e8465fd10b..217184094274 100644 --- a/www/unit-python/Makefile +++ b/www/unit-python/Makefile @@ -1,38 +1,38 @@ PKGNAMESUFFIX= -${UNIT_MODNAME} UNIT_MODNAME= python${PYTHON_SUFFIX} COMMENT= Python module for NGINX Unit -USES= python:3.7-3.10 gettext-runtime +USES= python:3.7-3.11 gettext-runtime USE_PYTHON= flavors PLIST_FILES= libexec/unit/modules/${UNIT_MODNAME}.unit.so RUN_DEPENDS= unitd:www/unit USE_RC_SUBR?= # reset to empty MASTERDIR= ${.CURDIR}/../unit post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} python \ --module=${UNIT_MODNAME} \ --config=${PYTHON_CMD}-config 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/${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/distinfo b/www/unit/distinfo index 9afa20a7af4a..8645dd0385e1 100644 --- a/www/unit/distinfo +++ b/www/unit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663075366 -SHA256 (unit-1.28.0.tar.gz) = 69779208ed2d1687b5d26f8c4e0f8460444eb285fb6ced2443652e0c584a80b0 -SIZE (unit-1.28.0.tar.gz) = 878878 +TIMESTAMP = 1671145509 +SHA256 (unit-1.29.0.tar.gz) = 1ddb4d7c67c2da25c4bacbcace9061d417f86f55002ff6c409483feb9aea57d9 +SIZE (unit-1.29.0.tar.gz) = 903909 diff --git a/www/unit/version.mk b/www/unit/version.mk index e324665699d2..a8583cac14f7 100644 --- a/www/unit/version.mk +++ b/www/unit/version.mk @@ -1,7 +1,7 @@ .if !defined(UNITVERSION_MK) UNITVERSION_MK= defined # Define NGINX Unit's version. -UNIT_VERSION= 1.28.0 +UNIT_VERSION= 1.29.0 .endif # UNITVERSION_MK