diff --git a/.gitignore b/.gitignore index 355bb5b..36a5d45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.26.20.tar.gz -SOURCES/subscription-manager-cockpit-1.26.20.tar.gz +SOURCES/subscription-manager-1.27.16.tar.gz +SOURCES/subscription-manager-cockpit-1.27.16.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 9231050..c6de86a 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -9d74e31039e339c2cb9bc6e725134a03f47ad462 SOURCES/subscription-manager-1.26.20.tar.gz -809fe04d1aa2f37b9b99e602ea1f8bec40582aa3 SOURCES/subscription-manager-cockpit-1.26.20.tar.gz +cfd3433c18f0af336bf9c35adc6541c26315aac0 SOURCES/subscription-manager-1.27.16.tar.gz +571e6fb831d8b4fa408419080b6d78354d93fcac SOURCES/subscription-manager-cockpit-1.27.16.tar.gz diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 92e8412..b413fce 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -57,7 +57,7 @@ %global completion_dir %{_datadir}/bash-completion/completions %endif -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} > 1110 || 0%{?rhel} >= 7 || 0%{?fedora} %global run_dir /run %else %global run_dir /var/run @@ -93,7 +93,7 @@ %endif %global use_dnf (%{with python3} && (0%{?fedora} || (0%{?rhel}))) || (0%{?rhel} >= 7) -%global use_yum (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?suse_version}) +%global use_yum (0%{?rhel} && 0%{?rhel} <= 7) %global use_cockpit 0%{?fedora} || 0%{?rhel} >= 7 %if %{with python3} @@ -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.26.20 +Version: 1.27.16 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -349,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 @@ -718,7 +724,7 @@ subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugi 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} @@ -765,21 +771,20 @@ 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 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} -sed -i 's/libexec/lib/g' %{buildroot}/%{_sysconfdir}/cron.daily/rhsmd %endif %find_lang rhsm @@ -885,7 +890,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %attr(755,root,root) %{_bindir}/rhsmcertd %attr(755,root,root) %{_libexecdir}/rhsmcertd-worker -%attr(755,root,root) %{_libexecdir}/rhsmd # our config dirs and files @@ -931,7 +935,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; # misc system config %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/subscription-manager -%attr(700,root,root) %{_sysconfdir}/cron.daily/rhsmd %attr(755,root,root) %dir %{_var}/log/rhsm %attr(755,root,root) %dir %{_var}/spool/rhsm/debug @@ -1105,6 +1108,7 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; # symlink to console-helper %{_bindir}/subscription-manager-gui %endif + %{_bindir}/rhsm-icon %doc %{_datadir}/gnome/help/subscription-manager/C/figures/*.png @@ -1198,9 +1202,9 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{rhsm_plugins_dir}/container_content.py* %if %{with python3} %{rhsm_plugins_dir}/__pycache__/*container* +%{python_sitearch}/subscription_manager/plugin/container/__pycache__ %endif %{python_sitearch}/subscription_manager/plugin/container/*.py* -%{python_sitearch}/subscription_manager/plugin/container/__pycache__ # Copying Red Hat CA cert into each directory: %attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com @@ -1315,6 +1319,15 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %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 @@ -1400,62 +1413,234 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Mon Aug 17 2020 William Poteat 1.26.20-1 -- 1869161: Do not print unchanged profile (jhnidek@redhat.com) +* Thu Sep 10 2020 Christopher Snyder 1.27.16-1 +- 1868734: Fix issue with syspurpose attrs. set in act. key + (jhnidek@redhat.com) -* Mon Aug 17 2020 William Poteat -- 1869161: Do not print unchanged profile (jhnidek@redhat.com) +* Thu Aug 20 2020 Christopher Snyder 1.27.15-1 +- 1615429: Fix sorting of plugin hooks (csnyder@redhat.com) +- 1820534: Update translations (csnyder@redhat.com) +- 1841601: Set default encoding properly; ENT-2499 (jhnidek@redhat.com) +- 1839199: More rhsmd cleanup (wpoteat@redhat.com) +- 1869725: Do not print traceback, when profile upload failed; ENT-2754 + (jhnidek@redhat.com) -* Tue Jul 21 2020 William Poteat 1.26.18-1 +* Wed Aug 12 2020 Christopher Snyder 1.27.14-1 +- 1862415: Print proper message, when consumer is deleted; ENT-2709 + (jhnidek@redhat.com) +- 1855893: Generate redhat.repo properly; ENT-2636 (jhnidek@redhat.com) +- Revert "Add --no-insights option; ENT-2471" (csnyder@redhat.com) +- Revert "Add insights-client messaging on registration" (csnyder@redhat.com) +- Revert "Address review feedback" (csnyder@redhat.com) +- Revert "1832990: Add rhsm.no_insights config option, improve messaging" + (csnyder@redhat.com) +- Automatic commit of package [subscription-manager] release [1.27.13-1]. + (wpoteat@redhat.com) +- 1663116: 1663390: 1663402: 1663408: Update translations (wpoteat@redhat.com) +- 1862425: Fix setting service-level; ENT-1862425 (jhnidek@redhat.com) +- 1862419: Make repo-override working again; ENT-2710 (jhnidek@redhat.com) +- 1858296: Do not print unchanged profile; ENT-2639 (jhnidek@redhat.com) +- 1861255: Catch all exception and print traceback to rhsm.log + (jhnidek@redhat.com) +- 1841600: D-Bus - update ent. cert., when act. key is used; ENT-2453 + (jhnidek@redhat.com) + +* Thu Aug 06 2020 William Poteat 1.27.13-1 +- 1663116: 1663390: 1663402: 1663408: Update translations (wpoteat@redhat.com) +- 1862425: Fix setting service-level (jhnidek@redhat.com) +- 1862419: Make repo-override working again (jhnidek@redhat.com) +- 1858296: Do not print unchanged profile (jhnidek@redhat.com) +- 1861255: Catch all exception and print traceback to rhsm.log + (jhnidek@redhat.com) +- 1841600: D-Bus - update ent. cert., when act. key is used + (jhnidek@redhat.com) +- Support Insights registration by default in cockpit (khowell@redhat.com) + +* Thu Jul 30 2020 Christopher Snyder 1.27.12-1 +- 1832990: Add rhsm.no_insights config option, improve messaging + (csnyder@redhat.com) +- Add --no-insights option; ENT-2471 (khowell@redhat.com) + +* Tue Jul 28 2020 William Poteat 1.27.11-1 +- 1780028: Remove man page entries for rhsmd (wpoteat@redhat.com) +- 1838423: Fix getting list of releases from CDN; (jhnidek@redhat.com) +- 1838670: set permissions on rhsm.conf (jbastian@redhat.com) +- cockpit: Fix AppStream launchable metainfo (martin@piware.de) +- 1838967: Sync syspurpose cache on registration (wpoteat@redhat.com) +- 1859532: Role --list handle wrong proxy conf (unregistered case) (jhnidek@redhat.com) +- 1859532: No traceback, when wrong proxy conf is used (jhnidek@redhat.com) +- 1857100: Do not print empty string as valid value (jhnidek@redhat.com) +- 1634023: Use list of valid syspurpose values provided by candlepin server (jhnidek@redhat.com) + +* Thu Jul 16 2020 William Poteat 1.27.10-1 +- 1847636: error when registering in intial-setup-graphical + (wpoteat@redhat.com) +- Added unit test for this case. (jhnidek@redhat.com) +- 1845399: List available subscription ondate options failed + (wpoteat@redhat.com) +- 1657269: Do not use /var/run, but use /run; ENT-1086 (jhnidek@redhat.com) +- cockpit: change button order to conform with patternfly guidelines + (anilsson@redhat.com) + +* 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) -- 1849572: prevent redundant remote syspurpose sync (pmoravec@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) -* Tue Apr 28 2020 William Poteat 1.26.17-1 -- 1828657: Make rhsmd cron read 'processTimeout' case-insensitive - (csnyder@redhat.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) -* Thu Apr 02 2020 Christopher Snyder 1.26.16-1 +* 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) +- Refactoring of save_sla_to_syspurpose_metadata; ENT-2228 (jhnidek@redhat.com) +- 1823523: Detect rhsm-icon running without psutil (csnyder@redhat.com) +- 1830994: Fix warning messages in dnf/yum (jhnidek@redhat.com) +- 1815624: When in Simple Content Access mode, subscription-manager should not + complain that subscriptions aren't attached (wpoteat@redhat.com) +- Bump jquery from 3.4.1 to 3.5.0 in /cockpit + (49699333+dependabot[bot]@users.noreply.github.com) +- Bug fix of Makefile for Debian (63191606+mallmaluss@users.noreply.github.com) + +* 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) + +* Tue Apr 14 2020 Christopher Snyder 1.27.1-1 +- Fix broken zypepr repo print (suttner@atix.de) +- Fix apt-plugin for subscription-manager (bucher@atix.de) +- Support to upload zypper repository profile (suttner@atix.de) +- 1816926: Fix "attach --auto" command; ENT-2242 (jhnidek@redhat.com) - 1820001: initConfig method needs to be reinstated (wpoteat@redhat.com) - -* Mon Mar 23 2020 Christopher Snyder 1.26.15-1 +- 1774187: Reinitialize logger, when necessary; ENT-1960 (jhnidek@redhat.com) +- 1796833: New keys.pot with new strings; ENT-2058 (jhnidek@redhat.com) +- 1775714: Do not install rhsmd and rhsm-icon on rhel8; ENT-1959 + (jhnidek@redhat.com) +- Various fixes for debian building and packaging (bucher@atix.de) +- Fix gcc warnings and clang build failures (tstellar@redhat.com) +- 1569491: rhn-migrate-classic-to-rhsm should try to resolve product ID + collisions (wpoteat@redhat.com) +- Remove yum for suse (suttner@atix.de) +- Add basic build-instructions for debian packages (bucher@atix.de) +- Make debian build more versatile (bucher@atix.de) +- Add missing debian-build-dependency for libssl-dev (bucher@atix.de) +- 1763271: Golden ticket: do not print list of products; ENT-2017 + (jhnidek@redhat.com) +- Added basic support for Pipenv for subscription-manager; ENT-1755 + (jhnidek@redhat.com) +- Implement --token option in subscription-manager (shwethakraman57@gmail.com) +- Fixed saving and reading configuration file from cockpit plugin. + (jhnidek@redhat.com) +- cockpit: Be more robust when showing the time for next Insights upload + (mvollmer@redhat.com) +- Fixed few issues with initConfig() (jhnidek@redhat.com) +- 1803783: Added copytruncate option to logrotate conf file; ENT-2114 + (jhnidek@redhat.com) - 1804114: New D-Bus method SetAll; ENT-2124 (jhnidek@redhat.com) - -* Fri Mar 06 2020 Christopher Snyder 1.26.14-1 -- 1754952: Update translations for syspurpose (csnyder@redhat.com) - -* Mon Feb 24 2020 Christopher Snyder 1.26.13-1 -- 1754952: Update translations (csnyder@redhat.com) -- cockpit: CSS fixes for dialog error messages (mvollmer@redhat.com) -- cockpit: Update cockpit-component-dialog (mvollmer@redhat.com) - -* Wed Feb 19 2020 Christopher Snyder 1.26.12-1 -- 1803858: Install insights-client package on demand (mvollmer@redhat.com) - -* Mon Feb 17 2020 Christopher Snyder 1.26.11-1 +- 1796986: Collect AWS instance id when available (wpoteat@redhat.com) +- Hint is printed by subscription-manager during registration. + (jhnidek@redhat.com) +- Implementation of getting organization using D-Bus API; ENT-1760 + (jhnidek@redhat.com) +- List user's organization during registration process on CLI + (jhnidek@redhat.com) +- Enable building of libdnf product-id plugin on RHEL 7. (jhnidek@redhat.com) +- Refactoring of DNF subscription-manager plugin; ENT-1906 (jhnidek@redhat.com) +- 1794826: Added option --force for command refresh; ENT-2033 + (jhnidek@redhat.com) - 1794653: corrected missing quotes for config check; ENT-2010 (crag@redhat.com) - -* Fri Jan 24 2020 Christopher Snyder 1.26.10-1 +- Ensure serial existence before comparison (csnyder@redhat.com) +- D-Bus API: support for pagged list of available subscriptions; ENT-1762 + (jhnidek@redhat.com) +- 1797386: Allow service plugin for zypper (SLES) to set autorefresh + (darinlively@gmail.com) - 1782910: Log errors in logging set up after set up completes; ENT-1890 (jhnidek@redhat.com) - -* Fri Dec 13 2019 Christopher Snyder 1.26.9-1 +- Add unit test for ASN1 generalized time (khowell@redhat.com) +- 1667792: added --disable-auto-attach option to register command; ENT-1684 + (jhnidek@redhat.com) +- ENT-1620: Add option to use our cache of npmjs repository (Nexus) + (jhnidek@redhat.com) +- cockpit: Sync with current Cockpit test API (martin@piware.de) +- Make x509 date parsing handle dates after 2049 (khowell@redhat.com) +- cockpit: Add 'doc' and 'keywords' into manifest (mmarusak@redhat.com) +- 1741183: Yum loaded subscription-manager plugin multiple times + (hyu@redhat.com) +- 1761566: include kpatch in facts; ENT-1700 (jhnidek@redhat.com) +- Fixed several issues based on PR review. (jhnidek@redhat.com) +- 1751200: Cockpit plugin: select registration method; ENT-1651 + (jhnidek@redhat.com) +- ENT-1682: Update build process to use Fedora Zanata (ojanus@redhat.com) +- Do not include pycache for container plugin on python2 (csnyder@redhat.com) - Make sure to set the mtime of the py files before creating pyc (csnyder@redhat.com) - -* Sun Dec 01 2019 Christopher Snyder 1.26.8-1 +- cockpit: Install insights-client package on demand (mvollmer@redhat.com) +- cockpit: CSS fixes for dialog error messages (mvollmer@redhat.com) +- Fixed unit test and build process specific for suse (jhnidek@redhat.com) +- cockpit: Update cockpit-component-dialog (mvollmer@redhat.com) - Fix downgradability due to conflicts with rhsm-icons (csnyder@redhat.com) - -* Wed Nov 20 2019 Christopher Snyder 1.26.7-1 - Add rhsm-icons package to contain all icons required by gui interfaces (csnyder@redhat.com) - -* Tue Nov 19 2019 Christopher Snyder 1.26.6-1 - 1728054: Obsolete sm-plugin-container on RHEL 8 (csnyder@redhat.com) +- cockpit: Don't use objects as React children for error details + (mvollmer@redhat.com) +- Security upgrades of javascript packages (jhnidek@redhat.com) +- D-BUS API: Better listing of provided products (jhnidek@redhat.com) -* Mon Nov 18 2019 Christopher Snyder 1.26.5-1 -- Add RHEL 8.2 releaser (csnyder@redhat.com) +* Mon Nov 18 2019 Christopher Snyder 1.27.0-1 +- Make Makefile SLE15 compatible (khowell@redhat.com) +- 1764265: Set gpgcheck to 0, when zypper is used; ENT-1758 + (jhnidek@redhat.com) +- 1760837: Disable zypper plugin via ZYPP_RHSM_PLUGIN_DISABLE + (khowell@redhat.com) +- 1764340: Handle RestlibException in zypper plugin (khowell@redhat.com) +- cockpit: Use new services image instead of candlepin (martin@piware.de) +- 1738764: Fix issue with syspurpose three-way merge; ENT-1564 + (jhnidek@redhat.com) +- 1703054: Blacklist some locales for Python2.x; ENT-1288 (jhnidek@redhat.com) +- 1752400: Ensure that configuration is recorded before data sync processes + (wpoteat@redhat.com) +- fixed wrong package name for dependency (p.seiler@linuxmail.org) +- cockpit: Bump test API to 204 (martin@piware.de) +- cockpit: Move default TESTS_OS to rhel-8-1 (martin@piware.de) +- cockpit: Support CI testing against a bots project PR (martin@piware.de) +- No need for inotify on suse (csnyder@redhat.com) +- cockpit: Don't clobber an existing bots checkout (martin@piware.de) + +* Mon Nov 18 2019 Christopher Snyder - Make Makefile SLE15 compatible (khowell@redhat.com) - 1764265: Set gpgcheck to 0, when zypper is used; ENT-1758 (jhnidek@redhat.com)