Commit 5bfb1303 authored by Luca Boccassi's avatar Luca Boccassi

Problem: packages not build with TLS support

Solution: add dependency to gnutls
parent de845bd0
...@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 9), ...@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 9),
libsodium-dev, libsodium-dev,
libunwind-dev | libunwind8-dev | libunwind7-dev, libunwind-dev | libunwind8-dev | libunwind7-dev,
libnss3-dev, libnss3-dev,
libgnutls28-dev,
pkg-config, pkg-config,
asciidoc-base | asciidoc, xmlto, asciidoc-base | asciidoc, xmlto,
Standards-Version: 3.9.8 Standards-Version: 3.9.8
...@@ -40,6 +41,7 @@ Depends: libzmq5 (= ${binary:Version}), ${misc:Depends}, ...@@ -40,6 +41,7 @@ Depends: libzmq5 (= ${binary:Version}), ${misc:Depends},
libsodium-dev, libsodium-dev,
libunwind-dev | libunwind8-dev | libunwind7-dev, libunwind-dev | libunwind8-dev | libunwind7-dev,
libnss3-dev, libnss3-dev,
libgnutls28-dev,
Conflicts: libzmq-dev, libzmq5-dev Conflicts: libzmq-dev, libzmq5-dev
Replaces: libzmq5-dev Replaces: libzmq5-dev
Provides: libzmq5-dev Provides: libzmq5-dev
......
...@@ -43,7 +43,7 @@ override_dh_clean: ...@@ -43,7 +43,7 @@ override_dh_clean:
rm -f config.log rm -f config.log
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- --with-pgm --with-libsodium --enable-drafts=$(DRAFTS) --with-libgssapi_krb5=yes --with-norm=yes --with-nss=yes dh_auto_configure -- --with-pgm --with-libsodium --enable-drafts=$(DRAFTS) --with-libgssapi_krb5=yes --with-norm=yes --with-nss=yes --with-tls=yes
override_dh_auto_test: override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
......
...@@ -6,7 +6,7 @@ Version: 4.3.3 ...@@ -6,7 +6,7 @@ Version: 4.3.3
Maintainer: libzmq Developers <zeromq-dev@lists.zeromq.org> Maintainer: libzmq Developers <zeromq-dev@lists.zeromq.org>
Homepage: http://www.zeromq.org/ Homepage: http://www.zeromq.org/
Standards-Version: 3.9.8 Standards-Version: 3.9.8
Build-Depends: debhelper (>= 9), dh-autoreconf, libkrb5-dev, libpgm-dev, libnorm-dev, libsodium-dev, libunwind-dev | libunwind8-dev | libunwind7-dev, libnss3-dev, pkg-config, asciidoc-base | asciidoc, xmlto Build-Depends: debhelper (>= 9), dh-autoreconf, libkrb5-dev, libpgm-dev, libnorm-dev, libsodium-dev, libunwind-dev | libunwind8-dev | libunwind7-dev, libnss3-dev, libgnutls28-dev, pkg-config, asciidoc-base | asciidoc, xmlto
Package-List: Package-List:
libzmq3-dev deb libdevel optional arch=any libzmq3-dev deb libdevel optional arch=any
libzmq5 deb libs optional arch=any libzmq5 deb libs optional arch=any
......
...@@ -56,6 +56,17 @@ BuildRequires: nss-devel ...@@ -56,6 +56,17 @@ BuildRequires: nss-devel
%else %else
%define NSS no %define NSS no
%endif %endif
%bcond_with tls
%if %{with tls} && ! 0%{?centos_version} < 700
%if 0%{?suse_version}
BuildRequires: libgnutls-devel
%else
BuildRequires: gnutls-devel
%endif
%define TLS yes
%else
%define TLS no
%endif
BuildRequires: gcc, make, gcc-c++, libstdc++-devel, asciidoc, xmlto BuildRequires: gcc, make, gcc-c++, libstdc++-devel, asciidoc, xmlto
Requires: libstdc++ Requires: libstdc++
...@@ -95,6 +106,15 @@ Requires: libstdc++ ...@@ -95,6 +106,15 @@ Requires: libstdc++
%{?_with_nss:Requires: nss} %{?_with_nss:Requires: nss}
%endif %endif
%if ! 0%{?centos_version} < 700
%if 0%{?suse_version}
%{?_with_tls:BuildRequires: libgnutls-devel}
%else
%{?_with_tls:BuildRequires: gnutls-devel}
%endif
%{?_with_tls:Requires: gnutls}
%endif
%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64 %ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
%{!?_with_pic: %{!?_without_pic: %define _with_pic --with-pic}} %{!?_with_pic: %{!?_without_pic: %define _with_pic --with-pic}}
%{!?_with_gnu_ld: %{!?_without_gnu_ld: %define _with_gnu_ld --with-gnu_ld}} %{!?_with_gnu_ld: %{!?_without_gnu_ld: %define _with_gnu_ld --with-gnu_ld}}
...@@ -150,6 +170,14 @@ Requires: mozilla-nss-devel ...@@ -150,6 +170,14 @@ Requires: mozilla-nss-devel
Requires: nss-devel Requires: nss-devel
%endif %endif
%endif %endif
%bcond_with tls
%if %{with tls} && ! 0%{?centos_version} < 700
%if 0%{?suse_version}
Requires: libgnutls-devel
%else
Requires: gnutls-devel
%endif
%endif
%description devel %description devel
The 0MQ lightweight messaging kernel is a library which extends the The 0MQ lightweight messaging kernel is a library which extends the
...@@ -192,6 +220,7 @@ autoreconf -fi ...@@ -192,6 +220,7 @@ autoreconf -fi
--with-libsodium=%{SODIUM} \ --with-libsodium=%{SODIUM} \
--with-libgssapi_krb5=%{GSSAPI} \ --with-libgssapi_krb5=%{GSSAPI} \
--with-nss=%{NSS} \ --with-nss=%{NSS} \
--with-tls=%{TLS} \
%{?_with_pic} \ %{?_with_pic} \
%{?_without_pic} \ %{?_without_pic} \
%{?_with_gnu_ld} \ %{?_with_gnu_ld} \
...@@ -244,6 +273,9 @@ autoreconf -fi ...@@ -244,6 +273,9 @@ autoreconf -fi
%{_bindir}/curve_keygen %{_bindir}/curve_keygen
%changelog %changelog
* Fri Oct 4 2019 Luca Boccassi <luca.boccassi@gmail.com>
- Add macro for optional TLS dependency
* Wed Sep 11 2019 Luca Boccassi <luca.boccassi@gmail.com> * Wed Sep 11 2019 Luca Boccassi <luca.boccassi@gmail.com>
- Add macro for optional NSS dependency - Add macro for optional NSS dependency
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment