Created attachment 246321 [details] Patch to update the gitea port to 1.21.0 Update gitea to 1.21.0 This release contains six breaking changes, and a large number of enhancements and bug fixes. See the release notes for details. Release notes: https://blog.gitea.com/release-of-1.21.0/
Thank you for your submission. Please submit future patches in "git-format-patch" format if possible.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c31527fa4e502fdc0d5489815721e6e0ba83ece1 commit c31527fa4e502fdc0d5489815721e6e0ba83ece1 Author: Stefan Bethke <stb@lassitu.de> AuthorDate: 2023-11-16 21:44:50 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-11-18 20:20:41 +0000 www/gitea: update to 1.21.0 Changelog: https://blog.gitea.com/release-of-1.21.0/ PR: 275096 www/gitea/Makefile | 4 ++-- www/gitea/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
Thank you for your contribution.
(In reply to Robert Clausecker from comment #3) Can this please be merged into the quarterly branch as well?
Are you sure you want to push breaking changes onto the quarterly branch? In the future, please remember to set the "merge quarterly" flag on the patch to request a merge to the quarterly branch.
(In reply to Robert Clausecker from comment #5) I would say yes. Previous Gitea patches, including breaking changes, were also merged into the quarterly branch. I did not set the flag because I did not understand the drop down options.
(In reply to Lion Haupt from comment #6) Okay. Policy is usually to only push bug and security fixes to the quarterly branch, but the final call is up to the maintainer. Set “merge-quarterly” to “?” to request the merge. The committer will decide whether to do it and sets the flag to “+” or “-” to show the result.
(In reply to Robert Clausecker from comment #7) Thank your for the explanation and setting(requesting) of the flag.
A commit in branch 2023Q4 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd41a938ad21fb99eec0b7fb4feeb00123908f03 commit fd41a938ad21fb99eec0b7fb4feeb00123908f03 Author: Stefan Bethke <stb@lassitu.de> AuthorDate: 2023-11-16 21:44:50 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-11-19 03:47:26 +0000 www/gitea: update to 1.21.0 Changelog: https://blog.gitea.com/release-of-1.21.0/ PR: 275096 (cherry picked from commit c31527fa4e502fdc0d5489815721e6e0ba83ece1) www/gitea/Makefile | 4 ++-- www/gitea/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
(In reply to Robert Clausecker from comment #5) I purposefully did not set the merge-quarterly flag (I am the maintainer).
(In reply to Stefan Bethke from comment #10) Is there a specific reason why? With the explanation from Robert Clausecker, I assumed the maintainer (you in this case) would have had to approve this, but that did not happen? I did not know of any valid reason why this specific version cannot be merged into quarterly, if there is I am sorry to have to have requested it without knowing.
(In reply to Lion Haupt from comment #11) No worries, I'm not opposed to merging this into quarterly, but as Robert said, normally you would try to limit applying breaking changes. There is precendent in Gitea for combining breaking changes with security fixes, and not applying security fixes to older branches, so in some cases, the only way to get a security fix on quarterly is to accept the newer release including the breaking changes. According to the release notes, there are no security fixes, so I would tend to not appliying this release to quarterly. But I don't have a strong opinion either way.
(In reply to Stefan Bethke from comment #12) Sorry, I missed that the merge-quarterly request was given by someone else. Please let me know if you would like this change to be reverted. I need to pay more attention.