commit 291781540f6905a0bf170d9d2af360dce6b6e1c5
Author: Jakub Bogusz <[email protected]>
Date: Sun Feb 19 22:19:36 2017 +0100
- enable openssl by default for ECDSA; libhcrypto exists now anyway (and
uses openssl as backend)
heimdal.spec | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/heimdal.spec b/heimdal.spec
index 9751f8c..d91ca9f 100644
--- a/heimdal.spec
+++ b/heimdal.spec
@@ -2,7 +2,7 @@
# Conditional build:
%bcond_without ldap # LDAP plugin
%bcond_without sqlite # Sqlite3 support
-%bcond_with openssl # use OpenSSL instead of internal
hcrypto
+%bcond_without openssl # OpenSSL as default hcrypto backend
(for ECDSA support)
%bcond_with expose_internals # install internal KCM headers
Summary: Heimdal implementation of Kerberos V5 system
@@ -309,7 +309,7 @@ cp -p %{SOURCE10}
$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/telnetd
%endif
cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/kadmind
-for l in
$RPM_BUILD_ROOT%{_libdir}/lib{asn1,gssapi,heimbase,heimntlm,hx509,kafs,krb5,roken,wind}.so
%{!?with_openssl:libhcrypto.so}; do
+for l in
$RPM_BUILD_ROOT%{_libdir}/lib{asn1,gssapi,hcrypto,heimbase,heimntlm,hx509,kafs,krb5,roken,wind}.so
; do
lib=`basename $l`
%{__mv} $RPM_BUILD_ROOT%{_libdir}/$lib.* $RPM_BUILD_ROOT/%{_lib}
ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/$lib.*.*)
$RPM_BUILD_ROOT%{_libdir}/$lib
@@ -473,10 +473,8 @@ fi
%attr(755,root,root) /%{_lib}/libgssapi.so.*.*.*
%attr(755,root,root) %ghost /%{_lib}/libgssapi.so.3
%attr(755,root,root) /%{_lib}/libheimbase.so.*.*.*
-%if %{without openssl}
%attr(755,root,root) /%{_lib}/libhcrypto.so.*.*.*
%attr(755,root,root) %ghost /%{_lib}/libhcrypto.so.4
-%endif
%attr(755,root,root) %ghost /%{_lib}/libheimbase.so.1
%attr(755,root,root) /%{_lib}/libheimntlm.so.*.*.*
%attr(755,root,root) %ghost /%{_lib}/libheimntlm.so.0
@@ -518,7 +516,7 @@ fi
%attr(755,root,root) %{_bindir}/krb5-config
%attr(755,root,root) %{_libdir}/libasn1.so
%attr(755,root,root) %{_libdir}/libgssapi.so
-%{!?with_openssl:%{_libdir}/libhcrypto.so}
+%attr(755,root,root) %{_libdir}/libhcrypto.so
%attr(755,root,root) %{_libdir}/libhdb.so
%attr(755,root,root) %{_libdir}/libheimbase.so
%attr(755,root,root) %{_libdir}/libheimntlm.so
@@ -534,7 +532,7 @@ fi
%attr(755,root,root) %{_libdir}/libwind.so
%{_libdir}/libasn1.la
%{_libdir}/libgssapi.la
-%{!?with_openssl:%{_libdir}/libhcrypto.la}
+%{_libdir}/libhcrypto.la
%{_libdir}/libhdb.la
%{_libdir}/libheimbase.la
%{_libdir}/libheimntlm.la
@@ -585,7 +583,7 @@ fi
%{_includedir}/wind_err.h
%{_includedir}/xdbm.h
%{_includedir}/gssapi
-%{!?with_openssl:%{_includedir}/hcrypto}
+%{_includedir}/hcrypto
%{_includedir}/kadm5
%{?with_expose_internals:%{_includedir}/kcm}
%{_includedir}/krb5
@@ -638,7 +636,7 @@ fi
%defattr(644,root,root,755)
%{_libdir}/libasn1.a
%{_libdir}/libgssapi.a
-%{!?with_openssl:%{_libdir}/libhcrypto.a}
+%{_libdir}/libhcrypto.a
%{_libdir}/libhdb.a
%{_libdir}/libheimbase.a
%{_libdir}/libheimntlm.a
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/heimdal.git/commitdiff/08416d15b3ebeb603ccaa1fa8647376b4e5c7f78
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
