Attached are a few enhancements: 1) Jim Knoble's addresses 2) /etc/profile.d referred to with %{_sysconfdir}/profile everywhere 3) move reload under a new function for consistency. Also: should %makeinstall used instead of make install? (note that the keys are generated if DESTDIR exists -- no matter though as they aren't in %files) %changelog says openssl should now be require, no prereq. This wasn't changed.
Created attachment 10720 [details] minor fixes
This defect is considered MUST-FIX for Florence Release-Candidate #2
Also add: @@ -22,6 +22,8 @@ # rpm -ba|--rebuild --define "rh7 1" %{?rh7:%define redhat7 1} +%define exact_openssl_version %(rpm -q openssl | cut -d - -f 2) + Summary: OpenSSH free Secure Shell (SSH) implementation Name: openssh Version: %{oversion} @@ -37,6 +39,7 @@ BuildRoot: /tmp/openssh-%{version}-buildroot Obsoletes: ssh PreReq: openssl >= 0.9.5a +PreReq: openssl = %{exact_openssl_version} Requires: openssl >= 0.9.5a Requires: rpm >= 3.0.5 BuildPreReq: perl, openssl-devel, tcp_wrappers .. else there will be tons of bogus errors when people upgrade to openssl-0.9.6 when they shouldn't.
Changes to the init script, X11 askpass, and Jim's email will be pulled into 2.5.1p1-4. We can't add libcrypt to the link line, because OpenSSL normally provides a crypt() implementation as well, and static linking could break this. Using %makeinstall wouldn't help here -- setting it to "/" doesn't skip generation of the host key, but using DESTDIR saves us from having to specify the libexecdir and sysconfdir more than once.