diff --git a/sysutils/nginx-ui/Makefile b/sysutils/nginx-ui/Makefile index 62713b5feb42..58e851c6da88 100644 --- a/sysutils/nginx-ui/Makefile +++ b/sysutils/nginx-ui/Makefile @@ -1,68 +1,67 @@ PORTNAME= nginx-ui DISTVERSIONPREFIX= v -DISTVERSION= 2.3.2 -PORTREVISION= 2 +DISTVERSION= 2.3.3 CATEGORIES= sysutils MASTER_SITES= LOCAL/dtxdf/${PORTNAME}/ # For instructions on how to create assets: # https://github.com/DtxdF/port-assets-makejails/tree/main/nginx-ui DISTFILES= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}.frontend${EXTRACT_SUFX} \ ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}.vendor${EXTRACT_SUFX} MAINTAINER= dtxdf@FreeBSD.org COMMENT= Yet another WebUI for Nginx WWW= https://nginxui.com LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go:1.25+,modules +USES= go:1.26+,modules USE_GITHUB= yes GH_ACCOUNT= 0xJacky USE_RC_SUBR= ${PORTNAME} GO_BUILDFLAGS= -ldflags "\ -X 'github.com/0xJacky/Nginx-UI/settings.buildTime=${BUILD_DATE}'" \ -tags=jsoniter SUB_FILES= pkg-message SUB_LIST= USER=${NGINXUI_USER} PLIST_SUB= GROUP=${NGINXUI_USER} \ USER=${NGINXUI_GROUP} NGINXUI_USER= root NGINXUI_GROUP= wheel BUILD_DATE= $$(date -u +%s) # Run 'git checkout ${DISTVERSIONPREFIX}${DISTVERSION} && git rev-parse HEAD' # in the NGINX UI repository to get the value of GITID. -GITID= cb1fb691aff413a3bf322a5e48bd51c299051724 +GITID= e5da6dd96dae5567a7aaa27a4000a4762696d89c post-extract: @${MKDIR} ${WRKSRC}/vendor @cd ${WRKDIR}/${PORTNAME}-vendor && ${COPYTREE_SHARE} . ${WRKSRC}/vendor @${MKDIR} ${WRKSRC}/app/dist @cd ${WRKDIR}/${PORTNAME}-frontend && ${COPYTREE_SHARE} . ${WRKSRC}/app/dist @${MV} ${WRKSRC}/app/dist/dist.tar.xz ${WRKSRC}/app/dist.tar.xz post-patch: @${REINPLACE_CMD} -e 's/newLineSymbol/"\\n"/g' \ ${WRKSRC}/vendor/github.com/imega/luaformatter/formatter/writer.go @${REINPLACE_CMD} -e 's,%%GITID%%,${GITID},g' ${WRKSRC}/cmd/version/generate.go @${RM} ${WRKSRC}/vendor/github.com/shirou/gopsutil/v4/internal/common/binary.go pre-build: @${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} generate ${WRKSRC}/cmd/version/generate.go post-install: @${MKDIR} ${STAGEDIR}/var/db/${PORTNAME} ${INSTALL_DATA} ${FILESDIR}/app.ini ${STAGEDIR}/var/db/${PORTNAME}/app.ini.sample @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${FILESDIR}/nginx-ui.conf ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${FILESDIR}/nginx.conf ${STAGEDIR}${DATADIR} @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${STAGEDIR}${DATADIR}/nginx.conf .include diff --git a/sysutils/nginx-ui/distinfo b/sysutils/nginx-ui/distinfo index f035be08b13f..571a42228d9f 100644 --- a/sysutils/nginx-ui/distinfo +++ b/sysutils/nginx-ui/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1766101340 -SHA256 (nginx-ui-v2.3.2.frontend.tar.gz) = e87c6a782eb30d05b81234f04ae9befbf507c65f7fabfd5d4f0dec99ef4a6557 -SIZE (nginx-ui-v2.3.2.frontend.tar.gz) = 4217892 -SHA256 (nginx-ui-v2.3.2.vendor.tar.gz) = 2f40dd225de0b895759290247ecb91107ea64052263c97a63d9095d06fde8fac -SIZE (nginx-ui-v2.3.2.vendor.tar.gz) = 31474803 -SHA256 (0xJacky-nginx-ui-v2.3.2_GH0.tar.gz) = 95171ac3de532f228cf1619beae0775050622359d6c30b3ede700510b7e52785 -SIZE (0xJacky-nginx-ui-v2.3.2_GH0.tar.gz) = 13085812 +TIMESTAMP = 1772433793 +SHA256 (nginx-ui-v2.3.3.frontend.tar.gz) = 3a819cc3212251098c3458bbaf3751c624373f2141fdf0b2346eaffdcda37363 +SIZE (nginx-ui-v2.3.3.frontend.tar.gz) = 4256331 +SHA256 (nginx-ui-v2.3.3.vendor.tar.gz) = 5b3f61d83d51ad2922b844104cab9217897e31680b6e876225a6d887a7a238ec +SIZE (nginx-ui-v2.3.3.vendor.tar.gz) = 31579017 +SHA256 (0xJacky-nginx-ui-v2.3.3_GH0.tar.gz) = 32b7e2fdd97c1b806e9168625065e0644be814e5f31b5fb8197fac8d6105b703 +SIZE (0xJacky-nginx-ui-v2.3.3_GH0.tar.gz) = 13122878 diff --git a/sysutils/nginx-ui/files/patch-cmd_version_generate.go b/sysutils/nginx-ui/files/patch-cmd_version_generate.go index 5891b1a46c0f..4c980475d7e6 100644 --- a/sysutils/nginx-ui/files/patch-cmd_version_generate.go +++ b/sysutils/nginx-ui/files/patch-cmd_version_generate.go @@ -1,23 +1,23 @@ ---- cmd/version/generate.go.orig 2025-08-28 00:13:15 UTC +--- cmd/version/generate.go.orig 2026-02-15 00:55:30 UTC +++ cmd/version/generate.go @@ -8,7 +8,6 @@ import ( "io" "io/fs" "os" - "os/exec" "path" "path/filepath" "runtime" @@ -74,11 +73,7 @@ func getGitCommitHash(basePath string) (string, error) } func getGitCommitHash(basePath string) (string, error) { - cmd := exec.Command("git", "-C", basePath, "rev-parse", "HEAD") - commitHash, err := cmd.Output() - if err != nil { - return "", err - } + commitHash := "%%GITID%%" return strings.TrimRight(string(commitHash), "\r\n"), nil }