Accepting request 835301 from home:jengelh:branches:network

(re)based onto//includes 835039


- Move some Requires to the right subpackage.

OBS-URL: https://build.opensuse.org/request/show/835301
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=214

openssh-askpass-gnome.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 17 20:41:39 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Upgrade some old specfile constructs/macros.
+
 -------------------------------------------------------------------
 Thu Sep 10 22:44:00 UTC 2020 - Hans Petter Jansson <hpj@suse.com>
 

openssh-askpass-gnome.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package openssh-askpass-gnome
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,15 +40,15 @@ for executing commands on a remote machine. This package contains a
 GNOME-based passphrase dialog for OpenSSH.
 
 %prep
-%setup -q -n %{_name}-%{version}
+%autosetup -p1 -n %{_name}-%{version}
 
 %build
 cd contrib
 export CFLAGS="%{optflags}"
 %if 0%{?suse_version} >= 1550
-make %{?_smp_mflags} gnome-ssh-askpass3
+%make_build gnome-ssh-askpass3
 %else
-make %{?_smp_mflags} gnome-ssh-askpass2
+%make_build gnome-ssh-askpass2
 %endif
 
 %install

openssh.changes

@@ -1,9 +1,19 @@
+-------------------------------------------------------------------
+Thu Sep 17 20:41:39 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Move some Requires to the right subpackage.
+- Avoid ">&" bashism in %post.
+- Upgrade some old specfile constructs/macros and drop unnecessary
+  %{?systemd_*}.
+- Trim descriptions and straighten out the grammar.
+
 -------------------------------------------------------------------
 Thu Sep 10 21:38:30 UTC 2020 - Hans Petter Jansson <hpj@suse.com>
 
-- Split openssh package into openssh, openssh-server and
+- Split openssh package into openssh, openssh-common,
-  openssh-clients. This allows for the ssh clients to be installed
+  openssh-server and openssh-clients. This allows for the ssh
-  without the server component (bsc#1176434).
+  clients to be installed without the server component
+  (bsc#1176434).
 
 -------------------------------------------------------------------
 Fri Jun  5 00:36:08 UTC 2020 - Hans Petter Jansson <hpj@suse.com>

openssh.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package openssh
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -113,17 +113,8 @@ BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(libfido2)
 BuildRequires:  pkgconfig(libsystemd)
-Requires(post): %fillup_prereq
+Requires:       %{name}-clients = %{version}-%{release}
-Requires(pre):  shadow
+Requires:       %{name}-server = %{version}-%{release}
-PreReq:         permissions
-Recommends:     %{name}-server = %{version}-%{release}
-Recommends:     %{name}-clients = %{version}-%{release}
-Recommends:     %{name}-helpers = %{version}-%{release}
-Recommends:     audit
-Conflicts:      %{name}-fips < %{version}-%{release}
-Conflicts:      %{name}-fips > %{version}-%{release}
-Conflicts:      nonfreessh
-%{?systemd_requires}
 %if %{with tirpc}
 BuildRequires:  libtirpc-devel
 %endif
@@ -135,58 +126,112 @@ BuildRequires:  krb5-mini-devel
 
 %description
 SSH (Secure Shell) is a program for logging into and executing commands
-on a remote machine. It is intended to replace rsh (rlogin and rsh) and
+on a remote machine. It replaces rsh (rlogin and rsh) and
-provides openssl (secure encrypted communication) between two untrusted
+provides a secure encrypted communication between two untrusted
 hosts over an insecure network.
 
 xorg-x11 (X Window System) connections and arbitrary TCP/IP ports can
 also be forwarded over the secure channel.
 
+This is a dummy package that pulls in both the client and server
+components.
+
+%package common
+Summary:        SSH (Secure Shell) common files
+Group:          Productivity/Networking/SSH
+Conflicts:      nonfreessh
+Conflicts:      %{name}-fips < %{version}-%{release}
+Conflicts:      %{name}-fips > %{version}-%{release}
+
+%description common
+SSH (Secure Shell) is a program for logging into and executing commands
+on a remote machine. It replaces rsh (rlogin and rsh) and
+provides a secure encrypted communication between two untrusted
+hosts over an insecure network.
+
+xorg-x11 (X Window System) connections and arbitrary TCP/IP ports can
+also be forwarded over the secure channel.
+
+This package contains common files for the Secure Shell server and
+clients.
+
 %package server
 Summary:        SSH (Secure Shell) server
 Group:          Productivity/Networking/SSH
-Requires:       openssh = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Recommends:     audit
+Requires(pre):  shadow
+Requires(post): %fillup_prereq
+Requires(post): permissions
+Provides:       openssh:%{_sbindir}/sshd
 
 %description server
-The SSH (Secure Shell) daemon allows clients to securely connect to your
+SSH (Secure Shell) is a program for logging into and executing commands
-server.
+on a remote machine. It replaces rsh (rlogin and rsh) and
+provides a secure encrypted communication between two untrusted
+hosts over an insecure network.
+
+xorg-x11 (X Window System) connections and arbitrary TCP/IP ports can
+also be forwarded over the secure channel.
+
+This package contains the Secure Shell daemon, which allows clients to
+securely connect to your server.
 
 %package clients
 Summary:        SSH (Secure Shell) client applications
 Group:          Productivity/Networking/SSH
-Requires:       openssh = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Provides:       openssh:%{_bindir}/ssh
 
 %description clients
-This package contains clients for making secure connections to SSH (Secure
+SSH (Secure Shell) is a program for logging into and executing commands
-Shell) servers.
+on a remote machine. It replaces rsh (rlogin and rsh) and
+provides a secure encrypted communication between two untrusted
+hosts over an insecure network.
+
+xorg-x11 (X Window System) connections and arbitrary TCP/IP ports can
+also be forwarded over the secure channel.
+
+This package contains clients for making secure connections to Secure
+Shell servers.
 
 %package helpers
 Summary:        OpenSSH AuthorizedKeysCommand helpers
 Group:          Productivity/Networking/SSH
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
 
 %description helpers
-Helper applications for OpenSSH which retrieve keys from various sources.
+SSH (Secure Shell) is a program for logging into and executing commands
+on a remote machine. It replaces rsh (rlogin and rsh) and
+provides a secure encrypted communication between two untrusted
+hosts over an insecure network.
+
+xorg-x11 (X Window System) connections and arbitrary TCP/IP ports can
+also be forwarded over the secure channel.
+
+This package contains helper applications for OpenSSH which retrieve
+keys from various sources.
 
 %package fips
-Summary:        OpenSSH FIPS cryptomodule HMACs
+Summary:        OpenSSH FIPS crypto module HMACs
 Group:          Productivity/Networking/SSH
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
-Conflicts:      %{name} < %{version}-%{release}
+Conflicts:      %{name}-common < %{version}-%{release}
-Conflicts:      %{name} > %{version}-%{release}
+Conflicts:      %{name}-common > %{version}-%{release}
 Obsoletes:      %{name}-hmac
 
 %description fips
-Hashes that together with the main package form the FIPS certifiable
+This package contains hashes that, together with the main openssh packages,
-cryptomodule.
+form the FIPS certifiable crypto module.
 
 %package cavs
-Summary:        OpenSSH FIPS cryptomodule CAVS tests
+Summary:        OpenSSH FIPS crypto module CAVS tests
 Group:          Productivity/Networking/SSH
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
 
 %description cavs
-FIPS140 CAVS tests related parts of the OpenSSH package
+This package contains the FIPS140 CAVS (Cryptographic Algorithm
+Validation Program/Suite) related tests of OpenSSH.
 
 %prep
 %setup -q
@@ -305,7 +350,7 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d %{_localstate
 # The openssh-fips trigger script for openssh will normally restart sshd once
 # it gets installed, so only restart the service here is openssh-fips is not
 # present
-rpm -q openssh-fips >& /dev/null && DISABLE_RESTART_ON_UPDATE=yes
+rpm -q openssh-fips >/dev/null 2>/dev/null && DISABLE_RESTART_ON_UPDATE=yes
 %service_del_postun sshd.service
 
 %triggerin -n openssh-fips -- %{name} = %{version}-%{release}
@@ -315,6 +360,11 @@ rpm -q openssh-fips >& /dev/null && DISABLE_RESTART_ON_UPDATE=yes
 %verify_permissions -e %{_sysconfdir}/ssh/sshd_config
 
 %files
+# openssh is an empty package that depends on -clients and -server,
+# resulting in a clean upgrade path from prior to the split even when
+# recommends are disabled.
+
+%files common
 %license LICENCE
 %doc README.SUSE README.kerberos README.FIPS ChangeLog OVERVIEW README TODO CREDITS
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh