Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2017-11-22 11:21:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Wed Nov 22 11:21:27 2017 rev:66 rq:542192 version:2017.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2017-10-17 01:52:10.691389630 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2017-11-22 11:21:33.875222195 +0100 @@ -1,2 +1 @@ -------------------------------------------------------------------- -Wed Oct 11 14:15:17 UTC 2017 - bmaryn...@suse.com +Fri Nov 9 10:22:08 UTC 2017 - mdi...@suse.de @@ -4,2 +3,2 @@ -- Add possibility to generate _version.py at the build time for - raw builds: https://github.com/saltstack/salt/pull/43955 +- Update to 2017.7.2 + See https://docs.saltstack.com/en/latest/topics/releases/2017.7.2.html @@ -9,0 +9,43 @@ +- Removed: + * add-a-salt-minion-service-control-file.patch + * add-clean_id-function-to-salt.utils.verify.py.patch + * add-options-for-dockerng.patch + * add-ssh-option-to-salt-ssh.patch + * add-unit-test-for-skip-false-values-from-preferred_i.patch + * add-yum-plugin.patch + * add-zypp-notify-plugin.patch + * adding-salt-minion-watchdog-for-sysv-systems-rhel6-a.patch + * adding-support-for-installing-patches-in-yum-dnf-exe.patch + * avoid-failures-on-sles-12-sp2-because-of-new-systemd.patch + * bugfix-jobs-scheduled-to-run-at-a-future-time-stay-p.patch + * bugfix-unable-to-use-127-as-hostname.patch + * catching-error-when-pidfile-cannot-be-deleted.patch + * change-travis-configuration-file-to-use-salt-toaster.patch + * check-if-byte-strings-are-properly-encoded-in-utf-8.patch + * clean-up-change-attribute-from-interface-dict.patch + * do-not-generate-a-date-in-a-comment-to-prevent-rebui.patch + * enables-salt-minion-watchdog-on-init.d-script-for-sy.patch + * escape-the-os.sep.patch + * fix-for-delete_deployment-in-kubernetes-module.patch + * fix-format-error-bsc-1043111.patch + * fix-grain-for-os_family-on-suse-series.patch + * fix-os_family-case-in-unittest.patch + * fix-regression-in-file.get_managed-add-unit-tests.patch + * fix-salt-summary-to-count-not-responding-minions-cor.patch + * fix-setting-language-on-suse-systems.patch + * fixed-issue-with-parsing-of-master-minion-returns-wh.patch + * fixing-beacons.list-integration-test-failure.patch + * introducing-the-kubernetes-module.patch + * notify-systemd-synchronously-bsc-1053376.patch + * rest_cherrypy-remove-sleep-call.patch + * revert-we-don-t-have-python-systemd-so-notify-can-t-.patch + * run-salt-api-as-user-salt-bsc-990029.patch + * run-salt-master-as-dedicated-salt-user.patch + * search-the-entire-cache_dir-because-storage-paths-ch.patch + * security-fixes-cve-2017-14695-and-cve-2017-14696.patch + * setting-up-os-grains-for-sles-expanded-support-suse-.patch + * special-salt-minion.service-file-for-rhel7.patch + * translate-variable-arguments-if-they-contain-hidden-.patch + * tserong-suse.com-we-don-t-have-python-systemd-so-not.patch + * use-correct-grain-constants-for-timezone.patch + @@ -11 +53 @@ -Tue Oct 10 15:31:36 UTC 2017 - bmaryn...@suse.com +Wed Oct 11 12:47:37 UTC 2017 - jbre...@suse.de @@ -13,7 +55,7 @@ -- Update to 2017.7.2 - See https://docs.saltstack.com/en/develop/topics/releases/2017.7.2.html - for full changelog -- Fix for CVE-2017-14695 (bsc#1062462) -- Fix for CVE-2017-14696 (bsc#1062464) -- Fix salt target-type field returns "String" for existing - jids but an empty "Array" for non existing jids. (issue #1711) +- Re-added previously removed unit-test for bsc#1050003 + +- Changed: + * catching-error-when-pidfile-cannot-be-deleted.patch + +------------------------------------------------------------------- +Wed Oct 11 10:02:25 UTC 2017 - bmaryn...@suse.com @@ -20,0 +63 @@ +- Fixes for CVE-2017-14695 and CVE-2017-14696 (bsc#1062462) @@ -22 +65 @@ - * bugfix-always-return-a-string-list-on-unknown-job-ta.patch + * security-fixes-cve-2017-14695-and-cve-2017-14696.patch @@ -23,0 +67,9 @@ +------------------------------------------------------------------- +Tue Oct 10 14:41:13 UTC 2017 - bmaryn...@suse.com + +- Add missing follow-up for CVE-2017-12791 (bsc#1053955) +- Fixed salt target-type field returns "String" for existing jids + but an empty "Array" for non existing jids. (issue#1711) +- Added: + * bugfix-always-return-a-string-list-on-unknown-job-ta.patch + * escape-the-os.sep.patch @@ -26 +78 @@ -Fri Oct 6 13:53:59 UTC 2017 - bmaryn...@suse.com +Mon Oct 9 14:08:46 UTC 2017 - bmaryn...@suse.com @@ -30,0 +83,3 @@ +- Changed: + * catching-error-when-pidfile-cannot-be-deleted.patch + @@ -33,0 +89,4 @@ + * revert-we-don-t-have-python-systemd-so-notify-can-t-.patch + +- Removed: + * revert-we-don-t-have-python-systemd-so-notify-can-t-work.patch @@ -36 +95 @@ -Thu Oct 5 15:37:06 UTC 2017 - pablo.suarezhernan...@suse.com +Thu Oct 5 15:27:55 UTC 2017 - pablo.suarezhernan...@suse.com @@ -40 +98,0 @@ -- Provide custom SUSE salt-master.service file. @@ -43 +101,9 @@ -Tue Oct 3 11:54:02 UTC 2017 - pablo.suarezhernan...@suse.com +Wed Sep 27 15:45:41 UTC 2017 - jbre...@suse.de + +- Fix for delete_deployment in Kubernetes module (bsc#1059291) + +- Added: + * fix-for-delete_deployment-in-kubernetes-module.patch + +------------------------------------------------------------------- +Mon Sep 18 08:51:35 UTC 2017 - jbre...@suse.de @@ -45 +111,4 @@ -- Fix wrong version reported by Salt (bsc#1061407) +- Catching error when PIDfile cannot be deleted (bsc#1050003) + +- Added: + * catching-error-when-pidfile-cannot-be-deleted.patch @@ -48 +117 @@ -Tue Sep 12 07:26:03 UTC 2017 - pablo.suarezhernan...@suse.com +Tue Sep 12 08:46:47 UTC 2017 - pablo.suarezhernan...@suse.com @@ -50,2 +118,0 @@ -- list_pkgs: add parameter for returned attribute selection (bsc#1052264) -- Adding the leftover for zypper and yum list_pkgs functionality. @@ -55 +121,0 @@ - * list_pkgs-add-parameter-for-returned-attribute-selec.patch @@ -59 +125 @@ -Wed Aug 16 09:26:01 UTC 2017 - bmaryn...@suse.com +Fri Sep 8 11:57:22 UTC 2017 - jbre...@suse.de @@ -61,4 +127,5 @@ -- Update to 2017.7.1 - See https://docs.saltstack.com/en/develop/topics/releases/2017.7.1.html - for full changelog -- Fix for CVE-2017-12791 (bsc#1053955) +- Fixed patches for Kubernetes and YUM modules + +- Updated: + * list_pkgs-add-parameter-for-returned-attribute-selec.patch + * introducing-the-kubernetes-module.patch @@ -67 +134 @@ -Sat Aug 12 21:26:49 UTC 2017 - jeng...@inai.de +Tue Sep 5 13:31:02 UTC 2017 - jbre...@suse.de @@ -69,5 +136,5 @@ -- Run fdupes over all of /usr because it still warns about - duplicate files. Remove ancient suse_version > 1020 conditional. -- Replace unnecessary %__ indirections. Use grep -q in favor of - >/dev/null. -- Avoid bashisms in %pre. +- Add patches to salt to support SUSE Manager scalability features + (bsc#1052264) + +- Added: + * list_pkgs-add-parameter-for-returned-attribute-selec.patch @@ -76 +143 @@ -Fri Jul 21 12:53:26 UTC 2017 - bmaryn...@suse.com +Thu Aug 31 14:31:31 UTC 2017 - jbre...@suse.de @@ -78,14 +145,34 @@ -- Update to 2017.7.0 - See https://docs.saltstack.com/en/develop/topics/releases/2017.7.0.html - for full changelog -- fix ownership for whole master cache directory (bsc#1035914) -- fix setting the language on SUSE systems (bsc#1038855) -- wrong os_family grains on SUSE - fix unittests (bsc#1038855) -- speed-up cherrypy by removing sleep call -- Disable 3rd party runtime packages to be explicitly recommended. - (bsc#1040886) -- fix format error (bsc#1043111) -- Add a salt-minion watchdog for RHEL6 and SLES11 systems (sysV) - to restart salt-minion in case of crashes during upgrade. -- Add procps as dependency. -- Bugfix: jobs scheduled to run at a future time stay +- Introducing the kubernetes module (bsc#1051948) + +- Added: + * introducing-the-kubernetes-module.patch + +------------------------------------------------------------------- +Wed Aug 30 15:46:20 UTC 2017 - jren...@suse.com + +- Revert "We don't have python-systemd, so notify can't work" + +- Added: + * revert-we-don-t-have-python-systemd-so-notify-can-t-work.patch + +------------------------------------------------------------------- +Wed Aug 23 12:48:37 UTC 2017 - bre...@gmail.com + +- Notify systemd synchronously via NOTIFY_SOCKET (bsc#1053376) + +- Added: + * notify-systemd-synchronously-bsc-1053376.patch + +------------------------------------------------------------------- +Wed Aug 16 09:54:15 UTC 2017 - pablo.suarezhernan...@suse.com + +- Add clean_id function to salt.utils.verify.py ++++ 1409 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/salt/salt.changes ++++ and /work/SRC/openSUSE:Factory/.salt.new/salt.changes Old: ---- v2017.7.2.tar.gz New: ---- _service salt-2017.7.2.tar.gz zyppnotify ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.uaFkVK/_old 2017-11-22 11:21:37.767080777 +0100 +++ /var/tmp/diff_new_pack.uaFkVK/_new 2017-11-22 11:21:37.771080632 +0100 @@ -1,7 +1,7 @@ # # spec file for package salt # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %else %bcond_with systemd %endif -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %if 0%{?suse_version} > 1110 %bcond_without bash_completion %bcond_without fish_completion @@ -42,64 +42,58 @@ License: Apache-2.0 Group: System/Management Url: http://saltstack.org/ -Source: https://github.com/saltstack/salt/archive/v%{version}.tar.gz +# Git: https://github.com/openSUSE/salt.git +Source0: salt-2017.7.2.tar.gz Source1: README.SUSE Source2: salt-tmpfiles.d Source3: html.tar.bz2 Source4: update-documentation.sh Source5: travis.yml +Source6: zyppnotify -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/42310 -# https://github.com/saltstack/salt/pull/42718 -# https://github.com/saltstack/salt/pull/43195 -# https://github.com/saltstack/salt/pull/43214 -# https://github.com/saltstack/salt/pull/43281 Patch1: list_pkgs-add-parameter-for-returned-attribute-selec.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43441 Patch2: use-home-to-get-the-user-home-directory-instead-usin.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43663 Patch3: multiprocessing-minion-option-documentation-fixes.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43669 Patch4: introduce-process_count_max-minion-configuration-par.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/ Patch5: bugfix-always-return-a-string-list-on-unknown-job-ta.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43955 Patch6: enable-with-salt-version-parameter-for-setup.py-scri.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: fdupes +BuildRequires: python-rpm-macros BuildRequires: logrotate -BuildRequires: python -BuildRequires: python-devel +BuildRequires: python3 +BuildRequires: python3-devel # requirements/base.txt %if 0%{?rhel} -BuildRequires: python-jinja2 +BuildRequires: python3-jinja2 %else -BuildRequires: python-Jinja2 +BuildRequires: python3-Jinja2 %endif -BuildRequires: python-futures >= 2.0 -BuildRequires: python-markupsafe -BuildRequires: python-msgpack-python > 0.3 -BuildRequires: python-psutil -BuildRequires: python-requests >= 1.0.0 -BuildRequires: python-tornado >= 4.2.1 -BuildRequires: python-yaml +BuildRequires: python3-MarkupSafe +BuildRequires: python3-msgpack-python > 0.3 +BuildRequires: python3-psutil +BuildRequires: python3-requests >= 1.0.0 +BuildRequires: python3-tornado >= 4.2.1 +BuildRequires: python3-PyYAML # requirements/zeromq.txt -BuildRequires: python-pycrypto >= 2.6.1 -BuildRequires: python-pyzmq >= 2.2.0 +BuildRequires: python3-pycrypto >= 2.6.1 +BuildRequires: python3-pyzmq >= 2.2.0 %if %{with test} # requirements/dev_python27.txt -BuildRequires: python-boto >= 2.32.1 -BuildRequires: python-mock -BuildRequires: python-moto >= 0.3.6 -BuildRequires: python-pip -BuildRequires: python-salt-testing >= 2015.2.16 -BuildRequires: python-unittest2 -BuildRequires: python-xml +BuildRequires: python3-boto >= 2.32.1 +BuildRequires: python3-mock +BuildRequires: python3-moto >= 0.3.6 +BuildRequires: python3-pip +BuildRequires: python3-salt-testing >= 2015.2.16 +BuildRequires: python3-unittest2 +BuildRequires: python3-xml %endif %if %{with builddocs} -BuildRequires: python-sphinx +BuildRequires: python3-sphinx +%endif +%if 0%{?suse_version} > 1020 +BuildRequires: fdupes %endif Requires(pre): %{_sbindir}/groupadd @@ -116,49 +110,48 @@ Requires(pre): dbus %endif -Requires: logrotate Requires: procps -Requires: python +Requires: logrotate +Requires: python3 # %if ! 0%{?suse_version} > 1110 -Requires: python-certifi +Requires: python3-certifi %endif # requirements/base.txt %if 0%{?rhel} -Requires: python-jinja2 +Requires: python3-jinja2 Requires: yum %if 0%{?rhel} == 6 Requires: yum-plugin-security %endif %else -Requires: python-Jinja2 +Requires: python3-Jinja2 %endif -Requires: python-futures >= 2.0 -Requires: python-markupsafe -Requires: python-msgpack-python > 0.3 -Requires: python-psutil -Requires: python-requests >= 1.0.0 -Requires: python-tornado >= 4.2.1 -Requires: python-yaml +Requires: python3-MarkupSafe +Requires: python3-msgpack-python > 0.3 +Requires: python3-psutil +Requires: python3-requests >= 1.0.0 +Requires: python3-tornado >= 4.2.1 +Requires: python3-PyYAML %if 0%{?suse_version} # required for zypper.py -Requires: rpm-python +Requires: python3-rpm Requires(pre): libzypp(plugin:system) >= 0 -Requires: zypp-plugin-python +Requires: python3-zypp-plugin # requirements/opt.txt (not all) # Suggests: python-MySQL-python ## Disabled for now, originally Recommended -Suggests: python-timelib -Suggests: python-gnupg +Suggests: python3-timelib +Suggests: python3-gnupg # requirements/zeromq.txt %endif -Requires: python-pycrypto >= 2.6.1 -Requires: python-pyzmq >= 2.2.0 +Requires: python3-pycrypto >= 2.6.1 +Requires: python3-pyzmq >= 2.2.0 # %if 0%{?suse_version} # python-xml is part of python-base in all rhel versions -Requires: python-xml -Suggests: python-Mako -Recommends: python-netaddr +Requires: python3-xml +Suggests: python3-Mako +Recommends: python3-netaddr %endif %if %{with systemd} @@ -204,7 +197,7 @@ Group: System/Management Requires: %{name} = %{version}-%{release} Requires: %{name}-master = %{version}-%{release} -Requires: python-CherryPy >= 3.2.2 +Requires: python3-CherryPy >= 3.2.2 %description api salt-api is a modular interface on top of Salt that can provide a variety of entry points into a running Salt system. @@ -214,10 +207,10 @@ Group: System/Management Requires: %{name} = %{version}-%{release} Requires: %{name}-master = %{version}-%{release} -Requires: python-apache-libcloud +Requires: python3-apache-libcloud %if 0%{?suse_version} -Recommends: python-botocore -Recommends: python-netaddr +Recommends: python3-botocore +Recommends: python3-netaddr %endif %description cloud @@ -240,7 +233,7 @@ Group: System/Management Requires: %{name} = %{version}-%{release} %if 0%{?suse_version} -Recommends: python-pygit2 >= 0.20.3 +Recommends: python3-pygit2 >= 0.20.3 %endif %ifarch %{ix86} x86_64 %if 0%{?suse_version} @@ -402,7 +395,7 @@ %setup -q -n salt-%{version} cp %{S:1} . cp %{S:5} ./.travis.yml - +cp %{S:6} ./zyppnotify %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -411,14 +404,13 @@ %patch6 -p1 %build -%{__python} setup.py --with-salt-version=%{version} --salt-transport=both build -cp ./build/lib/salt/_version.py ./salt +%{__python3} setup.py --salt-transport=both build %if %{with docs} && %{without builddocs} # extract docs from the tarball mkdir -p doc/_build pushd doc/_build/ -tar -xvf %{S:3} +tar xfv %{S:3} popd %endif @@ -428,7 +420,7 @@ %endif %install -%{__python} setup.py --salt-transport=both install --prefix=%{_prefix} --root=%{buildroot} +%{__python3} setup.py --salt-transport=both install --prefix=%{_prefix} --root=%{buildroot} ## create missing directories install -Dd -m 0750 %{buildroot}%{_sysconfdir}/salt/master.d install -Dd -m 0750 %{buildroot}%{_sysconfdir}/salt/minion.d @@ -471,24 +463,24 @@ ## Install Zypper plugins only on SUSE machines %if 0%{?suse_version} install -Dd -m 0750 %{buildroot}%{_prefix}/lib/zypp/plugins/commit -install scripts/suse/zypper/plugins/commit/zyppnotify %{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify +%{__install} zyppnotify %{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify %endif # Install Yum plugins only on RH machines %if 0%{?fedora} || 0%{?rhel} install -Dd %{buildroot}%{_prefix}/share/yum-plugins install -Dd %{buildroot}/etc/yum/pluginconf.d -install scripts/suse/yum/plugins/yumnotify.py %{buildroot}%{_prefix}/share/yum-plugins -install scripts/suse/yum/plugins/yumnotify.conf %{buildroot}/etc/yum/pluginconf.d +%{__install} scripts/yum/plugins/yumnotify.py %{buildroot}%{_prefix}/share/yum-plugins +%{__install} scripts/yum/plugins/yumnotify.conf %{buildroot}/etc/yum/pluginconf.d %endif ## install init and systemd scripts %if %{with systemd} -install -Dpm 0644 pkg/suse/salt-master.service %{buildroot}%{_unitdir}/salt-master.service +install -Dpm 0644 pkg/salt-master.service %{buildroot}%{_unitdir}/salt-master.service %if 0%{?suse_version} install -Dpm 0644 pkg/suse/salt-minion.service %{buildroot}%{_unitdir}/salt-minion.service %else -install -Dpm 0644 pkg/suse/salt-minion.service.rhel7 %{buildroot}%{_unitdir}/salt-minion.service +install -Dpm 0644 pkg/salt-minion.service.rhel7 %{buildroot}%{_unitdir}/salt-minion.service %endif install -Dpm 0644 pkg/salt-syndic.service %{buildroot}%{_unitdir}/salt-syndic.service install -Dpm 0644 pkg/suse/salt-api.service %{buildroot}%{_unitdir}/salt-api.service @@ -513,7 +505,7 @@ ## Install sysV salt-minion watchdog for SLES11 and RHEL6 %if 0%{?rhel} == 6 || 0%{?suse_version} == 1110 -install -Dpm 0755 scripts/suse/watchdog/salt-daemon-watcher %{buildroot}%{_bindir}/salt-daemon-watcher +install -Dpm 0755 scripts/watchdog/salt-daemon-watcher %{buildroot}%{_bindir}/salt-daemon-watcher %endif # @@ -526,12 +518,8 @@ install -Dpm 0640 conf/cloud.profiles %{buildroot}%{_sysconfdir}/salt/cloud.profiles install -Dpm 0640 conf/cloud.providers %{buildroot}%{_sysconfdir}/salt/cloud.providers # -## install logrotate file (for RHEL6 we use without sudo) -%if 0%{?rhel} > 6 || 0%{?suse_version} -install -Dpm 0644 pkg/suse/salt-common.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/salt -%else +## install logrotate file install -Dpm 0644 pkg/salt-common.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/salt -%endif # ## install SuSEfirewall2 rules install -Dpm 0644 pkg/suse/salt.SuSEfirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt @@ -550,21 +538,22 @@ %endif %if 0%{?suse_version} > 1020 -%fdupes %{buildroot}/%{_prefix} +%fdupes %{buildroot}%{_docdir} +%fdupes %{buildroot}%{python3_sitelib} %endif %check %if %{with test} -python setup.py test --runtests-opts=-u +python3 setup.py test --runtests-opts=-u %endif %pre S_HOME="/var/lib/salt" S_PHOME="/srv/salt" -getent passwd salt | grep -q $S_PHOME && usermod -d $S_HOME salt +getent passwd salt | grep $S_PHOME >/dev/null && usermod -d $S_HOME salt getent group salt >/dev/null || %{_sbindir}/groupadd -r salt getent passwd salt >/dev/null || %{_sbindir}/useradd -r -g salt -d $S_HOME -s /bin/false -c "salt-master daemon" salt -if [ -d "$S_PHOME/.ssh" ]; then +if [[ -d "$S_PHOME/.ssh" ]]; then mv $S_PHOME/.ssh $S_HOME fi @@ -879,8 +868,8 @@ %config(noreplace) %attr(0640, root, salt) %{_sysconfdir}/salt/cloud.profiles %config(noreplace) %attr(0640, root, salt) %{_sysconfdir}/salt/cloud.providers %dir %attr(0750, root, salt) %{_localstatedir}/cache/salt/cloud -%{python_sitelib}/salt/cloud/deploy/bootstrap-salt.sh -%attr(755,root,root)%{python_sitelib}/salt/cloud/deploy/bootstrap-salt.sh +%{python3_sitelib}/salt/cloud/deploy/bootstrap-salt.sh +%attr(755,root,root)%{python3_sitelib}/salt/cloud/deploy/bootstrap-salt.sh %{_mandir}/man1/salt-cloud.1.* %files ssh @@ -991,9 +980,9 @@ %{_mandir}/man1/salt-call.1.gz %{_mandir}/man1/spm.1.gz %config(noreplace) %{_sysconfdir}/logrotate.d/salt -%{python_sitelib}/* -%exclude %{python_sitelib}/salt/cloud/deploy/*.sh -%attr(755,root,root)%{python_sitelib}/salt/cloud/deploy/*.sh +%{python3_sitelib}/* +%exclude %{python3_sitelib}/salt/cloud/deploy/*.sh +%attr(755,root,root)%{python3_sitelib}/salt/cloud/deploy/*.sh %doc LICENSE AUTHORS README.rst HACKING.rst README.SUSE # %dir %attr(0750, root, salt) %{_sysconfdir}/salt ++++++ _service ++++++ <services> <service name="tar_scm" mode="localonly"> <param name="scm">git</param> <param name="url">https://github.com/opensuse/salt.git</param> <param name="exclude">.git</param> <param name="filename">package</param> <param name="revision">openSUSE-2017.7.2-python3-only</param> </service> <service name="extract_file" mode="localonly"> <param name="archive">*package*.tar</param> <param name="files"> */obs/* */scripts/suse/zypper/plugins/commit/zyppnotify </param> </service> <service name="verify_file" mode="localonly"> <param name="file">_service:extract_file:salt-2017.7.2.tar.gz</param> <param name="verifier">sha256</param> <param name="checksum">ff3bc7de5abf01b8acbd144db5811b00867179b2353f5c6f7f19241e2eff2840</param> </service> </services> ++++++ bugfix-always-return-a-string-list-on-unknown-job-ta.patch ++++++ --- /var/tmp/diff_new_pack.uaFkVK/_old 2017-11-22 11:21:37.823078742 +0100 +++ /var/tmp/diff_new_pack.uaFkVK/_new 2017-11-22 11:21:37.827078596 +0100 @@ -1,7 +1,7 @@ From 49a4e807fb1cb844cec7b7c11b37f6c276f899e4 Mon Sep 17 00:00:00 2001 From: Bo Maryniuk <b...@suse.de> Date: Mon, 9 Oct 2017 17:57:48 +0200 -Subject: [PATCH] Bugfix: always return a string "list" on unknown job +Subject: [PATCH 5/6] Bugfix: always return a string "list" on unknown job target type. --- @@ -66,4 +66,3 @@ -- 2.14.2 - ++++++ enable-with-salt-version-parameter-for-setup.py-scri.patch ++++++ --- /var/tmp/diff_new_pack.uaFkVK/_old 2017-11-22 11:21:37.835078306 +0100 +++ /var/tmp/diff_new_pack.uaFkVK/_new 2017-11-22 11:21:37.835078306 +0100 @@ -2,7 +2,7 @@ From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= <psuarezhernan...@suse.com> Date: Fri, 6 Oct 2017 17:12:15 +0100 -Subject: [PATCH] Enable '--with-salt-version' parameter for setup.py +Subject: [PATCH 6/6] Enable '--with-salt-version' parameter for setup.py script --- @@ -73,4 +73,3 @@ -- 2.14.2 - ++++++ html.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/salt/html.tar.bz2 /work/SRC/openSUSE:Factory/.salt.new/html.tar.bz2 differ: char 11, line 1 ++++++ introduce-process_count_max-minion-configuration-par.patch ++++++ --- /var/tmp/diff_new_pack.uaFkVK/_old 2017-11-22 11:21:37.867077143 +0100 +++ /var/tmp/diff_new_pack.uaFkVK/_new 2017-11-22 11:21:37.871076998 +0100 @@ -1,7 +1,7 @@ -From dd3490c7e56a0aca17f73dde1684d469fe5582df Mon Sep 17 00:00:00 2001 +From cb472e1f0fc18a554e0de9e3fe6bbe16557957ee Mon Sep 17 00:00:00 2001 From: Silvio Moioli <smoi...@suse.de> Date: Wed, 20 Sep 2017 14:33:33 +0200 -Subject: [PATCH] Introduce process_count_max minion configuration +Subject: [PATCH 4/6] Introduce process_count_max minion configuration parameter This allows users to limit the number of processes or threads a minion @@ -25,10 +25,10 @@ 5 files changed, 87 insertions(+), 3 deletions(-) diff --git a/conf/minion b/conf/minion -index b1122c9e52..6d2b43da1b 100644 +index 6cae043295..4a3cddcbd1 100644 --- a/conf/minion +++ b/conf/minion -@@ -671,6 +671,12 @@ +@@ -689,6 +689,12 @@ # for a full explanation. #multiprocessing: True @@ -42,10 +42,10 @@ ##### Logging settings ##### ########################################## diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst -index 5cc72f1daf..b935f86656 100644 +index 5c92b932ab..19e9026dd8 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst -@@ -2179,6 +2179,23 @@ executed in a thread. +@@ -2352,6 +2352,23 @@ executed in a thread. multiprocessing: True @@ -70,7 +70,7 @@ .. _minion-logging-settings: diff --git a/salt/config/__init__.py b/salt/config/__init__.py -index b5b7f2a1f7..e843d8c79d 100644 +index 0f06f9ccca..668051a789 100644 --- a/salt/config/__init__.py +++ b/salt/config/__init__.py @@ -328,6 +328,9 @@ VALID_OPTS = { @@ -92,10 +92,10 @@ 'mine_return_job': False, 'mine_interval': 60, diff --git a/salt/minion.py b/salt/minion.py -index 3c5046ee93..9e7301aafa 100644 +index 394b11a2e8..33cbb8fa0a 100644 --- a/salt/minion.py +++ b/salt/minion.py -@@ -1288,6 +1288,7 @@ class Minion(MinionBase): +@@ -1290,6 +1290,7 @@ class Minion(MinionBase): self._send_req_async(load, timeout, callback=lambda f: None) # pylint: disable=unexpected-keyword-arg return True @@ -103,7 +103,7 @@ def _handle_decoded_payload(self, data): ''' Override this method if you wish to handle the decoded data -@@ -1319,6 +1320,15 @@ class Minion(MinionBase): +@@ -1321,6 +1322,15 @@ class Minion(MinionBase): self.functions, self.returners, self.function_errors, self.executors = self._load_modules() self.schedule.functions = self.functions self.schedule.returners = self.returners @@ -208,4 +208,3 @@ -- 2.14.2 - ++++++ list_pkgs-add-parameter-for-returned-attribute-selec.patch ++++++ --- /var/tmp/diff_new_pack.uaFkVK/_old 2017-11-22 11:21:37.879076708 +0100 +++ /var/tmp/diff_new_pack.uaFkVK/_new 2017-11-22 11:21:37.879076708 +0100 @@ -1,7 +1,7 @@ -From 2996d5ab680b2b3c243a2216e13326750bc37ac8 Mon Sep 17 00:00:00 2001 +From ca7031e5223bb3bd35c31211d29177f05ed5e304 Mon Sep 17 00:00:00 2001 From: Silvio Moioli <smoi...@suse.de> Date: Thu, 13 Jul 2017 15:59:01 +0200 -Subject: [PATCH] list_pkgs: add parameter for returned attribute selection +Subject: [PATCH 1/6] list_pkgs: add parameter for returned attribute selection (bsc#1052264) zypper.list_pkgs: @@ -77,7 +77,7 @@ + full_version += '-{0}'.format(release) + return full_version diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py -index e659d1b79c..8ffc63a74e 100644 +index 0af6a811f4..8b63bff4a3 100644 --- a/salt/modules/yumpkg.py +++ b/salt/modules/yumpkg.py @@ -17,7 +17,6 @@ Support for YUM/DNF @@ -88,7 +88,7 @@ import datetime import fnmatch import itertools -@@ -584,15 +583,35 @@ def version_cmp(pkg1, pkg2, ignore_epoch=False): +@@ -595,15 +594,35 @@ def version_cmp(pkg1, pkg2, ignore_epoch=False): def list_pkgs(versions_as_list=False, **kwargs): ''' @@ -126,7 +126,7 @@ ''' versions_as_list = salt.utils.is_true(versions_as_list) # not yet implemented or not applicable -@@ -600,17 +619,14 @@ def list_pkgs(versions_as_list=False, **kwargs): +@@ -611,17 +630,14 @@ def list_pkgs(versions_as_list=False, **kwargs): for x in ('removed', 'purge_desired')]): return {} @@ -148,7 +148,7 @@ output = __salt__['cmd.run'](cmd, python_shell=False, output_loglevel='trace') -@@ -620,15 +636,25 @@ def list_pkgs(versions_as_list=False, **kwargs): +@@ -631,15 +647,25 @@ def list_pkgs(versions_as_list=False, **kwargs): osarch=__grains__['osarch'] ) if pkginfo is not None: @@ -183,7 +183,7 @@ def list_repo_pkgs(*args, **kwargs): -@@ -1205,11 +1231,42 @@ def install(name=None, +@@ -1221,11 +1247,42 @@ def install(name=None, .. versionadded:: 2014.7.0 @@ -226,7 +226,7 @@ ''' repo_arg = _get_repo_options(**kwargs) exclude_arg = _get_excludes_option(**kwargs) -@@ -1238,10 +1295,11 @@ def install(name=None, +@@ -1254,10 +1311,11 @@ def install(name=None, log.warning('"version" parameter will be ignored for multiple ' 'package targets') @@ -240,7 +240,7 @@ to_install = [] to_downgrade = [] -@@ -1544,7 +1602,7 @@ def install(name=None, +@@ -1560,7 +1618,7 @@ def install(name=None, errors.append(out['stdout']) __context__.pop('pkg.list_pkgs', None) @@ -787,6 +787,5 @@ def test_list_patches(self): ''' -- -2.12.2 - +2.14.2 ++++++ multiprocessing-minion-option-documentation-fixes.patch ++++++ --- /var/tmp/diff_new_pack.uaFkVK/_old 2017-11-22 11:21:37.891076271 +0100 +++ /var/tmp/diff_new_pack.uaFkVK/_new 2017-11-22 11:21:37.891076271 +0100 @@ -1,7 +1,7 @@ -From 6c5b8be3d14814903abc70b5605c87277dad39db Mon Sep 17 00:00:00 2001 +From 461654496d36a264903057a8255aec4eb700e506 Mon Sep 17 00:00:00 2001 From: Silvio Moioli <smoi...@suse.de> Date: Wed, 20 Sep 2017 14:32:47 +0200 -Subject: [PATCH] multiprocessing minion option: documentation fixes +Subject: [PATCH 3/6] multiprocessing minion option: documentation fixes --- doc/man/salt.7 | 1 + @@ -21,10 +21,10 @@ Default: \fBTrue\fP .sp diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst -index cd554268c1..5cc72f1daf 100644 +index e0f349931c..5c92b932ab 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst -@@ -2164,11 +2164,14 @@ Thread Settings +@@ -2337,11 +2337,14 @@ Thread Settings .. conf_minion:: multiprocessing @@ -44,4 +44,3 @@ -- 2.14.2 - ++++++ update-documentation.sh ++++++ --- /var/tmp/diff_new_pack.uaFkVK/_old 2017-11-22 11:21:37.935074673 +0100 +++ /var/tmp/diff_new_pack.uaFkVK/_new 2017-11-22 11:21:37.935074673 +0100 @@ -4,35 +4,10 @@ # Author: Bo Maryniuk <b...@suse.de> # -NO_SPHINX_PARAM="--without-sphinx" - -function build_virtenv() { - virtualenv --system-site-packages $1 - source $1/bin/activate - pip install --upgrade pip - if [ -z "$2" ]; then - pip install -I Sphinx - fi -} - function check_env() { - if [[ -z "$1" || "$1" != "$NO_SPHINX_PARAM" ]] && [ ! -z "$(which sphinx-build 2>/dev/null)" ]; then - cat <<EOF -You've installed Spinx globally. But it might be outdated or -clash with the version I am going to install into the temporary -virtual environment from PIP. - -Please consider to remove Sphinx from your system, perhaps? -Or pass me "$NO_SPHINX_PARAM" param so I will try reusing yours -and see what happens. :) - -EOF - exit 1; - fi - - for cmd in "make" "quilt" "virtualenv" "pip"; do + for cmd in "sphinx-build" "make" "quilt"; do if [ -z "$(which $cmd 2>/dev/null)" ]; then - echo "Error: '$cmd' is still missing. Install it, please." + echo "Error: '$cmd' is missing." exit 1; fi done @@ -51,7 +26,7 @@ cd _build/html chmod -R -x+X * cd .. - tar cvf - html | bzip2 > $2/html.tar.bz2 + tar cvf - html | bzip2 > /tmp/html.tar.bz2 } function write_changelog() { @@ -71,30 +46,19 @@ } if [ -z "$1" ]; then - echo "Usage: $0 <your e-mail> [--without-sphinx]" + echo "Usage: $0 <your e-mail>" exit 1; fi -check_env $2; - +check_env; START=$(pwd) -V_ENV="sphinx_doc_gen" -V_TMP=$(mktemp -d) - -for f in "salt.spec" "salt*tar.gz"; do - cp -v $f $V_TMP -done - -cd $V_TMP; -build_virtenv $V_ENV $2; - SRC_DIR="salt-$(cat salt.spec | grep ^Version: | cut -d: -f2 | sed -e 's/[[:blank:]]//g')"; quilt_setup $SRC_DIR -build_docs doc $V_TMP +build_docs doc cd $START -mv $V_TMP/html.tar.bz2 $START -rm -rf $V_TMP +rm -rf $SRC_DIR +mv /tmp/html.tar.bz2 $START echo "Done" echo "---------------" ++++++ use-home-to-get-the-user-home-directory-instead-usin.patch ++++++ --- /var/tmp/diff_new_pack.uaFkVK/_old 2017-11-22 11:21:37.947074237 +0100 +++ /var/tmp/diff_new_pack.uaFkVK/_new 2017-11-22 11:21:37.951074091 +0100 @@ -1,8 +1,8 @@ -From 2dfd28560f3825dc512822ba9d01d67070d5175b Mon Sep 17 00:00:00 2001 +From 418bcf80ca263c5523e701801e97bae60fdf9b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= <psuarezhernan...@suse.com> Date: Mon, 11 Sep 2017 19:57:28 +0200 -Subject: [PATCH] Use $HOME to get the user home directory instead using +Subject: [PATCH 2/6] Use $HOME to get the user home directory instead using '~' char --- @@ -24,6 +24,5 @@ if [ ! -d "$(dirname ${_salt_cache_functions})" ]; then -- -2.12.2 - +2.14.2 ++++++ zyppnotify ++++++ #!/usr/bin/python3 # # Copyright (c) 2016 SUSE Linux LLC # All Rights Reserved. # # Author: Bo Maryniuk <b...@suse.de> import sys import os import hashlib from zypp_plugin import Plugin class DriftDetector(Plugin): """ Return diff of the installed packages outside the Salt. """ def __init__(self): Plugin.__init__(self) self.ck_path = "/var/cache/salt/minion/rpmdb.cookie" self.rpm_path = "/var/lib/rpm/Packages" def _get_mtime(self): ''' Get the modified time of the RPM Database. Returns: Unix ticks ''' return os.path.exists(self.rpm_path) and int(os.path.getmtime(self.rpm_path)) or 0 def _get_checksum(self): ''' Get the checksum of the RPM Database. Returns: hexdigest ''' digest = hashlib.md5() with open(self.rpm_path, "rb") as rpm_db_fh: while True: buff = rpm_db_fh.read(0x1000) if not buff: break digest.update(buff) return digest.hexdigest() def PLUGINEND(self, headers, body): """ Hook when plugin closes Zypper's transaction. """ if 'SALT_RUNNING' not in os.environ: with open(self.ck_path, 'w') as ck_fh: ck_fh.write('{chksum} {mtime}\n'.format(chksum=self._get_checksum(), mtime=self._get_mtime())) self.ack() DriftDetector().main()
