diff options
| author | Fabio Pedretti <pedretti.fabio@gmail.com> | 2023-10-16 17:12:24 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-12-06 15:15:48 +0100 |
| commit | 6b9cd095565ddc5402d5096dce248fa0521dbda3 (patch) | |
| tree | f5fc772417e409b4e9ed009c34c4898e2c1c559f | |
| parent | Add new hardware-backed signing key for myself. (diff) | |
| download | openssh-6b9cd095565ddc5402d5096dce248fa0521dbda3.tar.xz openssh-6b9cd095565ddc5402d5096dce248fa0521dbda3.zip | |
Remove ancient RHL 6.x config in RPM spec.
It looks like build6x options were intended for RHL 6.x
(the Red Hat distro predating Fedora, not RHEL), but were
then applied to RHEL.
Completely remove support for this ancient configuration.
Successfully built, installed and run on RHEL 6. This also
remove a build warning about deprecation of PreReq.
| -rw-r--r-- | contrib/redhat/openssh.spec | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 802d64d18..40d4d7a79 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -23,14 +23,6 @@ # Use GTK2 instead of GNOME in gnome-ssh-askpass %global gtk2 1 -# Use build6x options for older RHEL builds -# RHEL 7 not yet supported -%if 0%{?rhel} > 6 -%global build6x 0 -%else -%global build6x 1 -%endif - %global without_openssl 0 # build without openssl where 1.1.1 is not available %if %{defined fedora} && 0%{?fedora} <= 28 @@ -53,14 +45,6 @@ # rpm -ba|--rebuild --define 'no_gtk2 1' %{?no_gtk2:%global gtk2 0} -# Is this a build for RHL 6.x or earlier? -%{?build_6x:%global build6x 1} - -# If this is RHL 6.x, the default configuration has sysconfdir in /usr/etc. -%if %{build6x} -%global _sysconfdir /etc -%endif - # Options for static OpenSSL link: # rpm -ba|--rebuild --define "static_openssl 1" %{?static_openssl:%global static_libcrypto 1} @@ -93,21 +77,13 @@ License: BSD Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Obsoletes: ssh -%if %{build6x} -PreReq: initscripts >= 5.00 -%else Requires: initscripts >= 5.20 -%endif BuildRequires: perl %if ! %{without_openssl} BuildRequires: openssl-devel >= 1.1.1 %endif BuildRequires: /bin/login -%if ! %{build6x} BuildRequires: glibc-devel, pam -%else -BuildRequires: /usr/include/security/pam_appl.h -%endif %if ! %{no_x11_askpass} BuildRequires: /usr/include/X11/Xlib.h # Xt development tools @@ -136,9 +112,7 @@ Summary: The OpenSSH server daemon. Group: System Environment/Daemons Obsoletes: ssh-server Requires: openssh = %{version}-%{release}, chkconfig >= 0.9 -%if ! %{build6x} Requires: /etc/pam.d/system-auth -%endif %package askpass Summary: A passphrase dialog for OpenSSH and X. @@ -427,6 +401,8 @@ fi - Remove reference of dropped sshd.pam.old file - Update openssl-devel dependency to require >= 1.1.1 - Build with --without-openssl elsewhere +- Remove ancient build6x config, intended for RHL 6.x + (the distro predating Fedora, not RHEL) * Thu Oct 28 2021 Damien Miller <djm@mindrot.org> - Remove remaining traces of --with-md5-passwords |