From 65981156b8fb16b52903d42bd138ca4c095f9e0b Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Sat, 24 Feb 2001 00:05:29 +0000 Subject: [PATCH] - (bal) pam_stack fix to correctly detect between RH7 and older RHs. Patch by Pekka Savola --- ChangeLog | 6 +++++- contrib/redhat/openssh.spec | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a03d77e2c..cf708e5fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20010224 + - (bal) pam_stack fix to correctly detect between RH7 and older RHs. + Patch by Pekka Savola + 20010223 - (bal) Fix --define rh7 in openssh.spec file. Patch by Steve Tell @@ -4106,4 +4110,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.815 2001/02/23 05:05:53 mouring Exp $ +$Id: ChangeLog,v 1.816 2001/02/24 00:05:29 mouring Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index b7c25159d..f27cc5504 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -36,10 +36,10 @@ Source1: http://www.jmknoble.cx/software/x11-ssh-askpass/x11-ssh-askpass-%{avers %endif Copyright: BSD Group: Applications/Internet -BuildRoot: /tmp/openssh-%{version}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Obsoletes: ssh PreReq: openssl >= 0.9.5a -RreReq: openssl = %{exact_openssl_version} +PreReq: openssl = %{exact_openssl_version} Requires: openssl >= 0.9.5a Requires: rpm >= 3.0.5 BuildPreReq: perl, openssl-devel, tcp_wrappers @@ -61,6 +61,9 @@ Group: System Environment/Daemons Obsoletes: ssh-server PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9 Requires: initscripts >= 4.16 +%if %{redhat7} +Requires: /etc/pam.d/system-auth +%endif %package askpass Summary: OpenSSH X11 passphrase dialog