diff --git a/.gitignore b/.gitignore index 37d1706..e61f3e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.27.4.tar.gz -SOURCES/subscription-manager-cockpit-1.27.4.tar.gz +SOURCES/subscription-manager-1.27.9.tar.gz +SOURCES/subscription-manager-cockpit-1.27.9.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 380b284..c77003f 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -4687f5b0c05bc1ef8115806e43f30180d51d823e SOURCES/subscription-manager-1.27.4.tar.gz -596b1c985b2f7a1426ab3d7f42d0738cf16258bf SOURCES/subscription-manager-cockpit-1.27.4.tar.gz +517d261e8bc3f686ab0f634b4a80e3c65ca67b59 SOURCES/subscription-manager-1.27.9.tar.gz +79e6926ecdc52dd73b22995556a6f1e35e51364a SOURCES/subscription-manager-cockpit-1.27.9.tar.gz diff --git a/SOURCES/CENTOS-use-centos-syspurposes.patch b/SOURCES/CENTOS-use-centos-syspurposes.patch deleted file mode 100644 index 52d2e66..0000000 --- a/SOURCES/CENTOS-use-centos-syspurposes.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/etc-conf/syspurpose/valid_fields.json b/etc-conf/syspurpose/valid_fields.json -index 1ac7ea0e..305ec4b9 100644 ---- a/etc-conf/syspurpose/valid_fields.json -+++ b/etc-conf/syspurpose/valid_fields.json -@@ -1,12 +1,10 @@ - { - "role": [ -- "Red Hat Enterprise Linux Server", -- "Red Hat Enterprise Linux Workstation", -- "Red Hat Enterprise Linux Compute Node" -+ "CentOS Linux Server", -+ "CentOS Linux Workstation", -+ "CentOS Linux Compute Node" - ], - "service_level_agreement": [ -- "Premium", -- "Standard", - "Self-Support" - ], - "usage": [ diff --git a/SOURCES/subscription-manager-centos-remove-redhat.repo.patch b/SOURCES/subscription-manager-centos-remove-redhat.repo.patch deleted file mode 100644 index d474938..0000000 --- a/SOURCES/subscription-manager-centos-remove-redhat.repo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNrp subscription-manager-1.23.8.orig/src/subscription_manager/repofile.py subscription-manager-1.23.8/src/subscription_manager/repofile.py ---- subscription-manager-1.23.8.orig/src/subscription_manager/repofile.py 2019-03-06 08:15:21.000000000 -0600 -+++ subscription-manager-1.23.8/src/subscription_manager/repofile.py 2019-07-10 12:03:11.266030982 -0500 -@@ -340,6 +340,7 @@ class RepoFileBase(object): - return self.path_exists(self.path) - - def create(self): -+ return - if self.path_exists(self.path) or not self.manage_repos: - return - with open(self.path, 'w') as f: diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index a2ecfd9..4e6c004 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -138,7 +138,11 @@ %if %{use_initial_setup} %global post_boot_tool INSTALL_INITIAL_SETUP=true INSTALL_FIRSTBOOT=false %else +%if %{use_firstboot} %global post_boot_tool INSTALL_INITIAL_SETUP=false INSTALL_FIRSTBOOT=true +%else +%global post_boot_tool INSTALL_INITIAL_SETUP=false INSTALL_FIRSTBOOT=false +%endif %endif %if 0%{?suse_version} @@ -222,7 +226,7 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.27.4 +Version: 1.27.9 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -253,9 +257,6 @@ Source2: subscription-manager-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif -Patch100: CENTOS-use-centos-syspurposes.patch -Patch101: subscription-manager-centos-remove-redhat.repo.patch - # The following macro examples are preceeded by '%' to stop macro expansion # in the comments. (See https://bugzilla.redhat.com/show_bug.cgi?id=1224660 for # why this is necessary) @@ -352,21 +353,23 @@ BuildRequires: %{py_package_prefix}-six BuildRequires: desktop-file-utils %endif -BuildRequires: %{?suse_version:dbus-1-glib-devel} %{!?suse_version:dbus-glib-devel} %if 0%{?suse_version} <= 1110 BuildRequires: %{?suse_version:sles-release} %{!?suse_version:system-release} %else BuildRequires: %{?suse_version:distribution-release} %{!?suse_version:system-release} %endif -BuildRequires: %{?suse_version:gconf2-devel} %{!?suse_version:GConf2-devel} -BuildRequires: %{?suse_version:update-desktop-files} %{!?suse_version:scrollkeeper} - -BuildRequires: %{?gtk3:gtk3-devel} %{!?gtk3:gtk2-devel} %if 0%{?suse_version} BuildRequires: libzypp %endif +%if %{use_subman_gui} +BuildRequires: %{?suse_version:gconf2-devel} %{!?suse_version:GConf2-devel} +BuildRequires: %{?suse_version:update-desktop-files} %{!?suse_version:scrollkeeper} +BuildRequires: %{?suse_version:dbus-1-glib-devel} %{!?suse_version:dbus-glib-devel} +BuildRequires: %{?gtk3:gtk3-devel} %{!?gtk3:gtk2-devel} +%endif + %if %use_systemd # We need the systemd RPM macros %if 0%{?suse_version} >= 1210 @@ -561,11 +564,9 @@ Group: System Environment/Base Requires: rhsm-gtk = %{version}-%{release} Requires: initial-setup-gui >= 0.3.9.24-1 Obsoletes: subscription-manager-firstboot < 1.15.3-1 -%if %{undefined centos} %if (0%{?rhel} >= 8) Supplements: initial-setup-gui %endif -%endif %description -n subscription-manager-initial-setup-addon This package contains the initial-setup screens for subscription-manager. @@ -718,14 +719,12 @@ subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugi %prep %setup -q -%patch100 -p1 -%patch101 -p1 %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \ %{?gtk_version} %{?subpackages} %{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} \ - %{exclude_packages} + %{exclude_packages} %{?with_subman_gui} %if %{with python2_rhsm} python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-version=%{version}-%{release} @@ -772,8 +771,10 @@ cp %{buildroot}%{python_sitearch}/rhsm/*.py %{buildroot}%{python2_sitearch}/rhsm %endif %if 0%{?suse_version} +%if %use_subman_gui %suse_update_desktop_file -n -r subscription-manager-gui Settings PackageManager %endif +%endif %if %use_subman_gui desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop @@ -801,9 +802,7 @@ desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-c # fake out the redhat.repo file %if %{use_yum} || %{use_dnf} mkdir %{buildroot}%{_sysconfdir}/yum.repos.d - %if %{undefined centos} touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo - %endif %endif # fake out the certificate directories @@ -813,19 +812,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement %if %{use_container_plugin} # Setup cert directories for the container plugin: mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/ -%if %{undefined centos} mkdir %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %endif -%endif -%if %{undefined centos} mkdir -p %{buildroot}%{_sysconfdir}/etc/rhsm/ca install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-uep.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-uep.pem -%else -rm %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -%endif %if %use_cockpit # install cockpit dist targz @@ -851,10 +844,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %endif %endif -%if %{defined centos} -sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscription-manager.conf -%endif - # base/cli tools use the gettext domain 'rhsm', while the # gnome-help tools use domain 'subscription-manager' %files -f rhsm.lang @@ -1231,12 +1220,10 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %endif %{python_sitearch}/subscription_manager/plugin/container/*.py* -%if %{undefined centos} # Copying Red Hat CA cert into each directory: %attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com %attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %endif -%endif %if %has_ostree %files -n subscription-manager-plugin-ostree @@ -1291,10 +1278,8 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %attr(755,root,root) %dir %{_sysconfdir}/rhsm %attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca -%if %{undefined centos} %attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem %attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem -%endif %if %use_cockpit %files -n subscription-manager-cockpit @@ -1348,6 +1333,15 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %endif %endif +# When subscription-manager is upgraded on RHEL 8 (from RHEL 8.2 to RHEL 8.3), then kill +# instance of rhsmd, because it is not necessary anymore and it can cause issues. +# See: https://bugzilla.redhat.com/show_bug.cgi?id=1840364 +%if ( 0%{?rhel} >= 8 || 0%{?fedora} ) +if [ "$1" = "2" ] ; then + killall rhsmd 2> /dev/null || true +fi +%endif + if [ -x /bin/dbus-send ] ; then dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : fi @@ -1433,6 +1427,31 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Sun Jun 28 2020 Christopher Snyder 1.27.9-1 +- 1840364: Kill rhsmd during post-install on rhel8 + (jhnidek@redhat.com) +- 1848636, 1849074: Update insights machine-id path (csnyder@redhat.com) +- 1700441: Create directories, when missing (jhnidek@redhat.com) + +* Thu Jun 11 2020 Christopher Snyder 1.28.0-1 +- 1804454: collect uuid on aarch64 system (wpoteat@redhat.com) +- WIP: Try to fix build of rpms on suse. (jhnidek@redhat.com) +- 1842474: Update local and cache file during sync(); ENT-2433 + (jhnidek@redhat.com) +- 1725525: Mark one string for translation; ENT-1680 (jhnidek@redhat.com) +- 1789457: Syspurpose exception message parsing (wpoteat@redhat.com) +- Fix building sub-man on Fedora 32 (jhnidek@redhat.com) +- cockpit: Call run-tests from common to run cockpit integration tests + (sanne.raymaekers@gmail.com) + +* Sun May 31 2020 Christopher Snyder 1.27.5-1 +- Revert "1667792: added --disable-auto-attach option to register command; + ENT-1684" (csnyder@redhat.com) +- 1834792: Try to terminate rhsmd after timeout; ENT-2368 (jhnidek@redhat.com) +- 1837244: Fix wrong version provided by subscription-manager version; ENT-2388 + (jhnidek@redhat.com) +- 1838012: prevent redundant remote syspurpose sync (pmoravec@redhat.com) + * Wed May 20 2020 Christopher Snyder 1.27.4-1 - Fix unit test of getting release information (jhnidek@redhat.com) - Send Service-level during registration only once (csnyder@redhat.com)