From f716c85e713a732d49d9c63e95e84a46c233f7fa6499a70bb732b9dddead3b91 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Tue, 19 Dec 2023 01:39:20 +0000 Subject: [PATCH] Accepting request 1113799 from home:kukuk:branches:network - Disable SLP by default for Factory and ALP (bsc#1214884) OBS-URL: https://build.opensuse.org/request/show/1113799 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=253 --- openssh.changes | 5 +++++ openssh.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/openssh.changes b/openssh.changes index 087e2d3..771ff28 100644 --- a/openssh.changes +++ b/openssh.changes @@ -28,6 +28,11 @@ Tue Oct 24 10:56:31 UTC 2023 - Dominique Leuenberger - Add cb4ed12f.patch: Fix build using zlib 1.3. The check expected a version in the form a.b.c[.d], which no longer matches 1.3. +------------------------------------------------------------------- +Wed Sep 27 06:28:57 UTC 2023 - Thorsten Kukuk + +- Disable SLP by default for Factory and ALP (bsc#1214884) + ------------------------------------------------------------------- Fri Jul 21 02:48:58 UTC 2023 - Simon Lees diff --git a/openssh.spec b/openssh.spec index 0fa5302..f39e348 100644 --- a/openssh.spec +++ b/openssh.spec @@ -349,8 +349,10 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/sshd install -d -m 755 %{buildroot}%{_localstatedir}/lib/sshd install -d -m 755 %{buildroot}%{_sysconfdir}/ssh/ssh_config.d install -d -m 755 %{buildroot}%{_sysconfdir}/ssh/sshd_config.d +%if 0%{?suse_version} < 1600 install -d -m 755 %{buildroot}%{_sysconfdir}/slp.reg.d/ install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/slp.reg.d/ +%endif install -D -m 0644 %{SOURCE10} %{buildroot}%{_unitdir}/sshd.service ln -s service %{buildroot}%{_sbindir}/rcsshd install -d -m 755 %{buildroot}%{_fillupdir} @@ -500,8 +502,10 @@ test -f /etc/ssh/ssh_config.rpmsave && mv -v /etc/ssh/ssh_config.rpmsave /etc/ss %attr(0444,root,root) %{_mandir}/man8/sftp-server.8* %attr(0444,root,root) %{_mandir}/man8/sshd.8* %attr(0755,root,root) %{_libexecdir}/ssh/sftp-server +%if 0%{?suse_version} < 1600 %dir %{_sysconfdir}/slp.reg.d %config %{_sysconfdir}/slp.reg.d/ssh.reg +%endif %{_fillupdir}/sysconfig.ssh %if 0%{?suse_version} < 1550 %dir %{_fwdir}