Index: head/www/unit/Makefile =================================================================== --- head/www/unit/Makefile (revision 544842) +++ head/www/unit/Makefile (revision 544843) @@ -1,122 +1,121 @@ # Created by: Sergey A. Osokin # $FreeBSD$ PORTNAME= unit -PORTVERSION= 1.18.0 -PORTREVISION= 1 +PORTVERSION= 1.19.0 CATEGORIES= www MASTER_SITES= https://unit.nginx.org/download/ MAINTAINER= osa@FreeBSD.org COMMENT?= Dynamic web application server LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE PATCH_STRIP= -p1 USES+= compiler:c11 cpe CPE_VENDOR= nginx CPE_PRODUCT= unit OPTIONS_DEFINE?= \ DEBUG \ DEVKIT \ IPV6 \ SSL \ UNIXSOCK OPTIONS_DEFAULT?=UNIXSOCK DEBUG_DESC= Enable debug logging DEVKIT_DESC= Install headers and library SSL_DESC= Enable SSL/TLS UNIXSOCK_DESC= Enable unix sockets .include HAS_CONFIGURE= yes UNIT_VARDIR?= /var 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=libexec/unit \ --tmp=${UNIT_TMPDIR} \ --user=${WWWOWN} --group=${WWWGRP} USERS?= ${WWWOWN} GROUPS?=${WWWGRP} ALL_TARGET= PLIST_DIRS?= libexec/unit/modules \ libexec/unit PLIST_FILES?= sbin/unitd 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 ${PORT_OPTIONS:MDEVKIT} PLIST_FILES+= include/nxt_unit_field.h \ include/nxt_unit_request.h \ include/nxt_unit_response.h \ include/nxt_unit_sptr.h \ include/nxt_unit_typedefs.h \ include/nxt_unit_websocket.h \ include/nxt_unit.h \ include/nxt_version.h \ include/nxt_websocket_header.h \ lib/libunit.a .endif .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--no-ipv6 .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 post-build-DEVKIT-on: @cd ${WRKSRC} && ${MAKE} build/libunit.a .if !target(post-install) post-install: ${MKDIR} ${STAGEDIR}${UNIT_LOGDIR} ${MKDIR} ${STAGEDIR}${UNIT_RUNDIR} ${MKDIR} ${STAGEDIR}${UNIT_TMPDIR} ${ECHO_CMD} @dir ${UNIT_LOGDIR} >> ${TMPPLIST} ${ECHO_CMD} @dir ${UNIT_RUNDIR} >> ${TMPPLIST} ${ECHO_CMD} @dir ${UNIT_TMPDIR} >> ${TMPPLIST} ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules post-install-DEVKIT-on: ${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${STAGEDIR} .endif .include Index: head/www/unit/distinfo =================================================================== --- head/www/unit/distinfo (revision 544842) +++ head/www/unit/distinfo (revision 544843) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590688617 -SHA256 (unit-1.18.0.tar.gz) = 43ffa7b935b081a5e99c0cc875b823daf4f20fc1938cd3483dc7bffaf15ec089 -SIZE (unit-1.18.0.tar.gz) = 742273 +TIMESTAMP = 1597354325 +SHA256 (unit-1.19.0.tar.gz) = 8cb849420221932685689708235efbfef2024656f856b72887ae9ff1cf75f98b +SIZE (unit-1.19.0.tar.gz) = 761292 Index: head/www/unit/files/patch-fix-rootfs-build =================================================================== --- head/www/unit/files/patch-fix-rootfs-build (revision 544842) +++ head/www/unit/files/patch-fix-rootfs-build (nonexistent) @@ -1,169 +0,0 @@ -# HG changeset patch -# User Tiago Natel de Moura -# Date 1590694099 -3600 -# Thu May 28 20:28:19 2020 +0100 -# Node ID 6fcd2b868ff0603173af1f13642b996805eea1eb -# Parent 9e14c63773be52613dd47dea9fd113037f15a3eb -Python: fixed configure script on OSX. - -diff --git a/auto/modules/python b/auto/modules/python ---- a/auto/modules/python -+++ b/auto/modules/python -@@ -68,7 +68,6 @@ if /bin/sh -c "$NXT_PYTHON_CONFIG --pref - NXT_PYTHON_CONFIG="${NXT_PYTHON_CONFIG} --embed" - fi - -- NXT_PYTHON_EXEC=`${NXT_PYTHON_CONFIG} --exec-prefix`/bin/${NXT_PYTHON} - NXT_PYTHON_INCLUDE=`${NXT_PYTHON_CONFIG} --includes` - NXT_PYTHON_LIBS=`${NXT_PYTHON_CONFIG} --ldflags` - -@@ -133,7 +132,7 @@ fi - - NXT_PYTHON_MOUNTS_HEADER=$NXT_BUILD_DIR/nxt_python_mounts.h - --$NXT_PYTHON_EXEC -c 'import os.path -+$NXT_PYTHON -c 'import os.path - import sys - pyver = "python" + str(sys.version_info[0]) + "." + str(sys.version_info[1]) - -# HG changeset patch -# User Tiago Natel de Moura -# Date 1590694548 -3600 -# Thu May 28 20:35:48 2020 +0100 -# Node ID 9c63e42284103b24c9f23639ac9c71c91793136b -# Parent 6fcd2b868ff0603173af1f13642b996805eea1eb -Isolation: fixed build when features aren't detected. - -diff --git a/auto/isolation b/auto/isolation ---- a/auto/isolation -+++ b/auto/isolation -@@ -111,7 +111,7 @@ nxt_feature_libs= - nxt_feature_test="#include - - int main() { -- return MS_BIND | MS_REC -+ return MS_BIND | MS_REC; - }" - . auto/feature - -diff --git a/src/nxt_application.c b/src/nxt_application.c ---- a/src/nxt_application.c -+++ b/src/nxt_application.c -@@ -474,20 +474,24 @@ nxt_discovery_quit(nxt_task_t *task, nxt - static nxt_int_t - nxt_app_prefork(nxt_task_t *task, nxt_process_t *process, nxt_mp_t *mp) - { -- nxt_int_t cap_setid, cap_chroot; -+ nxt_int_t cap_setid; - nxt_int_t ret; - nxt_runtime_t *rt; - nxt_common_app_conf_t *app_conf; -- nxt_app_lang_module_t *lang; - - rt = task->thread->runtime; - app_conf = process->data.app; - cap_setid = rt->capabilities.setid; -+ -+#if (NXT_HAVE_ISOLATION_ROOTFS) -+ nxt_int_t cap_chroot; -+ nxt_app_lang_module_t *lang; -+ - cap_chroot = rt->capabilities.chroot; -- - lang = nxt_app_lang_module(rt, &app_conf->type); - - nxt_assert(lang != NULL); -+#endif - - if (app_conf->isolation != NULL) { - ret = nxt_app_set_isolation(task, app_conf->isolation, process); -@@ -499,7 +503,10 @@ nxt_app_prefork(nxt_task_t *task, nxt_pr - #if (NXT_HAVE_CLONE_NEWUSER) - if (nxt_is_clone_flag_set(process->isolation.clone.flags, NEWUSER)) { - cap_setid = 1; -+ -+#if (NXT_HAVE_ISOLATION_ROOTFS) - cap_chroot = 1; -+#endif - } - #endif - -diff --git a/src/nxt_process.c b/src/nxt_process.c ---- a/src/nxt_process.c -+++ b/src/nxt_process.c -@@ -37,13 +37,11 @@ static void nxt_process_created_error(nx - static nxt_int_t nxt_process_chroot(nxt_task_t *task, const char *path); - #endif - --#if (NXT_HAVE_PIVOT_ROOT) -+#if (NXT_HAVE_ISOLATION_ROOTFS) && (NXT_HAVE_PIVOT_ROOT) \ -+ && (NXT_HAVE_CLONE_NEWNS) - static nxt_int_t nxt_process_pivot_root(nxt_task_t *task, const char *rootfs); - static nxt_int_t nxt_process_private_mount(nxt_task_t *task, - const char *rootfs); --#endif -- --#if (NXT_HAVE_PIVOT_ROOT) - static int nxt_pivot_root(const char *new_root, const char *old_root); - #endif - -@@ -590,11 +588,6 @@ nxt_process_change_root(nxt_task_t *task - #endif - - --#endif -- -- --#if (NXT_HAVE_ISOLATION_ROOTFS) -- - static nxt_int_t - nxt_process_chroot(nxt_task_t *task, const char *path) - { -@@ -625,8 +618,6 @@ nxt_process_unmount_all(nxt_task_t *task - } - } - --#endif -- - - #if (NXT_HAVE_PIVOT_ROOT) && (NXT_HAVE_CLONE_NEWNS) - -@@ -856,6 +847,8 @@ nxt_pivot_root(const char *new_root, con - - #endif - -+#endif -+ - - static nxt_int_t - nxt_process_send_ready(nxt_task_t *task, nxt_process_t *process) -diff --git a/src/perl/nxt_perl_psgi.c b/src/perl/nxt_perl_psgi.c ---- a/src/perl/nxt_perl_psgi.c -+++ b/src/perl/nxt_perl_psgi.c -@@ -118,12 +118,8 @@ NXT_EXPORT nxt_app_module_t nxt_app_mod - nxt_perl_psgi_compat, - nxt_string("perl"), - PERL_VERSION_STRING, -- --#if (NXT_HAVE_ISOLATION_ROOTFS) - NULL, - 0, --#endif -- - NULL, - nxt_perl_psgi_start, - }; -diff --git a/src/ruby/nxt_ruby.c b/src/ruby/nxt_ruby.c ---- a/src/ruby/nxt_ruby.c -+++ b/src/ruby/nxt_ruby.c -@@ -79,10 +79,8 @@ NXT_EXPORT nxt_app_module_t nxt_app_mod - compat, - nxt_string("ruby"), - ruby_version, --#if (NXT_HAVE_ISOLATION_ROOTFS) - nxt_ruby_mounts, - nxt_nitems(nxt_ruby_mounts), --#endif - NULL, - nxt_ruby_start, - }; Property changes on: head/www/unit/files/patch-fix-rootfs-build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property