- (djm) Add "static_openssl" RPM build option, remove rsh build dependency

diff --git a/ChangeLog b/ChangeLog
index 0611339160eef5ef6c1eb58a9e222e428378b6e5..1346dda5bb75b22eb39d9cfd2a416d274e88e60e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@
      remove -v again. use -B instead for bubblebabble. make -B consistent
      with -l and make -B work with /path/to/known_hosts. ok deraadt@
  - (djm) Bump portable version number for generating test RPMs
+ - (djm) Add "static_openssl" RPM build option, remove rsh build dependency
 
 20010311
  - OpenBSD CVS Sync
@@ -4523,4 +4524,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.948 2001/03/12 03:23:52 djm Exp $
+$Id: ChangeLog,v 1.949 2001/03/12 03:47:30 djm Exp $

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 1e7b21bf5136b935deb7d850ff2fb26c4a4c3ad2..d31115807b17b30ab429313be17d90ae9253357c 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -10,6 +10,9 @@
 # Do we want to disable building of gnome-askpass? (1=yes 0=no)
 %define no_gnome_askpass 0
 
+# Do we want to link against a static libcrypto? (1=yes 0=no)
+%define static_libcrypto 0
+
 # Use Redhat 7.0 pam control file
 %define redhat7 0
 
@@ -22,6 +25,10 @@
 # rpm -ba|--rebuild --define "rh7 1"
 %{?rh7:%define redhat7 1}
 
+# Options for static OpenSSL link:
+# rpm -ba|--rebuild --define "static_openssl 1"
+%{?static_openssl:%define static_libcrypto 1}
+
 %define exact_openssl_version   %(rpm -q openssl | cut -d - -f 2)
 
 Summary: OpenSSH free Secure Shell (SSH) implementation
@@ -38,16 +45,18 @@ Copyright: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{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
-BuildPreReq: /bin/login, /usr/bin/rsh, /usr/include/security/pam_appl.h
+BuildPreReq: /bin/login, /usr/include/security/pam_appl.h
 BuildPreReq: rpm >= 3.0.5
 %if ! %{no_gnome_askpass}
 BuildPreReq: gnome-libs-devel
 %endif
+%if ! %{static_libcrypto}
+PreReq: openssl >= 0.9.5a
+PreReq: openssl = %{exact_openssl_version}
+Requires: openssl >= 0.9.5a
+%endif
+Requires: rpm >= 3.0.5
 
 %package clients
 Summary: OpenSSH Secure Shell protocol clients
@@ -167,6 +176,10 @@ This package contains the GNOME passphrase dialog.
        --with-rsh=/usr/bin/rsh \
        --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
 
+%if %{static_libcrypto}
+perl -pi -e "s|-lcrypto|/usr/lib/libcrypto.a|g" Makefile
+%endif
+
 make
 
 %if ! %{no_x11_askpass}