Date: Tue, 28 Oct 2025 11:17:40 GMT From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= <des@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ee8bf6e236f4 - main - www/forgejo: Update to 13.0.2 Message-ID: <202510281117.59SBHeva027084@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by des: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee8bf6e236f47362b464cc3eeda4cce663603e2d commit ee8bf6e236f47362b464cc3eeda4cce663603e2d Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2025-10-28 11:06:49 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2025-10-28 11:06:49 +0000 www/forgejo: Update to 13.0.2 Changelog: * https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/13.0.2.md Additional changes: * Stop setting FORGEJO_WORK_DIR environment variable. It is already hardcoded into the binary, and can be overridden in the configuration file if needed. * Improve the prestart check. PR: 287010 PR: 289846 MFH: 2025Q4 Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D53394 --- www/forgejo/Makefile | 6 +++--- www/forgejo/distinfo | 6 +++--- www/forgejo/files/forgejo.in | 19 ++++++++++--------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/www/forgejo/Makefile b/www/forgejo/Makefile index 1b2111c3be11..92df5e9e5661 100644 --- a/www/forgejo/Makefile +++ b/www/forgejo/Makefile @@ -1,6 +1,6 @@ PORTNAME= forgejo DISTVERSIONPREFIX= v -DISTVERSION= 13.0.1 +DISTVERSION= 13.0.2 CATEGORIES= www MASTER_SITES= https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONFULL}/ DISTNAME= forgejo-src-${DISTVERSION} @@ -14,12 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git -USES= cpe gmake go:no_targets +USES= cpe gmake go:1.25,no_targets USE_RC_SUBR= forgejo PIE_UNSAFE= yes -CONFLICTS_INSTALL= forgejo[0-79]* +CONFLICTS_INSTALL= forgejo-lts forgejo7 EXTRACT_AFTER_ARGS= --strip-components 1 DBDIR= /var/db/forgejo diff --git a/www/forgejo/distinfo b/www/forgejo/distinfo index 4c444383e3ce..ec6731f34bd8 100644 --- a/www/forgejo/distinfo +++ b/www/forgejo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761217700 -SHA256 (forgejo-src-13.0.1.tar.gz) = 98cb495cd07881d90aa32cf143facef4abba2b732684ab1d938af9fa3ab12f26 -SIZE (forgejo-src-13.0.1.tar.gz) = 55449730 +TIMESTAMP = 1761594542 +SHA256 (forgejo-src-13.0.2.tar.gz) = 6731d5e73a025c1a04aba0f84caf80886d5be0031f4c154ac63026e7fe30918a +SIZE (forgejo-src-13.0.2.tar.gz) = 55481937 diff --git a/www/forgejo/files/forgejo.in b/www/forgejo/files/forgejo.in index 516f63862e60..1474bd63438a 100644 --- a/www/forgejo/files/forgejo.in +++ b/www/forgejo/files/forgejo.in @@ -20,7 +20,6 @@ load_rc_config $name : ${forgejo_configcheck_enable:="YES"} : ${forgejo_facility:="daemon"} : ${forgejo_priority:="info"} -: ${forgejo_shared:="%%PREFIX%%/share/${name}"} : ${forgejo_custom:="%%PREFIX%%/etc/${name}"} command="%%PREFIX%%/sbin/${name} web" @@ -42,7 +41,6 @@ forgejo_start() { /usr/sbin/daemon %%DAEMONARGS%% \ -u ${forgejo_user} -p ${pidfile} \ /usr/bin/env -i \ - "FORGEJO_WORK_DIR=${forgejo_shared}" \ "FORGEJO_CUSTOM=${forgejo_custom}" \ "HOME=${githome}" \ "PATH=%%PREFIX%%/bin:${PATH}" \ @@ -52,13 +50,16 @@ forgejo_start() { forgejo_prestart() { if checkyesno forgejo_configcheck_enable; then - if su -m ${forgejo_user} -c "FORGEJO_CUSTOM=${forgejo_custom} \ - %%PREFIX%%/sbin/${name} doctor check >/dev/null"; then - else - echo "cannot start ${name} because of configuration errors. Run" >&2 - echo " su -m git -c '${name} doctor check'" >&2 - echo "for further details" - return 1 + if ! errstr=$(/usr/bin/env -i \ + "FORGEJO_CUSTOM=${forgejo_custom}" \ + "HOME=${githome}" \ + "PATH=%%PREFIX%%/bin:${PATH}" \ + "USER=${forgejo_user}" \ + /usr/bin/su -m ${forgejo_user} -c \ + "%%PREFIX%%/sbin/${name} doctor check" 2>&1); then + rc=$? + echo "$errstr" >&2 + return $rc fi fi }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510281117.59SBHeva027084>