diff --git a/www/forgejo/Makefile b/www/forgejo/Makefile index 7d3cbdc219ff..1b2111c3be11 100644 --- a/www/forgejo/Makefile +++ b/www/forgejo/Makefile @@ -1,91 +1,90 @@ PORTNAME= forgejo DISTVERSIONPREFIX= v -DISTVERSION= 12.0.4 +DISTVERSION= 13.0.1 CATEGORIES= www MASTER_SITES= https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONFULL}/ DISTNAME= forgejo-src-${DISTVERSION} -MAINTAINER= stb@lassitu.de -COMMENT= Compact self-hosted Git service +MAINTAINER= des@FreeBSD.org +COMMENT= Compact self-hosted Git forge WWW= https://forgejo.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git USES= cpe gmake go:no_targets USE_RC_SUBR= forgejo PIE_UNSAFE= yes CONFLICTS_INSTALL= forgejo[0-79]* EXTRACT_AFTER_ARGS= --strip-components 1 +DBDIR= /var/db/forgejo +LOGDIR= /var/log/forgejo SUB_FILES= app.ini.sample pkg-message -SUB_LIST= GITUSER=${USERS} +SUB_LIST= GITUSER=${USERS} DBDIR=${DBDIR} LOGDIR=${LOGDIR} +PLIST_SUB= DBDIR=${DBDIR} LOGDIR=${LOGDIR} NO_WRKSUBDIR= yes USERS= git GROUPS= git PORTDATA= * OPTIONS_DEFINE= BINDATA GIT_LFS PAM SQLITE OPTIONS_DEFAULT= BINDATA GIT_LFS PAM SQLITE OPTIONS_SUB= yes BINDATA_DESC= Build a single monolithic binary, with all assets included GIT_LFS_DESC= Support for Git Large File Storage (LFS) PAM_DESC= Enable support for PAM BINDATA_VARS= GO_TAGS+=bindata GIT_LFS_RUN_DEPENDS= git-lfs:devel/git-lfs PAM_VARS= GO_TAGS+=pam SQLITE_VARS= GO_TAGS+="sqlite sqlite_unlock_notify" +SSP_UNSAFE= true +LDFLAGS= "'-X "forgejo.org/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'" \ + "'-X "forgejo.org/modules/setting.AppWorkPath=${DATADIR}"'" +MAKE_ARGS= GOFLAGS="-buildvcs=false" \ + GOPATH=${WRKDIR} \ + TAGS="${GO_TAGS}" +ALL_TARGET= backend +MAKE_JOBS_UNSAFE= yes + .include .if ${OPSYS} == FreeBSD DAEMONARGS= -S -l \$${forgejo_facility} -s \$${forgejo_priority} -T \ \$${name} .else DAEMONARGS= -f .endif - SUB_LIST+= DAEMONARGS="${DAEMONARGS}" -SSP_UNSAFE= true -LDFLAGS+= "'-X "forgejo.org/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'" \ - "'-X "forgejo.org/modules/setting.AppWorkPath=${PREFIX}/share/forgejo"'" -MAKE_ARGS= GOFLAGS="-buildvcs=false" \ - GOPATH=${WRKDIR} \ - TAGS="${GO_TAGS}" -ALL_TARGET= backend -MAKE_JOBS_UNSAFE= yes - -post-patch: - ${ECHO_CMD} ${DISTVERSION} >${WRKSRC}/VERSION - # Too lazy to figure out why go install won't work. do-install: # Go binary is statically linked and cannot be stripped, so use # INSTALL_SCRIPT. ${INSTALL_SCRIPT} ${WRKSRC}/gitea \ ${STAGEDIR}${PREFIX}/sbin/forgejo @${MKDIR} ${STAGEDIR}${ETCDIR}/conf ${INSTALL_DATA} ${WRKDIR}/app.ini.sample \ ${STAGEDIR}${ETCDIR}/conf/app.ini.sample ${INSTALL_DATA} ${WRKSRC}/custom/conf/app.example.ini \ ${STAGEDIR}${ETCDIR}/conf/app.ini.defaults ${MKDIR} ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}/var/db/forgejo/data - ${MKDIR} ${STAGEDIR}/var/db/forgejo/forgejo-repositories - ${MKDIR} ${STAGEDIR}/var/log/forgejo + ${MKDIR} ${STAGEDIR}${DBDIR}/data + ${MKDIR} ${STAGEDIR}${DBDIR}/forgejo-repositories + ${MKDIR} ${STAGEDIR}${LOGDIR} do-install-BINDATA-off: cd ${WRKSRC} && \ ${COPYTREE_SHARE} "options public templates" ${STAGEDIR}${DATADIR} .include diff --git a/www/forgejo/distinfo b/www/forgejo/distinfo index fd739adc9fdf..4c444383e3ce 100644 --- a/www/forgejo/distinfo +++ b/www/forgejo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1758356864 -SHA256 (forgejo-src-12.0.4.tar.gz) = b1adeec3f5f446c63996250a334be62baf0cd8fbb9ad71a3316a5896cb327d08 -SIZE (forgejo-src-12.0.4.tar.gz) = 54124346 +TIMESTAMP = 1761217700 +SHA256 (forgejo-src-13.0.1.tar.gz) = 98cb495cd07881d90aa32cf143facef4abba2b732684ab1d938af9fa3ab12f26 +SIZE (forgejo-src-13.0.1.tar.gz) = 55449730 diff --git a/www/forgejo/files/app.ini.sample.in b/www/forgejo/files/app.ini.sample.in index b54e756578be..f06b9819cc84 100644 --- a/www/forgejo/files/app.ini.sample.in +++ b/www/forgejo/files/app.ini.sample.in @@ -1,94 +1,94 @@ # # Sample Configuration for Forgejo using SQLite # # 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 forgejo binary. # # This sample configuration runs Forgejo with a local database. Before # running this configuration, make sure to change the INTERNAL_TOKEN, # JWT_SECRET, and SECRET_KEY variables. SECRET_KEY is a password of your # choosing, INTERNAL_TOKEN is a 64-byte random number in BASE64 encoding, # JWT_SECRET is a 32-byte random number in BASE64 encoding. # # You can generate appropriate values using: # gitea generate secret [INTERNAL_TOKEN|JWT_SECRET|LFS_JWT_SECRET|SECRET_KEY] # and then copy that output to the appropriate place in this file. # # You can let Forgejo add these to the config for you; you need to make # app.ini writeable by the git user. # # There are no pre-configured users; the first user to register becomes an # admin. In this sample configuration, the HTTP server only listens on # localhost. # # If you'd rather use the web-based installer, remove this conf/app.ini file -# and make %%PREFIX%%/etc/forgejo/conf writeable to the git user. +# and make %%ETCDIR%%/conf writeable to the git user. APP_NAME = Forgejo: A self-hosted lightweight software forge RUN_MODE = prod RUN_USER = %%GITUSER%% [database] DB_TYPE = sqlite3 HOST = 127.0.0.1:3306 NAME = forgejo PASSWD = -PATH = /var/db/forgejo/forgejo.db +PATH = %%DBDIR%%/forgejo.db SSL_MODE = disable USER = root [indexer] -ISSUE_INDEXER_PATH = /var/db/forgejo/indexers/issues.bleve +ISSUE_INDEXER_PATH = %%DBDIR%%/indexers/issues.bleve [log] LEVEL = Info MODE = file -ROOT_PATH = /var/log/forgejo +ROOT_PATH = %%LOGDIR%% [mailer] ENABLED = false [oauth2] JWT_SECRET = CHANGE_ME [picture] -AVATAR_UPLOAD_PATH = /var/db/forgejo/data/avatars +AVATAR_UPLOAD_PATH = %%DBDIR%%/data/avatars DISABLE_GRAVATAR = true ENABLE_FEDERATED_AVATAR = false [repository] -ROOT = /var/db/forgejo/forgejo-repositories +ROOT = %%DBDIR%%/forgejo-repositories # Forgejo's default is 'bash', so if you have bash installed, you can comment # this out. SCRIPT_TYPE = sh [repository.upload] -TEMP_PATH = /var/db/forgejo/data/tmp/uploads +TEMP_PATH = %%DBDIR%%/data/tmp/uploads [security] INSTALL_LOCK = true INTERNAL_TOKEN = CHANGE_ME SECRET_KEY = CHANGE_ME [session] PROVIDER = file -PROVIDER_CONFIG = /var/db/forgejo/data/sessions +PROVIDER_CONFIG = %%DBDIR%%/data/sessions [server] -APP_DATA_PATH = /var/db/forgejo/data +APP_DATA_PATH = %%DBDIR%%/data DISABLE_SSH = false DOMAIN = localhost HTTP_ADDR = 127.0.0.1 HTTP_PORT = 3000 OFFLINE_MODE = false ROOT_URL = http://localhost:3000/ SSH_DOMAIN = %(DOMAIN)s SSH_PORT = 22 [service] DISABLE_REGISTRATION = false ENABLE_CAPTCHA = true ENABLE_NOTIFY_MAIL = false REGISTER_EMAIL_CONFIRM = false REQUIRE_SIGNIN_VIEW = false diff --git a/www/forgejo/files/forgejo.in b/www/forgejo/files/forgejo.in index 026fed82b0b2..516f63862e60 100644 --- a/www/forgejo/files/forgejo.in +++ b/www/forgejo/files/forgejo.in @@ -1,66 +1,66 @@ #!/bin/sh # PROVIDE: forgejo # REQUIRE: NETWORKING SYSLOG # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable forgejo: # #forgejo_enable="YES" . /etc/rc.subr name="forgejo" rcvar="forgejo_enable" load_rc_config $name : ${forgejo_user:="%%GITUSER%%"} : ${forgejo_enable:="NO"} : ${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" procname="%%PREFIX%%/sbin/${name}" githome="$(eval echo ~${forgejo_user})" pidfile="/var/run/${name}.pid" start_cmd="${name}_start" start_precmd="${name}_prestart" forgejo_start() { - for d in /var/db/forgejo /var/log/forgejo; do + for d in %%DBDIR%% %%LOGDIR%%; do if [ ! -e "$d" ]; then mkdir "$d" chown ${forgejo_user} "$d" fi done /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}" \ "USER=${forgejo_user}" \ $command } 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 fi fi } run_rc_command "$1" diff --git a/www/forgejo/pkg-plist b/www/forgejo/pkg-plist index cfdd317d833c..133c23b66678 100644 --- a/www/forgejo/pkg-plist +++ b/www/forgejo/pkg-plist @@ -1,8 +1,8 @@ @sample %%ETCDIR%%/conf/app.ini.sample %%ETCDIR%%/conf/app.ini.defaults sbin/forgejo -@dir share/forgejo -@dir(git,git,755) /var/db/forgejo -@dir(git,git,755) /var/db/forgejo/data -@dir(git,git,755) /var/db/forgejo/forgejo-repositories -@dir(git,git,755) /var/log/forgejo +@dir %%DATADIR%% +@dir(git,git,755) %%DBDIR%% +@dir(git,git,755) %%DBDIR%%/data +@dir(git,git,755) %%DBDIR%%/forgejo-repositories +@dir(git,git,755) %%LOGDIR%%