openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package salt (Revision 421ddfca3d68a21623983e1d324b725f)

Currently displaying revision 421ddfca3d68a21623983e1d324b725f , Show latest

--- salt.changes.orig
+++ salt.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Fri May  5 21:31:22 UTC 2023 - Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
+
+- Drop all insserv and SysV references
+
+-------------------------------------------------------------------
 Fri May  5 08:29:26 UTC 2023 - Alexander Graul <alexander.graul@suse.com>
 
 - Update to Salt release version 3006.0 (jsc#PED-3139)
--- salt.spec.orig
+++ salt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package salt
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,8 +12,14 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
+
+
+%if 0%{?suse_version} > 1600
+%define service_del_preun echo %{*}
+%endif
+
 %global debug_package %{nil}
 
 %if 0%{?suse_version} > 1210 || 0%{?rhel} >= 7 || 0%{?fedora} >=28
@@ -41,7 +47,7 @@ Release:        0
 Summary:        A parallel remote execution system
 License:        Apache-2.0
 Group:          System/Management
-Url:            https://saltproject.io/
+URL:            https://saltproject.io/
 Source:         v%{version}.tar.gz
 Source1:        README.SUSE
 Source2:        salt-tmpfiles.d
@@ -249,24 +255,24 @@ Patch53:        add-support-for-gpgautoi
 # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/62519
 Patch54:        change-the-delimeters-to-prevent-possible-tracebacks.patch
 # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/62898
-Patch55:       pass-the-context-to-pillar-ext-modules.patch
+Patch55:        pass-the-context-to-pillar-ext-modules.patch
 # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/c6be36eeea49ee0d0641da272087305f79c32c99 (not yet upstream)
 # Fix problem caused by: https://github.com/openSUSE/salt/pull/493 (Patch47) affecting only 3005.1.
-Patch56:       use-rlock-to-avoid-deadlocks-in-salt-ssh.patch
+Patch56:        use-rlock-to-avoid-deadlocks-in-salt-ssh.patch
 # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/61064
 # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/5e3ff4d662321c237ddd5b2c5c83f35a84af594c (not PR to master yet)
-Patch57:       fixes-for-python-3.10-502.patch
+Patch57:        fixes-for-python-3.10-502.patch
 # PATCH-FIX-OPENSUSE: https://github.com/openSUSE/salt/pull/571
-Patch58:       control-the-collection-of-lvm-grains-via-config.patch
+Patch58:        control-the-collection-of-lvm-grains-via-config.patch
 # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/63460
-Patch59:       3005.1-implement-zypper-removeptf-573.patch
+Patch59:        3005.1-implement-zypper-removeptf-573.patch
 # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/63460
 # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/578
-Patch60:       skip-package-names-without-colon-bsc-1208691-578.patch
+Patch60:        skip-package-names-without-colon-bsc-1208691-578.patch
 # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/c0fae09e5a4f6997a60007d970c7c6a5614d9102
-Patch61:       fix-version-detection-and-avoid-building-and-testing.patch
+Patch61:        fix-version-detection-and-avoid-building-and-testing.patch
 # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/64113
-Patch62:       make-sure-the-file-client-is-destroyed-upon-used.patch
+Patch62:        make-sure-the-file-client-is-destroyed-upon-used.patch
 
 ### IMPORTANT: The line below is used as a snippet marker. Do not touch it.
 ### SALT PATCHES LIST END
@@ -284,7 +290,6 @@ Requires(pre):  %{_sbindir}/groupadd
 Requires(pre):  %{_sbindir}/useradd
 
 %if 0%{?suse_version}
-Requires(pre):  %fillup_prereq
 Requires(pre):  shadow
 %endif
 
@@ -310,10 +315,6 @@ Requires:       iproute
 %if %{with systemd}
 BuildRequires:  pkgconfig(systemd)
 %{?systemd_ordering}
-%else
-%if 0%{?suse_version}
-Requires(pre): %insserv_prereq
-%endif
 %endif
 
 %if %{with fish_completion}
@@ -360,10 +361,10 @@ BuildRequires:  python3-setuptools
 # requirements/base.txt
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:  python3-jinja2
+BuildRequires:  python3-m2crypto
 BuildRequires:  python3-markupsafe
 BuildRequires:  python3-msgpack > 0.3
 BuildRequires:  python3-zmq >= 2.2.0
-BuildRequires:  python3-m2crypto
 %else
 BuildRequires:  python3-Jinja2
 BuildRequires:  python3-MarkupSafe
@@ -376,11 +377,12 @@ BuildRequires:  python3-pycrypto >= 2.6.
 %endif
 %endif
 BuildRequires:  python3-PyYAML
-BuildRequires:  python3-psutil
-BuildRequires:  python3-requests >= 1.0.0
+BuildRequires:  python3-distro
 BuildRequires:  python3-distro
 BuildRequires:  python3-looseversion
 BuildRequires:  python3-packaging
+BuildRequires:  python3-psutil
+BuildRequires:  python3-requests >= 1.0.0
 
 # requirements/zeromq.txt
 %if %{with test}
@@ -403,11 +405,11 @@ Requires:       python3
 # requirements/base.txt
 %if 0%{?rhel} || 0%{?fedora}
 Requires:       python3-jinja2
-Requires:       yum
+Requires:       python3-m2crypto
 Requires:       python3-markupsafe
 Requires:       python3-msgpack > 0.3
-Requires:       python3-m2crypto
 Requires:       python3-zmq >= 2.2.0
+Requires:       yum
 
 %if 0%{?rhel} == 8 || 0%{?fedora} >= 30
 Requires:       dnf
@@ -426,14 +428,16 @@ Requires:       python3-pycrypto >= 2.6.
 %endif
 Requires:       python3-pyzmq >= 2.2.0
 %endif # end of RHEL / SUSE specific section
-Requires:       python3-jmespath
 Requires:       python3-PyYAML
-Requires:       python3-psutil
-Requires:       python3-requests >= 1.0.0
+Requires:       python3-contextvars
+Requires:       python3-contextvars
 Requires:       python3-distro
+Requires:       python3-distro
+Requires:       python3-jmespath
 Requires:       python3-looseversion
 Requires:       python3-packaging
-Requires:       python3-contextvars
+Requires:       python3-psutil
+Requires:       python3-requests >= 1.0.0
 %if 0%{?suse_version}
 # required for zypper.py
 Requires:       python3-rpm
@@ -517,14 +521,7 @@ Requires:       pmtools
 %endif
 %if %{with systemd}
 %{?systemd_requires}
-BuildRequires:	systemd
-%else
-%if 0%{?suse_version}
-Requires(pre):  %insserv_prereq
-%endif
-%endif
-%if 0%{?suse_version}
-Requires(pre):  %fillup_prereq
+BuildRequires:  systemd
 %endif
 
 %description master
@@ -542,13 +539,6 @@ Requires:       (%{name}-transactional-u
 
 %if %{with systemd}
 %{?systemd_requires}
-%else
-%if 0%{?suse_version}
-Requires(pre):  %insserv_prereq
-%endif
-%endif
-%if 0%{?suse_version}
-Requires(pre):  %fillup_prereq
 %endif
 
 %description minion
@@ -561,13 +551,6 @@ Group:          System/Management
 Requires:       %{name} = %{version}-%{release}
 %if %{with systemd}
 %{?systemd_requires}
-%else
-%if 0%{?suse_version}
-Requires(pre):  %insserv_prereq
-%endif
-%endif
-%if 0%{?suse_version}
-Requires(pre):  %fillup_prereq
 %endif
 
 %description proxy
@@ -577,7 +560,6 @@ Examples include network gear that has a
 devices with limited CPU or memory, or devices that could run a minion, but for
 security reasons, will not.
 
-
 %package syndic
 Summary:        The syndic component for saltstack
 Group:          System/Management
@@ -585,13 +567,6 @@ Requires:       %{name} = %{version}-%{r
 Requires:       %{name}-master = %{version}-%{release}
 %if %{with systemd}
 %{?systemd_requires}
-%else
-%if 0%{?suse_version}
-Requires(pre):  %insserv_prereq
-%endif
-%endif
-%if 0%{?suse_version}
-Requires(pre):  %fillup_prereq
 %endif
 
 %description syndic
@@ -609,13 +584,6 @@ Recommends:     sshpass
 %endif
 %if %{with systemd}
 %{?systemd_requires}
-%else
-%if 0%{?suse_version}
-Requires(pre):  %insserv_prereq
-%endif
-%endif
-%if 0%{?suse_version}
-Requires(pre):  %fillup_prereq
 %endif
 
 %description ssh
@@ -695,7 +663,6 @@ For transactional systems, like MicroOS,
 transparently if the executor "transactional-update" is registered in
 list of active executors.  This package add the configuration file.
 
-
 %prep
 %setup -q -n salt-%{version}-suse
 cp %{S:1} .
@@ -823,23 +790,7 @@ ln -s service %{buildroot}%{_sbindir}/rc
 ln -s service %{buildroot}%{_sbindir}/rcsalt-minion
 ln -s service %{buildroot}%{_sbindir}/rcsalt-api
 install -Dpm 644 %{S:2}                   %{buildroot}/usr/lib/tmpfiles.d/salt.conf
-%else
-mkdir -p %{buildroot}%{_initddir}
-## install init scripts
-install -Dpm 0755 pkg/old/suse/salt-master %{buildroot}%{_initddir}/salt-master
-install -Dpm 0755 pkg/old/suse/salt-syndic %{buildroot}%{_initddir}/salt-syndic
-install -Dpm 0755 pkg/old/suse/salt-minion %{buildroot}%{_initddir}/salt-minion
-install -Dpm 0755 pkg/old/suse/salt-api %{buildroot}%{_initddir}/salt-api
-ln -sf %{_initddir}/salt-master %{buildroot}%{_sbindir}/rcsalt-master
-ln -sf %{_initddir}/salt-syndic %{buildroot}%{_sbindir}/rcsalt-syndic
-ln -sf %{_initddir}/salt-minion %{buildroot}%{_sbindir}/rcsalt-minion
-ln -sf %{_initddir}/salt-api %{buildroot}%{_sbindir}/rcsalt-api
-%endif
-
-## 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
-%endif 
+%endif
 
 #
 ## install config files
@@ -935,14 +886,9 @@ dbus-uuidgen --ensure
 %if %{with systemd}
 %if 0%{?suse_version}
 %service_add_post salt-proxy@.service
-%fillup_only
 %else
 %systemd_post salt-proxy@.service
 %endif
-%else
-%if 0%{?suse_version}
-%fillup_and_insserv
-%endif
 %endif
 
 %postun proxy
@@ -952,11 +898,6 @@ dbus-uuidgen --ensure
 %else
 %systemd_postun_with_restart salt-proxy@.service
 %endif
-%else
-%if 0%{?suse_version}
-%insserv_cleanup
-%restart_on_update salt-proxy
-%endif
 %endif
 
 %preun syndic
@@ -966,15 +907,6 @@ dbus-uuidgen --ensure
 %else
 %systemd_preun salt-syndic.service
 %endif
-%else
-%if 0%{?suse_version}
-%stop_on_removal salt-syndic
-%else
-  if [ $1 -eq 0 ] ; then
-      /sbin/service salt-syndic stop >/dev/null 2>&1
-      /sbin/chkconfig --del salt-syndic
-  fi
-%endif
 %endif
 
 %pre syndic
@@ -988,14 +920,9 @@ dbus-uuidgen --ensure
 %if %{with systemd}
 %if 0%{?suse_version}
 %service_add_post salt-syndic.service
-%fillup_only
 %else
 %systemd_post salt-syndic.service
 %endif
-%else
-%if 0%{?suse_version}
-%fillup_and_insserv
-%endif
 %endif
 
 %postun syndic
@@ -1005,11 +932,6 @@ dbus-uuidgen --ensure
 %else
 %systemd_postun_with_restart salt-syndic.service
 %endif
-%else
-%if 0%{?suse_version}
-%insserv_cleanup
-%restart_on_update salt-syndic
-%endif
 %endif
 
 %preun master
@@ -1019,15 +941,6 @@ dbus-uuidgen --ensure
 %else
 %systemd_preun salt-master.service
 %endif
-%else
-%if 0%{?suse_version}
-%stop_on_removal salt-master
-%else
-  if [ $1 -eq 0 ] ; then
-      /sbin/service salt-master stop >/dev/null 2>&1
-      /sbin/chkconfig --del salt-master
-  fi
-%endif
 %endif
 
 %pre master
@@ -1063,16 +976,9 @@ if [ "${systemd_ver%%.*}" -lt 228 ]; the
 fi
 %if 0%{?suse_version}
 %service_add_post salt-master.service
-%fillup_only
 %else
 %systemd_post salt-master.service
 %endif
-%else
-%if 0%{?suse_version}
-%fillup_and_insserv
-%else
-  /sbin/chkconfig --add salt-master
-%endif
 %endif
 
 %postun master
@@ -1082,15 +988,6 @@ fi
 %else
 %systemd_postun_with_restart salt-master.service
 %endif
-%else
-%if 0%{?suse_version}
-%restart_on_update salt-master
-%insserv_cleanup
-%else
-  if [ "$1" -ge "1" ] ; then
-      /sbin/service salt-master condrestart >/dev/null 2>&1 || :
-  fi
-%endif
 %endif
 
 %preun minion
@@ -1100,15 +997,6 @@ fi
 %else
 %systemd_preun salt-minion.service
 %endif
-%else
-%if 0%{?suse_version}
-%stop_on_removal salt-minion
-%else
-  if [ $1 -eq 0 ] ; then
-      /sbin/service salt-minion stop >/dev/null 2>&1
-      /sbin/chkconfig --del salt-minion
-  fi
-%endif
 %endif
 
 %pre minion
@@ -1122,16 +1010,9 @@ fi
 %if %{with systemd}
 %if 0%{?suse_version}
 %service_add_post salt-minion.service
-%fillup_only
 %else
 %systemd_post salt-minion.service
 %endif
-%else
-%if 0%{?suse_version}
-%fillup_and_insserv
-%else
-  /sbin/chkconfig --add salt-minion
-%endif
 %endif
 
 %postun minion
@@ -1141,15 +1022,6 @@ fi
 %else
 %systemd_postun_with_restart salt-minion.service
 %endif
-%else
-%if 0%{?suse_version}
-%insserv_cleanup
-%restart_on_update salt-minion
-%else
-  if [ "$1" -ge "1" ] ; then
-      /sbin/service salt-minion condrestart >/dev/null 2>&1 || :
-  fi
-%endif
 %endif
 
 %preun api
@@ -1177,10 +1049,6 @@ fi
 %else
 %systemd_post salt-api.service
 %endif
-%else
-%if 0%{?suse_version}
-%fillup_and_insserv
-%endif
 %endif
 
 %postun api
@@ -1190,11 +1058,6 @@ fi
 %else
 %systemd_postun_with_restart salt-api.service
 %endif
-%else
-%if 0%{?suse_version}
-%insserv_cleanup
-%restart_on_update
-%endif
 %endif
 
 %posttrans -n python3-salt
@@ -1205,11 +1068,9 @@ rm -f %{_localstatedir}/cache/salt/minio
 %files api
 %defattr(-,root,root)
 %{_bindir}/salt-api
-%{_sbindir}/rcsalt-api
 %if %{with systemd}
+%{_sbindir}/rcsalt-api
 %{_unitdir}/salt-api.service
-%else
-%{_initddir}/salt-api
 %endif
 %{_mandir}/man1/salt-api.1.*
 
@@ -1235,11 +1096,9 @@ rm -f %{_localstatedir}/cache/salt/minio
 %defattr(-,root,root)
 %{_bindir}/salt-syndic
 %{_mandir}/man1/salt-syndic.1.gz
-%{_sbindir}/rcsalt-syndic
 %if %{with systemd}
+%{_sbindir}/rcsalt-syndic
 %{_unitdir}/salt-syndic.service
-%else
-%{_initddir}/salt-syndic
 %endif
 
 %files minion
@@ -1251,7 +1110,9 @@ rm -f %{_localstatedir}/cache/salt/minio
 %dir               %attr(0750, root, root) %{_sysconfdir}/salt/minion.d/
 %dir               %attr(0750, root, root) %{_sysconfdir}/salt/pki/minion/
 %dir               %attr(0750, root, root) %{_localstatedir}/cache/salt/minion/
+%if %{with systemd}
 %{_sbindir}/rcsalt-minion
+%endif
 
 # Install plugin only on SUSE machines
 %if 0%{?suse_version}
@@ -1272,13 +1133,6 @@ rm -f %{_localstatedir}/cache/salt/minio
 
 %if %{with systemd}
 %{_unitdir}/salt-minion.service
-%else
-%config(noreplace) %{_initddir}/salt-minion
-%endif
-
-## Install sysV salt-minion watchdog for SLES11 and RHEL6
-%if 0%{?rhel} == 6 || 0%{?suse_version} == 1110
-%{_bindir}/salt-daemon-watcher
 %endif
 
 %files proxy
@@ -1304,11 +1158,9 @@ rm -f %{_localstatedir}/cache/salt/minio
 %if 0%{?suse_version} <= 1500
 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt
 %endif
-%{_sbindir}/rcsalt-master
 %if %{with systemd}
+%{_sbindir}/rcsalt-master
 %{_unitdir}/salt-master.service
-%else
-%config(noreplace) %{_initddir}/salt-master
 %endif
 #
 %config(noreplace) %attr(0640, root, salt) %{_sysconfdir}/salt/master
@@ -1405,7 +1257,4 @@ rm -f %{_localstatedir}/cache/salt/minio
 %defattr(-,root,root)
 %config(noreplace) %attr(0640, root, root) %{_sysconfdir}/salt/minion.d/transactional_update.conf
 
-
 %changelog
-
-

Places

File project.diff of Package salt (Revision 421ddfca3d68a21623983e1d324b725f)

Places