forgejo: correct a few mistakes

[Pierre Pronchery (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Mon Aug 3 23:39:49 2026 +0200
Changeset:	4640a021ad530b00eac318613053c19b2d57fc07

Modified Files:
	forgejo/Makefile
	forgejo/files/app.ini.sample
	forgejo/files/forgejo.sh
Removed Files:
	forgejo/TODO

Log Message:
forgejo: correct a few mistakes

While there, also differentiate more paths from Gitea, and remove the
TODO file.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4640a021ad530b00eac318613053c19b2d57fc07

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 forgejo/Makefile             | 15 +++++++++++++++
 forgejo/TODO                 |  2 --
 forgejo/files/app.ini.sample | 25 +++++++++++++------------
 forgejo/files/forgejo.sh     |  6 +++---
 4 files changed, 31 insertions(+), 17 deletions(-)

diffs:
diff --git a/forgejo/Makefile b/forgejo/Makefile
index 7f5e3683f2..32f46f0c24 100644
--- a/forgejo/Makefile
+++ b/forgejo/Makefile
@@ -10,6 +10,8 @@ HOMEPAGE=	https://forgejo.org/
 COMMENT=	Git hosting software
 LICENSE=	mit
 
+GO_VERSION_REQD=	126
+
 DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 TEST_DEPENDS+=	bash-[0-9]*:../../shells/bash
 
@@ -31,12 +33,25 @@ FORGEJO_GROUP?=	git
 PKG_GROUPS_VARS+=	FORGEJO_GROUP
 PKG_USERS_VARS+=	FORGEJO_USER
 
+PKG_SYSCONFSUBDIR=	forgejo
+
 INSTALLATION_DIRS+=	sbin
 INSTALLATION_DIRS+=	share/forgejo/options
 INSTALLATION_DIRS+=	share/forgejo/templates
 INSTALLATION_DIRS+=	share/forgejo/public
 INSTALLATION_DIRS+=	share/examples/forgejo
 
+PKG_GROUPS=	${FORGEJO_GROUP}
+PKG_USERS=	${FORGEJO_USER}:${FORGEJO_GROUP}
+
+PKG_SHELL.${FORGEJO_USER}=	${SH}
+PKG_HOME.${FORGEJO_USER}=	${VARBASE}/db/forgejo
+
+FILES_SUBST+=	FORGEJO_USER=${FORGEJO_USER}
+FILES_SUBST+=	FORGEJO_GROUP=${FORGEJO_GROUP}
+FILES_SUBST+=	FORGEJO_USER_HOME=${VARBASE}/db/forgejo
+FILES_SUBST+=	FORGEJO_SHARE_DIR=${PREFIX}/share/forgejo
+
 RCD_SCRIPTS+=	forgejo
 
 MAKE_ENV+=	TAGS="${GO_TAGS}"
diff --git a/forgejo/TODO b/forgejo/TODO
deleted file mode 100644
index b584f48fef..0000000000
--- a/forgejo/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-This package has known vulnerabilities, please investigate and fix if possible:
-  CVE-2025-68971, CVE-2026-59102
diff --git a/forgejo/files/app.ini.sample b/forgejo/files/app.ini.sample
index f5b2de28c0..69b418135b 100644
--- a/forgejo/files/app.ini.sample
+++ b/forgejo/files/app.ini.sample
@@ -3,7 +3,7 @@
 #
 # For information on the available settings, consult the online
 # documentation, or see the accompanying file app.ini.defaults, which
-# contains the settings incorporated into the gitea binary.
+# contains the settings incorporated into the forgejo binary.
 #
 # This sample configuration runs Gitea with a local database.  Before
 # running this configuration, make sure to change the SECRET_KEY and the
@@ -17,26 +17,27 @@
 # localhost.
 #
 # If you'd rather use the web-based installer, remove this conf/app.ini file
-# and make @PKG_SYSCONFDIR@/conf writeable to the @GITEA_USER@ user.
+# and make @PKG_SYSCONFDIR@/conf writeable to the @FORGEJO_USER@ user.
 
 APP_NAME = Gitea: Git with a cup of tea
-RUN_USER = @GITEA_USER@
+RUN_USER = @FORGEJO_USER@
 RUN_MODE = prod
+WORK_PATH= @FORGEJO_SHARE_DIR@
 
 [database]
 DB_TYPE  = sqlite3
 HOST     = 127.0.0.1:3306
-NAME     = gitea
+NAME     = forgejo
 PASSWD   = 
-PATH     = @VARBASE@/db/gitea/gitea.db
+PATH     = @VARBASE@/db/forgejo/forgejo.db
 SSL_MODE = disable
 USER     = root
 
 [indexer]
-ISSUE_INDEXER_PATH = @VARBASE@/db/gitea/indexers/issues.bleve
+ISSUE_INDEXER_PATH = @VARBASE@/db/forgejo/indexers/issues.bleve
 
 [log]
-ROOT_PATH = @VARBASE@/log/gitea
+ROOT_PATH = @VARBASE@/log/forgejo
 MODE      = file
 LEVEL     = Info
 
@@ -44,18 +45,18 @@ LEVEL     = Info
 ENABLED = false
 
 [picture]
-AVATAR_UPLOAD_PATH      = @VARBASE@/db/gitea/data/avatars
+AVATAR_UPLOAD_PATH      = @VARBASE@/db/forgejo/data/avatars
 DISABLE_GRAVATAR        = false
 ENABLE_FEDERATED_AVATAR = false
 
 [repository]
-ROOT = @VARBASE@/db/gitea/gitea-repositories
+ROOT = @VARBASE@/db/forgejo/forgejo-repositories
 # Gitea's default is 'bash', so if you have bash installed, you can comment
 # this out.
 SCRIPT_TYPE = sh
 
 [repository.upload]
-TEMP_PATH = @VARBASE@/db/gitea/data/tmp/uploads
+TEMP_PATH = @VARBASE@/db/forgejo/data/tmp/uploads
 
 [security]
 INSTALL_LOCK = true
@@ -64,7 +65,7 @@ SECRET_KEY   = ChangeMeBeforeRunning
 
 [session]
 PROVIDER = file
-PROVIDER_CONFIG = @VARBASE@/db/gitea/data/sessions
+PROVIDER_CONFIG = @VARBASE@/db/forgejo/data/sessions
 
 [server]
 DOMAIN       = localhost
@@ -75,7 +76,7 @@ DISABLE_SSH  = false
 SSH_DOMAIN   = %(DOMAIN)s
 SSH_PORT     = 22
 OFFLINE_MODE = false
-APP_DATA_PATH = @VARBASE@/db/gitea/data
+APP_DATA_PATH = @VARBASE@/db/forgejo/data
 
 [service]
 REGISTER_EMAIL_CONFIRM = false
diff --git a/forgejo/files/forgejo.sh b/forgejo/files/forgejo.sh
index ae1dec2257..13da7cefd6 100644
--- a/forgejo/files/forgejo.sh
+++ b/forgejo/files/forgejo.sh
@@ -18,9 +18,9 @@ command="@PREFIX@/sbin/forgejo"
 command_args="--config @PKG_SYSCONFDIR@/conf/app.ini web > /dev/null &"
 
 forgejo_env="FORGEJO_WORK_DIR=@FORGEJO_SHARE_DIR@"
-forgejo_env="${FORGEJO_env} FORGEJO_CUSTOM=@PKG_SYSCONFDIR@"
-forgejo_env="${FORGEJO_env} HOME=@FORGEJO_USER_HOME@"
-forgejo_env="${FORGEJO_env} USER=@FORGEJO_USER@"
+forgejo_env="${forgejo_env} FORGEJO_CUSTOM=@PKG_SYSCONFDIR@"
+forgejo_env="${forgejo_env} HOME=@FORGEJO_USER_HOME@"
+forgejo_env="${forgejo_env} USER=@FORGEJO_USER@"
 
 forgejo_user="@FORGEJO_USER@"
 forgejo_group="@FORGEJO_GROUP@"