CVS commit: pkgsrc

["Sergey A. Osokin" <osa%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   osa
Date:           Mon May 15 22:24:38 UTC 2023

Modified Files:
        pkgsrc/devel/libunit: Makefile
        pkgsrc/www/unit: Makefile.common distinfo ext.mk version.mk

Log Message:
*/*unit*: update NGINX Unit: 1.29.1 -> 1.30.0

<ChangeLog>

*) 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.

</ChangeLog>


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/libunit/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/unit/Makefile.common
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/unit/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/unit/ext.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/unit/version.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libunit/Makefile
diff -u pkgsrc/devel/libunit/Makefile:1.5 pkgsrc/devel/libunit/Makefile:1.6
--- pkgsrc/devel/libunit/Makefile:1.5   Wed Feb 23 04:24:37 2022
+++ pkgsrc/devel/libunit/Makefile       Mon May 15 22:24:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/02/23 04:24:37 osa Exp $
+# $NetBSD: Makefile,v 1.6 2023/05/15 22:24:38 osa Exp $
 
 PKGNAME=       libunit-${UNIT_VERSION}
 DISTNAME=      unit-${UNIT_VERSION}
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=      --ld-opt="-L${PREFIX}/l
 CONFIGURE_ARGS+=       --no-regex
 
 do-build:
-       cd ${WRKSRC} && ${MAKE} build/libunit.a
+       cd ${WRKSRC} && ${MAKE} build/lib/libunit.a
 
 do-install:
        ${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${DESTDIR}

Index: pkgsrc/www/unit/Makefile.common
diff -u pkgsrc/www/unit/Makefile.common:1.4 pkgsrc/www/unit/Makefile.common:1.5
--- pkgsrc/www/unit/Makefile.common:1.4 Sun Aug 22 04:03:07 2021
+++ pkgsrc/www/unit/Makefile.common     Mon May 15 22:24:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2021/08/22 04:03:07 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.5 2023/05/15 22:24:38 osa Exp $
 #
 # used by devel/libunit/Makefile
 # used by www/unit/Makefile
@@ -42,11 +42,13 @@ CONFIGURE_ENV+=             PATH=${PATH}
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --ld-opt="-L${PREFIX}/lib -R${PREFIX}/lib"
 CONFIGURE_ARGS+=       --log=${UNIT_LOGDIR}/unit.log
-CONFIGURE_ARGS+=       --modules=${UNIT_EXTENSION_DIR}
+CONFIGURE_ARGS+=       --logdir=${UNIT_LOGDIR}
+CONFIGURE_ARGS+=       --modulesdir=${PREFIX}/${UNIT_EXTENSION_DIR}
 CONFIGURE_ARGS+=       --pid=${UNIT_PIDDIR}/unit.pid
-CONFIGURE_ARGS+=       --state=${UNIT_DATADIR}
+CONFIGURE_ARGS+=       --runstatedir=${UNIT_RUNDIR}
+CONFIGURE_ARGS+=       --statedir=${UNIT_DATADIR}
 CONFIGURE_ARGS+=       --control=unix:${UNIT_RUNDIR}/control.unit.sock
-CONFIGURE_ARGS+=       --tmp=${UNIT_TMPDIR}
+CONFIGURE_ARGS+=       --tmpdir=${UNIT_TMPDIR}
 CONFIGURE_ARGS+=       --user=${UNIT_USER}
 CONFIGURE_ARGS+=       --group=${UNIT_GROUP}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}

Index: pkgsrc/www/unit/distinfo
diff -u pkgsrc/www/unit/distinfo:1.14 pkgsrc/www/unit/distinfo:1.15
--- pkgsrc/www/unit/distinfo:1.14       Tue Apr 18 19:24:52 2023
+++ pkgsrc/www/unit/distinfo    Mon May 15 22:24:38 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2023/04/18 19:24:52 osa Exp $
+$NetBSD: distinfo,v 1.15 2023/05/15 22:24:38 osa Exp $
 
-BLAKE2s (unit-1.29.1.tar.gz) = 83fa858c826b16a9545f473c1ad5a251ae3781478d552c4a3e1c5100a8090ba1
-SHA512 (unit-1.29.1.tar.gz) = c99cea78804ead999e62777132fe204e0f87e1b58e55b0b4a074ab8d203149c14c8faef64872a44404f8fca5bfd98d2f9e4aae2db89bebeee15f27cabbc9f247
-Size (unit-1.29.1.tar.gz) = 906654 bytes
+BLAKE2s (unit-1.30.0.tar.gz) = f7e52b90480d529ef304cc659b123819270d24c74e5c9085a61d71b59c409e35
+SHA512 (unit-1.30.0.tar.gz) = cee27016c5445eb44d144a491c6ec36445e45492c09775ec62613dd260e36a9a2d387088e3ae814082d1782dbcefca105e884ebd21dea94288a03062c945139d
+Size (unit-1.30.0.tar.gz) = 894843 bytes
 SHA1 (patch-auto_events) = 0556b5d3db6b88d23d686d9da1f3274187079973
 SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
 SHA1 (patch-auto_shmem) = cb37c368c19205c2cc1750f4a847af23be8bfa25

Index: pkgsrc/www/unit/ext.mk
diff -u pkgsrc/www/unit/ext.mk:1.2 pkgsrc/www/unit/ext.mk:1.3
--- pkgsrc/www/unit/ext.mk:1.2  Sun Feb 14 13:43:39 2021
+++ pkgsrc/www/unit/ext.mk      Mon May 15 22:24:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ext.mk,v 1.2 2021/02/14 13:43:39 otis Exp $
+# $NetBSD: ext.mk,v 1.3 2023/05/15 22:24:38 osa Exp $
 #
 # NGINX Unit extension package framework, for bundled extensions.
 #
@@ -45,7 +45,7 @@ do-build:
        cd ${WRKSRC} && ${MAKE} ${MODNAME}
 
 do-install:
-       ${INSTALL_LIB} ${WRKSRC}/build/${PKGMODNAME}.${SHLIB_SUFFIX} \
+       ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${PKGMODNAME}.${SHLIB_SUFFIX} \
                ${DESTDIR}${PREFIX}/${UNIT_EXTENSION_DIR}
 
 .endif  # UNITEXT_MK

Index: pkgsrc/www/unit/version.mk
diff -u pkgsrc/www/unit/version.mk:1.8 pkgsrc/www/unit/version.mk:1.9
--- pkgsrc/www/unit/version.mk:1.8      Tue Apr 18 19:24:52 2023
+++ pkgsrc/www/unit/version.mk  Mon May 15 22:24:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.8 2023/04/18 19:24:52 osa Exp $
+# $NetBSD: version.mk,v 1.9 2023/05/15 22:24:38 osa Exp $
 #
 # UNIT_EXTENSION_DIR
 #      Relative path to ${PREFIX} for NGINX Unit's modules.
@@ -12,7 +12,7 @@
 UNITVERSION_MK=        defined
 
 # Define NGINX Unit's version.
-UNIT_VERSION=  1.29.1
+UNIT_VERSION=  1.30.0
 
 # Define NGINX Unit's modules directory
 UNIT_EXTENSION_DIR=    libexec/unit/modules