From nobody Fri May 12 14:36:24 2023 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 4QHrtJ6jy6z4B5Dn; Fri, 12 May 2023 14:36:24 +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 4QHrtJ67Nhz43wY; Fri, 12 May 2023 14:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683902184; 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=rDpwDtE22M89rhvyoAy+IJCNfzUdSAWT1yD7Kw3T568=; b=TOCKzb3tcn4SVHM7kwxQbX6RQUdnYqxOq1SgK58xqI5h5qvTyBIMuIXXPRsbo+wT7xyfXu neboEFeZAioo4du2QbD8MlArVdsLbIgPliWMgxz/iUfqLwEU2kdbUKSjukLJAGFdb2dcTo eWrY9zU4YRIS8meWQc6KTua+CO5ExDQHVdPjnBC4dNXf0tdn7fWiAk96SVLOVBSMPrewpj JCCossmm9zmS4DP+IC/Bl1Tqdz0UW7Sw0ui3FTqPNQtrjwYK9B3Cdqm0nuMWcFVBMMIV+1 CiadlJib+M1T0Zg9A8izthwUtv1wZV36cXRcTcq0z9FrpROX883tMmusT8PYmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683902184; 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=rDpwDtE22M89rhvyoAy+IJCNfzUdSAWT1yD7Kw3T568=; b=yHVI7oxwCeTCcuQsRZJ0JA6CU7vkYHHUN1uerW76DwIUV/0/T5VOh4184kUdaTfexTGxPz +dA5+15nCHfZcXIaAcmcP11bKY7mUS9wFfkzIQxtsuK8jx06XHhH6konIdhtQ8RmdxaKg5 256DvHwrlst2Sz1VxCzVRCSnJcu/otf5ABVjtyIii6Q3mBgo3yXTfIb/e9C9qehb77vhi7 1PBaSOITLF4CfQo4eWrSBcFWuSQgYV8zC+S9Gc1xIBccVcRurGfpeC/FmV/yTucvo9h+UH IKdlcMFL6Hyiizv3yIbqavmfNt/YI48tE0/PbZTgCZMKO6dZl9scYhxhQfEO9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683902184; a=rsa-sha256; cv=none; b=q0tqvJNGQj2JSrlAJliCsb3MTh3jmeFmJFWnm9CW3xm82YSKchp+6t4Zh/cB1wuuTJtRYf x8e+Vms5ZJVqY4fgnr5WxKNtXpJIBOfA2SV1KuKqyn4kNefMnvghqYYwgsh/Tef14y+C9T NIM71P5hOcngZ2fMMiwhiliPlOMYQ7ffx/5S9AU7F8Eht2s2jNmIi9FeJd8KXr5XrB17Pm e09dQ7uo3W5DEERqXRZEespwoQpbYJA7EAJMm4uVdmck3DvpinZ5vjuSgvnieKXVcgz4/K erlv7LfcmwilamOOkrtrCUaDBZehY+Kg/Sx84mLSGk22TCwrZO8IIKy+9DZhkQ== 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 4QHrtJ5DRbzf4k; Fri, 12 May 2023 14:36:24 +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 34CEaOV4048317; Fri, 12 May 2023 14:36:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CEaOH7048316; Fri, 12 May 2023 14:36:24 GMT (envelope-from git) Date: Fri, 12 May 2023 14:36:24 GMT Message-Id: <202305121436.34CEaOH7048316@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 6684134299d5 - main - */*unit*: update NGINX Unit: 1.29.1 -> 1.30.0 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6684134299d5750fc4c390646a4410e13497e51d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=6684134299d5750fc4c390646a4410e13497e51d commit 6684134299d5750fc4c390646a4410e13497e51d Author: Sergey A. Osokin AuthorDate: 2023-05-12 14:35:33 +0000 Commit: Sergey A. Osokin CommitDate: 2023-05-12 14:36:16 +0000 */*unit*: update NGINX Unit: 1.29.1 -> 1.30.0 *) Change: remove Unix domain listen sockets upon reconfiguration. *) Feature: basic URI rewrite support. *) Feature: NJS loadable modules support. *) Feature: per-application logging. *) Feature: conditional logging of route selection. *) Feature: support the keys API on the request objects in NJS. *) Feature: default values for 'make install' pathnames such as prefix; this allows to './configure && make && sudo make install'. *) Feature: "server_version" setting to omit the version token from "Server" header field. *) Bugfix: request header field values could be corrupted in some cases; the bug had appeared in 1.29.0. *) Bugfix: PHP error handling (added missing 403 and 404 errors). *) Bugfix: Perl applications crash on second responder call. --- devel/libunit/Makefile | 2 +- www/unit-java/distinfo | 6 +++--- www/unit-perl/Makefile | 2 +- www/unit-php/Makefile | 2 +- www/unit-python/Makefile | 2 +- www/unit-ruby/Makefile | 2 +- www/unit/Makefile | 12 ++++++++---- www/unit/distinfo | 6 +++--- www/unit/version.mk | 2 +- www/unitc/distinfo | 6 +++--- 10 files changed, 23 insertions(+), 19 deletions(-) diff --git a/devel/libunit/Makefile b/devel/libunit/Makefile index e424961a2640..5dbb6e8683fd 100644 --- a/devel/libunit/Makefile +++ b/devel/libunit/Makefile @@ -37,7 +37,7 @@ PLIST_FILES+= include/nxt_auto_config.h \ lib/libunit.a do-build: - @cd ${WRKSRC} && ${MAKE} build/libunit.a + @cd ${WRKSRC} && ${MAKE} build/lib/libunit.a do-install: ${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${STAGEDIR} diff --git a/www/unit-java/distinfo b/www/unit-java/distinfo index 2099d5ed57fb..46a8fb8fc501 100644 --- a/www/unit-java/distinfo +++ b/www/unit-java/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1677692680 -SHA256 (unit-1.29.1.tar.gz) = 7d756cff8c1a40b38c313fdbe8748333ffce034a3916fa1b502d63cc10623437 -SIZE (unit-1.29.1.tar.gz) = 906654 +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 SHA256 (ecj-3.26.0.jar) = ac0ba5876eaf7ebb47749a0d1be179c51f194b9dd0b875d1c09e1b530f5a2db5 diff --git a/www/unit-perl/Makefile b/www/unit-perl/Makefile index 7766b6c2394d..d24b5506ca0c 100644 --- a/www/unit-perl/Makefile +++ b/www/unit-perl/Makefile @@ -26,7 +26,7 @@ do-build: do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ - ${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \ + ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \ ${STAGEDIR}${PREFIX}/libexec/unit/modules/ # Overwrite the target in the ${MASTERDIR}/Makefile diff --git a/www/unit-php/Makefile b/www/unit-php/Makefile index 08e2431f6a96..34bd9a876100 100644 --- a/www/unit-php/Makefile +++ b/www/unit-php/Makefile @@ -27,7 +27,7 @@ do-build: do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ - ${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \ + ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \ ${STAGEDIR}${PREFIX}/libexec/unit/modules/ # Overwrite the target in the ${MASTERDIR}/Makefile diff --git a/www/unit-python/Makefile b/www/unit-python/Makefile index 217184094274..4bedca571065 100644 --- a/www/unit-python/Makefile +++ b/www/unit-python/Makefile @@ -28,7 +28,7 @@ do-build: do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ - ${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \ + ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \ ${STAGEDIR}${PREFIX}/libexec/unit/modules/ # Overwrite the target in the ${MASTERDIR}/Makefile diff --git a/www/unit-ruby/Makefile b/www/unit-ruby/Makefile index 3f2dc4bc7824..cea2e9dd1252 100644 --- a/www/unit-ruby/Makefile +++ b/www/unit-ruby/Makefile @@ -30,7 +30,7 @@ do-build: do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ - ${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \ + ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \ ${STAGEDIR}${PREFIX}/libexec/unit/modules/ # Overwrite the target in the ${MASTERDIR}/Makefile diff --git a/www/unit/Makefile b/www/unit/Makefile index df85abe9fd58..018e336e7b0f 100644 --- a/www/unit/Makefile +++ b/www/unit/Makefile @@ -51,10 +51,12 @@ UNIT_TMPDIR?= ${UNIT_VARDIR}/tmp/unit CONFIGURE_ARGS= --prefix=${PREFIX} \ --ld-opt="-L${LOCALBASE}/lib" \ --log=${UNIT_LOGFILE} \ - --modules=libexec/unit/modules \ + --logdir=${UNIT_LOGDIR} \ + --modulesdir=${PREFIX}/libexec/unit/modules \ --pid=${UNIT_PIDFILE} \ - --state=${UNIT_DBDIR} \ - --tmp=${UNIT_TMPDIR} \ + --runstatedir=${UNIT_RUNDIR} \ + --statedir=${UNIT_DBDIR} \ + --tmpdir=${UNIT_TMPDIR} \ --user=${WWWOWN} --group=${WWWGRP} USERS?= ${WWWOWN} @@ -84,6 +86,7 @@ CONFIGURE_ARGS+=--no-ipv6 .endif .if ${PORT_OPTIONS:MNJS} +USES+= pkgconfig BUILD_DEPENDS+= ${LOCALBASE}/lib/libnjs.a:devel/libnjs CONFIGURE_ARGS+=--njs \ --cc-opt="-I${LOCALBASE}/include" \ @@ -132,7 +135,8 @@ post-install: ${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 + ${INSTALL_MAN} ${WRKSRC}/build/share/man/man8/unitd.8 \ + ${STAGEDIR}${MAN8PREFIX}/share/man/man8 .endif .include "../../www/unit/version.mk" diff --git a/www/unit/distinfo b/www/unit/distinfo index 9f8623349734..1f2da79c10fb 100644 --- a/www/unit/distinfo +++ b/www/unit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677622904 -SHA256 (unit-1.29.1.tar.gz) = 7d756cff8c1a40b38c313fdbe8748333ffce034a3916fa1b502d63cc10623437 -SIZE (unit-1.29.1.tar.gz) = 906654 +TIMESTAMP = 1683828429 +SHA256 (unit-1.30.0.tar.gz) = 129ba1b3c4e33dfadbd38683f0634152d8ecf770cacf3af50ee50b5683dc498b +SIZE (unit-1.30.0.tar.gz) = 894843 diff --git a/www/unit/version.mk b/www/unit/version.mk index d39edbc53d7a..9b269d2d71b3 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.29.1 +UNIT_VERSION= 1.30.0 .endif # UNITVERSION_MK diff --git a/www/unitc/distinfo b/www/unitc/distinfo index 9f8623349734..2a373c720e8f 100644 --- a/www/unitc/distinfo +++ b/www/unitc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677622904 -SHA256 (unit-1.29.1.tar.gz) = 7d756cff8c1a40b38c313fdbe8748333ffce034a3916fa1b502d63cc10623437 -SIZE (unit-1.29.1.tar.gz) = 906654 +TIMESTAMP = 1683845953 +SHA256 (unit-1.30.0.tar.gz) = 129ba1b3c4e33dfadbd38683f0634152d8ecf770cacf3af50ee50b5683dc498b +SIZE (unit-1.30.0.tar.gz) = 894843