disable TLSMC in F29+
It should not affect any active Fedora branches, but will save time in future. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
		
							parent
							
								
									e3677af8bb
								
							
						
					
					
						commit
						60f1a0883e
					
				| @ -1,3 +1,10 @@ | |||||||
|  | # 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 | ||||||
| @ -44,9 +51,13 @@ Patch91: check-password.patch | |||||||
| # MozNSS compatibility layer | # MozNSS compatibility layer | ||||||
| Patch100: openldap-tlsmc.patch | Patch100: openldap-tlsmc.patch | ||||||
| 
 | 
 | ||||||
| BuildRequires: cyrus-sasl-devel, nss-devel, openssl-devel, krb5-devel, unixODBC-devel | %if %{with tlsmc} | ||||||
|  | BuildRequires: nss-devel | ||||||
|  | Recommends:    nss-tools | ||||||
|  | %endif | ||||||
|  | 
 | ||||||
|  | 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) | ||||||
| Recommends: nss-tools |  | ||||||
| 
 | 
 | ||||||
| %description | %description | ||||||
| OpenLDAP is an open source suite of LDAP (Lightweight Directory Access | OpenLDAP is an open source suite of LDAP (Lightweight Directory Access | ||||||
| @ -192,7 +203,7 @@ pushd openldap-%{version} | |||||||
| 	\ | 	\ | ||||||
| 	--disable-static \ | 	--disable-static \ | ||||||
| 	\ | 	\ | ||||||
| 	--enable-moznss-compatibility=yes \ | 	--enable-moznss-compatibility=%{?with_tlsmc:yes}%{!?with_tlsmc:no} \ | ||||||
| 	\ | 	\ | ||||||
| 	--with-cyrus-sasl \ | 	--with-cyrus-sasl \ | ||||||
| 	--without-fetch \ | 	--without-fetch \ | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user