From ab203b63827bda5087f12ec79667ab4b6293ca0c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 29 2020 06:58:01 +0000 Subject: import subscription-manager-1.24.42-1.el7 --- diff --git a/.gitignore b/.gitignore index 26cb909..4abcaf8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.24.26.tar.gz -SOURCES/subscription-manager-cockpit-1.24.26.tar.gz +SOURCES/subscription-manager-1.24.42.tar.gz +SOURCES/subscription-manager-cockpit-1.24.42.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 0c20559..f34fb2b 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -399e129a63dfb1096ce96666070b1442aed9dc1b SOURCES/subscription-manager-1.24.26.tar.gz -e2f3e9fb8c585fff5adfce25ac13ffb112a4b9b7 SOURCES/subscription-manager-cockpit-1.24.26.tar.gz +eb87e8a88752cc9196d90e4b1a33be78bd2272ce SOURCES/subscription-manager-1.24.42.tar.gz +2b75c9ca59b32c8c62718c117bdda637820c6389 SOURCES/subscription-manager-cockpit-1.24.42.tar.gz diff --git a/SOURCES/subscription-manager-1.24.13-centos-remove-redhat.repo.patch b/SOURCES/subscription-manager-1.24.13-centos-remove-redhat.repo.patch deleted file mode 100644 index b8bcb38..0000000 --- a/SOURCES/subscription-manager-1.24.13-centos-remove-redhat.repo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNrp subscription-manager-1.24.13.orig/src/subscription_manager/repofile.py subscription-manager-1.24.13/src/subscription_manager/repofile.py ---- subscription-manager-1.24.13.orig/src/subscription_manager/repofile.py 2019-06-21 18:36:40.000000000 +0000 -+++ subscription-manager-1.24.13/src/subscription_manager/repofile.py 2019-08-07 15:55:54.331501447 +0000 -@@ -345,6 +345,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 d2c7997..c8e48c6 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -2,7 +2,6 @@ %global use_systemd 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 7) || (0%{?suse_version} && 0%{?suse_version} >= 1315) # For optional building of ostree-plugin sub package. Unrelated to systemd # but the same versions apply at the moment. -%global if_centos (0%{?centos_ver} && 0%{?centos_ver} >= 7) %global has_ostree %use_systemd && 0%{?suse_version} == 0 %global use_initial_setup 1 %global use_firstboot 0 @@ -133,8 +132,8 @@ %global subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}" Name: subscription-manager -Version: 1.24.26 -Release: 4%{?dist} +Version: 1.24.42 +Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base License: GPLv2 @@ -155,8 +154,6 @@ Source1: %{name}-cockpit-%{version}.tar.gz Source2: subscription-manager-rpmlintrc %endif -Patch999: subscription-manager-1.24.13-centos-remove-redhat.repo.patch - %if 0%{?suse_version} < 1200 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif @@ -528,8 +525,6 @@ Subscription Manager Cockpit UI %prep %setup -q -%patch999 -p1 - %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \ @@ -576,6 +571,28 @@ python2 ./setup.py build_ext --build-lib %{buildroot}%{python2_sitearch} --quiet cp %{buildroot}%{python_sitearch}/rhsm/*.py %{buildroot}%{python2_sitearch}/rhsm/ %endif +%if 0%{?suse_version} +%suse_update_desktop_file -n -r subscription-manager-gui Settings PackageManager +%endif + +%if %use_subman_gui +desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop +desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop +%else + +%if %use_cockpit +desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-cockpit.desktop +%endif + +%endif + +# libexec directory does not exist on sles based distros +%if 0%{?suse_version} +%if %use_subman_gui + sed -i 's/libexec/lib/g' %{buildroot}/%{_sysconfdir}/cron.daily/rhsmd +%endif +%endif + %find_lang rhsm %if 0%{?include_syspurpose} %find_lang syspurpose @@ -592,21 +609,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/consumer mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement # Setup cert directories for the container plugin: -%if 0%{!?if_centos} mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/ 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 -%else -rm %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -%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 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem -%endif %if %use_cockpit # install cockpit dist targz @@ -616,11 +625,6 @@ rm %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem # fix timestamps on our byte compiled files so they match across arches find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; -rm -f %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop -rm -f %{buildroot}/usr/bin/rhsm-icon -rm -f %{buildroot}/usr/bin/subscription-manager-gui -rm -f %{buildroot}/usr/sbin/subscription-manager-gui - %if %{with python3} %py_byte_compile %{__python3} %{buildroot}%{rhsm_plugins_dir}/ %py_byte_compile %{__python3} %{buildroot}%{_datadir}/anaconda/addons/com_redhat_subscription_manager/ @@ -679,7 +683,10 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui %attr(755,root,root) %{_bindir}/rhsmcertd %attr(755,root,root) %{_libexecdir}/rhsmcertd-worker -%attr(755,root,root) %{_libexecdir}/rhsmd + +%if %{use_subman_gui} + %attr(755,root,root) %{_libexecdir}/rhsmd +%endif # our config dirs and files @@ -721,7 +728,9 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui # misc system config %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/subscription-manager -%attr(700,root,root) %{_sysconfdir}/cron.daily/rhsmd +%if %{use_subman_gui} + %attr(700,root,root) %{_sysconfdir}/cron.daily/rhsmd +%endif %attr(755,root,root) %dir %{_var}/log/rhsm %attr(755,root,root) %dir %{_var}/spool/rhsm/debug @@ -878,7 +887,7 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui #%files -n subscription-manager-gui -f subscription-manager.lang %files -n subscription-manager-gui %defattr(-,root,root,-) -#%attr(755,root,root) %{_sbindir}/subscription-manager-gui +%attr(755,root,root) %{_sbindir}/subscription-manager-gui %if 0%{?suse_version} %dir %{python_sitearch}/subscription_manager/gui/data %dir %{python_sitearch}/subscription_manager/gui/data/glade @@ -894,9 +903,10 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui %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 %{_datadir}/gnome/help/subscription-manager/C/figures/*.png %{_datadir}/gnome/help/subscription-manager/C/*.xml @@ -906,7 +916,7 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui %{_datadir}/appdata/subscription-manager-gui.appdata.xml # desktop config files -#%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop +%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop %if !0%{?suse_version} %{_sysconfdir}/pam.d/subscription-manager-gui %{_sysconfdir}/security/console.apps/subscription-manager-gui @@ -992,9 +1002,9 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui %{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}/rhsm/ca/redhat-entitlement-authority.pem -#%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}/rhsm/ca/redhat-entitlement-authority.pem +%attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %if %has_ostree @@ -1049,7 +1059,7 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui %attr(755,root,root) %dir %{_sysconfdir}/rhsm %attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca -#%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem +%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem %if %use_cockpit %files -n subscription-manager-cockpit @@ -1058,11 +1068,12 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui %{_datadir}/cockpit/subscription-manager/index.html %{_datadir}/cockpit/subscription-manager/index.min.js.gz %{_datadir}/cockpit/subscription-manager/subscriptions.css +%{_datadir}/cockpit/subscription-manager/index.css %{_datadir}/cockpit/subscription-manager/manifest.json %{_datadir}/cockpit/subscription-manager/po.*.js %{_datadir}/cockpit/subscription-manager/po.js %{_datadir}/cockpit/subscription-manager/node_modules/* -%{_datadir}/metainfo/org.cockpit-project.subscription-manager.metainfo.xml +%{_datadir}/metainfo/org.candlepinproject.subscription_manager.metainfo.xml %if ! %use_subman_gui %{_datadir}/applications/subscription-manager-cockpit.desktop %{_datadir}/icons/hicolor/16x16/apps/*.png @@ -1150,20 +1161,106 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Thu Jul 09 2020 William Poteat 1.24.26-4 +* Fri Jun 19 2020 Christopher Snyder 1.24.42-1 +- 1848636, 1849074: Update insights machine-id path (csnyder@redhat.com) +- 1796833: Update translations (csnyder@redhat.com) + +* Thu Jun 18 2020 William Poteat 1.24.41-1 - 1842474: Update local and cache file during sync(); ENT-2433 (jhnidek@redhat.com) -- 1855280: prevent redundant remote syspurpose sync (pmoravec@redhat.com) +- 1838012: prevent redundant remote syspurpose sync (pmoravec@redhat.com) + +* Tue Jun 02 2020 Christopher Snyder 1.24.40-1 +- 1725525: Update keys for translations (csnyder@redhat.com) + +* Tue Jun 02 2020 Christopher Snyder 1.24.39-1 +- 1789457: Syspurpose exception message parsing (wpoteat@redhat.com) +- 1725525: Mark one string for translation; ENT-1680 (jhnidek@redhat.com) +- 1796833: Fix a few broken fr translations (csnyder@redhat.com) +- 1796833: Update translations (csnyder@redhat.com) + +* Wed May 27 2020 William Poteat 1.24.38-1 +- 1837244: Fix wrong version provided by subscription-manager version; ENT-2388 + (jhnidek@redhat.com) +- 1834792: Try to terminate rhsmd after timeout; ENT-2368 (jhnidek@redhat.com) + +* Fri May 08 2020 William Poteat 1.24.37-1 +- 1830994: Fix warning messages in dnf/yum (jhnidek@redhat.com) +- 1823523: Detect rhsm-icon running without psutil (csnyder@redhat.com) +- 1771921: Package profiles sends too early when registering a client + (wpoteat@redhat.com) +- 1688702: Generate redhat.repo in off-line mode; ENT-2302 (jhnidek@redhat.com) + +* Tue May 05 2020 William Poteat 1.24.36-1 +- 1831104: When in Simple Content Access mode, subscription-manager should not + complain that subscriptions aren't attached (wpoteat@redhat.com) -* Mon Apr 27 2020 William Poteat 1.24.26-3 -- 1828186: Make rhsmd cron read 'processTimeout' case-insensitive +* Fri Apr 24 2020 William Poteat 1.24.35-1 +- 1827711: Make rhsmd cron read 'processTimeout' case-insensitive (csnyder@redhat.com) -- 1827103: Added copytruncate option to logrotate conf file; ENT-2114 + +* Fri Apr 17 2020 William Poteat 1.24.34-1 +- 1796986: Collect AWS instance id when available (wpoteat@redhat.com) + +* Thu Apr 16 2020 William Poteat 1.24.33-1 +- 1796833: RHEL 7.9 Tier 0 Localization (wpoteat@redhat.com) +- 1818932: Using 'Simple Content Access' for access mode + (wpoteat@redhat.com) + +* Wed Apr 08 2020 William Poteat 1.24.32-1 +- 1821830: Registration fails with a message "Restlib' object has no attribute + '_get_cert_key_list' (wpoteat@redhat.com) + +* Mon Apr 06 2020 William Poteat 1.24.31-1 +- Flags for build [relro] (wpoteat@redhat.com) + +* Mon Apr 06 2020 William Poteat 1.24.30-1 +- 1816926: Fix "attach --auto" command; ENT-2242 (jhnidek@redhat.com) +- 1775714: Do not install rhsmd and rhsm-icon on rhel8; ENT-1959 (jhnidek@redhat.com) +- 1763271: Golden ticket: do not print list of products; ENT-2017 + (jhnidek@redhat.com) + +* Thu Mar 26 2020 Christopher Snyder 1.24.29-1 +- 1569491: rhn-migrate-classic-to-rhsm should try to resolve product ID + collisions (wpoteat@redhat.com) +- 1688702: allow offline repo management (code@james.cassell.me) -* Fri Apr 17 2020 William Poteat 1.24.26-2 -- 1823780: corrected missing quotes for config check; ENT-2010 +* Fri Mar 20 2020 William Poteat 1.24.28-1 +- 1794653: corrected missing quotes for config check; ENT-2010 (crag@redhat.com) +- Update to releasers (wpoteat@redhat.com) +- 1803783: Added copytruncate option to logrotate conf file; ENT-2114 + (jhnidek@redhat.com) + +* Wed Feb 26 2020 William Poteat 1.24.27-1 +- 1796088: Added option --force for command refresh; ENT-2033 + (jhnidek@redhat.com) +- Update releasers for new release (wpoteat@redhat.com) +- 1702753: Fix cockpit plugin, when golden ticket is used; ENT-1287 + (jhnidek@redhat.com) +- Bump sshpk from 1.13.1 to 1.16.1 in /cockpit + (dependabot[bot]@users.noreply.github.com) +- Bump eslint from 3.19.0 to 4.18.2 in /cockpit + (49699333+dependabot[bot]@users.noreply.github.com) +- Bump stringstream from 0.0.5 to 0.0.6 in /cockpit + (49699333+dependabot[bot]@users.noreply.github.com) +- Bump macaddress from 0.2.8 to 0.2.9 in /cockpit + (dependabot[bot]@users.noreply.github.com) +- Bump is-my-json-valid from 2.16.0 to 2.20.0 in /cockpit + (dependabot[bot]@users.noreply.github.com) +- 1719709: cockpit - Improve behavior when connection to D-Bus fails + (mvollmer@redhat.com) +- 1719702: cockpit - Fix overlapping update requests (mvollmer@redhat.com) +- 1719697: cockpit - Fix detection of proxy while attaching + (mvollmer@redhat.com) +- Bump sshpk from 1.13.1 to 1.16.1 in /cockpit + (dependabot[bot]@users.noreply.github.com) +- Bump tar from 2.2.1 to 2.2.2 in /cockpit + (dependabot[bot]@users.noreply.github.com) +- cockpit plugin: Fix alignment and layout issues in register dialog + (anilsson@redhat.com) +- Fix subscription-manager-cockpit AppStream data (martin@piware.de) * Wed Jan 22 2020 William Poteat 1.24.26-1 - 1741183: Yum loaded subscription-manager plugin multiple times