Attachment 250704 Details for Bug 278876 – Updated patch with correct Go version

[patch] Updated patch with correct Go version

forgejo-7.0.2.patch (text/plain), 4.24 KB, created by Stefan Bethke on 2024-05-16 15:15:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Bethke

Created: 2024-05-16 15:15:21 UTC

Size: 4.24 KB

patch

obsolete

>diff --git a/www/forgejo/Makefile b/www/forgejo/Makefile
>index 3cfdb6f7b8cd..2c802d317a2f 100644
>--- a/www/forgejo/Makefile
>+++ b/www/forgejo/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	forgejo
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.21.10-0
>-PORTREVISION=	1
>+DISTVERSION=	7.0.2
> CATEGORIES=	www
> MASTER_SITES=	https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
> DISTNAME=	forgejo-src-${DISTVERSION}
>@@ -15,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	git:devel/git
> 
>-USES=			cpe gmake go:1.21,no_targets
>+USES=			cpe gmake go:1.22,no_targets
> USE_RC_SUBR=	forgejo
> 
> EXTRACT_AFTER_ARGS=	--strip-components 1
>@@ -54,10 +53,11 @@ DAEMONARGS=	-f
> SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
> 
> SSP_UNSAFE=	true
>-# Default LDFLAGS are incompatible with build
>-MAKE_ENV=	LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"
>+LDFLAGS+=	"'-X "code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'"
>+LDFLAGS+=	"'-X "code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/forgejo"'"
> MAKE_ARGS=	GOPATH=${WRKDIR} \
>-		TAGS="${GO_TAGS}"
>+		TAGS="${GO_TAGS}" \
>+		GOFLAGS="-buildvcs=false"
> ALL_TARGET=	backend
> MAKE_JOBS_UNSAFE=	yes
> 
>diff --git a/www/forgejo/distinfo b/www/forgejo/distinfo
>index 35e0c2d393a7..74fb0a430f7e 100644
>--- a/www/forgejo/distinfo
>+++ b/www/forgejo/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1712360403
>-SHA256 (forgejo-src-1.21.10-0.tar.gz) = 0cc21835404e40355cf7125b479efebb1fecf2cc17d018d4d54521d75943caf5
>-SIZE (forgejo-src-1.21.10-0.tar.gz) = 58820868
>+TIMESTAMP = 1715265831
>+SHA256 (forgejo-src-7.0.2.tar.gz) = 39b2079be7671f2248dcc36377ae20be65f20695d7f968ae227c0fc55dacca06
>+SIZE (forgejo-src-7.0.2.tar.gz) = 54862292
>diff --git a/www/forgejo/files/forgejo.in b/www/forgejo/files/forgejo.in
>index ad5aee48f95d..c635f3a9a9b1 100644
>--- a/www/forgejo/files/forgejo.in
>+++ b/www/forgejo/files/forgejo.in
>@@ -17,8 +17,9 @@ load_rc_config $name
> 
> : ${forgejo_user:="%%GITUSER%%"}
> : ${forgejo_enable:="NO"}
>+: ${forgejo_configcheck_enable:="YES"}
> : ${forgejo_facility:="daemon"}
>-: ${forgejo_priority:="debug"}
>+: ${forgejo_priority:="info"}
> : ${forgejo_shared:="%%PREFIX%%/share/${name}"}
> : ${forgejo_custom:="%%PREFIX%%/etc/${name}"}
> 
>@@ -29,6 +30,7 @@ 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
>@@ -48,4 +50,16 @@ forgejo_start() {
> 		$command
> }
> 
>+forgejo_prestart() {
>+	if checkyesno forgejo_configcheck_enable; then
>+		if su -m ${forgejo_user} -c "%%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-message b/www/forgejo/pkg-message
>index 5c8f0b5d39b4..b237e014ca8a 100644
>--- a/www/forgejo/pkg-message
>+++ b/www/forgejo/pkg-message
>@@ -1,13 +1,27 @@
> [
> { type: install
>   message: <<EOM
>-Before starting forgejo you must create the main configuration file.
>+Before starting forgejo for the first time, you must set a number of
>+secrets in the configuration file. For your convenience, a sample file
>+has been copied to %%PREFIX%%/etc/forgejo/conf/app.ini.
> 
>-    cp /usr/local/etc/forgejo/conf/app.ini.sample /usr/local/etc/forgejo/conf/app.ini
>-    ${EDITOR} /usr/local/etc/forgejo/conf/app.ini
>+You need to replace every occurence of CHANGE_ME in the file with
>+sensible values. Please refer to the official documentation at
>+https://forgejo.org for details.
>+
>+You will also likely need to create directories for persistent storage.
>+Run
>+    su -m git -c 'forgejo doctor check'
>+to check if all prerequisites have been met.
> 
>-You need to replace every occurence of CHANGE_ME in the file with sensitive
>-values. Please refer to the official documentation for details.
> EOM
> }
>+{ type: upgrade
>+  maximum_version: forgejo-1.21
>+  message: <<EOF
>+Since forgejo version 7, the startup script will run forgejo doctor check
>+to verify that forgejo can be started successfully. If you are sure that
>+forgejo will start even if doctor has identified an issue, you can disable
>+the check by setting forgejo_configcheck_enabled=NO in rc.conf.
>+EOM
> ]

Flags:

stb: maintainer-approval+

Actions: View | Diff

Attachments on bug 278876: 250553 | 250704