summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--contrib/redhat/openssh.spec23
2 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 061133916..1346dda5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@
30 remove -v again. use -B instead for bubblebabble. make -B consistent 30 remove -v again. use -B instead for bubblebabble. make -B consistent
31 with -l and make -B work with /path/to/known_hosts. ok deraadt@ 31 with -l and make -B work with /path/to/known_hosts. ok deraadt@
32 - (djm) Bump portable version number for generating test RPMs 32 - (djm) Bump portable version number for generating test RPMs
33 - (djm) Add "static_openssl" RPM build option, remove rsh build dependency
33 34
3420010311 3520010311
35 - OpenBSD CVS Sync 36 - OpenBSD CVS Sync
@@ -4523,4 +4524,4 @@
4523 - Wrote replacements for strlcpy and mkdtemp 4524 - Wrote replacements for strlcpy and mkdtemp
4524 - Released 1.0pre1 4525 - Released 1.0pre1
4525 4526
4526$Id: ChangeLog,v 1.948 2001/03/12 03:23:52 djm Exp $ 4527$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 1e7b21bf5..d31115807 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -10,6 +10,9 @@
10# Do we want to disable building of gnome-askpass? (1=yes 0=no) 10# Do we want to disable building of gnome-askpass? (1=yes 0=no)
11%define no_gnome_askpass 0 11%define no_gnome_askpass 0
12 12
13# Do we want to link against a static libcrypto? (1=yes 0=no)
14%define static_libcrypto 0
15
13# Use Redhat 7.0 pam control file 16# Use Redhat 7.0 pam control file
14%define redhat7 0 17%define redhat7 0
15 18
@@ -22,6 +25,10 @@
22# rpm -ba|--rebuild --define "rh7 1" 25# rpm -ba|--rebuild --define "rh7 1"
23%{?rh7:%define redhat7 1} 26%{?rh7:%define redhat7 1}
24 27
28# Options for static OpenSSL link:
29# rpm -ba|--rebuild --define "static_openssl 1"
30%{?static_openssl:%define static_libcrypto 1}
31
25%define exact_openssl_version %(rpm -q openssl | cut -d - -f 2) 32%define exact_openssl_version %(rpm -q openssl | cut -d - -f 2)
26 33
27Summary: OpenSSH free Secure Shell (SSH) implementation 34Summary: OpenSSH free Secure Shell (SSH) implementation
@@ -38,16 +45,18 @@ Copyright: BSD
38Group: Applications/Internet 45Group: Applications/Internet
39BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot 46BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
40Obsoletes: ssh 47Obsoletes: ssh
41PreReq: openssl >= 0.9.5a
42PreReq: openssl = %{exact_openssl_version}
43Requires: openssl >= 0.9.5a
44Requires: rpm >= 3.0.5
45BuildPreReq: perl, openssl-devel, tcp_wrappers 48BuildPreReq: perl, openssl-devel, tcp_wrappers
46BuildPreReq: /bin/login, /usr/bin/rsh, /usr/include/security/pam_appl.h 49BuildPreReq: /bin/login, /usr/include/security/pam_appl.h
47BuildPreReq: rpm >= 3.0.5 50BuildPreReq: rpm >= 3.0.5
48%if ! %{no_gnome_askpass} 51%if ! %{no_gnome_askpass}
49BuildPreReq: gnome-libs-devel 52BuildPreReq: gnome-libs-devel
50%endif 53%endif
54%if ! %{static_libcrypto}
55PreReq: openssl >= 0.9.5a
56PreReq: openssl = %{exact_openssl_version}
57Requires: openssl >= 0.9.5a
58%endif
59Requires: rpm >= 3.0.5
51 60
52%package clients 61%package clients
53Summary: OpenSSH Secure Shell protocol clients 62Summary: OpenSSH Secure Shell protocol clients
@@ -167,6 +176,10 @@ This package contains the GNOME passphrase dialog.
167 --with-rsh=/usr/bin/rsh \ 176 --with-rsh=/usr/bin/rsh \
168 --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin 177 --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
169 178
179%if %{static_libcrypto}
180perl -pi -e "s|-lcrypto|/usr/lib/libcrypto.a|g" Makefile
181%endif
182
170make 183make
171 184
172%if ! %{no_x11_askpass} 185%if ! %{no_x11_askpass}