summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--contrib/redhat/openssh.spec18
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c24f02152..9e3cc2c33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
6 on Ben's work 6 on Ben's work
7 - (djm) Specify --datadir in RPM spec files so smartcard applet gets 7 - (djm) Specify --datadir in RPM spec files so smartcard applet gets
8 put somewhere sane. Add Ssh.bin to manifest. 8 put somewhere sane. Add Ssh.bin to manifest.
9 - (djm) Make smartcard support conditional in Redhat RPM spec
9 10
1020010917 1120010917
11 - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds 12 - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
@@ -6466,4 +6467,4 @@
6466 - Wrote replacements for strlcpy and mkdtemp 6467 - Wrote replacements for strlcpy and mkdtemp
6467 - Released 1.0pre1 6468 - Released 1.0pre1
6468 6469
6469$Id: ChangeLog,v 1.1529 2001/09/18 05:12:10 djm Exp $ 6470$Id: ChangeLog,v 1.1530 2001/09/18 05:33:07 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index ca1c20d1d..2cda144a2 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -13,6 +13,9 @@
13# Do we want to link against a static libcrypto? (1=yes 0=no) 13# Do we want to link against a static libcrypto? (1=yes 0=no)
14%define static_libcrypto 0 14%define static_libcrypto 0
15 15
16# Do we want smartcard support (1=yes 0=no)
17%define scard 0
18
16# Use Redhat 7.0 pam control file 19# Use Redhat 7.0 pam control file
17%define redhat7 0 20%define redhat7 0
18 21
@@ -29,6 +32,10 @@
29# rpm -ba|--rebuild --define "static_openssl 1" 32# rpm -ba|--rebuild --define "static_openssl 1"
30%{?static_openssl:%define static_libcrypto 1} 33%{?static_openssl:%define static_libcrypto 1}
31 34
35# Options for Smartcard support: (needs libsectok and openssl-engine)
36# rpm -ba|--rebuild --define "smartcard 1"
37%{?smartcard:%define scard 1}
38
32%define exact_openssl_version %(rpm -q openssl | cut -d - -f 2) 39%define exact_openssl_version %(rpm -q openssl | cut -d - -f 2)
33 40
34Summary: The OpenSSH implementation of SSH. 41Summary: The OpenSSH implementation of SSH.
@@ -137,6 +144,12 @@ GNOME GUI desktop environment.
137 144
138%define _sysconfdir /etc/ssh 145%define _sysconfdir /etc/ssh
139 146
147EXTRA_OPTS=""
148
149%if %{smartcard}
150 EXTRA_OPTS="$EXTRA_OPTS --with-smartcard"
151%endif
152
140%configure \ 153%configure \
141 --libexecdir=%{_libexecdir}/openssh \ 154 --libexecdir=%{_libexecdir}/openssh \
142 --datadir=%{_datadir}/openssh \ 155 --datadir=%{_datadir}/openssh \
@@ -144,7 +157,8 @@ GNOME GUI desktop environment.
144 --with-tcp-wrappers \ 157 --with-tcp-wrappers \
145 --with-ipv4-default \ 158 --with-ipv4-default \
146 --with-rsh=/usr/bin/rsh \ 159 --with-rsh=/usr/bin/rsh \
147 --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin 160 --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin \
161 $EXTRA_OPTS
148 162
149%if %{static_libcrypto} 163%if %{static_libcrypto}
150perl -pi -e "s|-lcrypto|/usr/lib/libcrypto.a|g" Makefile 164perl -pi -e "s|-lcrypto|/usr/lib/libcrypto.a|g" Makefile
@@ -223,8 +237,10 @@ fi
223%attr(0755,root,root) %dir %{_sysconfdir} 237%attr(0755,root,root) %dir %{_sysconfdir}
224%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli 238%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli
225%attr(0755,root,root) %dir %{_libexecdir}/openssh 239%attr(0755,root,root) %dir %{_libexecdir}/openssh
240%if %{smartcard}
226%attr(0755,root,root) %dir %{_datadir}/openssh 241%attr(0755,root,root) %dir %{_datadir}/openssh
227%attr(0644,root,root) %{_datadir}/openssh/Ssh.bin 242%attr(0644,root,root) %{_datadir}/openssh/Ssh.bin
243%endif
228 244
229%files clients 245%files clients
230%defattr(-,root,root) 246%defattr(-,root,root)