diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-05-23 14:30:47 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-05-23 14:55:25 +0200 |
| commit | 437d68cab0f6c0a38ee493a6ba2a9a4fde00d1b4 (patch) | |
| tree | bf9fb52f744bdc6600bafe832a919d89a50056fc | |
| parent | a141d438195a19db9970357357cafef2fca5ee2b (diff) | |
| download | NetworkManager-th/contrib-rpm-use-gnutls.tar.gz | |
contrib/rpm: use gnutls crypto library instead of NSS on rhel-8 and fedora-29th/contrib-rpm-use-gnutls
https://bugzilla.redhat.com/show_bug.cgi?id=1581693
| -rw-r--r-- | contrib/fedora/REQUIRED_PACKAGES | 1 | ||||
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index 27606d1946..2efe95ce95 100644 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -23,6 +23,7 @@ yum install \ dhclient \ gettext-devel \ git \ + gnutls-devel \ gobject-introspection-devel \ gtk-doc \ intltool \ diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 618e6178b0..8da0cea5a3 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -74,6 +74,11 @@ %else %bcond_with connectivity_fedora %endif +%if 0%{?fedora} > 28 || 0%{?rhel} > 7 +%bcond_without crypto_gnutls +%else +%bcond_with crypto_gnutls +%endif ############################################################################### @@ -141,7 +146,11 @@ BuildRequires: automake autoconf intltool libtool %if %{with ppp} BuildRequires: ppp-devel >= 2.4.5 %endif +%if %{with crypto_gnutls} +BuildRequires: gnutls-devel >= 2.12 +%else BuildRequires: nss-devel >= 3.11.7 +%endif BuildRequires: dhclient BuildRequires: readline-devel BuildRequires: audit-libs-devel @@ -419,7 +428,11 @@ intltoolize --automake --copy --force --with-dhcpcd=no \ --with-dhcpcanon=no \ --with-config-dhcp-default=dhclient \ +%if %{with crypto_gnutls} + --with-crypto=gnutls \ +%else --with-crypto=nss \ +%endif %if %{with sanitizer} --with-address-sanitizer=exec \ %if 0%{?fedora} |