diff --git a/www/angie/Makefile b/www/angie/Makefile index 97361cc17f29..85409be0f36d 100644 --- a/www/angie/Makefile +++ b/www/angie/Makefile @@ -1,187 +1,184 @@ -PORTNAME?= angie -DISTVERSION= 1.8.1 -CATEGORIES+= www -MASTER_SITES+= https://download.angie.software/files/:angie -DISTNAME= angie-${DISTVERSIONFULL} -DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}:angie - -MAINTAINER?= oleg@mamontov.net -COMMENT?= Efficient, powerful and scalable reverse proxy and web server -WWW?= https://angie.software/en/ - -LICENSE?= BSD2CLAUSE -.if ${PORTNAME} == angie -LICENSE_FILE= ${WRKSRC}/LICENSE -.else -LICENSE_FILE?= ${WRKSRC_module}/LICENSE -.endif - -.if ${PORTNAME} == angie -LIB_DEPENDS= libpcre2-8.so:devel/pcre2 -.else -BUILD_DEPENDS+= pcre2>=0:devel/pcre2 -RUN_DEPENDS+= angie==${PKGVERSION}:www/angie -.endif +PORTNAME?= angie +DISTVERSION= 1.9.1 +CATEGORIES+= www +MASTER_SITES+= https://download.angie.software/files/:angie +DISTNAME= angie-${DISTVERSIONFULL} +DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}:angie -USES+= localbase:ldflags ssl -USE_GITHUB= nodefault +MAINTAINER?= oleg@mamontov.net +COMMENT?= Efficient, powerful and scalable reverse proxy and web server +WWW?= https://angie.software/en/ -HAS_CONFIGURE?= yes +LICENSE?= BSD2CLAUSE .if ${PORTNAME} == angie -ALL_TARGET= build -SUB_FILES= angie.conf.sample \ - default.conf.sample \ - example.conf.sample \ - pkg-message -USE_RC_SUBR= angie +LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 +USE_RC_SUBR= angie +ALL_TARGET= build +SUB_FILES= angie.conf.sample \ + default.conf.sample \ + example.conf.sample \ + pkg-message .else -ALL_TARGET?= modules -CONFIGURE_ADD?= --add-dynamic-module=${WRKSRC_module} +LICENSE_FILE?= ${WRKSRC_module}/LICENSE +BUILD_DEPENDS+= pcre2>=0:devel/pcre2 +RUN_DEPENDS+= angie==${PKGVERSION}:www/angie +ALL_TARGET?= modules +CONFIGURE_ADD?= --add-dynamic-module=${WRKSRC_module} .endif -# modules always have their own assets -PATCHDIR?= ${.CURDIR}/files -FILESDIR?= ${.CURDIR}/files -SCRIPTDIR?= ${.CURDIR}/scripts -PKGDIR?= ${.CURDIR} +USES+= localbase:ldflags ssl +USE_GITHUB= nodefault + +HAS_CONFIGURE?= yes +CONFIGURE_ARGS= --prefix=${PREFIX}/etc/angie \ + --conf-path=${PREFIX}/etc/angie/angie.conf \ + --error-log-path=${LOGDIR}/error.log \ + --http-log-path=${LOGDIR}/access.log \ + --lock-path=${RUNDIR}/angie.lock \ + --modules-path=${MODDIR} \ + --pid-path=${RUNDIR}/angie.pid \ + --sbin-path=${PREFIX}/sbin/angie \ + --http-client-body-temp-path=${CACHEDIR}/client_temp \ + --http-fastcgi-temp-path=${CACHEDIR}/fastcgi_temp \ + --http-proxy-temp-path=${CACHEDIR}/proxy_temp \ + --http-scgi-temp-path=${CACHEDIR}/scgi_temp \ + --http-uwsgi-temp-path=${CACHEDIR}/uwsgi_temp \ + --user=${WWWOWN} \ + --group=${WWWGRP} \ + --with-file-aio \ + --with-http_addition_module \ + --with-http_auth_request_module \ + --with-http_dav_module \ + --with-http_flv_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_mp4_module \ + --with-http_random_index_module \ + --with-http_realip_module \ + --with-http_secure_link_module \ + --with-http_slice_module \ + --with-http_ssl_module \ + --with-http_stub_status_module \ + --with-http_sub_module \ + --with-http_v2_module \ + --with-http_v3_module \ + --with-mail \ + --with-mail_ssl_module \ + --with-stream \ + --with-stream_realip_module \ + --with-stream_ssl_module \ + --with-stream_ssl_preread_module \ + --with-threads \ + --with-cc-opt="${CFLAGS}" \ + --with-ld-opt="${LDFLAGS}" \ + ${CONFIGURE_ADD} # angie-specific variables -CACHEDIR= /var/cache/angie -LOGDIR= /var/log/angie -MODDIR= ${PREFIX}/libexec/angie -RUNDIR= /var/run -WRKSRC_DEBUG= ${WRKSRC}-debug - -PLIST_SUB+= CACHEDIR=${CACHEDIR} \ - LOGDIR=${LOGDIR} \ - MODDIR=${MODDIR} \ - RUNDIR=${RUNDIR} - -SUB_LIST+= CACHEDIR=${CACHEDIR} \ - LOGDIR=${LOGDIR} \ - MODDIR=${MODDIR} \ - RUNDIR=${RUNDIR} \ - WWWOWN=${WWWOWN} - -SUB_FILES?= pkg-message - -OPTIONS_SUB= yes - -CONFIGURE_ARGS= --prefix=${PREFIX}/etc/angie \ - --conf-path=${PREFIX}/etc/angie/angie.conf \ - --error-log-path=${LOGDIR}/error.log \ - --http-log-path=${LOGDIR}/access.log \ - --lock-path=${RUNDIR}/angie.lock \ - --modules-path=${MODDIR} \ - --pid-path=${RUNDIR}/angie.pid \ - --sbin-path=${PREFIX}/sbin/angie \ - --http-client-body-temp-path=${CACHEDIR}/client_temp \ - --http-fastcgi-temp-path=${CACHEDIR}/fastcgi_temp \ - --http-proxy-temp-path=${CACHEDIR}/proxy_temp \ - --http-scgi-temp-path=${CACHEDIR}/scgi_temp \ - --http-uwsgi-temp-path=${CACHEDIR}/uwsgi_temp \ - --user=${WWWOWN} \ - --group=${WWWGRP} \ - --with-file-aio \ - --with-http_addition_module \ - --with-http_auth_request_module \ - --with-http_dav_module \ - --with-http_flv_module \ - --with-http_gunzip_module \ - --with-http_gzip_static_module \ - --with-http_mp4_module \ - --with-http_random_index_module \ - --with-http_realip_module \ - --with-http_secure_link_module \ - --with-http_slice_module \ - --with-http_ssl_module \ - --with-http_stub_status_module \ - --with-http_sub_module \ - --with-http_v2_module \ - --with-http_v3_module \ - --with-mail \ - --with-mail_ssl_module \ - --with-stream \ - --with-stream_realip_module \ - --with-stream_ssl_module \ - --with-stream_ssl_preread_module \ - --with-threads \ - --with-cc-opt="${CFLAGS}" \ - --with-ld-opt="${LDFLAGS}" \ - ${CONFIGURE_ADD} +CACHEDIR= /var/cache/angie +DBDIR= /var/db/angie +ETCDIR= ${PREFIX}/etc/angie +LOGDIR= /var/log/angie +MODDIR= ${PREFIX}/libexec/angie +RUNDIR= /var/run +WRKSRC_DEBUG= ${WRKSRC}-debug +# modules always have their own assets +FILESDIR?= ${.CURDIR}/files +PATCHDIR?= ${.CURDIR}/files +PKGDIR?= ${.CURDIR} +SCRIPTDIR?= ${.CURDIR}/scripts + +SUB_FILES?= pkg-message +SUB_LIST+= CACHEDIR=${CACHEDIR} \ + DBDIR=${DBDIR} \ + ETCDIR=${ETCDIR} \ + LOGDIR=${LOGDIR} \ + MODDIR=${MODDIR} \ + RUNDIR=${RUNDIR} \ + WWWGRP=${WWWGRP} \ + WWWOWN=${WWWOWN} + +PLIST_SUB+= CACHEDIR=${CACHEDIR} \ + DBDIR=${DBDIR} \ + LOGDIR=${LOGDIR} \ + MODDIR=${MODDIR} \ + RUNDIR=${RUNDIR} \ + WWWGRP=${WWWGRP} \ + WWWOWN=${WWWOWN} OPTIONS_DEFINE?= DEBUG OPTIONS_DEFAULT?= DEBUG +OPTIONS_SUB= yes DEBUG_DESC?= Include debug version .include post-patch-DEBUG-on: @${CP} -Rp ${WRKSRC} ${WRKSRC_DEBUG} post-configure-DEBUG-on: @(cd ${WRKSRC_DEBUG} && \ ${SET_LATE_CONFIGURE_ARGS} \ if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ - CFLAGS="${CFLAGS} -g" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ - INSTALL="/usr/bin/install -c" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_LIB="${INSTALL_LIB}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} --with-debug; then \ - ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ - (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT_80} ; \ - ${FALSE}; \ + CFLAGS="${CFLAGS} -g" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ + INSTALL="/usr/bin/install -c" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_LIB="${INSTALL_LIB}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} --with-debug; then \ + ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ + (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT_80} ; \ + ${FALSE}; \ fi \ ) post-build-DEBUG-on: @(cd ${WRKSRC_DEBUG} && ${DO_MAKE_BUILD} ${ALL_TARGET}) .if ${PORTNAME} == angie do-install: ${MKDIR} ${STAGEDIR}${CACHEDIR} + ${MKDIR} ${STAGEDIR}${DBDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${ETCDIR}/http.d ${MKDIR} ${STAGEDIR}${ETCDIR}/stream.d - ${MKDIR} ${STAGEDIR}${LOGDIR} ${MKDIR} ${STAGEDIR}${MODDIR} ${MKDIR} ${STAGEDIR}${WWWDIR}/html ${RLN} ${STAGEDIR}${MODDIR} ${STAGEDIR}${ETCDIR}/modules ${INSTALL_PROGRAM} ${WRKSRC}/objs/angie \ ${STAGEDIR}${PREFIX}/sbin/angie-nodebug ${LN} -fs angie-nodebug ${STAGEDIR}${PREFIX}/sbin/angie ${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${PREFIX}/share/man/man8 .for i in CHANGES CHANGES.ru ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .for i in fastcgi.conf fastcgi_params mime.types scgi_params uwsgi_params ${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}.sample .endfor ${INSTALL_DATA} ${WRKSRC}/conf/prometheus_all.conf \ ${STAGEDIR}${ETCDIR}/prometheus_all.conf.sample ${INSTALL_DATA} ${WRKDIR}/angie.conf.sample \ ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/default.conf.sample \ ${STAGEDIR}${ETCDIR}/http.d ${INSTALL_DATA} ${WRKDIR}/example.conf.sample \ ${STAGEDIR}${ETCDIR}/stream.d .for i in 50x.html index.html ${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${WWWDIR}/html/${i} .endfor do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${BINMODE} ${WRKSRC_DEBUG}/objs/angie \ ${STAGEDIR}${PREFIX}/sbin/angie-debug .endif .include diff --git a/www/angie/distinfo b/www/angie/distinfo index 69f05d2e6e3b..44465aaf3daa 100644 --- a/www/angie/distinfo +++ b/www/angie/distinfo @@ -1,51 +1,51 @@ -TIMESTAMP = 1737668800 -SHA256 (angie-1.8.1.tar.gz) = db30b69045cf9a40f144911814414d9e1b4d4370f6693d008f4017dcb4370b4c -SIZE (angie-1.8.1.tar.gz) = 1672621 +TIMESTAMP = 1749050000 +SHA256 (angie-1.9.1.tar.gz) = af11cc06dfebe7c17832375b348a8d786af052cefce5ffafaaa898484e18ce36 +SIZE (angie-1.9.1.tar.gz) = 1723240 SHA256 (kjdev-nginx-auth-jwt-0.9.0_GH0.tar.gz) = d7c72634261a053afaacc2cb762eccf9ce4c462ca738ad0c4809eb964ddf3c0c SIZE (kjdev-nginx-auth-jwt-0.9.0_GH0.tar.gz) = 75474 SHA256 (stnoonan-spnego-http-auth-nginx-module-v1.1.2_GH0.tar.gz) = 72b4dfe3e3cee4feaa698c5710ec1590f85bfbe4cd50e8e8d1700c210c82150a SIZE (stnoonan-spnego-http-auth-nginx-module-v1.1.2_GH0.tar.gz) = 24682 SHA256 (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b SIZE (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = 16207 SHA256 (nginx-modules-ngx_cache_purge-2.5.3_GH0.tar.gz) = 43158a75bbc8d4ba66ec9c60a1ec13a792803a36b62ffc3fa01088d8675108e0 SIZE (nginx-modules-ngx_cache_purge-2.5.3_GH0.tar.gz) = 17156 SHA256 (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859 SIZE (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = 14558 SHA256 (openresty-echo-nginx-module-v0.63_GH0.tar.gz) = 8af374d29592ef95baee53c91959c7b04927f11304c318a94f0ee140760515a4 SIZE (openresty-echo-nginx-module-v0.63_GH0.tar.gz) = 53421 SHA256 (bpaquet-ngx_http_enhanced_memcached_module-v0.3_GH0.tar.gz) = 4071b2cc0baa9f403c124c0ef0cdfbde14dacc1ec9f0dbc92d7310ac530e3eeb SIZE (bpaquet-ngx_http_enhanced_memcached_module-v0.3_GH0.tar.gz) = 101136 SHA256 (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 6b91d3c2c2f254ebb37eb3dd6dd41048dfb18320bb98a3afdd1ad38b47f6d609 SIZE (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 14188 SHA256 (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = ad72fc23348d715a330994984531fab9b3606e160483236737f9a4a6957d9452 SIZE (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = 8877 SHA256 (openresty-headers-more-nginx-module-v0.37_GH0.tar.gz) = cf6e169d6b350c06d0c730b0eaf4973394026ad40094cddd3b3a5b346577019d SIZE (openresty-headers-more-nginx-module-v0.37_GH0.tar.gz) = 29433 SHA256 (max-lt-nginx-jwt-module-v3.4.2_GH0.tar.gz) = c8c8a01c27e3aab853ddd437c119b9a3fcd1f111c1627ad200a0277b19505ff9 SIZE (max-lt-nginx-jwt-module-v3.4.2_GH0.tar.gz) = 16453 SHA256 (kjdev-nginx-keyval-0.3.0_GH0.tar.gz) = c4e5d2a03ead32cfccb9f04f01a8cdf664f5deca3f677c13b1509bff832cf2c7 SIZE (kjdev-nginx-keyval-0.3.0_GH0.tar.gz) = 24150 SHA256 (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 634827d54de6216cb0502d14f76610788b3a3e33160e91d5578d6db0d9a34a20 SIZE (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 869217 SHA256 (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 3b1103cf5ee940ea94711eae1a7ccc1a161273ec9a08eb415f1d45ad385f967d SIZE (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 395259 SHA256 (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = faa2fcd5168b10764d35081356511d5f84db5c526a1aa4b6add2db94b6853b2b SIZE (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = 66561 SHA256 (nginx-njs-0.8.9_GH0.tar.gz) = 918accac7ec252baac1146e49fdc0f5c101c66ef3b9ceba7ce1b59be704acebf SIZE (nginx-njs-0.8.9_GH0.tar.gz) = 900847 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9 SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742 SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438 SIZE (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = 25471 SHA256 (arut-nginx-rtmp-module-v1.2.2_GH0.tar.gz) = 07f19b7bffec5e357bb8820c63e5281debd45f5a2e6d46b1636d9202c3e09d78 SIZE (arut-nginx-rtmp-module-v1.2.2_GH0.tar.gz) = 519934 SHA256 (openresty-set-misc-nginx-module-v0.33_GH0.tar.gz) = cd5e2cc834bcfa30149e7511f2b5a2183baf0b70dc091af717a89a64e44a2985 SIZE (openresty-set-misc-nginx-module-v0.33_GH0.tar.gz) = 30084 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-e12e965ac1837ca709709f9a26f572a54d83430e_GH0.tar.gz) = da2a26aa75884e1216941c7291b6e8b7fc4dd7163700a04191b92060b61fabb3 SIZE (yaoweibin-ngx_http_substitutions_filter_module-e12e965ac1837ca709709f9a26f572a54d83430e_GH0.tar.gz) = 94121 SHA256 (kyprizel-testcookie-nginx-module-64137c2f7e66e8866f56fdecaaf09ac10a034da9_GH0.tar.gz) = 2946fd88157be64f69e29409160cf48a594fd6272c3f4c6b7f170bfa13074ee0 SIZE (kyprizel-testcookie-nginx-module-64137c2f7e66e8866f56fdecaaf09ac10a034da9_GH0.tar.gz) = 20732 SHA256 (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = c86e318addb9c88d70fdbd58ff1f6ef6f404a93070f6db8017a1f880c97946c4 SIZE (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = 40139 SHA256 (kaltura-nginx-vod-module-1.33_GH0.tar.gz) = 9c9600e5da4ee02ef6820d056da9eb5f3449f715468334ddab41727b76d478d8 SIZE (kaltura-nginx-vod-module-1.33_GH0.tar.gz) = 471858 diff --git a/www/angie/pkg-plist b/www/angie/pkg-plist index 4f1d8cbb5921..d942c89a5322 100644 --- a/www/angie/pkg-plist +++ b/www/angie/pkg-plist @@ -1,28 +1,34 @@ +@preexec test -e %%LOGDIR%% || install -d -m 755 -o root -g wheel %%LOGDIR%% +@preexec test -e %%DBDIR%%/state || install -d -m 755 -o %%WWWOWN%% -g %%WWWGRP%% %%DBDIR%%/state + +@postunexec test -d %%DBDIR%%/state && rmdir %%DBDIR%%/state 2>/dev/null || : +@postunexec test -d %%LOGDIR%% && rmdir %%LOGDIR%% 2>/dev/null || : + @dir %%ETCDIR%%/http.d @dir %%ETCDIR%%/stream.d @dir %%CACHEDIR%% -@dir %%LOGDIR%% +@dir %%DBDIR%% @dir %%MODDIR%% %%ETCDIR%%/modules sbin/angie-nodebug sbin/angie %%DEBUG%%sbin/angie-debug share/man/man8/angie.8.gz %%DOCSDIR%%/CHANGES %%DOCSDIR%%/CHANGES.ru @sample %%ETCDIR%%/angie.conf.sample @sample %%ETCDIR%%/fastcgi.conf.sample @sample %%ETCDIR%%/fastcgi_params.sample @sample %%ETCDIR%%/mime.types.sample @sample %%ETCDIR%%/prometheus_all.conf.sample @sample %%ETCDIR%%/scgi_params.sample @sample %%ETCDIR%%/uwsgi_params.sample @sample %%ETCDIR%%/http.d/default.conf.sample @sample %%ETCDIR%%/stream.d/example.conf.sample %%WWWDIR%%/html/50x.html %%WWWDIR%%/html/index.html