From bc0e632455cde3f92c868d60a443a9cb54964b4b7284f2f00123b3affd0e7a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 15 Nov 2024 15:03:05 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main suseconnect-ng revision 23172d9176883d2890575c2d1c9c53d0 --- _service | 4 ++-- suseconnect-ng-1.12.0.tar.xz | 3 --- suseconnect-ng-1.13.0.tar.xz | 3 +++ suseconnect-ng.changes | 13 +++++++++++++ suseconnect-ng.spec | 19 ++++++++++++++----- vendor.tar.xz | 4 ++-- 6 files changed, 34 insertions(+), 12 deletions(-) delete mode 100644 suseconnect-ng-1.12.0.tar.xz create mode 100644 suseconnect-ng-1.13.0.tar.xz diff --git a/_service b/_service index f06cc27..bebdbf6 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git https://github.com/SUSE/connect-ng.git - v1.12.0 - 1.12.0 + v1.13.0 + 1.13.0 suseconnect-ng no disable diff --git a/suseconnect-ng-1.12.0.tar.xz b/suseconnect-ng-1.12.0.tar.xz deleted file mode 100644 index 8e7b112..0000000 --- a/suseconnect-ng-1.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b82059fede586f4c527e6299c9a76fef35f8742af4d38c79654dc76819ffa45 -size 112764 diff --git a/suseconnect-ng-1.13.0.tar.xz b/suseconnect-ng-1.13.0.tar.xz new file mode 100644 index 0000000..f023d57 --- /dev/null +++ b/suseconnect-ng-1.13.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4e2855d373c41d790d5c16a586cf891c9b30961ec005289e217d7e6e10a9b13 +size 115816 diff --git a/suseconnect-ng.changes b/suseconnect-ng.changes index 1f62adc..648af67 100644 --- a/suseconnect-ng.changes +++ b/suseconnect-ng.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Nov 14 11:01:05 UTC 2024 - Miquel Sabaté Solà + +- Update version to 1.13: + - Integrating uptime-tracker + - Honor auto-import-gpg-keys flag on migration (bsc#1231328) + - Only send labels if targetting SCC + - Skip the docker auth generation on RMT (bsc#1231185) + - Add --set-labels to register command to set labels at registration time on SCC + - Add a new function to display suse-uptime-tracker version + - Integrate with uptime-tracker ( https://github.com/SUSE/uptime-tracker/ ) + - Add a command to show the info being gathered + ------------------------------------------------------------------- Fri Sep 13 14:11:22 UTC 2024 - Miquel Sabate Sola diff --git a/suseconnect-ng.spec b/suseconnect-ng.spec index 9c53d37..8dd8bc3 100644 --- a/suseconnect-ng.spec +++ b/suseconnect-ng.spec @@ -19,7 +19,7 @@ %global project github.com/SUSE/connect-ng Name: suseconnect-ng -Version: 1.12.0 +Version: 1.13.0 Release: 0 URL: https://github.com/SUSE/connect-ng License: LGPL-2.1-or-later @@ -108,6 +108,7 @@ echo %{version} > internal/connect/version.txt go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/suseconnect %{project}/cmd/suseconnect go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/zypper-migration %{project}/cmd/zypper-migration go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/zypper-search-packages %{project}/cmd/zypper-search-packages +go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/suse-uptime-tracker %{project}/cmd/suse-uptime-tracker # the library mkdir -p %_builddir/go/lib @@ -116,6 +117,7 @@ go build -v -ldflags "-s -w" -mod=vendor -buildmode=c-shared -o lib/libsuseconne %install # Install binary + symlinks install -D -m 0755 bin/suseconnect %{buildroot}/%{_bindir}/suseconnect +install -D -m 0755 bin/suse-uptime-tracker %{buildroot}/%{_bindir}/suse-uptime-tracker ln -s %{_bindir}/suseconnect %{buildroot}/%{_bindir}/SUSEConnect install -d -m 0755 %{buildroot}/%{_sbindir} @@ -140,13 +142,16 @@ install -D -m 644 SUSEConnect.example %{buildroot}%{_sysconfdir}/SUSEConnect.exa # Install the SUSEConnect --keepalive timer and service. install -D -m 644 build/packaging/suseconnect-keepalive.timer %{buildroot}/%{_unitdir}/suseconnect-keepalive.timer install -D -m 644 build/packaging/suseconnect-keepalive.service %{buildroot}/%{_unitdir}/suseconnect-keepalive.service +install -D -m 644 build/packaging/suse-uptime-tracker.timer %{buildroot}/%{_unitdir}/suse-uptime-tracker.timer +install -D -m 644 build/packaging/suse-uptime-tracker.service %{buildroot}/%{_unitdir}/suse-uptime-tracker.service ln -sf service %{buildroot}/%{_sbindir}/rcsuseconnect-keepalive +ln -sf service %{buildroot}/%{_sbindir}/rcsuse-uptime-tracker # we currently do not ship the source for any go module rm -rf %{buildroot}/usr/share/go %pre -%service_add_pre suseconnect-keepalive.service suseconnect-keepalive.timer +%service_add_pre suseconnect-keepalive.service suseconnect-keepalive.timer suse-uptime-tracker.service suse-uptime-tracker.timer # in pre blocks the old version is still installed. This way we can detect # if --keepalive was already present before @@ -198,13 +203,13 @@ fi sed -i '/RandomizedDelaySec*/d' %{_unitdir}/suseconnect-keepalive.timer sed -i "s/OnCalendar=daily/OnCalendar=*-*-* $TIMER_HOUR:$TIMER_MINUTE:00/" %{_unitdir}/suseconnect-keepalive.timer %endif -%service_add_post suseconnect-keepalive.service suseconnect-keepalive.timer +%service_add_post suseconnect-keepalive.service suseconnect-keepalive.timer suse-uptime-tracker.service suse-uptime-tracker.timer %preun -%service_del_preun suseconnect-keepalive.service suseconnect-keepalive.timer +%service_del_preun suseconnect-keepalive.service suseconnect-keepalive.timer suse-uptime-tracker.service suse-uptime-tracker.timer %postun -%service_del_postun suseconnect-keepalive.service suseconnect-keepalive.timer +%service_del_postun suseconnect-keepalive.service suseconnect-keepalive.timer suse-uptime-tracker.service suse-uptime-tracker.timer %posttrans if [ -e /run/suseconnect-keepalive.timer.is-enabled ]; then @@ -220,15 +225,19 @@ fi %license LICENSE LICENSE.LGPL %doc README.md %{_bindir}/suseconnect +%{_bindir}/suse-uptime-tracker %{_bindir}/SUSEConnect %{_sbindir}/SUSEConnect %{_sbindir}/rcsuseconnect-keepalive +%{_sbindir}/rcsuse-uptime-tracker /usr/lib/zypper/commands %{_mandir}/man8/* %{_mandir}/man5/* %{_unitdir}/suseconnect-keepalive.service %{_unitdir}/suseconnect-keepalive.timer %config %{_sysconfdir}/SUSEConnect.example +%{_unitdir}/suse-uptime-tracker.service +%{_unitdir}/suse-uptime-tracker.timer %files -n libsuseconnect %license LICENSE LICENSE.LGPL diff --git a/vendor.tar.xz b/vendor.tar.xz index 978980f..5c2b362 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c6429b8ce45e3ec8caa562835a45aa53ff88afdbdd4af723ff8889ee6c36f76 -size 125724 +oid sha256:2733d50c558c42a4fdb20ad49dd0846e56be0b41736e137a9b10a374399c0699 +size 125708