Remove unused leftover MozNSS Compat. Layer references

Related: #1557967
This commit is contained in:
Matúš Honěk 2018-07-04 16:13:06 +02:00
parent 799c2121f4
commit 5411c8463a
2 changed files with 4 additions and 1834 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,3 @@
# TLSMC is MozNSS compatibility layer and should be disabled in F29+
%if 0%{?fedora} && 0%{?fedora} <= 28
%bcond_without tlsmc
%else
%bcond_with tlsmc
%endif
%global _hardened_build 1 %global _hardened_build 1
%global systemctl_bin /usr/bin/systemctl %global systemctl_bin /usr/bin/systemctl
@ -12,7 +5,7 @@
Name: openldap Name: openldap
Version: 2.4.46 Version: 2.4.46
Release: 3%{?dist} Release: 4%{?dist}
Summary: LDAP support libraries Summary: LDAP support libraries
License: OpenLDAP License: OpenLDAP
URL: http://www.openldap.org/ URL: http://www.openldap.org/
@ -46,14 +39,6 @@ Patch20: openldap-ldapi-sasl.patch
Patch90: check-password-makefile.patch Patch90: check-password-makefile.patch
Patch91: check-password.patch Patch91: check-password.patch
# MozNSS compatibility layer
Patch100: openldap-tlsmc.patch
%if %{with tlsmc}
BuildRequires: nss-devel
Recommends: nss-tools
%endif
BuildRequires: cyrus-sasl-devel, openssl-devel, krb5-devel, unixODBC-devel BuildRequires: cyrus-sasl-devel, openssl-devel, krb5-devel, unixODBC-devel
BuildRequires: glibc-devel, libtool, libtool-ltdl-devel, groff, perl-interpreter, perl-devel, perl-generators, perl(ExtUtils::Embed) BuildRequires: glibc-devel, libtool, libtool-ltdl-devel, groff, perl-interpreter, perl-devel, perl-generators, perl(ExtUtils::Embed)
@ -191,8 +176,6 @@ pushd openldap-%{version}
\ \
--disable-static \ --disable-static \
\ \
--enable-moznss-compatibility=%{?with_tlsmc:yes}%{!?with_tlsmc:no} \
\
--with-cyrus-sasl \ --with-cyrus-sasl \
--without-fetch \ --without-fetch \
--with-threads \ --with-threads \
@ -504,6 +487,9 @@ exit 0
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Wed Jul 4 2018 Matus Honek <mhonek@redhat.com> - 2.4.46-4
- Remove unused leftover MozNSS Compat. Layer references (#1557967)
* Wed Jul 4 2018 Matus Honek <mhonek@redhat.com> - 2.4.46-3 * Wed Jul 4 2018 Matus Honek <mhonek@redhat.com> - 2.4.46-3
- MozNSS Compat. Layer: Make log messages more clear (#1598103) - MozNSS Compat. Layer: Make log messages more clear (#1598103)
- MozNSS Compat. Layer: Fix memleaks reported by valgrind (#1595203) - MozNSS Compat. Layer: Fix memleaks reported by valgrind (#1595203)