rpms/openldap
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update the spec file for upcoming autoconf-2.71

Browse Source 
Resolves: #1943079
This commit is contained in:
Simon Pichugin 2021-07-07 17:38:10 +02:00
parent a924611f4e
commit 66dbf14221
2 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
openldap-cbinding-ITS-8573-TLS-option-test-suite.patch
View File

@ -4,7 +4,6 @@ Date: Thu, 14 Jun 2018 16:12:59 +0100
Subject: [PATCH] ITS#8573 TLS option test suite Subject: [PATCH] ITS#8573 TLS option test suite
--- ---
configure | 4 +
configure.in | 4 + configure.in | 4 +
tests/data/slapd-tls-sasl.conf | 65 ++ tests/data/slapd-tls-sasl.conf | 65 ++
tests/data/slapd-tls.conf | 61 ++ tests/data/slapd-tls.conf | 61 ++
@ -38,42 +37,6 @@ Subject: [PATCH] ITS#8573 TLS option test suite
create mode 100755 tests/scripts/test069-delta-multimaster-starttls create mode 100755 tests/scripts/test069-delta-multimaster-starttls
create mode 100755 tests/scripts/test070-delta-multimaster-ldaps create mode 100755 tests/scripts/test070-delta-multimaster-ldaps
diff --git a/configure b/configure
index e87850ec2..e8a720961 100755
--- a/configure
+++ b/configure
@@ -758,6 +758,7 @@ AUTH_LIBS
LIBSLAPI
SLAPI_LIBS
MODULES_LIBS
+WITH_TLS_TYPE
TLS_LIBS
SASL_LIBS
KRB5_LIBS
@@ -5133,6 +5134,7 @@ KRB4_LIBS=
KRB5_LIBS=
SASL_LIBS=
TLS_LIBS=
+WITH_TLS_TYPE=
MODULES_LIBS=
SLAPI_LIBS=
LIBSLAPI=
@@ -15582,6 +15584,7 @@ fi
if test $have_openssl = yes ; then
ol_with_tls=openssl
ol_link_tls=yes
+ WITH_TLS_TYPE=openssl
$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
@@ -15716,6 +15719,7 @@ fi
if test $have_gnutls = yes ; then
ol_with_tls=gnutls
ol_link_tls=yes
+ WITH_TLS_TYPE=gnutls
TLS_LIBS="-lgnutls"
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
index 0c7c0a9ee..cf143d9bf 100644 index 0c7c0a9ee..cf143d9bf 100644
--- a/configure.in --- a/configure.in

7
openldap.spec
View File

@ -138,8 +138,6 @@ programs needed for accessing and modifying OpenLDAP directories.
pushd openldap-%{version} pushd openldap-%{version}
AUTOMAKE=%{_bindir}/true autoreconf -fi
%patch0 -p1 %patch0 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
@ -162,6 +160,10 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
%patch62 -p1 %patch62 -p1
%patch63 -p1 %patch63 -p1
# The change is needed for autoconf-2.71
sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.in
AUTOMAKE=%{_bindir}/true autoreconf -f -i
# build smbk5pwd with other overlays # build smbk5pwd with other overlays
ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
mv contrib/slapd-modules/smbk5pwd/README contrib/slapd-modules/smbk5pwd/README.smbk5pwd mv contrib/slapd-modules/smbk5pwd/README contrib/slapd-modules/smbk5pwd/README.smbk5pwd
@ -556,6 +558,7 @@ exit 0
%changelog %changelog
* Wed Jul 7 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.59-1 * Wed Jul 7 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.59-1
- Rebase to version 2.4.59 (#1980015) - Rebase to version 2.4.59 (#1980015)
- Update the spec file for upcoming autoconf-2.71 (#1943079)
* Tue Jun 15 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.58-5 * Tue Jun 15 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.58-5
- Fix slapd.tmpfiles complaints (#1972147) - Fix slapd.tmpfiles complaints (#1972147)