rpms/openldap
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop superfluous back-sql linking patch

Browse Source 
This patch is not needed any more as we do not build with back-sql at
all.

Related: #1548676
This commit is contained in:
Matúš Honěk 2018-02-28 14:26:58 +01:00
parent cd7bdcf821
commit 6f8a4c6436
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openldap-sql-linking.patch
View File

@ -1,14 +0,0 @@
Removes unnecessary linking of SQL libraries into slapd. This makes openldap-servers package
independent on libodbc. (SQL backend is packaged separately in openldap-servers-sql.)
--- openldap-2.4.24.orig/build/top.mk
+++ openldap-2.4.24/build/top.mk
@@ -201,7 +201,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@
-SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
# Our Defaults
CC = $(AC_CC)

3
openldap.spec
View File

@ -29,7 +29,6 @@ Source53: libexec-upgrade-db.sh
# patches for 2.4 # patches for 2.4
Patch0: openldap-manpages.patch Patch0: openldap-manpages.patch
Patch1: openldap-sql-linking.patch
Patch2: openldap-reentrant-gethostby.patch Patch2: openldap-reentrant-gethostby.patch
Patch3: openldap-smbk5pwd-overlay.patch Patch3: openldap-smbk5pwd-overlay.patch
Patch5: openldap-ai-addrconfig.patch Patch5: openldap-ai-addrconfig.patch
@ -128,7 +127,6 @@ ln -s %{_includedir}/nspr4 include/nspr
AUTOMAKE=%{_bindir}/true autoreconf -fi AUTOMAKE=%{_bindir}/true autoreconf -fi
%patch0 -p1 %patch0 -p1
%patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch5 -p1 %patch5 -p1
@ -509,6 +507,7 @@ exit 0
* Thu Mar 1 2018 Matus Honek <mhonek@redhat.com> - 2.4.45-13 * Thu Mar 1 2018 Matus Honek <mhonek@redhat.com> - 2.4.45-13
- fix: openldap does not use Fedora build flags - fix: openldap does not use Fedora build flags
+ makes use of redhat-rpm-config package + makes use of redhat-rpm-config package
- Drop superfluous back-sql linking patch
* Wed Feb 28 2018 Matus Honek <mhonek@redhat.com> - 2.4.45-12 * Wed Feb 28 2018 Matus Honek <mhonek@redhat.com> - 2.4.45-12
- MozNSS Compat. Layer: fix: libldap tlsmc continues even after it fails to extract CA certificates (#1550110) - MozNSS Compat. Layer: fix: libldap tlsmc continues even after it fails to extract CA certificates (#1550110)