From a3d32f09ee214cf5a6ccff9b9dc3676991ce452f Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 10 Oct 2025 10:59:09 -0500 Subject: [PATCH 1/5] Rebuild for golang 1.25.2 From e9dbd1aacd806a2962e744c6fd1448bbcfb10d91 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 21 Oct 2025 17:41:55 +0200 Subject: [PATCH 2/5] Update to version 13.0.1 Signed-off-by: Nils Philippsen --- .gitignore | 2 ++ forgejo.spec | 16 +++------------- go-vendor-tools.toml | 10 +++++----- sources | 5 ++--- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index e940984..fd74156 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /forgejo-src-12.0.3.tar.gz.asc /forgejo-src-12.0.4.tar.gz /forgejo-src-12.0.4.tar.gz.asc +/forgejo-src-13.0.1.tar.gz +/forgejo-src-13.0.1.tar.gz.asc diff --git a/forgejo.spec b/forgejo.spec index 9f3080a..5cd7cdb 100644 --- a/forgejo.spec +++ b/forgejo.spec @@ -12,20 +12,18 @@ %global __node_deps_provides %{S:10} %{_builddir}/%{name}-src-%{version}/package-lock.json %global __node_deps_path ^%{_bindir}/%{name}$ -%global pagure_migrator_gitrev c9a5694dd2 - Name: forgejo -Version: 12.0.4 +Version: 13.0.1 Release: %autorelease Summary: A lightweight software forge # CC0-1.0 is normally not permissible for code in Fedora. Because the vendored Go package # github.com/zeebo/blake3 it applies to has been available in Fedora as golang-github-zeebo-blake3 # since before the cutoff date 2022-08-01, the exception to use it also applies here. -%global vendored_go_mod_licenses Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-3.0-or-later AND ICU AND ISC AND LicenseRef-Fedora-Public-Domain AND MIT AND MPL-2.0 AND (FTL OR GPL-2.0-or-later) +%global vendored_go_mod_licenses 0BSD AND AGPL-3.0-only AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-3.0-only AND GPL-3.0-or-later AND ICU AND ISC AND MIT AND MPL-2.0 AND (FTL OR GPL-2.0-or-later) # Determined using forgejo-node-get-licenses.py -%global vendored_node_mod_licenses (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-3-Clause AND ISC AND PSF-2.0 AND CC-BY-3.0 AND Apache-2.0 AND (MIT OR CC0-1.0) AND MIT AND (MIT OR Apache-2.0) AND BlueOak-1.0.0 AND MIT-0 AND (MIT AND CC-BY-3.0) AND 0BSD AND MPL-2.0 AND BSD-2-Clause AND LGPL-3.0-only AND CC0-1.0 AND CC-BY-4.0 AND (MPL-2.0 OR Apache-2.0) AND Unlicense +%global vendored_node_mod_licenses Apache-2.0 AND LGPL-3.0-or-later AND Unlicense AND PSF-2.0 AND (BSD-2-Clause OR MIT OR Apache-2.0) AND CC-BY-4.0 AND CC-BY-3.0 AND MIT-0 AND Apache-2.0 AND LGPL-3.0-only AND BSD-2-Clause AND LGPL-3.0-or-later AND (MIT OR Apache-2.0) AND Apache-2.0 AND LGPL-3.0-or-later AND MIT AND ISC AND BSD-3-Clause AND BlueOak-1.0.0 AND (MPL-2.0 OR Apache-2.0) AND MPL-2.0 AND 0BSD AND CC0-1.0 AND MIT AND (MIT AND CC-BY-3.0) AND (MIT OR CC0-1.0) # Forgejo itself is "MIT AND GPL-3.0-or-later", the following is the combination with vendored # sources. @@ -54,12 +52,6 @@ Source10: forgejo-node-deps-provides.py Source11: forgejo-node-get-licenses.py Patch0: forgejo-10.0.1-app.ini.tmpl.patch -# Pagure migrator plugin. Generate from the pagure-migrator branch of -# https://codeberg.org/ryanlerch/forgejo like this (assuming the branch is based off of the -# v12.0/forgejo upstream branch): -# git diff $(git merge-base v12.0/forgejo pagure-migrator) pagure-migrator | \ -# gzip -9 -c > %%{name}-pagure-migrator-%%{pagure_migrator_gitrev}.patch.gz -Patch1: %{name}-pagure-migrator-%{pagure_migrator_gitrev}.patch.gz ExclusiveArch: %golang_arches_future @@ -95,8 +87,6 @@ them! %autosetup -N -n %{name}-src-%{version} patch --input=%{PATCH0} --output=app.ini.tmpl custom/conf/app.example.ini -%patch 1 -p1 -b .pagure-migrator - %generate_buildrequires %go_vendor_license_buildrequires -c %{S:3} diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml index 743d8cb..fbfd439 100644 --- a/go-vendor-tools.toml +++ b/go-vendor-tools.toml @@ -23,11 +23,6 @@ path = "vendor/github.com/golang/freetype/LICENSE" sha256sum = "d3ba056adc2b7909e95681deaae397fb37c97ed491a920f491214f07b62c41d0" expression = "FTL OR GPL-2.0-or-later" -[[licensing.licenses]] -path = "vendor/github.com/xi2/xz/LICENSE" -sha256sum = "5c640056d513f276d56635af7a0bed81cb7eac02a31b6e56d40c416557a8d8ce" -expression = "LicenseRef-Fedora-Public-Domain" - [[licensing.licenses]] path = "vendor/github.com/zeebo/blake3/LICENSE" sha256sum = "0589f544f68ffc436e6e21efec2cf7cc2dbb2ac09ce6cb8a8cdb75ab74489716" @@ -67,3 +62,8 @@ expression = "MIT AND Apache-2.0" path = "vendor/github.com/gogs/chardet/LICENSE" sha256sum = "44699611628b82dec802229cd039c401b6df44808eeb5dc873698255a0642d04" expression = "ICU AND MIT" + +[[licensing.licenses]] +path = "vendor/go.yaml.in/yaml/v3/LICENSE" +sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b" +expression = "Apache-2.0 AND MIT" diff --git a/sources b/sources index 123c881..dd7659e 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (forgejo-pagure-migrator-c9a5694dd2.patch.gz) = 17bd0ce6bf687db0ff32b736f6c117f0472b7b81633d80319e8c8e885cd0366a09b01aca4158b5465d620f74f242f62d049d9bb44a2cc7b20fca0d7216190da4 -SHA512 (forgejo-src-12.0.4.tar.gz) = 16fd7e0c1b3c329641f74158a7a733d337bb83dbd9b81032392681eb20c6f7e435dd0cbe42fb35c223de3127ef618f975b72cf5eb5e24603178da44aadb6af88 -SHA512 (forgejo-src-12.0.4.tar.gz.asc) = 1970a531145c29057168becb7d50e978c274b7c16322a79d5a66701abfd2af61490212e1e586b458fec76030a03cb9b84a4b6c3097c8bf7fc3e06b9434befc94 +SHA512 (forgejo-src-13.0.1.tar.gz) = 075e26960e7ed9cdae19f619aa33da58bcf0c74c7b440ba789ea9d6a729e3495feeb3f58c00063a6a011dd6c81e200c3127988d0fa6f8af7d4480d7882a174db +SHA512 (forgejo-src-13.0.1.tar.gz.asc) = 24a6e0b67f79ceb45305cad7ee783be5c262e4f88b07a8e22d43b7ed84fa75c70d7c645e65a2be877e79cb42063aa3a269e985bf787d7c24273e735c1cf34cfa From 53f5e5089584e40784d86aa6f8811f7f285ba753 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 3 Nov 2025 17:01:45 +0100 Subject: [PATCH 3/5] Update to version 13.0.2 Signed-off-by: Nils Philippsen --- .gitignore | 2 ++ forgejo.spec | 3 +-- sources | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fd74156..b13ff7f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /forgejo-src-12.0.4.tar.gz.asc /forgejo-src-13.0.1.tar.gz /forgejo-src-13.0.1.tar.gz.asc +/forgejo-src-13.0.2.tar.gz +/forgejo-src-13.0.2.tar.gz.asc diff --git a/forgejo.spec b/forgejo.spec index 5cd7cdb..41ca430 100644 --- a/forgejo.spec +++ b/forgejo.spec @@ -13,7 +13,7 @@ %global __node_deps_path ^%{_bindir}/%{name}$ Name: forgejo -Version: 13.0.1 +Version: 13.0.2 Release: %autorelease Summary: A lightweight software forge @@ -172,7 +172,6 @@ hardlink --ignore-time %{buildroot} %dir %license %{_defaultlicensedir}/%{name}/public %dir %license %{_defaultlicensedir}/%{name}/public/assets %license %{_defaultlicensedir}/%{name}/public/assets/licenses.txt -%license %{_defaultlicensedir}/%{name}/vendor/modules.txt %doc CONTRIBUTING.md README.md RELEASE-NOTES.md %doc custom/conf/app.example.ini diff --git a/sources b/sources index dd7659e..4dceba7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (forgejo-src-13.0.1.tar.gz) = 075e26960e7ed9cdae19f619aa33da58bcf0c74c7b440ba789ea9d6a729e3495feeb3f58c00063a6a011dd6c81e200c3127988d0fa6f8af7d4480d7882a174db -SHA512 (forgejo-src-13.0.1.tar.gz.asc) = 24a6e0b67f79ceb45305cad7ee783be5c262e4f88b07a8e22d43b7ed84fa75c70d7c645e65a2be877e79cb42063aa3a269e985bf787d7c24273e735c1cf34cfa +SHA512 (forgejo-src-13.0.2.tar.gz) = 51c044a04568bd14f826a334c02e11689326b27f3cf4aaac99d652ae93b5a35f9ee1529b235ea894832b39ea012bcfd996419b4d666927ca3e74dd889a867161 +SHA512 (forgejo-src-13.0.2.tar.gz.asc) = e683ad4dd34c709e915dc1810693d41059b0aa5b17ce7ef867420f926a9a5bc8fea1a7fc2ddcc368e552d43774549cbcbba9210b0d4bcc0da499d333eaf40f7f From 2e0754d841054f4cbc5718874ab2303b3b6a6b74 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 24 Nov 2025 15:32:19 +0100 Subject: [PATCH 4/5] Update to 13.0.3 Signed-off-by: Nils Philippsen --- .gitignore | 2 ++ forgejo.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b13ff7f..b760873 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /forgejo-src-13.0.1.tar.gz.asc /forgejo-src-13.0.2.tar.gz /forgejo-src-13.0.2.tar.gz.asc +/forgejo-src-13.0.3.tar.gz +/forgejo-src-13.0.3.tar.gz.asc diff --git a/forgejo.spec b/forgejo.spec index 41ca430..f994d50 100644 --- a/forgejo.spec +++ b/forgejo.spec @@ -13,7 +13,7 @@ %global __node_deps_path ^%{_bindir}/%{name}$ Name: forgejo -Version: 13.0.2 +Version: 13.0.3 Release: %autorelease Summary: A lightweight software forge diff --git a/sources b/sources index 4dceba7..a0d12e3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (forgejo-src-13.0.2.tar.gz) = 51c044a04568bd14f826a334c02e11689326b27f3cf4aaac99d652ae93b5a35f9ee1529b235ea894832b39ea012bcfd996419b4d666927ca3e74dd889a867161 -SHA512 (forgejo-src-13.0.2.tar.gz.asc) = e683ad4dd34c709e915dc1810693d41059b0aa5b17ce7ef867420f926a9a5bc8fea1a7fc2ddcc368e552d43774549cbcbba9210b0d4bcc0da499d333eaf40f7f +SHA512 (forgejo-src-13.0.3.tar.gz) = d8da1530a505b39e516def13252e5cc73b369604f5020a407c3c509cab5615c48cfa054d10ce5122c3c80173b2e5ec3b32bae333c42e5fe21d45020845b9b2b5 +SHA512 (forgejo-src-13.0.3.tar.gz.asc) = 72a3ae6b8fffd6415a9ed91f51a8ec1d6e6dd163959e5eb9a703c6d0d633e6e3ad72bbfab82eb6282a67953b69d0cd4e1c38ee8706617953ad0586492b072c41 From 45b53d196915c9277e7d2d9bf1326ebe934f0062 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 8 Jan 2026 15:45:28 +0100 Subject: [PATCH 5/5] Update to 13.0.4 Signed-off-by: Nils Philippsen --- .gitignore | 2 ++ dj3498u4hyyarh35rkjfnghbjxug6b19.pgp | Bin 2730 -> 3031 bytes forgejo.spec | 2 +- sources | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b760873..8268a0c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ /forgejo-src-13.0.2.tar.gz.asc /forgejo-src-13.0.3.tar.gz /forgejo-src-13.0.3.tar.gz.asc +/forgejo-src-13.0.4.tar.gz +/forgejo-src-13.0.4.tar.gz.asc diff --git a/dj3498u4hyyarh35rkjfnghbjxug6b19.pgp b/dj3498u4hyyarh35rkjfnghbjxug6b19.pgp index 5d1410f8ee655c8c1d135db66d0f47a8e8c42d0d..dd8a602a174630e0a5954eaacf968cd34ba4d8ff 100644 GIT binary patch delta 265 zcmV+k0rvi?71tNA_X#vJ1ZhES#TE%G1_1;C+D8uo0S7?T22u7tkCMrNta#d@qlX~m zI3HNB(57-MqTst)Cr8JV(FY<7X+dqp0viGa2?EFJlm7=8e>?Q(6Zl9HK^>qTTf`V` z_HRpPPz3^ML2bnV3JDOz7;W}%OJ`8f902_hK@8h_NhL;}(7i)!Y1R^*#+{Rp8+Lc% z<*(PQ5m#{l`T}kpuUW5D*8oM=2Lv-@iog}TzU+={nPb&6&K&O+0REu>|7TDz##}|| zMGHsBKJkz+GiTU%8vJfS%9M~$IX7;R