From 13cf2478d6b2ad98bcb50ae20fbea1a8119e7c6e Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Thu, 25 Oct 2012 15:39:45 +0200 Subject: [PATCH] smartcard support is replaced with PKCS#11 support already in 5.4p1 https://bugzilla.mindrot.org/show_bug.cgi?id=1371 --- openssh.spec | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/openssh.spec b/openssh.spec index 1ebafc0..e14ea9c 100644 --- a/openssh.spec +++ b/openssh.spec @@ -15,10 +15,6 @@ # Do we want to link against a static libcrypto? (1=yes 0=no) %define static_libcrypto 0 -# Do we want smartcard support (1=yes 0=no) -#Smartcard support is broken from 5.4p1 -%define scard 0 - # Use GTK2 instead of GNOME in gnome-ssh-askpass %define gtk2 1 @@ -57,10 +53,6 @@ # rpm -ba|--rebuild --define "static_openssl 1" %{?static_openssl:%global static_libcrypto 1} -# Options for Smartcard support: (needs libsectok and openssl-engine) -# rpm -ba|--rebuild --define "smartcard 1" -%{?smartcard:%global scard 1} - # Is this a build for the rescue CD (without PAM, with MD5)? (1=yes 0=no) %define rescue 0 %{?build_rescue:%global rescue 1} @@ -238,9 +230,6 @@ BuildRequires: gnome-libs-devel %endif %endif -%if %{scard} -BuildRequires: sharutils -%endif %if %{ldap} BuildRequires: openldap-devel %endif @@ -522,9 +511,6 @@ fi --with-ssl-engine \ --with-authorized-keys-command \ --with-ipaddr-display \ -%if %{scard} - --with-smartcard \ -%endif %if %{ldap} --with-ldap \ %endif @@ -631,10 +617,6 @@ install contrib/ssh-copy-id.1 $RPM_BUILD_ROOT%{_mandir}/man1/ install contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass %endif -%if ! %{scard} - rm -f $RPM_BUILD_ROOT%{_datadir}/openssh/Ssh.bin -%endif - %if ! %{no_gnome_askpass} ln -s gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ @@ -705,10 +687,6 @@ getent passwd sshd >/dev/null || \ %attr(0755,root,root) %{_libexecdir}/openssh/ctr-cavstest %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* %endif -%if %{scard} -%attr(0755,root,root) %dir %{_datadir}/openssh -%attr(0644,root,root) %{_datadir}/openssh/Ssh.bin -%endif %files clients %defattr(-,root,root)