From nobody Sun Jan 26 18:45:13 2025 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 4Yh0px4Fmcz5m8QT; Sun, 26 Jan 2025 18:45:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yh0px1rdfz44tH; Sun, 26 Jan 2025 18:45:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737917113; 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=1nbJx/sxmTV87lYD1rUddMWS5j8t5aNnAmKyN8yQCaU=; b=cxAcHUVamsFEUH/eLIZg7867bgohcDNYthM6QHU0M9pDFYrTahU3MU8taup0CQhn17uKFH WwnsRIm80EPCz8OMy/++vjLUz7nw3bz2yblnmni0vEJDgBmpLOsrEIX7VviZqBxOMc5q48 MD36UWe18WOn41ctK1GV9G++D2Eo3V4vKdvdC+VJaP5qWK7Ux9wI06c68itDt7Vw/TK52z QSAF2e6rijXpzUA/kgQ5WduT/PBEXdJRS6zND7FD9/lKhvk65NRdnFjp7XJkWeiuBoYYBX ESTsbQ5hzaS3EsneTbSA/wbTmHJa9N5faWqNyKR//onBakQgH/PtcPPEhHgGIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737917113; 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=1nbJx/sxmTV87lYD1rUddMWS5j8t5aNnAmKyN8yQCaU=; b=Tx8J3nvHlw/phuqEzqOaKDOxagsp+iQWOwZad3lDm1lW5ZlEfVZyJR1ChIBC90ukyCASvH fW7kc4qRChQxU5xgL/e1171pLup8pWPl9nF3vgiS8fVUIk8GZlpn7CALoYk/Ef35vyIBYC ZlPI3uQYriEXVKHcENqaTiGIh5PuE0n8Hj7r3NIP1d1ZYeI7bRMVxk4gnPLdr134xFNu5f XPSXMnvdZmeigHVSFpGHdVCKoVL7gEP67S2Uh2CX2+eNtA+BiQ4iQrRwpoeOGilPYpqnKP bd+xUtu/9supyMGaWWsQ4KF4LlbJYEfIwkQ8uMnWT8b0BYurLiuZsp+6+976TQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737917113; a=rsa-sha256; cv=none; b=j7Jo17+8iyiZLH5I6HZ3P+J4JiINLenbDbo4rOYUndsxhpWyjfWCXAFGbgBmdqrOJHbfVx k3WtpcdQYB/SGVqGa7od3pePvpuovUd0BrsLGZEwzoRNANB9t4OmsIJLziT+HcAUtdt+Yu eDHNsxHuQ0YKsgFr3epaVQTR6ebW7dBgBA15uB0+xNK0wD3qGnmenh4Uc6MXu2RGTxjxb5 bKVdnznzRHHQq9pDi6UanQm0BGndRaXwo8xCLcqSoUIoiSdlyV+07Pw/h0elo0mZJ1iwyl BblehCRr1eavhK9U4F95dJCuUyec7ifhO/4uHkkheNzCxHgOmZKaZQcZ9Nz6QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yh0px1SJHzvWZ; Sun, 26 Jan 2025 18:45:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50QIjD6f059636; Sun, 26 Jan 2025 18:45:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50QIjDal059633; Sun, 26 Jan 2025 18:45:13 GMT (envelope-from git) Date: Sun, 26 Jan 2025 18:45:13 GMT Message-Id: <202501261845.50QIjDal059633@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: e538d246b3cb - 2025Q1 - =?utf-8?Q?www/gitea: Update 1.22.6 =E2=86=92 1.23.1 (fixes security vulnerability)?= 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: e538d246b3cbb0ab9875c2804a8a7ad612f0dd47 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e538d246b3cbb0ab9875c2804a8a7ad612f0dd47 commit e538d246b3cbb0ab9875c2804a8a7ad612f0dd47 Author: Stefan Bethke AuthorDate: 2025-01-26 18:35:05 +0000 Commit: Vladimir Druzenko CommitDate: 2025-01-26 18:44:26 +0000 www/gitea: Update 1.22.6 → 1.23.1 (fixes security vulnerability) Announcement: https://blog.gitea.com/release-of-1.23.0/ Release Notes: https://github.com/go-gitea/gitea/releases/tag/v1.23.0 https://github.com/go-gitea/gitea/releases/tag/v1.23.1 PR: 284360 MFH: 2025Q1 (cherry picked from commit 95b887efad8f60836bed72f9880dfcddb4a5f0bd) --- www/gitea/Makefile | 9 ++++++--- www/gitea/distinfo | 6 +++--- www/gitea/files/app.ini.sample.in | 16 +++++++++------- www/gitea/files/gitea.in | 1 + www/gitea/pkg-plist | 3 +++ 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/www/gitea/Makefile b/www/gitea/Makefile index b35eef040c15..f64f166e2fa4 100644 --- a/www/gitea/Makefile +++ b/www/gitea/Makefile @@ -1,7 +1,6 @@ PORTNAME= gitea DISTVERSIONPREFIX= v -DISTVERSION= 1.22.6 -PORTREVISION= 1 +DISTVERSION= 1.23.1 CATEGORIES= www MASTER_SITES= https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ \ https://dl.gitea.io/gitea/${DISTVERSION}/ @@ -16,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git -USES= cpe gmake go:1.22,no_targets +USES= cpe gmake go:1.23,no_targets USE_RC_SUBR= gitea EXTRACT_AFTER_ARGS= --strip-components 1 # since 1.17.0, archive includes gitea-src-VERSION directory @@ -71,6 +70,10 @@ do-install: @${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/gitea + ${MKDIR} ${STAGEDIR}/var/db/gitea/gitea-repositories + ${MKDIR} ${STAGEDIR}/var/log/gitea do-install-BINDATA-off: cd ${WRKSRC} && ${COPYTREE_SHARE} "options public templates" ${STAGEDIR}${DATADIR} diff --git a/www/gitea/distinfo b/www/gitea/distinfo index 9260354fa231..4781f67ed8c4 100644 --- a/www/gitea/distinfo +++ b/www/gitea/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734459279 -SHA256 (gitea-src-1.22.6.tar.gz) = 251a3ee97e11f288764f9e15d0163116a04f2811b9d0d3c32f46a04f90f0756e -SIZE (gitea-src-1.22.6.tar.gz) = 54465618 +TIMESTAMP = 1737883673 +SHA256 (gitea-src-1.23.1.tar.gz) = da4d36c4c9fe3980b4ba130526cf030ba7dba51d3a6844c6723a6eaef34b6df9 +SIZE (gitea-src-1.23.1.tar.gz) = 55539987 diff --git a/www/gitea/files/app.ini.sample.in b/www/gitea/files/app.ini.sample.in index 71cccbf31650..0080ed412ca4 100644 --- a/www/gitea/files/app.ini.sample.in +++ b/www/gitea/files/app.ini.sample.in @@ -7,15 +7,17 @@ # # This sample configuration runs Gitea 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. +# JWT_SECRET, LFS_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 the token using for example: -# openssl rand -base64 64 +# 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 Gitea add these to the config for you; you need to make -# app.ini writeable by the git user. +# Alternatively, you can let Gitea 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 diff --git a/www/gitea/files/gitea.in b/www/gitea/files/gitea.in index 566a4b46ef93..affda78defa1 100644 --- a/www/gitea/files/gitea.in +++ b/www/gitea/files/gitea.in @@ -41,6 +41,7 @@ gitea_start() { done /usr/sbin/daemon %%DAEMONARGS%% \ -u ${gitea_user} -p ${pidfile} \ + -l daemon -s warning \ /usr/bin/env -i \ "GITEA_WORK_DIR=${gitea_shared}" \ "GITEA_CUSTOM=${gitea_custom}" \ diff --git a/www/gitea/pkg-plist b/www/gitea/pkg-plist index 209e1c8e372c..acab89e7b63f 100644 --- a/www/gitea/pkg-plist +++ b/www/gitea/pkg-plist @@ -1,3 +1,6 @@ @sample %%ETCDIR%%/conf/app.ini.sample %%ETCDIR%%/conf/app.ini.defaults sbin/gitea +@dir(git,git,755) /var/db/gitea +@dir(git,git,755) /var/db/gitea/gitea-repositories +@dir(git,git,755) /var/log/gitea