diff --git a/www/unit-java/distinfo b/www/unit-java/distinfo index 6d419e066e00..2099d5ed57fb 100644 --- a/www/unit-java/distinfo +++ b/www/unit-java/distinfo @@ -1,31 +1,31 @@ -TIMESTAMP = 1671139548 -SHA256 (unit-1.29.0.tar.gz) = 1ddb4d7c67c2da25c4bacbcace9061d417f86f55002ff6c409483feb9aea57d9 -SIZE (unit-1.29.0.tar.gz) = 903909 +TIMESTAMP = 1677692680 +SHA256 (unit-1.29.1.tar.gz) = 7d756cff8c1a40b38c313fdbe8748333ffce034a3916fa1b502d63cc10623437 +SIZE (unit-1.29.1.tar.gz) = 906654 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.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-ruby/Makefile b/www/unit-ruby/Makefile index d8a236ddec77..3f2dc4bc7824 100644 --- a/www/unit-ruby/Makefile +++ b/www/unit-ruby/Makefile @@ -1,41 +1,40 @@ -PORTREVISION= 1 PKGNAMESUFFIX= -${UNIT_MODNAME} UNIT_MODNAME= ruby${RUBY_VER} COMMENT= Ruby module for NGINX Unit RUN_DEPENDS= rackup:www/rubygem-rack22 \ unitd:www/unit PLIST_FILES= libexec/unit/modules/${UNIT_MODNAME}.unit.so USES= ruby CFLAGS+= -fdeclspec USE_RC_SUBR?= # reset to empty MASTERDIR= ${.CURDIR}/../unit post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ruby \ --ruby=ruby${RUBY_VER:S|.||} \ --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/Makefile b/www/unit/Makefile index 20a5e2d927ba..23826e99313c 100644 --- a/www/unit/Makefile +++ b/www/unit/Makefile @@ -1,140 +1,139 @@ PORTNAME= unit PORTVERSION= ${UNIT_VERSION} -PORTREVISION= 1 CATEGORIES= www MASTER_SITES?= https://unit.nginx.org/download/ MAINTAINER= osa@FreeBSD.org COMMENT?= Dynamic web application server WWW= https://unit.nginx.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES+= compiler:c11 cpe CPE_VENDOR= nginx CPE_PRODUCT= unit OPTIONS_DEFINE?= \ DEBUG \ IPV6 \ NJS \ SSL \ UNIXSOCK OPTIONS_DEFAULT?= IPV6 PCRE2 SSL UNIXSOCK OPTIONS_RADIO+= REGEX OPTIONS_RADIO_REGEX= NOPCRE PCRE PCRE2 DEBUG_DESC= Enable debug logging REGEX_DESC= Support regular expressions NJS_DESC= Enable NGINX JavaScript NOPCRE_DESC= No support for Regular Expressions PCRE_DESC= Regular Expressions via devel/pcre PCRE2_DESC= Regular Expressions via devel/pcre2 SSL_DESC= Enable SSL/TLS UNIXSOCK_DESC= Enable unix sockets .include HAS_CONFIGURE= yes UNIT_VARDIR?= /var UNIT_DBDIR?= ${UNIT_VARDIR}/db/${PORTNAME} UNIT_LOGDIR?= ${UNIT_VARDIR}/log/${PORTNAME} UNIT_LOGFILE?= ${UNIT_LOGDIR}/${PORTNAME}.log UNIT_PIDFILE?= ${UNIT_RUNDIR}/${PORTNAME}.pid UNIT_RUNDIR?= ${UNIT_VARDIR}/run/unit UNIT_SOCK?= ${UNIT_RUNDIR}/control.unit.sock UNIT_TMPDIR?= ${UNIT_VARDIR}/tmp/unit CONFIGURE_ARGS= --prefix=${PREFIX} \ --ld-opt="-L${LOCALBASE}/lib" \ --log=${UNIT_LOGFILE} \ --modules=libexec/unit/modules \ --pid=${UNIT_PIDFILE} \ --state=${UNIT_DBDIR} \ --tmp=${UNIT_TMPDIR} \ --user=${WWWOWN} --group=${WWWGRP} USERS?= ${WWWOWN} GROUPS?=${WWWGRP} ALL_TARGET= PLIST_DIRS?= libexec/unit/modules \ libexec/unit PLIST_FILES?= sbin/unitd \ share/man/man8/unitd.8.gz USE_RC_SUBR?= unitd SUB_LIST= PREFIX=${PREFIX} \ UNIT_PIDFILE=${UNIT_PIDFILE} \ UNIT_SOCK=${UNIT_SOCK} \ UNIT_TMPDIR=${UNIT_TMPDIR} \ WWWOWN=${WWWOWN} \ WWWGRP=${WWWGRP} .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--debug .endif .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--no-ipv6 .endif .if ${PORT_OPTIONS:MNJS} BUILD_DEPENDS+= ${LOCALBASE}/lib/libnjs.a:devel/libnjs CONFIGURE_ARGS+=--njs \ --cc-opt="-I${LOCALBASE}/include" \ --ld-opt="-L${LOCALBASE}/lib" .endif .if ${PORT_OPTIONS:MNOPCRE} CONFIGURE_ARGS+=--no-regex .endif .if ${PORT_OPTIONS:MPCRE} CONFIGURE_ARGS+=--no-pcre2 LIB_DEPENDS+= libpcre.so:devel/pcre .endif .if ${PORT_OPTIONS:MPCRE2} LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 .endif .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+=--openssl USES+= ssl .endif .if empty(PORT_OPTIONS:MUNIXSOCK) CONFIGURE_ARGS+=--no-unix-sockets .else CONFIGURE_ARGS+=--control=unix:${UNIT_SOCK} .endif .if defined(UNIT_MODNAME) && ${UNIT_MODNAME:Mperl*} # Fix build failure on clang >= 12 .if ${OSVERSION} >= 1301000 CFLAGS+= -Wno-compound-token-split-by-macro .endif .endif .if !target(post-install) post-install: ${MKDIR} ${STAGEDIR}${UNIT_DBDIR} ${MKDIR} ${STAGEDIR}${UNIT_LOGDIR} ${MKDIR} ${STAGEDIR}${UNIT_RUNDIR} ${MKDIR} ${STAGEDIR}${UNIT_TMPDIR} ${ECHO_CMD} @dir ${UNIT_DBDIR} >> ${TMPPLIST} ${ECHO_CMD} @dir ${UNIT_LOGDIR} >> ${TMPPLIST} ${ECHO_CMD} @dir ${UNIT_RUNDIR} >> ${TMPPLIST} ${ECHO_CMD} @dir ${UNIT_TMPDIR} >> ${TMPPLIST} ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules ${INSTALL_MAN} ${WRKSRC}/build/unitd.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8 .endif .include "../../www/unit/version.mk" .include diff --git a/www/unit/distinfo b/www/unit/distinfo index 8645dd0385e1..9f8623349734 100644 --- a/www/unit/distinfo +++ b/www/unit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1671145509 -SHA256 (unit-1.29.0.tar.gz) = 1ddb4d7c67c2da25c4bacbcace9061d417f86f55002ff6c409483feb9aea57d9 -SIZE (unit-1.29.0.tar.gz) = 903909 +TIMESTAMP = 1677622904 +SHA256 (unit-1.29.1.tar.gz) = 7d756cff8c1a40b38c313fdbe8748333ffce034a3916fa1b502d63cc10623437 +SIZE (unit-1.29.1.tar.gz) = 906654 diff --git a/www/unit/version.mk b/www/unit/version.mk index a8583cac14f7..d39edbc53d7a 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.29.0 +UNIT_VERSION= 1.29.1 .endif # UNITVERSION_MK