Date: Mon, 25 Nov 2024 17:47:57 GMT From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: beaad8dead17 - main - www/freenginx-devel: Update to 1.27.4 Message-ID: <202411251747.4APHlvR1036097@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=beaad8dead17d4783644d466e4d3003c0ea0e655 commit beaad8dead17d4783644d466e4d3003c0ea0e655 Author: Jochen Neumeister <joneum@FreeBSD.org> AuthorDate: 2024-11-25 17:45:11 +0000 Commit: Jochen Neumeister <joneum@FreeBSD.org> CommitDate: 2024-11-25 17:47:39 +0000 www/freenginx-devel: Update to 1.27.4 Update to 1.27.4, fix Invalid root path PR: 280401 Sponsored by: Netzkommune GmbH --- www/freenginx-devel/Makefile | 6 +++--- www/freenginx-devel/distinfo | 2 +- www/freenginx-devel/files/nginx.in | 2 +- www/freenginx-devel/files/patch-conf-nginx.conf | 4 ++-- www/freenginx-devel/files/pkg-message.in | 2 +- www/freenginx-devel/pkg-plist | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile index 0f57503adbd5..736721988431 100644 --- a/www/freenginx-devel/Makefile +++ b/www/freenginx-devel/Makefile @@ -375,9 +375,9 @@ post-install: ${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist post-install-WWW-on: - ${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist - (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \ - ${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING) + ${MKDIR} ${STAGEDIR}${PREFIX}/www/freenginx-dist + (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/freenginx-dist && \ + ${TOUCH} ${STAGEDIR}${PREFIX}/www/freenginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING) .endif .include <bsd.port.post.mk> diff --git a/www/freenginx-devel/distinfo b/www/freenginx-devel/distinfo index fdfdf17ca5ee..0753df781c86 100644 --- a/www/freenginx-devel/distinfo +++ b/www/freenginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1725787707 +TIMESTAMP = 1732461845 SHA256 (freenginx-1.27.2.tar.gz) = e43500ff3e75a33a101a253cc252e7ebadc4a3d17e04951e77e719dda68b97d1 SIZE (freenginx-1.27.2.tar.gz) = 1224762 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae diff --git a/www/freenginx-devel/files/nginx.in b/www/freenginx-devel/files/nginx.in index 652468a97596..7da8670ba17e 100644 --- a/www/freenginx-devel/files/nginx.in +++ b/www/freenginx-devel/files/nginx.in @@ -44,7 +44,7 @@ command="%%PREFIX%%/sbin/nginx" _pidprefix="%%NGINX_RUNDIR%%" pidfile="${_pidprefix}/${name}.pid" _tmpprefix="%%NGINX_TMPDIR%%" -required_files=%%PREFIX%%/etc/nginx/nginx.conf +required_files=%%PREFIX%%/etc/freenginx/nginx.conf extra_commands="reload configtest upgrade gracefulstop" [ -z "$nginx_enable" ] && nginx_enable="NO" diff --git a/www/freenginx-devel/files/patch-conf-nginx.conf b/www/freenginx-devel/files/patch-conf-nginx.conf index fb38c9c3d9cc..39cc18aa517e 100644 --- a/www/freenginx-devel/files/patch-conf-nginx.conf +++ b/www/freenginx-devel/files/patch-conf-nginx.conf @@ -32,7 +32,7 @@ location / { - root html; -+ root %%PREFIX%%/www/nginx; ++ root %%PREFIX%%/www/freenginx; index index.html index.htm; } @@ -41,7 +41,7 @@ error_page 500 502 503 504 /50x.html; location = /50x.html { - root html; -+ root %%PREFIX%%/www/nginx-dist; ++ root %%PREFIX%%/www/freenginx-dist; } # proxy the PHP scripts to Apache listening on 127.0.0.1:80 diff --git a/www/freenginx-devel/files/pkg-message.in b/www/freenginx-devel/files/pkg-message.in index adde28032712..68ff0115d5fc 100644 --- a/www/freenginx-devel/files/pkg-message.in +++ b/www/freenginx-devel/files/pkg-message.in @@ -19,7 +19,7 @@ details. Default path for the NGINX dynamic modules is -%%PREFIX%%/libexec/nginx. +%%PREFIX%%/libexec/freenginx. EOM } ] diff --git a/www/freenginx-devel/pkg-plist b/www/freenginx-devel/pkg-plist index 41c20955e01a..200a8eaa786b 100644 --- a/www/freenginx-devel/pkg-plist +++ b/www/freenginx-devel/pkg-plist @@ -94,11 +94,11 @@ share/vim/vimfiles/ftdetect/nginx.vim share/vim/vimfiles/ftplugin/nginx.vim share/vim/vimfiles/indent/nginx.vim share/vim/vimfiles/syntax/nginx.vim -%%WWW%%@postexec mkdir -p -m 755 %D/www/nginx-dist +%%WWW%%@postexec mkdir -p -m 755 %D/www/freenginx-dist %%WWW%%@postexec if [ ! -d %D/www/freenginx/ ] ; then ln -fs %D/www/freenginx-dist %D/www/freenginx; fi -%%WWW%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING -%%WWW%%www/nginx-dist/index.html -%%WWW%%www/nginx-dist/50x.html +%%WWW%%www/freenginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING +%%WWW%%www/freenginx-dist/index.html +%%WWW%%www/freenginx-dist/50x.html %%WWW%%@postexec chmod a-w %D/www/freenginx-dist %%WWW%%@postunexec if [ -L %D/www/freenginx ]; then rm -f %D/www/freenginx; fi @dir %%NGINX_TMPDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411251747.4APHlvR1036097>