From nobody Thu May 16 17:26:50 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgH8C064gz5LZkK; Thu, 16 May 2024 17:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgH8B5Xg9z4R0v; Thu, 16 May 2024 17:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715880410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZqSrvr4lLhPsDELFv4k5c9Ov/mnuDeSvnClrAlHS5/g=; b=dF/jvw4MH6Xvbx07GsQ3OxL5Y0IuSb7hHiAXNqt/YVIhZBHm9EzZmdDcXjAtw8Z0UF3Vy3 AkfMaNyMkBdT2LobWmS3BTtrVanCiMlxpKgrs0NuJWb90UFwJXznipE7j1Tc8wH7ncszEX aPqd9499kAW+uI2tXBNF2RKkgA7x13gIc1RInHE5AHfMFi79WWSsHBpECrLz8o2CQuHW++ ZyFulbt2V7ktGQ8c4tdKM+x1BzjR9tFBPCwuZQZk+JOcrm4Q3rEQCKiVkVF5BAi3Jiq9CJ g0JbNFt+/rPoHSkvqNA5aslQOMN/2x5yrYkAD1A4GiYnDvovFSzd9PEAhDbQLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715880410; a=rsa-sha256; cv=none; b=sYkPbek9MccYR46ZLMhpYifSTcCPpwtjlMEMhmLJOowFgDwtHOtDSiFkGGcjLsd86+UWC/ X24eEIQPRsGpYyqNZ7VqgYpun1WIwsggZWvhqrv0NEOc2anfMqOoi1wkOP6K3Xq8yNeFDe SWmPtgxKU15Nyr17+uP3EdRB+/o7EDlFUoJI8ITrUwOJ+qMQnWBLN6/3HSDoarAVK80C03 WVle+jDVkKJjab4CCkaTICKCrxBb/G286ZN77s61Umt2mSjzmtDucjnw6KDn4Q/YROet0N 1HiAzcs31pb06RR8V4h5JsthRNEsZeRswobI7IiKePUTjvIh1xXqAhXQsTUneg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715880410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZqSrvr4lLhPsDELFv4k5c9Ov/mnuDeSvnClrAlHS5/g=; b=p4iMxcmPeSJ63fE3MI1yCPD5su3/fhpBstTMLzf7+0llbXnQwnM4DWRUtG+6EVUCttfWkR j+j5NZ31eYEYsTNGqH/G7U89U81MAH82eKHnSsMUbZ+6bReSnoBzeY1IPGFhxOGY6J1dn8 qc8M3+iYXsLl8na6d7O5kpRpldmaMNUo85xAfpdBE29nrHqICfViiEJhQdGaD+pmKDwKVq Lp4IoTKUJGWs6ILPe9ZnGqTrcte9PrZof7FaoQBlKpIOBtqfemie8EqEn8hozNKgVW6HJy 7HObYDES/5lI/c2L5LmghP+8RG8qP1z97A1YeLM5n/dVpvzc7hXhDwf1ZlTtYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VgH8B553mz179k; Thu, 16 May 2024 17:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44GHQoxb053677; Thu, 16 May 2024 17:26:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GHQoqY053674; Thu, 16 May 2024 17:26:50 GMT (envelope-from git) Date: Thu, 16 May 2024 17:26:50 GMT Message-Id: <202405161726.44GHQoqY053674@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: bfcf765a321b - main - www/forgejo: Update to 7.0.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfcf765a321bcf7ed02348a07b6cbcc32987c0b9 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=bfcf765a321bcf7ed02348a07b6cbcc32987c0b9 commit bfcf765a321bcf7ed02348a07b6cbcc32987c0b9 Author: Stefan Bethke AuthorDate: 2024-05-16 16:23:54 +0000 Commit: Li-Wen Hsu CommitDate: 2024-05-16 17:26:36 +0000 www/forgejo: Update to 7.0.2 Also improve diagnostics prior to starting the service, add information to pkg-message, and enable running the forgejo binary on the command line more easily. Release notes: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-2 PR: 278876 --- www/forgejo/Makefile | 16 ++++++++-------- www/forgejo/distinfo | 6 +++--- www/forgejo/files/forgejo.in | 16 +++++++++++++++- www/forgejo/files/pkg-message.in | 27 +++++++++++++++++++++++++++ www/forgejo/pkg-message | 13 ------------- 5 files changed, 53 insertions(+), 25 deletions(-) diff --git a/www/forgejo/Makefile b/www/forgejo/Makefile index 52027faa5c83..b9e69c542c3d 100644 --- a/www/forgejo/Makefile +++ b/www/forgejo/Makefile @@ -1,7 +1,6 @@ PORTNAME= forgejo DISTVERSIONPREFIX= v -DISTVERSION= 1.21.10-0 -PORTREVISION= 2 +DISTVERSION= 7.0.2 CATEGORIES= www MASTER_SITES= https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ DISTNAME= forgejo-src-${DISTVERSION} @@ -15,12 +14,12 @@ 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 -SUB_FILES+= app.ini.sample -SUB_LIST+= GITUSER=${USERS} +SUB_FILES= app.ini.sample pkg-message +SUB_LIST= GITUSER=${USERS} NO_WRKSUBDIR= yes @@ -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/files/pkg-message.in b/www/forgejo/files/pkg-message.in new file mode 100644 index 000000000000..03164efe7264 --- /dev/null +++ b/www/forgejo/files/pkg-message.in @@ -0,0 +1,27 @@ +[ +{ type: install + message: <