Update to 13.0.4

Signed-off-by: Nils Philippsen <nils@redhat.com>

.gitignore

@@ -17,4 +17,11 @@
 /forgejo-src-12.0.3.tar.gz.asc
 /forgejo-src-12.0.4.tar.gz
 /forgejo-src-12.0.4.tar.gz.asc
-/9468.patch
+/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
+/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

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.4
 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,16 +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
-
-# https://codeberg.org/forgejo/forgejo/issues/9461
-# https://codeberg.org/forgejo/forgejo/pulls/9468
-Patch2:         https://codeberg.org/forgejo/forgejo/pulls/9468.patch
 
 ExclusiveArch:  %golang_arches_future
 
@@ -99,9 +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
-%patch 2 -p1 -b .package-cleanup-rule-fail
-
 
 %generate_buildrequires
 %go_vendor_license_buildrequires -c %{S:3}
@@ -187,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
 

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"

sources

@@ -1,4 +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 (9468.patch) = 9fd10ce054ab0f84aba01897b0c2704e70d69a1c8f6c43663c73c50e376b74595f4f8321fc976b3f3160b38a582da4a9591888d8f5102cdcf27fffc8cfa513c1
+SHA512 (forgejo-src-13.0.4.tar.gz) = 0beb922f450bc0ba0a0db8f15f8591bd0722c2729d4fb7b6bb0da40a91438773ab546b215eb4ba8d8dab1bdced6fb984920f6351c3d735052e7a935ae7c20058
+SHA512 (forgejo-src-13.0.4.tar.gz.asc) = 03f96cd13565a4d7507c8fff40a0fdcb7c6f455383a22911140d87b6664fc5a84de929eb8827d23f54b80384e2f52c32c941ce2ca4773f3ad6d4989a418a4543