From 065a1cbe1e5099b21aeab15e1dc802b1d5fb81fa Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Wed, 18 Dec 2024 18:18:40 +0100 Subject: [PATCH 01/13] Update to 1.2.1 - Closes rhbz#2333048 --- .gitignore | 1 + .packit.yaml | 19 +++++++++++++++++++ age.spec | 2 +- sources | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 .packit.yaml diff --git a/.gitignore b/.gitignore index 74164a0..55d7742 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /age-1.1.0-rc.1.tar.gz /age-1.1.1.tar.gz /age-1.2.0.tar.gz +/age-1.2.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..a64ad8f --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +specfile_path: age.spec + +upstream_package_name: age +upstream_project_url: https://github.com/FiloSottile/age +downstream_package_name: age + +upstream_tag_template: v{version} + +jobs: + +- job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + +- job: koji_build + trigger: commit + dist_git_branches: + - fedora-rawhide diff --git a/age.spec b/age.spec index 15d219a..27b8a06 100644 --- a/age.spec +++ b/age.spec @@ -13,7 +13,7 @@ # https://github.com/FiloSottile/age %global goipath filippo.io/age %global forgeurl https://github.com/FiloSottile/age -Version: 1.2.0 +Version: 1.2.1 %gometa -L -f diff --git a/sources b/sources index 49df8a8..58730d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (age-1.2.0.tar.gz) = fddc7e6a68115d52f4b98957ef87a82cbf634ba38a028fb113370392d88af3e8b32991baabc1595280ecbd8e44bbc88dcea93e7336e7ffa2cbccfea0c953842f +SHA512 (age-1.2.1.tar.gz) = 685914db0bf398e20ee599627d131004f85ab5f37dcbc6752b1379c07702a1896d48163a8e9c71a25a44858ec648f3cb404f7c92360657f935342cd766a13a3a From 1a0bf27c8b47b429d335ae9f6608cd761449fb1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:42:21 +0000 Subject: [PATCH 02/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 972ac7c2d979507156d0c4b5e2278822925e657d Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Tue, 15 Jul 2025 21:38:48 +0200 Subject: [PATCH 03/13] Adopt Go Vendor Tools --- .gitignore | 1 + age.spec | 58 ++++++++++++-------------------------------- go-vendor-tools.toml | 8 ++++++ sources | 1 + 4 files changed, 26 insertions(+), 42 deletions(-) create mode 100644 go-vendor-tools.toml diff --git a/.gitignore b/.gitignore index 55d7742..50e2e88 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /age-1.1.1.tar.gz /age-1.2.0.tar.gz /age-1.2.1.tar.gz +/age-1.2.1-vendor.tar.bz2 diff --git a/age.spec b/age.spec index 27b8a06..d924856 100644 --- a/age.spec +++ b/age.spec @@ -1,14 +1,5 @@ -# Generated by go2rpm 1.14.0 +# Generated by go2rpm 1.16.0 %bcond check 1 -%bcond bootstrap 0 - -%if %{with bootstrap} -%global debug_package %{nil} -%endif - -%if %{with bootstrap} -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ -%endif # https://github.com/FiloSottile/age %global goipath filippo.io/age @@ -21,74 +12,57 @@ Version: 1.2.1 A simple, modern and secure encryption tool (and Go library) with small explicit keys, no config options, and UNIX-style composability.} -%global golicenses LICENSE -%global godocs AUTHORS README.md - Name: age Release: %autorelease Summary: Simple, modern and secure encryption tool -License: BSD-3-Clause +# Generated by go-vendor-tools +License: 0BSD AND BSD-3-Clause URL: %{gourl} -Source: %{gosource} +Source0: %{gosource} +# Generated by go-vendor-tools +Source1: %{archivename}-vendor.tar.bz2 +Source2: go-vendor-tools.toml + +BuildRequires: go-vendor-tools %description %{common_description} -%gopkg - %prep %goprep -A +%setup -q -T -D -a1 %{forgesetupargs} %autopatch -p1 -# To avoid extra dep on c2sp.org/CCTV/age -rm -rfv testkit_test.go - -%if %{without bootstrap} %generate_buildrequires -%go_generate_buildrequires -%endif +%go_vendor_license_buildrequires -c %{S:2} -%if %{without bootstrap} %build for cmd in cmd/* ; do %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd done -%endif %install -%gopkginstall -%if %{without bootstrap} +%go_vendor_license_install -c %{S:2} install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ mkdir -p %{buildroot}%{_mandir}/man1 install -m 644 doc/%{name}.1 %{buildroot}%{_mandir}/man1/ install -m 644 doc/age-keygen.1 %{buildroot}%{_mandir}/man1/ -%endif -%if %{without bootstrap} -%if %{with check} %check -%ifarch s390x -for test in "TestScript" \ -; do -awk -i inplace '/^func.*'"$test"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' $(grep -rl $test) -done -%endif +%go_vendor_license_check -c %{S:2} +%if %{with check} %gocheck %endif -%endif -%if %{without bootstrap} -%files -%license LICENSE +%files -f %{go_vendor_license_filelist} +%license vendor/modules.txt %doc doc AUTHORS README.md %{_bindir}/age %{_bindir}/age-keygen %{_mandir}/man1/* -%endif -%gopkgfiles %changelog %autochangelog diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml new file mode 100644 index 0000000..d7cf4ac --- /dev/null +++ b/go-vendor-tools.toml @@ -0,0 +1,8 @@ +[archive] + +[licensing] +detector = "trivy" +[[licensing.licenses]] +path = "vendor/c2sp.org/CCTV/age/README.md" +sha256sum = "5b8b7a5e0ccfd7c70d106e1b5f43104dd30a89fffee3f96ef5afd88184dec927" +expression = "0BSD" diff --git a/sources b/sources index 58730d2..96f0eb2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (age-1.2.1.tar.gz) = 685914db0bf398e20ee599627d131004f85ab5f37dcbc6752b1379c07702a1896d48163a8e9c71a25a44858ec648f3cb404f7c92360657f935342cd766a13a3a +SHA512 (age-1.2.1-vendor.tar.bz2) = 5fd33b0a322943ea4aa6fb72479fefe9397e6d09d227a20d75731391db1da03a61d6ea53ac7abb062f8d6c566d7e7d6dc0564f65e67bfd4c3f7c8c1bdbd8e572 From 468c9bfb1bba16a477fc5d952431d4ddf80e78f7 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Sun, 20 Jul 2025 00:20:20 +0200 Subject: [PATCH 04/13] Fix s390x tests --- go-vendor-tools.toml | 2 ++ sources | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml index d7cf4ac..d1661eb 100644 --- a/go-vendor-tools.toml +++ b/go-vendor-tools.toml @@ -1,5 +1,7 @@ [archive] +[archive.dependency_overrides] +"github.com/rogpeppe/go-internal" = "v1.13.1" [licensing] detector = "trivy" [[licensing.licenses]] diff --git a/sources b/sources index 96f0eb2..6ea94d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (age-1.2.1.tar.gz) = 685914db0bf398e20ee599627d131004f85ab5f37dcbc6752b1379c07702a1896d48163a8e9c71a25a44858ec648f3cb404f7c92360657f935342cd766a13a3a -SHA512 (age-1.2.1-vendor.tar.bz2) = 5fd33b0a322943ea4aa6fb72479fefe9397e6d09d227a20d75731391db1da03a61d6ea53ac7abb062f8d6c566d7e7d6dc0564f65e67bfd4c3f7c8c1bdbd8e572 +SHA512 (age-1.2.1-vendor.tar.bz2) = 701e0268253355c227c490e03e263da18af5096ded89b240182e2f902a38eed28480856055a422c8ffa79ab24391861dc49eb0019950ea8dfc61ba75ed62a549 From 2958f9db9a2764a5c0b831b8cbbdd6b6d369f789 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:49:23 +0000 Subject: [PATCH 05/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 13537df666d437918cd83c42b0a2da09ca1de27e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 26 Jul 2025 19:23:30 -0500 Subject: [PATCH 06/13] Miscellaneous packaging improvements - Embed Version in binary so --version works - Use GO111MODULE=on. This is the modern way to build Go applications and also includes extra dependency metadata in the binary. - Use simpler %gotest macro instead of %gocheck script - Remove globs in the %files section. Ref: https://gitlab.com/fedora/sigs/go/go2rpm/-/commit/85a703ecaed69742d425a557c6a79c25db3d5e83 Ref: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_explicit_lists [skip changelog] --- age.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/age.spec b/age.spec index d924856..fbc5928 100644 --- a/age.spec +++ b/age.spec @@ -37,6 +37,8 @@ BuildRequires: go-vendor-tools %go_vendor_license_buildrequires -c %{S:2} %build +%global gomodulesmode GO111MODULE=on +GO_LDFLAGS="-X main.Version=%{version}" for cmd in cmd/* ; do %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd done @@ -53,7 +55,7 @@ install -m 644 doc/age-keygen.1 %{buildroot}%{_mandir}/man1/ %check %go_vendor_license_check -c %{S:2} %if %{with check} -%gocheck +%gotest ./... %endif %files -f %{go_vendor_license_filelist} @@ -61,7 +63,8 @@ install -m 644 doc/age-keygen.1 %{buildroot}%{_mandir}/man1/ %doc doc AUTHORS README.md %{_bindir}/age %{_bindir}/age-keygen -%{_mandir}/man1/* +%{_mandir}/man1/age.1* +%{_mandir}/man1/age-keygen.1* %changelog From 95b1daaf05db4531f98f47912fa056cd8a2057d9 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 14:19:19 -0500 Subject: [PATCH 07/13] Rebuild for golang-1.25.0 --- age.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/age.spec b/age.spec index fbc5928..4997fc7 100644 --- a/age.spec +++ b/age.spec @@ -13,7 +13,7 @@ A simple, modern and secure encryption tool (and Go library) with small explicit keys, no config options, and UNIX-style composability.} Name: age -Release: %autorelease +Release: %autorelease.1 Summary: Simple, modern and secure encryption tool # Generated by go-vendor-tools @@ -68,4 +68,7 @@ install -m 644 doc/age-keygen.1 %{buildroot}%{_mandir}/man1/ %changelog +* Fri Aug 15 2025 Maxwell G - 1.2.1-1.1 +- Rebuild for golang-1.25.0 + %autochangelog From 02e91684c25ccffae43def2cf75805c8f4d1db4a Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 15:24:44 -0500 Subject: [PATCH 08/13] Revert "Rebuild for golang-1.25.0" This reverts commit 95b1daaf05db4531f98f47912fa056cd8a2057d9. --- age.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/age.spec b/age.spec index 4997fc7..fbc5928 100644 --- a/age.spec +++ b/age.spec @@ -13,7 +13,7 @@ A simple, modern and secure encryption tool (and Go library) with small explicit keys, no config options, and UNIX-style composability.} Name: age -Release: %autorelease.1 +Release: %autorelease Summary: Simple, modern and secure encryption tool # Generated by go-vendor-tools @@ -68,7 +68,4 @@ install -m 644 doc/age-keygen.1 %{buildroot}%{_mandir}/man1/ %changelog -* Fri Aug 15 2025 Maxwell G - 1.2.1-1.1 -- Rebuild for golang-1.25.0 - %autochangelog From a1d6c08619302af197f7a513db640f778e5a9fc9 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 16:00:08 -0500 Subject: [PATCH 09/13] Rebuild for golang-1.25.0 From 571616dbde76e956c88dfe9a340f35dfe723ccc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 12:35:49 +0200 Subject: [PATCH 10/13] rebuild From 84eb1ce35aab37191736eb783acb0f7bfb71898a Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Sun, 28 Dec 2025 14:36:21 +0100 Subject: [PATCH 11/13] Update to 1.3.0 - Closes rhbz#2425652 --- .gitignore | 2 ++ .packit.yaml | 20 ++++++++++++++++++-- age.spec | 22 +++++++++++++--------- go-vendor-tools.toml | 9 ++++----- sources | 4 ++-- 5 files changed, 39 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 50e2e88..812a9bb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /age-1.2.0.tar.gz /age-1.2.1.tar.gz /age-1.2.1-vendor.tar.bz2 +/age-1.3.0.tar.gz +/age-1.3.0-vendor.tar.bz2 diff --git a/.packit.yaml b/.packit.yaml index a64ad8f..3dda84b 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -11,9 +11,25 @@ jobs: - job: pull_from_upstream trigger: release dist_git_branches: - - fedora-rawhide + - rawhide - job: koji_build trigger: commit dist_git_branches: - - fedora-rawhide + - rawhide + +actions: + post-modifications: + # https://fedora.gitlab.io/sigs/go/go-vendor-tools/scenarios/#manual-update + - | + sh -xeuc " + cd $PACKIT_DOWNSTREAM_REPO + export GOTOOLCHAIN=auto + go_vendor_archive create --config go-vendor-tools.toml age.spec + go_vendor_license \ + --config go-vendor-tools.toml \ + --path age.spec \ + report \ + --verify-spec + " +create_sync_note: false diff --git a/age.spec b/age.spec index fbc5928..8c6ca7f 100644 --- a/age.spec +++ b/age.spec @@ -1,23 +1,22 @@ -# Generated by go2rpm 1.16.0 +# Generated by go2rpm 1.18.0 %bcond check 1 # https://github.com/FiloSottile/age %global goipath filippo.io/age %global forgeurl https://github.com/FiloSottile/age -Version: 1.2.1 +Version: 1.3.0 %gometa -L -f -%global common_description %{expand: -A simple, modern and secure encryption tool (and Go library) with small -explicit keys, no config options, and UNIX-style composability.} Name: age Release: %autorelease Summary: Simple, modern and secure encryption tool # Generated by go-vendor-tools -License: 0BSD AND BSD-3-Clause +# https://github.com/C2SP/CCTV/issues/14 +# vendor/c2sp.org/CCTV/age/internal is not packaged +License: BSD-3-Clause AND (0BSD OR CC0-1.0 OR Unlicense) URL: %{gourl} Source0: %{gosource} # Generated by go-vendor-tools @@ -26,7 +25,9 @@ Source2: go-vendor-tools.toml BuildRequires: go-vendor-tools -%description %{common_description} +%description +A simple, modern and secure encryption tool (and Go library) with small +explicit keys, no config options, and UNIX-style composability. %prep %goprep -A @@ -39,7 +40,7 @@ BuildRequires: go-vendor-tools %build %global gomodulesmode GO111MODULE=on GO_LDFLAGS="-X main.Version=%{version}" -for cmd in cmd/* ; do +for cmd in cmd/{age,age-keygen,age-inspect} ; do %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd done @@ -51,6 +52,7 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ mkdir -p %{buildroot}%{_mandir}/man1 install -m 644 doc/%{name}.1 %{buildroot}%{_mandir}/man1/ install -m 644 doc/age-keygen.1 %{buildroot}%{_mandir}/man1/ +install -m 644 doc/age-inspect.1 %{buildroot}%{_mandir}/man1/ %check %go_vendor_license_check -c %{S:2} @@ -60,10 +62,12 @@ install -m 644 doc/age-keygen.1 %{buildroot}%{_mandir}/man1/ %files -f %{go_vendor_license_filelist} %license vendor/modules.txt -%doc doc AUTHORS README.md +%doc doc README.md %{_bindir}/age +%{_bindir}/age-inspect %{_bindir}/age-keygen %{_mandir}/man1/age.1* +%{_mandir}/man1/age-inspect.1* %{_mandir}/man1/age-keygen.1* diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml index d1661eb..9c9f1d2 100644 --- a/go-vendor-tools.toml +++ b/go-vendor-tools.toml @@ -1,10 +1,9 @@ + [archive] -[archive.dependency_overrides] -"github.com/rogpeppe/go-internal" = "v1.13.1" [licensing] -detector = "trivy" +detector = "askalono" [[licensing.licenses]] path = "vendor/c2sp.org/CCTV/age/README.md" -sha256sum = "5b8b7a5e0ccfd7c70d106e1b5f43104dd30a89fffee3f96ef5afd88184dec927" -expression = "0BSD" +sha256sum = "fdbd4b06044f3803c72bdaf2df7681fdce3a45a326a2898e75640eae906606ad" +expression = "0BSD OR CC0-1.0 OR Unlicense" diff --git a/sources b/sources index 6ea94d3..44a10b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (age-1.2.1.tar.gz) = 685914db0bf398e20ee599627d131004f85ab5f37dcbc6752b1379c07702a1896d48163a8e9c71a25a44858ec648f3cb404f7c92360657f935342cd766a13a3a -SHA512 (age-1.2.1-vendor.tar.bz2) = 701e0268253355c227c490e03e263da18af5096ded89b240182e2f902a38eed28480856055a422c8ffa79ab24391861dc49eb0019950ea8dfc61ba75ed62a549 +SHA512 (age-1.3.0.tar.gz) = a246e1b51bd9910f04f4709ca2a23bfeb44bb16c4f007945202af25eff72ccdd5374d33cf6d49459dbb214107d1201a517f86c33b3cc60c802b7139c02b33e6d +SHA512 (age-1.3.0-vendor.tar.bz2) = c0863d04a2206e4f18ffb4d3b0429fc33685e4e7be1ffac7eca2218af590218ad62776fe11f60258092921f3aafffd6962d720eeeb6dd0ea68a14b39730c3908 From 07a80f3899781cc83153e49e122b060a68b0d9cd Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Mon, 5 Jan 2026 17:01:41 +0100 Subject: [PATCH 12/13] Update to 1.3.1 --- .gitignore | 2 ++ age.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 812a9bb..5a47264 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /age-1.2.1-vendor.tar.bz2 /age-1.3.0.tar.gz /age-1.3.0-vendor.tar.bz2 +/age-1.3.1-vendor.tar.bz2 +/age-1.3.1.tar.gz diff --git a/age.spec b/age.spec index 8c6ca7f..b6dd710 100644 --- a/age.spec +++ b/age.spec @@ -4,7 +4,7 @@ # https://github.com/FiloSottile/age %global goipath filippo.io/age %global forgeurl https://github.com/FiloSottile/age -Version: 1.3.0 +Version: 1.3.1 %gometa -L -f diff --git a/sources b/sources index 44a10b3..65f5af2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (age-1.3.0.tar.gz) = a246e1b51bd9910f04f4709ca2a23bfeb44bb16c4f007945202af25eff72ccdd5374d33cf6d49459dbb214107d1201a517f86c33b3cc60c802b7139c02b33e6d -SHA512 (age-1.3.0-vendor.tar.bz2) = c0863d04a2206e4f18ffb4d3b0429fc33685e4e7be1ffac7eca2218af590218ad62776fe11f60258092921f3aafffd6962d720eeeb6dd0ea68a14b39730c3908 +SHA512 (age-1.3.1-vendor.tar.bz2) = c0863d04a2206e4f18ffb4d3b0429fc33685e4e7be1ffac7eca2218af590218ad62776fe11f60258092921f3aafffd6962d720eeeb6dd0ea68a14b39730c3908 +SHA512 (age-1.3.1.tar.gz) = 95bb8049de36630f0b128c9626427646e5d4d76e35b6bd6790e29cf3f69fb2a0266ac7786616f56fe9bf378a81c1f3edc17fd9eba197286041b970944898504c From 0219a932038e248c06130cc90dcb6755577716b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:30:40 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild