From f194a56dd43188833b61983615d3d9a14e99985e225a9560350f72510a5deeb9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 28 Feb 2024 08:58:05 +0000 Subject: [PATCH 1/7] - update to 2.5.0: * Upgrade to go 1.21 * Allow setting of SCC credentials via environment variables * Bump github.com/urfave/cli/v2 from 2.25.7 to 2.27.1 * Use switch instead of else if construction * Add system token header to query SCC subscriptions (bsc#1219855) OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/container-suseconnect?expand=0&rev=15 --- _service | 12 ++++++------ container-suseconnect-2.4.0.tar.zst | 3 --- container-suseconnect-2.5.0.tar.zst | 3 +++ container-suseconnect.changes | 11 +++++++++++ container-suseconnect.spec | 12 ++++++++---- vendor.tar.zst | 4 ++-- 6 files changed, 30 insertions(+), 15 deletions(-) delete mode 100644 container-suseconnect-2.4.0.tar.zst create mode 100644 container-suseconnect-2.5.0.tar.zst diff --git a/_service b/_service index 24d8db7..1bf6e3f 100644 --- a/_service +++ b/_service @@ -1,18 +1,18 @@ - + https://github.com/SUSE/container-suseconnect.git git container-suseconnect .git - 2.4.0 - v2.4.0 + 2.5.0 + v2.5.0 - + *.tar zst - - + + zst diff --git a/container-suseconnect-2.4.0.tar.zst b/container-suseconnect-2.4.0.tar.zst deleted file mode 100644 index 39a2236..0000000 --- a/container-suseconnect-2.4.0.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da996c93ec6ebe32dcb8e3ab13e05cc12f39bfe521d757f3ef9aeeeca4c83bb6 -size 40070 diff --git a/container-suseconnect-2.5.0.tar.zst b/container-suseconnect-2.5.0.tar.zst new file mode 100644 index 0000000..7ab2108 --- /dev/null +++ b/container-suseconnect-2.5.0.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7534cda083bc59534c4cd1219356873800e22bd9dd343975cb1f76ccdd3aa411 +size 40404 diff --git a/container-suseconnect.changes b/container-suseconnect.changes index 7218a33..bbd2181 100644 --- a/container-suseconnect.changes +++ b/container-suseconnect.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Feb 28 08:57:41 UTC 2024 - Dirk Müller + +- update to 2.5.0: + * Upgrade to go 1.21 + * Allow setting of SCC credentials via environment variables + * Bump github.com/urfave/cli/v2 from 2.25.7 to 2.27.1 + * Use switch instead of else if construction + * Add system token header to query SCC subscriptions + (bsc#1219855) + ------------------------------------------------------------------- Thu Oct 5 12:52:42 UTC 2023 - Dirk Müller diff --git a/container-suseconnect.spec b/container-suseconnect.spec index b614dd5..bd32e91 100644 --- a/container-suseconnect.spec +++ b/container-suseconnect.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package container-suseconnect # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %global zypp_services %{zypp_path}/services %global zypp_urlresolver %{zypp_path}/urlresolver Name: %{project} -Version: 2.4.0 +Version: 2.5.0 Release: 0 Summary: Provides access to repositories inside containers License: Apache-2.0 @@ -34,7 +34,11 @@ Source2: container-suseconnect-rpmlintrc BuildRequires: golang-packaging BuildRequires: libzypp > 9.34 BuildRequires: zstd +%if 0%{?suse_version} == 1500 +BuildRequires: go1.21-openssl +%else BuildRequires: golang(API) = 1.21 +%endif Requires: libzypp > 9.34 %description @@ -45,7 +49,7 @@ using the host machine entitlements. %setup -q -n %{project}-%{version} -a1 %build -go build -o %{project} -mod=vendor -buildmode=pie -trimpath -ldflags="-s -w" ./cmd/container-suseconnect +go build -tags enablecgo -o %{project} -mod=vendor -buildmode=pie -trimpath -ldflags="-s -w" ./cmd/container-suseconnect %install install -D -m 755 %{project} %{buildroot}/%{_bindir}/%{project} diff --git a/vendor.tar.zst b/vendor.tar.zst index 572cff4..36e7258 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6da8271aca997942ec28e9593157114980a640d0bf646b0e620b27c0e461957a -size 115069 +oid sha256:1e7341b7ec9fe921e8f76038b61dc9caf968f07d6787ebef13f050c2a2032dca +size 94440 From 088293e172d2297253a5fc6492a2be750691a283fa0ad95e109cab5372c99058 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 28 Feb 2024 09:00:09 +0000 Subject: [PATCH 2/7] - run tests OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/container-suseconnect?expand=0&rev=16 --- container-suseconnect.changes | 1 + container-suseconnect.spec | 3 +++ 2 files changed, 4 insertions(+) diff --git a/container-suseconnect.changes b/container-suseconnect.changes index bbd2181..e1c171d 100644 --- a/container-suseconnect.changes +++ b/container-suseconnect.changes @@ -8,6 +8,7 @@ Wed Feb 28 08:57:41 UTC 2024 - Dirk Müller * Use switch instead of else if construction * Add system token header to query SCC subscriptions (bsc#1219855) +- run tests ------------------------------------------------------------------- Thu Oct 5 12:52:42 UTC 2023 - Dirk Müller diff --git a/container-suseconnect.spec b/container-suseconnect.spec index bd32e91..d146670 100644 --- a/container-suseconnect.spec +++ b/container-suseconnect.spec @@ -51,6 +51,9 @@ using the host machine entitlements. %build go build -tags enablecgo -o %{project} -mod=vendor -buildmode=pie -trimpath -ldflags="-s -w" ./cmd/container-suseconnect +%check +go test ./... + %install install -D -m 755 %{project} %{buildroot}/%{_bindir}/%{project} mkdir -p %{buildroot}/%{zypp_services} From a5ba9beac9a3d7f30b051a3304176a32533bcd6eb921764e8afb2743897ec6a6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 5 Mar 2024 20:58:52 +0000 Subject: [PATCH 3/7] - remove unnecessary packaging buildrequires OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/container-suseconnect?expand=0&rev=17 --- container-suseconnect.changes | 5 +++++ container-suseconnect.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/container-suseconnect.changes b/container-suseconnect.changes index e1c171d..e46ff61 100644 --- a/container-suseconnect.changes +++ b/container-suseconnect.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 5 20:58:41 UTC 2024 - Dirk Müller + +- remove unnecessary packaging buildrequires + ------------------------------------------------------------------- Wed Feb 28 08:57:41 UTC 2024 - Dirk Müller diff --git a/container-suseconnect.spec b/container-suseconnect.spec index d146670..e4a3703 100644 --- a/container-suseconnect.spec +++ b/container-suseconnect.spec @@ -31,7 +31,6 @@ URL: https://%{import_path} Source0: %{project}-%{version}.tar.zst Source1: vendor.tar.zst Source2: container-suseconnect-rpmlintrc -BuildRequires: golang-packaging BuildRequires: libzypp > 9.34 BuildRequires: zstd %if 0%{?suse_version} == 1500 From 7a7edddd6aa3d7589f2a6abdf954664e2ead668ec4ac22ec08745ba9b074f9c2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 5 Mar 2024 21:10:56 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/container-suseconnect?expand=0&rev=18 --- container-suseconnect.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/container-suseconnect.spec b/container-suseconnect.spec index e4a3703..622c1f5 100644 --- a/container-suseconnect.spec +++ b/container-suseconnect.spec @@ -45,7 +45,12 @@ container-suseconnect gives access to package repositories inside containers using the host machine entitlements. %prep +%if 0%{?suse_version} && 0%{?suse_version} < 1500 +%setup -q -n %{project}-%{version} +tar -I zstd -xvf %{SOURCE1} +%else %setup -q -n %{project}-%{version} -a1 +%endif %build go build -tags enablecgo -o %{project} -mod=vendor -buildmode=pie -trimpath -ldflags="-s -w" ./cmd/container-suseconnect From f8df2704d45548070262c3f105e53f022272d5a1a7c509441c3e88d83e2079fa Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 5 Mar 2024 21:25:36 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/container-suseconnect?expand=0&rev=19 --- container-suseconnect.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/container-suseconnect.spec b/container-suseconnect.spec index 622c1f5..e64d448 100644 --- a/container-suseconnect.spec +++ b/container-suseconnect.spec @@ -46,6 +46,7 @@ using the host machine entitlements. %prep %if 0%{?suse_version} && 0%{?suse_version} < 1500 +export TAR_OPTIONS="-I zstd" %setup -q -n %{project}-%{version} tar -I zstd -xvf %{SOURCE1} %else From ede1d19275275834489ab5aee47df93aeb91d8b63fab38b22a10ddf0e90f98db Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 5 Mar 2024 21:28:13 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/container-suseconnect?expand=0&rev=20 --- container-suseconnect.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/container-suseconnect.spec b/container-suseconnect.spec index e64d448..b2cc17a 100644 --- a/container-suseconnect.spec +++ b/container-suseconnect.spec @@ -47,8 +47,7 @@ using the host machine entitlements. %prep %if 0%{?suse_version} && 0%{?suse_version} < 1500 export TAR_OPTIONS="-I zstd" -%setup -q -n %{project}-%{version} -tar -I zstd -xvf %{SOURCE1} +%setup -q -n %{project}-%{version} -a1 %else %setup -q -n %{project}-%{version} -a1 %endif From c1abdb28c1e1582d5c2655e12cd9fded300f1db4f2e996cef1387649f77e9777 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 5 Mar 2024 21:30:35 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/container-suseconnect?expand=0&rev=21 --- container-suseconnect.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/container-suseconnect.spec b/container-suseconnect.spec index b2cc17a..a05d1b2 100644 --- a/container-suseconnect.spec +++ b/container-suseconnect.spec @@ -47,10 +47,8 @@ using the host machine entitlements. %prep %if 0%{?suse_version} && 0%{?suse_version} < 1500 export TAR_OPTIONS="-I zstd" -%setup -q -n %{project}-%{version} -a1 -%else -%setup -q -n %{project}-%{version} -a1 %endif +%setup -q -n %{project}-%{version} -a1 %build go build -tags enablecgo -o %{project} -mod=vendor -buildmode=pie -trimpath -ldflags="-s -w" ./cmd/container-suseconnect