diff --git a/.gitignore b/.gitignore index c04436b..ac1f2be 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,15 @@ /butane-0.13.0.tar.gz /butane-0.13.1.tar.gz /butane-0.14.0.tar.gz +/butane-0.15.0.tar.gz +/butane-0.16.0.tar.gz +/butane-0.17.0.tar.gz +/butane-0.18.0.tar.gz +/butane-0.19.0.tar.gz +/butane-0.20.0.tar.gz +/butane-0.21.0.tar.gz +/butane-0.22.0.tar.gz +/butane-0.23.0.tar.gz +/butane-0.24.0.tar.gz +/butane-0.25.0.tar.gz +/butane-0.25.1.tar.gz diff --git a/butane.spec b/butane.spec index 0125db9..014bda4 100644 --- a/butane.spec +++ b/butane.spec @@ -10,23 +10,22 @@ # https://github.com/coreos/butane %global goipath github.com/coreos/butane %global gomodulesmode GO111MODULE=on -Version: 0.14.0 +Version: 0.25.1 -%gometa +%gometa -f %global common_description %{expand: Butane translates human-readable Butane Configs into machine-readable Ignition configs for provisioning operating systems that use Ignition.} %global golicenses LICENSE -%global godocs docs README.md NEWS +%global godocs docs README.md Name: butane -Release: 1%{?dist} +Release: 2%{?dist} Summary: Butane config transpiler -# Upstream license specification: Apache-2.0 -License: ASL 2.0 +License: Apache-2.0 URL: %{gourl} Source0: %{gosource} @@ -37,38 +36,41 @@ Obsoletes: fedora-coreos-config-transpiler < 0.10.0-2 Provides: fcct = %{version}-%{release} # Generated by go-mods-to-bundled-provides.py -Provides: bundled(golang(github.com/clarketm/json)) = 1.14.1 -Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 -Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = 0.0.0-20190321100706.git95778dfbb74e -Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 0.0.0-20190321100706.git95778dfbb74e -Provides: bundled(golang(github.com/coreos/ignition/v2/config/merge)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/errors)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/validations)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/util)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_0/types)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_1/types)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_2/types)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_3/types)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_4_experimental/types)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/validate)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/yaml)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/davecgh/go-spew/spew)) = 1.1.1 -Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6-0.20210604193023.gitd5e0c0615ace -Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.7.0 +Provides: bundled(golang(github.com/clarketm/json)) = 1.17.1 +Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.1 +Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.5.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/doc)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/merge)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/errors)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/parse)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/validations)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/util)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_0/types)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_1/types)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_2/types)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_3/types)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_4/types)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_5/types)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_6_experimental/types)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/validate)) = 2.23.0 +Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20230201181013.gitd72178a18687 +Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20230201181013.gitd72178a18687 +Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20230201181013.gitd72178a18687 +Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20230201181013.gitd72178a18687 +Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20230201181013.gitd72178a18687 +Provides: bundled(golang(github.com/coreos/vcontext/yaml)) = 0.0.0-20230201181013.gitd72178a18687 +Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.7 +Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.10.0 +Provides: bundled(golang(github.com/stretchr/testify/assert/yaml)) = 1.10.0 Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 1.0.0 -Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.0-20210107192922.git496545a6307b +Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description %{common_description} %package redistributable Summary: Statically built Butane for Linux, macOS and Windows -License: ASL 2.0 +License: Apache-2.0 BuildArch: noarch # In case someone has this subpackage installed, obsolete the old name @@ -94,7 +96,7 @@ export GOFLAGS="-mod=vendor" echo "Building butane..." %gobuild -o ./butane internal/main.go -%global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x +%global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c8 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x echo "Building Linux Butane with static linking..." CGO_ENABLED=0 GOARCH=arm64 GOOS=linux %gocrossbuild -o butane-aarch64-unknown-linux-gnu-static internal/main.go @@ -104,6 +106,7 @@ CGO_ENABLED=0 GOARCH=amd64 GOOS=linux %gocrossbuild -o butane-x86_64-unknown-lin echo "Building macOS Butane..." GOARCH=amd64 GOOS=darwin %gocrossbuild -o butane-x86_64-apple-darwin internal/main.go +GOARCH=arm64 GOOS=darwin %gocrossbuild -o butane-aarch64-apple-darwin internal/main.go echo "Building Windows Butane..." GOARCH=amd64 GOOS=windows %gocrossbuild -o butane-x86_64-pc-windows-gnu.exe internal/main.go @@ -113,6 +116,7 @@ install -d -p %{buildroot}%{_bindir} install -p -m 0755 ./butane %{buildroot}%{_bindir} ln -s butane %{buildroot}%{_bindir}/fcct install -d -p %{buildroot}%{_datadir}/butane +install -p -m 0644 ./butane-aarch64-apple-darwin %{buildroot}%{_datadir}/butane install -p -m 0644 ./butane-aarch64-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane install -p -m 0644 ./butane-ppc64le-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane install -p -m 0644 ./butane-s390x-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane @@ -134,6 +138,7 @@ install -p -m 0644 ./butane-x86_64-unknown-linux-gnu-static %{buildroot}%{_datad %files redistributable %license %{golicenses} %dir %{_datadir}/butane +%{_datadir}/butane/butane-aarch64-apple-darwin %{_datadir}/butane/butane-aarch64-unknown-linux-gnu-static %{_datadir}/butane/butane-ppc64le-unknown-linux-gnu-static %{_datadir}/butane/butane-s390x-unknown-linux-gnu-static @@ -142,6 +147,86 @@ install -p -m 0644 ./butane-x86_64-unknown-linux-gnu-static %{buildroot}%{_datad %{_datadir}/butane/butane-x86_64-unknown-linux-gnu-static %changelog +* Fri Oct 10 2025 Alejandro Sáez - 0.25.1-2 +- rebuild + +* Wed Sep 24 2025 Tiago Bueno - 0.25.1-1 +- New release + +* Mon Sep 08 2025 Tiago Bueno - 0.25.0-1 +- New release + +* Fri Aug 15 2025 Maxwell G - 0.24.0-3 +- Rebuild for golang-1.25.0 + +* Wed Jul 23 2025 Fedora Release Engineering - 0.24.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue May 27 2025 Steven Presti - 0.24.0-1 +- New release + +* Thu Jan 16 2025 Fedora Release Engineering - 0.23.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Dec 05 2024 Steven Presti - 0.23.0-1 +- New release + +* Fri Sep 20 2024 Yasmin de Souza - 0.22.0-1 +- New release + +* Wed Jul 17 2024 Fedora Release Engineering - 0.21.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jun 6 2024 Yasmin de Souza - 0.21.0-1 +- New release + +* Wed Apr 24 2024 Timothée Ravier - 0.20.0-2 +- Exclude ix86 + +* Mon Feb 19 2024 Steven Presti - 0.20.0-1 +- New release + +* Sun Feb 11 2024 Maxwell G - 0.19.0-4 +- Rebuild for golang 1.22.0 + +* Tue Jan 23 2024 Fedora Release Engineering - 0.19.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 0.19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Oct 03 2023 Steven Presti - 0.19.0-1 +- New release + +* Wed Jul 19 2023 Fedora Release Engineering - 0.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Mar 28 2023 Steven Presti - 0.18.0-1 +- New release + +* Wed Jan 18 2023 Fedora Release Engineering - 0.17.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jan 4 2023 Sohan Kunkerkar - 0.17.0-1 +- New release + +* Fri Oct 14 2022 Benjamin Gilbert - 0.16.0-1 +- New release +- Switch License tags to SPDX + +* Wed Jul 20 2022 Fedora Release Engineering - 0.15.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 27 2022 Benjamin Gilbert - 0.15.0-2 +- Add macOS aarch64 binary to -redistributable + +* Mon Jun 27 2022 Steven Presti - 0.15.0-1 +- New release + +* Fri Jun 17 2022 Robert-André Mauchin - 0.14.0-2 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629 + * Thu Jan 27 2022 Benjamin Gilbert - 0.14.0-1 - New release diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..54217e2 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,4 @@ +--- +debuginfo: + ignore: + - /usr/share/butane/butane-*-unknown-linux-gnu-static \ No newline at end of file diff --git a/sources b/sources index c139319..b9f9a88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (butane-0.14.0.tar.gz) = 3a3ad4142e0bf42a227fb20d486dfd01b2b248024cbddbd03592cea4049124fd452529def20bae4d1c3194e6d2e30ca77f7426b37af2430fb1221df98828c48c +SHA512 (butane-0.25.1.tar.gz) = 602f0075381cb98096b7a7cb1d7df8542f86f1391b2071029a72193237b0596063c758b989e118a0eef5ae9d070f98c36811bb92bb03a99dfc86832995e291bb