Skip to content

Commit

Permalink
SPEC/CI: enable openssl build for Debian and upcoming versions
Browse files Browse the repository at this point in the history
Related to https://pagure.io/SSSD/sssd/issue/3495

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
  • Loading branch information
sumit-bose authored and fidencio committed Jun 5, 2018
1 parent ee76c68 commit 8adf6ea
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
10 changes: 10 additions & 0 deletions contrib/ci/configure.sh
Expand Up @@ -65,6 +65,16 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
)
fi

if [[ "$DISTRO_BRANCH" == -redhat-fedora-29* ||
"$DISTRO_BRANCH" == -redhat-fedora-3* ||
"$DISTRO_BRANCH" == -debian-* ||
"$DISTRO_BRANCH" == -redhat-redhatenterprise*-8.*- ||
"$DISTRO_BRANCH" == -redhat-centos-8.*- ]]; then
CONFIGURE_ARG_LIST+=(
"--with-crypto=libcrypto"
)
fi

declare -r -a CONFIGURE_ARG_LIST

fi # _CONFIGURE_SH
4 changes: 4 additions & 0 deletions contrib/ci/deps.sh
Expand Up @@ -135,6 +135,10 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
dbus
python-dbus
pep8
libssl-dev
gnutls-bin
softhsm2
libp11-kit-dev
)
DEPS_INTGCHECK_SATISFIED=true
fi
Expand Down
16 changes: 14 additions & 2 deletions contrib/sssd.spec.in
Expand Up @@ -78,6 +78,10 @@
%global with_initscript --with-initscript=sysv
%endif

%if (0%{?fedora} > 28 || 0%{?rhel} > 7)
%global use_openssl 1
%endif

%global enable_experimental 1

%if (0%{?enable_experimental} == 1)
Expand Down Expand Up @@ -228,8 +232,13 @@ BuildRequires: nss_wrapper
# data needed for the p11_child Smartcard tests. Since p11_child only looks at
# slots with are flagged as 'removable' softhsm version 2.1.0 or higher is
# needed.
# BuildRequires: gnutls-utils
# BuildRequires: softhsm >= 2.1.0
%if (0%{?use_openssl} == 1)
BuildRequires: p11-kit-devel
BuildRequires: openssl-devel
BuildRequires: gnutls-utils
BuildRequires: softhsm >= 2.1.0
%endif

BuildRequires: openssl
BuildRequires: openssh
BuildRequires: nss-tools
Expand Down Expand Up @@ -763,6 +772,9 @@ autoreconf -ivf
--enable-pammoddir=/%{_lib}/security \
--enable-nfsidmaplibdir=%{_libdir}/libnfsidmap \
--disable-static \
%if (0%{?use_openssl} == 1)
--with-crypto=libcrypto \
%endif
--disable-rpath \
%if %{with sssd_user}
--with-sssd-user=sssd \
Expand Down

0 comments on commit 8adf6ea

Please sign in to comment.