Matúš Honěk
parent
58ea27bc6e
commit
0f227076e4
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@
|
||||
/openldap-2.4.38.tgz
|
||||
/openldap-2.4.39.tgz
|
||||
/openldap-2.4.40.tgz
|
||||
/openldap-2.4.41.tgz
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
From f0409f40dab6013d1aec05f5c86ae31d2f49b485 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Synacek <jsynacek@redhat.com>
|
||||
Date: Wed, 11 Feb 2015 10:32:28 +0100
|
||||
Subject: [PATCH] fix libdb detection with gcc 5
|
||||
|
||||
The old cpp version generated:
|
||||
__db_version 5
|
||||
|
||||
The new output:
|
||||
__db_version
|
||||
5
|
||||
|
||||
Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5.
|
||||
Behavior with older versions of gcc is not changed.
|
||||
---
|
||||
build/openldap.m4 | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/build/openldap.m4 b/build/openldap.m4
|
||||
index caf8fc2..bdcb4d6 100644
|
||||
--- a/build/openldap.m4
|
||||
+++ b/build/openldap.m4
|
||||
@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
|
||||
#endif
|
||||
__db_version DB_VERSION_MAJOR
|
||||
])
|
||||
- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
|
||||
+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
|
||||
ol_cv_bdb_major=${3}
|
||||
])
|
||||
case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
|
||||
@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
|
||||
#endif
|
||||
__db_version DB_VERSION_MINOR
|
||||
])
|
||||
- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
|
||||
+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
|
||||
ol_cv_bdb_minor=${3}
|
||||
])
|
||||
case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 7a5a98577a0481d864ca7fe05b9b32274d4d1fb5 Mon Sep 17 00:00:00 2001
|
||||
From: Howard Chu <hyc@openldap.org>
|
||||
Date: Mon, 19 Jan 2015 22:25:53 +0000
|
||||
Subject: [PATCH] ITS#8027 require non-empty AttributeList
|
||||
|
||||
---
|
||||
servers/slapd/overlays/deref.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/servers/slapd/overlays/deref.c b/servers/slapd/overlays/deref.c
|
||||
index 9420e3e..05aa890 100644
|
||||
--- a/servers/slapd/overlays/deref.c
|
||||
+++ b/servers/slapd/overlays/deref.c
|
||||
@@ -183,7 +183,8 @@ deref_parseCtrl (
|
||||
ber_len_t cnt = sizeof(struct berval);
|
||||
ber_len_t off = 0;
|
||||
|
||||
- if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR )
|
||||
+ if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR
|
||||
+ || !cnt )
|
||||
{
|
||||
rs->sr_text = "Dereference control: derefSpec decoding error";
|
||||
rs->sr_err = LDAP_PROTOCOL_ERROR;
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
%global check_password_version 1.1
|
||||
|
||||
Name: openldap
|
||||
Version: 2.4.40
|
||||
Release: 14%{?dist}
|
||||
Version: 2.4.41
|
||||
Release: 1%{?dist}
|
||||
Summary: LDAP support libraries
|
||||
Group: System Environment/Daemons
|
||||
License: OpenLDAP
|
||||
@ -44,8 +44,6 @@ Patch19: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
|
||||
Patch20: openldap-ldapi-sasl.patch
|
||||
# TLSv1 support, already included upstream
|
||||
Patch21: openldap-support-tlsv1-and-later.patch
|
||||
# CVE-2015-1545, already upstream
|
||||
Patch22: openldap-require-non-empty-attributelist.patch
|
||||
|
||||
# check-password module specific patches
|
||||
Patch90: check-password-makefile.patch
|
||||
@ -53,8 +51,6 @@ Patch91: check-password.patch
|
||||
|
||||
# Fedora specific patches
|
||||
Patch100: openldap-autoconf-pkgconfig-nss.patch
|
||||
# GCC 5 cpp patch, pending upstream inclusion (ITS #8056)
|
||||
Patch101: openldap-gcc-5.patch
|
||||
|
||||
BuildRequires: cyrus-sasl-devel, nss-devel, krb5-devel, tcp_wrappers-devel, unixODBC-devel
|
||||
BuildRequires: glibc-devel, libtool, libtool-ltdl-devel, groff, perl, perl-devel, perl(ExtUtils::Embed)
|
||||
@ -129,7 +125,6 @@ pushd openldap-%{version}
|
||||
# use pkg-config for Mozilla NSS library
|
||||
%patch100 -p1
|
||||
|
||||
%patch101 -p1
|
||||
# alternative include paths for Mozilla NSS
|
||||
ln -s %{_includedir}/nss3 include/nss
|
||||
ln -s %{_includedir}/nspr4 include/nspr
|
||||
@ -151,7 +146,6 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
|
||||
%patch19 -p1
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
|
||||
# build smbk5pwd with other overlays
|
||||
ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
|
||||
@ -542,6 +536,9 @@ exit 0
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Thu Jul 16 2015 Matúš Honěk <mhonek@redhat.com> - 2.4.41-1
|
||||
- New upstream release 2.4.41 (#1238251)
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.40-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user