summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-03-12 14:47:30 +1100
committerDamien Miller <djm@mindrot.org>2001-03-12 14:47:30 +1100
commit3e292fab40a750b64e86695bd6626c67eedd25df (patch)
treefccedc6e027e639bc471556d9e3b1179fef9201e /contrib
parent547c27620326710ce595692d2eba6c7f84e73343 (diff)
- (djm) Add "static_openssl" RPM build option, remove rsh build dependency
Diffstat (limited to 'contrib')
-rw-r--r--contrib/redhat/openssh.spec23
1 files changed, 18 insertions, 5 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 1e7b21bf..d3111580 100644
--- 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}