From 7bd9048be00812f1b3d54c6861bd366249a7c6f5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 09 2023 20:08:54 +0000 Subject: import rhc-0.2.1-12.el8_7 --- diff --git a/SOURCES/0001-fix-enable-content-when-registering-with-username-password.patch b/SOURCES/0001-fix-enable-content-when-registering-with-username-password.patch new file mode 100644 index 0000000..ca54c3b --- /dev/null +++ b/SOURCES/0001-fix-enable-content-when-registering-with-username-password.patch @@ -0,0 +1,11 @@ +--- register.go.orig 2023-01-27 11:47:09.384066280 -0500 ++++ register.go 2023-01-27 11:47:28.493289715 -0500 +@@ -61,7 +61,7 @@ + return err + } + +- if err := privConn.Object("com.redhat.RHSM1", "/com/redhat/RHSM1/Register").Call("com.redhat.RHSM1.Register.Register", dbus.Flags(0), "", username, password, map[string]string{}, map[string]string{}, "").Err; err != nil { ++ if err := privConn.Object("com.redhat.RHSM1", "/com/redhat/RHSM1/Register").Call("com.redhat.RHSM1.Register.Register", dbus.Flags(0), "", username, password, map[string]string{"enable_content": "true"}, map[string]string{}, "").Err; err != nil { + return unpackError(err) + } + diff --git a/SPECS/rhc.spec b/SPECS/rhc.spec index 245984b..aaca239 100644 --- a/SPECS/rhc.spec +++ b/SPECS/rhc.spec @@ -1,5 +1,3 @@ -%define debug_package %{nil} - %global buildflags -buildmode pie -compiler gc -a -v -x %global goldflags %{expand:-linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'} @@ -8,7 +6,7 @@ Name: rhc Version: 0.2.1 -Release: 10%{?dist} +Release: 12%{?dist} Epoch: 1 Summary: rhc connects the system to Red Hat hosted services License: GPLv3 @@ -26,6 +24,8 @@ Patch0: 0001-feat-default-config-file-location.patch Patch1: 0003-fix-collect-error-messages-during-disconnect.patch # Fixed upstream https://github.com/RedHatInsights/yggdrasil/pull/100/commits/d75dc60df73a88b0a14c799f3b6f1e8f66cee3d4 Patch2: 0001-fix-read-worker-output-using-io.Read.patch +# Fixed upstream https://github.com/RedHatInsights/rhc/commit/ab0b7f95e494634a121ccc3bd286c605d07fea27 +Patch3: 0001-fix-enable-content-when-registering-with-username-password.patch ExclusiveArch: %{go_arches} @@ -65,6 +65,7 @@ cd %{_builddir}/%{name}/yggdrasil-worker-package-manager %patch0 -p0 cd %{_builddir}/%{name}/%{name}-%{version} %patch1 -p1 +%patch3 -p0 cd %{_builddir}/%{name}/yggdrasil-%{yggdrasil_ver} %patch2 -p1 @@ -118,6 +119,11 @@ make %{makeflags} \ %changelog +* Fri Jan 27 2023 Link Dupont - 0.2.1-12 +- Enable debuginfo builds + +* Fri Jan 27 2023 Link Dupont - 0.2.1-11 +- Fix an issue enabling content when registering with username/password (RHBZ#2165099) * Tue Nov 22 2022 Link Dupont - 0.2.1-10 - Fix an issue scanning worker's stdout (RHBZ#2146923)