From 292ef42533a0d9e9c7a2c1bd82467da3eab62d80 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 14 2020 22:45:20 +0000 Subject: import subscription-manager-1.27.3-1.el8 --- diff --git a/.gitignore b/.gitignore index b20c1ef..4919d80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.27.2.tar.gz -SOURCES/subscription-manager-cockpit-1.27.2.tar.gz +SOURCES/subscription-manager-1.27.3.tar.gz +SOURCES/subscription-manager-cockpit-1.27.3.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 23abb80..673c6cb 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -03dc1274180068cd4beeb81f5173ff0c2f81739a SOURCES/subscription-manager-1.27.2.tar.gz -3961036cee1f496d2f6157f559525f68e882cc49 SOURCES/subscription-manager-cockpit-1.27.2.tar.gz +770f06a56549febdc50b89874828976187353f2e SOURCES/subscription-manager-1.27.3.tar.gz +b77fda846d248edfe316382ec83b4d4e854958c4 SOURCES/subscription-manager-cockpit-1.27.3.tar.gz diff --git a/SOURCES/CENTOS-use-centos-syspurposes.patch b/SOURCES/CENTOS-use-centos-syspurposes.patch deleted file mode 100644 index ac09958..0000000 --- a/SOURCES/CENTOS-use-centos-syspurposes.patch +++ /dev/null @@ -1,21 +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 6e349df..0000000 --- a/SOURCES/subscription-manager-centos-remove-redhat.repo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr subscription-manager-1.27.2.orig/src/subscription_manager/repofile.py subscription-manager-1.27.2/src/subscription_manager/repofile.py ---- subscription-manager-1.27.2.orig/src/subscription_manager/repofile.py 2020-04-15 11:01:20.000000000 -0500 -+++ subscription-manager-1.27.2/src/subscription_manager/repofile.py 2020-04-25 21:44:05.271150745 -0500 -@@ -348,6 +348,7 @@ - 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 afedb40..e12c55b 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -7,7 +7,6 @@ %global use_firstboot 0 %global use_inotify 1 %global py2_package_prefix python2 -%global if_centos (0%{?centos_ver} && 0%{?centos_ver} >= 7) # Plugin for container (docker, podman) is not supported on RHEL 8 and higher %if (0%{?rhel} && 0%{?rhel} >= 8) @@ -49,7 +48,7 @@ %if %{with python3} || 0%{?suse_version} %global use_subman_gui 0 %else -%global use_subman_gui 0 +%global use_subman_gui 1 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1200 @@ -223,7 +222,7 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.27.2 +Version: 1.27.3 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -254,9 +253,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) @@ -717,8 +713,6 @@ 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}" \ @@ -800,7 +794,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 - #touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo + touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo %endif # fake out the certificate directories @@ -810,19 +804,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 0%{!?if_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 0%{!?if_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 @@ -1124,30 +1112,30 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %dir %{_datadir}/omf/subscription-manager %else # symlink to console-helper -#{_bindir}/subscription-manager-gui +%{_bindir}/subscription-manager-gui %endif -#{_bindir}/rhsm-icon +%{_bindir}/rhsm-icon %doc %{_datadir}/gnome/help/subscription-manager/C/figures/*.png %doc %{_datadir}/gnome/help/subscription-manager/C/*.xml %{_datadir}/omf/subscription-manager/subscription-manager-C.omf -#{_datadir}/applications/subscription-manager-gui.desktop -#{_datadir}/appdata/subscription-manager-gui.appdata.xml +%{_datadir}/applications/subscription-manager-gui.desktop +%{_datadir}/appdata/subscription-manager-gui.appdata.xml # desktop config files -#{_sysconfdir}/xdg/autostart/rhsm-icon.desktop -#if !0%{?suse_version} -#{_sysconfdir}/pam.d/subscription-manager-gui -#{_sysconfdir}/security/console.apps/subscription-manager-gui -#endif +%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop +%if !0%{?suse_version} +%{_sysconfdir}/pam.d/subscription-manager-gui +%{_sysconfdir}/security/console.apps/subscription-manager-gui +%endif -#{completion_dir}/subscription-manager-gui +%{completion_dir}/subscription-manager-gui %doc -#{_mandir}/man8/subscription-manager-gui.8* -#{_mandir}/man8/rhsm-icon.8* +%{_mandir}/man8/subscription-manager-gui.8* +%{_mandir}/man8/rhsm-icon.8* %doc LICENSE %endif @@ -1225,8 +1213,8 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{python_sitearch}/subscription_manager/plugin/container/*.py* # 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 +%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 %if %has_ostree @@ -1282,8 +1270,8 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %attr(755,root,root) %dir %{_sysconfdir}/rhsm %attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca -#attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -#attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem +%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem +%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem %if %use_cockpit %files -n subscription-manager-cockpit @@ -1422,6 +1410,21 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon Apr 27 2020 William Poteat 1.27.3-1 +- 1771921: Package profiles sends too early when registering a client + (wpoteat@redhat.com) +- 1827708: Make rhsmd cron read 'processTimeout' case- + insensitive (csnyder@redhat.com) +- Reduced REST API calls during register, when SLA is set; ENT-2229 + (jhnidek@redhat.com) +- cockpit: Show more Insights details (mvollmer@redhat.com) +- integration-test: Update mock-insights to use regexp routing + (mvollmer@redhat.com) +- 1688702: Generate redhat.repo in off-line mode; ENT-2302 (jhnidek@redhat.com) +- Fix issue with getPoolsList (jhnidek@redhat.com) +- 1818932: 1820267: Using 'Simple Content Access' for access mode + (wpoteat@redhat.com) + * Wed Apr 15 2020 William Poteat 1.27.2-1 - Update releasers for 8.3 (wpoteat@redhat.com) - 1821747: Automatically create /etc/rhsm/syspurpose (jhnidek@redhat.com)