From 1949d03acb57a5325b593d4c55903d7bc47ea92c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 22 Oct 2025 13:52:53 +0200 Subject: [PATCH] Fix panic running package cleanup rules https://codeberg.org/forgejo/forgejo/issues/9461 https://codeberg.org/forgejo/forgejo/pulls/9468 Signed-off-by: Nils Philippsen --- .gitignore | 1 + forgejo.spec | 5 +++++ sources | 1 + 3 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index e940984..dc4c377 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /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 diff --git a/forgejo.spec b/forgejo.spec index 9f3080a..2cb5ab4 100644 --- a/forgejo.spec +++ b/forgejo.spec @@ -61,6 +61,10 @@ Patch0: forgejo-10.0.1-app.ini.tmpl.patch # 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 BuildRequires: coreutils @@ -96,6 +100,7 @@ them! 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 diff --git a/sources b/sources index 123c881..668f8a5 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ 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