From 7e9d04698628fb536f09dc7a63d48cc7ff04022f Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 7 Sep 2020 09:37:51 +0200 Subject: [PATCH] Remove support for building rescue CD This is not used for close to 20 years and is broken at least from Fedora 31 --- openssh.spec | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/openssh.spec b/openssh.spec index 0dfb17f..e6fb8be 100644 --- a/openssh.spec +++ b/openssh.spec @@ -49,18 +49,6 @@ # rpm -ba|--rebuild --define "static_openssl 1" %{?static_openssl:%global static_libcrypto 1} -# Is this a build for the rescue CD (without PAM, with MD5)? (1=yes 0=no) -%global rescue 0 -%{?build_rescue:%global rescue 1} -%{?build_rescue:%global rescue_rel rescue} - -# Turn off some stuff for resuce builds -%if %{rescue} -%global kerberos5 0 -%global libedit 0 -%global pam_ssh_agent 0 -%endif - # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1 %global openssh_ver 8.3p1 %global openssh_rel 4 @@ -70,7 +58,7 @@ Summary: An open source implementation of SSH protocol version 2 Name: openssh Version: %{openssh_ver} -Release: %{openssh_rel}%{?dist}%{?rescue_rel} +Release: %{openssh_rel}%{?dist} URL: http://www.openssh.com/portable.html #URL1: http://pamsshagentauth.sourceforge.net Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz @@ -284,7 +272,7 @@ Requires: openssh = %{version}-%{release} %package -n pam_ssh_agent_auth Summary: PAM module for authentication with ssh-agent Version: %{pam_ssh_agent_ver} -Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist}%{?rescue_rel}.1 +Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist}.1 License: BSD %description @@ -411,9 +399,6 @@ popd # the -fvisibility=hidden is needed for clean build of the pam_ssh_agent_auth # it is needed for lib(open)ssh build too since it is linked to the pam module too CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden"; export CFLAGS -%if %{rescue} -CFLAGS="$CFLAGS -Os" -%endif %if %{pie} %ifarch s390 s390x sparc sparcv9 sparc64 CFLAGS="$CFLAGS -fPIC" @@ -459,11 +444,7 @@ fi --with-systemd \ --with-default-pkcs11-provider=yes \ --with-security-key-builtin=yes \ -%if %{rescue} - --without-pam \ -%else --with-pam \ -%endif %if %{WITH_SELINUX} --with-selinux --with-audit=linux \ --with-sandbox=seccomp_filter \ @@ -608,13 +589,11 @@ test -f %{sysconfig_anaconda} && \ %doc CREDITS ChangeLog OVERVIEW PROTOCOL* README README.platform README.privsep README.tun README.dns TODO %attr(0755,root,root) %dir %{_sysconfdir}/ssh %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli -%if ! %{rescue} %attr(0755,root,root) %{_bindir}/ssh-keygen %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* %attr(0755,root,root) %dir %{_libexecdir}/openssh %attr(2555,root,ssh_keys) %{_libexecdir}/openssh/ssh-keysign %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* -%endif %files clients %attr(0755,root,root) %{_bindir}/ssh @@ -625,7 +604,6 @@ test -f %{sysconfig_anaconda} && \ %dir %attr(0755,root,root) %{_sysconfdir}/ssh/ssh_config.d/ %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config.d/50-redhat.conf %attr(0644,root,root) %{_mandir}/man5/ssh_config.5* -%if ! %{rescue} %attr(0755,root,root) %{_bindir}/ssh-agent %attr(0755,root,root) %{_bindir}/ssh-add %attr(0755,root,root) %{_bindir}/ssh-keyscan @@ -640,9 +618,7 @@ test -f %{sysconfig_anaconda} && \ %attr(0644,root,root) %{_mandir}/man1/ssh-copy-id.1* %attr(0644,root,root) %{_mandir}/man8/ssh-pkcs11-helper.8* %attr(0644,root,root) %{_mandir}/man8/ssh-sk-helper.8* -%endif -%if ! %{rescue} %files server %dir %attr(0711,root,root) %{_var}/empty/sshd %attr(0755,root,root) %{_sbindir}/sshd @@ -663,7 +639,6 @@ test -f %{sysconfig_anaconda} && \ %attr(0644,root,root) %{_unitdir}/sshd-keygen@.service %attr(0644,root,root) %{_unitdir}/sshd-keygen.target %attr(0644,root,root) %{_tmpfilesdir}/openssh.conf -%endif %files keycat %doc HOWTO.ssh-keycat