summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--contrib/redhat/openssh.spec7
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 @@
120010224
2 - (bal) pam_stack fix to correctly detect between RH7 and older RHs.
3 Patch by Pekka Savola <pekkas@netcore.fi>
4
120010223 520010223
2 - (bal) Fix --define rh7 in openssh.spec file. Patch by Steve Tell 6 - (bal) Fix --define rh7 in openssh.spec file. Patch by Steve Tell
3 <tell@telltronics.org> 7 <tell@telltronics.org>
@@ -4106,4 +4110,4 @@
4106 - Wrote replacements for strlcpy and mkdtemp 4110 - Wrote replacements for strlcpy and mkdtemp
4107 - Released 1.0pre1 4111 - Released 1.0pre1
4108 4112
4109$Id: ChangeLog,v 1.815 2001/02/23 05:05:53 mouring Exp $ 4113$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
36%endif 36%endif
37Copyright: BSD 37Copyright: BSD
38Group: Applications/Internet 38Group: Applications/Internet
39BuildRoot: /tmp/openssh-%{version}-buildroot 39BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
40Obsoletes: ssh 40Obsoletes: ssh
41PreReq: openssl >= 0.9.5a 41PreReq: openssl >= 0.9.5a
42RreReq: openssl = %{exact_openssl_version} 42PreReq: openssl = %{exact_openssl_version}
43Requires: openssl >= 0.9.5a 43Requires: openssl >= 0.9.5a
44Requires: rpm >= 3.0.5 44Requires: rpm >= 3.0.5
45BuildPreReq: perl, openssl-devel, tcp_wrappers 45BuildPreReq: perl, openssl-devel, tcp_wrappers
@@ -61,6 +61,9 @@ Group: System Environment/Daemons
61Obsoletes: ssh-server 61Obsoletes: ssh-server
62PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9 62PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9
63Requires: initscripts >= 4.16 63Requires: initscripts >= 4.16
64%if %{redhat7}
65Requires: /etc/pam.d/system-auth
66%endif
64 67
65%package askpass 68%package askpass
66Summary: OpenSSH X11 passphrase dialog 69Summary: OpenSSH X11 passphrase dialog