jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

smartcard support is replaced with PKCS#11 support already in 5.4p1 https://bugzilla.mindrot.org/show_bug.cgi?id=1371

Browse Source
This commit is contained in:
Petr Lautrbach 2012-10-25 15:39:45 +02:00
parent 1a5c95ee57
commit 13cf2478d6
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openssh.spec
View File

@ -15,10 +15,6 @@
# Do we want to link against a static libcrypto? (1=yes 0=no) # Do we want to link against a static libcrypto? (1=yes 0=no)
%define static_libcrypto 0 %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 # Use GTK2 instead of GNOME in gnome-ssh-askpass
%define gtk2 1 %define gtk2 1
@ -57,10 +53,6 @@
# rpm -ba|--rebuild --define "static_openssl 1" # rpm -ba|--rebuild --define "static_openssl 1"
%{?static_openssl:%global static_libcrypto 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) # Is this a build for the rescue CD (without PAM, with MD5)? (1=yes 0=no)
%define rescue 0 %define rescue 0
%{?build_rescue:%global rescue 1} %{?build_rescue:%global rescue 1}
@ -238,9 +230,6 @@ BuildRequires: gnome-libs-devel
%endif %endif
%endif %endif
%if %{scard}
BuildRequires: sharutils
%endif
%if %{ldap} %if %{ldap}
BuildRequires: openldap-devel BuildRequires: openldap-devel
%endif %endif
@ -522,9 +511,6 @@ fi
--with-ssl-engine \ --with-ssl-engine \
--with-authorized-keys-command \ --with-authorized-keys-command \
--with-ipaddr-display \ --with-ipaddr-display \
%if %{scard}
--with-smartcard \
%endif
%if %{ldap} %if %{ldap}
--with-ldap \ --with-ldap \
%endif %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 install contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass
%endif %endif
%if ! %{scard}
rm -f $RPM_BUILD_ROOT%{_datadir}/openssh/Ssh.bin
%endif
%if ! %{no_gnome_askpass} %if ! %{no_gnome_askpass}
ln -s gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass ln -s gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ 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(0755,root,root) %{_libexecdir}/openssh/ctr-cavstest
%attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8*
%endif %endif
%if %{scard}
%attr(0755,root,root) %dir %{_datadir}/openssh
%attr(0644,root,root) %{_datadir}/openssh/Ssh.bin
%endif
%files clients %files clients
%defattr(-,root,root) %defattr(-,root,root)