packages/openldap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

delete libdb-devel in buildrequires and requires

Browse Source
This commit is contained in:
orange-snn 2021-02-25 10:56:38 +08:00
parent a0286c70f5
commit a3c567152c
5 changed files with 24482 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
backport-Fix-test-suite.patch Normal file
View File

@ -0,0 +1,71 @@
From 70f87370f99e78ac3874501bfe5124dbb86185a8 Mon Sep 17 00:00:00 2001
From: zhangqiumiao <zhangqiumiao1@huawei.com>
Date: Fri, 25 Sep 2020 21:56:43 +0800
Subject: [PATCH] backport Fix test suite
---
tests/data/monitor2.out | 3 ---
tests/scripts/test052-memberof | 2 +-
tests/scripts/test056-monitor | 11 ++---------
3 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/tests/data/monitor2.out b/tests/data/monitor2.out
index 26e9ce9..20209d1 100644
--- a/tests/data/monitor2.out
+++ b/tests/data/monitor2.out
@@ -10,9 +10,6 @@ structuralObjectClass: monitoredObject
monitorIsShadow: FALSE
namingContexts: o=OpenLDAP Project,l=Internet
readOnly: FALSE
-olmBDBEntryCache: 0
-olmBDBDNCache: 0
-olmBDBIDLCache: 0
entryDN: cn=Database 1,cn=Databases,cn=Monitor
dn: cn=Database 2,cn=Databases,cn=Monitor
diff --git a/tests/scripts/test052-memberof b/tests/scripts/test052-memberof
index a73a929..1dba946 100755
--- a/tests/scripts/test052-memberof
+++ b/tests/scripts/test052-memberof
@@ -72,7 +72,7 @@ EOF
fi
fi
-indexInclude="" mainInclude="" " nullExclude=""
+indexInclude="" mainInclude="" nullExclude=""
test $INDEXDB = indexdb || indexInclude="# "
test $MAINDB = maindb || mainInclude="# "
case $BACKEND in
diff --git a/tests/scripts/test056-monitor b/tests/scripts/test056-monitor
index 7a87eaa..0e1ba20 100755
--- a/tests/scripts/test056-monitor
+++ b/tests/scripts/test056-monitor
@@ -85,7 +85,7 @@ echo "Using ldapsearch to read database monitor entries..."
$LDAPSEARCH -S "" -b "$DATABASESMONITORDN" -h $LOCALHOST -p $PORT1 \
'objectclass=*' \
structuralObjectClass entryDN namingContexts readOnly \
- monitorIsShadow monitorContext
+ monitorIsShadow monitorContext \
> $SEARCHOUT 2>&1
RC=$?
@@ -98,15 +98,8 @@ fi
echo "Filtering ldapsearch results..."
$LDIFFILTER -b monitor < $SEARCHOUT > $SEARCHFLT
-TMPMONITOROUT2=$MONITOROUT2
-case $BACKEND in
-*)
- TMPMONITOROUT2=$TESTDIR/monitor2.out
- ;;
-esac
-
echo "Comparing filter output..."
-$CMP $SEARCHFLT $TMPMONITOROUT2 > $CMPOUT
+$CMP $SEARCHFLT $MONITOROUT2 > $CMPOUT
if test $? != 0 ; then
echo "comparison failed - database monitor output is not correct"
--
2.19.1

406
backport-ITS-9010-More-BDB-HDB-cleanup.patch Normal file
View File

@ -0,0 +1,406 @@
From ac37a67536d37ae059ed120f00b540429be6b4e0 Mon Sep 17 00:00:00 2001
From: zhangqiumiao <zhangqiumiao1@huawei.com>
Date: Sun, 27 Sep 2020 15:01:05 +0800
Subject: [PATCH] backport ITS#9010 More BDB/HDB cleanup
---
doc/guide/admin/aspell.en.pws | 7 -
tests/data/regressions/its4337/config.out | 129 ------------------
tests/data/regressions/its4337/its4337 | 157 ----------------------
tests/data/regressions/its4337/slapd.conf | 36 -----
4 files changed, 329 deletions(-)
delete mode 100644 tests/data/regressions/its4337/config.out
delete mode 100755 tests/data/regressions/its4337/its4337
delete mode 100644 tests/data/regressions/its4337/slapd.conf
diff --git a/doc/guide/admin/aspell.en.pws b/doc/guide/admin/aspell.en.pws
index ae777e2..ec24572 100644
--- a/doc/guide/admin/aspell.en.pws
+++ b/doc/guide/admin/aspell.en.pws
@@ -220,8 +220,6 @@ AVAs
associatedDomain
organizationalRole
initgroups
-olcDbCachesize
-olcDbCacheSize
ETCDIR
colaligns
olcReadOnly
@@ -426,10 +424,8 @@ txt
UTR
XER
roomNumber
-olcDbIDLcacheSize
namespace
LDAPControl
-dbconfig
olcAttributeOptions
dsaparam
searchResult
@@ -965,7 +961,6 @@ unwillingToPerform
PhotoURI
MyCompany
mkdep
-idlcachesize
irresponsive
PasswordModify
readOnly
@@ -1183,7 +1178,6 @@ monitorRuntimeConfig
olcAuditlogFile
namingContexts
referralAttrDN
-idlecachesize
moddn
calloc
LDFLAGS
@@ -1375,7 +1369,6 @@ spasswd
sprintf
monitorCounterObject
Instanstantiation
-olcDbConfig
olcLastMod
vals
param
diff --git a/tests/data/regressions/its4337/config.out b/tests/data/regressions/its4337/config.out
deleted file mode 100644
index bdcbbe5..0000000
--- a/tests/data/regressions/its4337/config.out
+++ /dev/null
@@ -1,129 +0,0 @@
-# Searching databases __before__ append...
-dn: olcDatabase={-1}frontend,cn=config
-objectClass: olcDatabaseConfig
-objectClass: olcFrontendConfig
-olcDatabase: {-1}frontend
-olcAddContentAcl: FALSE
-olcLastMod: TRUE
-olcMaxDerefDepth: 0
-olcReadOnly: FALSE
-olcSchemaDN: cn=Subschema
-olcSyncUseSubentry: FALSE
-olcMonitoring: FALSE
-
-dn: olcDatabase={0}config,cn=config
-objectClass: olcDatabaseConfig
-olcDatabase: {0}config
-olcAccess: {0}to * by * none
-olcAddContentAcl: TRUE
-olcLastMod: TRUE
-olcMaxDerefDepth: 15
-olcReadOnly: FALSE
-olcRootDN: cn=config
-olcRootPW: config
-olcSyncUseSubentry: FALSE
-olcMonitoring: FALSE
-
-dn: olcDatabase={1}monitor,cn=config
-objectClass: olcDatabaseConfig
-olcDatabase: {1}monitor
-olcAddContentAcl: FALSE
-olcLastMod: TRUE
-olcMaxDerefDepth: 15
-olcReadOnly: FALSE
-olcSyncUseSubentry: FALSE
-olcMonitoring: FALSE
-
-# Searching databases __after__ append...
-dn: olcDatabase={-1}frontend,cn=config
-objectClass: olcDatabaseConfig
-objectClass: olcFrontendConfig
-olcDatabase: {-1}frontend
-olcAddContentAcl: FALSE
-olcLastMod: TRUE
-olcMaxDerefDepth: 0
-olcReadOnly: FALSE
-olcSchemaDN: cn=Subschema
-olcSyncUseSubentry: FALSE
-olcMonitoring: FALSE
-
-dn: olcDatabase={0}config,cn=config
-objectClass: olcDatabaseConfig
-olcDatabase: {0}config
-olcAccess: {0}to * by * none
-olcAddContentAcl: TRUE
-olcLastMod: TRUE
-olcMaxDerefDepth: 15
-olcReadOnly: FALSE
-olcRootDN: cn=config
-olcRootPW: config
-olcSyncUseSubentry: FALSE
-olcMonitoring: FALSE
-
-dn: olcDatabase={1}monitor,cn=config
-objectClass: olcDatabaseConfig
-olcDatabase: {1}monitor
-olcAddContentAcl: FALSE
-olcLastMod: TRUE
-olcMaxDerefDepth: 15
-olcReadOnly: FALSE
-olcSyncUseSubentry: FALSE
-olcMonitoring: FALSE
-
-dn: olcDatabase={2}bdb,cn=config
-objectClass: olcDatabaseConfig
-objectClass: olcBdbConfig
-olcDatabase: {2}bdb
-olcDbDirectory: ./testrun/db.1.a
-olcSuffix: dc=com
-
-# Searching databases __after__ insert...
-dn: olcDatabase={-1}frontend,cn=config
-objectClass: olcDatabaseConfig
-objectClass: olcFrontendConfig
-olcDatabase: {-1}frontend
-olcAddContentAcl: FALSE
-olcLastMod: TRUE
-olcMaxDerefDepth: 0
-olcReadOnly: FALSE
-olcSchemaDN: cn=Subschema
-olcSyncUseSubentry: FALSE
-olcMonitoring: FALSE
-
-dn: olcDatabase={0}config,cn=config
-objectClass: olcDatabaseConfig
-olcDatabase: {0}config
-olcAccess: {0}to * by * none
-olcAddContentAcl: TRUE
-olcLastMod: TRUE
-olcMaxDerefDepth: 15
-olcReadOnly: FALSE
-olcRootDN: cn=config
-olcRootPW: config
-olcSyncUseSubentry: FALSE
-olcMonitoring: FALSE
-
-dn: olcDatabase={1}bdb,cn=config
-objectClass: olcDatabaseConfig
-objectClass: olcBdbConfig
-olcDatabase: {1}bdb
-olcDbDirectory: ./testrun/db.2.a
-olcSuffix: dc=org
-
-dn: olcDatabase={2}monitor,cn=config
-objectClass: olcDatabaseConfig
-olcDatabase: {2}monitor
-olcAddContentAcl: FALSE
-olcLastMod: TRUE
-olcMaxDerefDepth: 15
-olcReadOnly: FALSE
-olcSyncUseSubentry: FALSE
-olcMonitoring: FALSE
-
-dn: olcDatabase={3}bdb,cn=config
-objectClass: olcDatabaseConfig
-objectClass: olcBdbConfig
-olcDatabase: {3}bdb
-olcDbDirectory: ./testrun/db.1.a
-olcSuffix: dc=com
-
diff --git a/tests/data/regressions/its4337/its4337 b/tests/data/regressions/its4337/its4337
deleted file mode 100755
index 66bc716..0000000
--- a/tests/data/regressions/its4337/its4337
+++ /dev/null
@@ -1,157 +0,0 @@
-#! /bin/sh
-# $OpenLDAP$
-## This work is part of OpenLDAP Software <http://www.openldap.org/>.
-##
-## Copyright 1998-2020 The OpenLDAP Foundation.
-## All rights reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted only as authorized by the OpenLDAP
-## Public License.
-##
-## A copy of this license is available in the file LICENSE in the
-## top-level directory of the distribution or, alternatively, at
-## <http://www.OpenLDAP.org/license.html>.
-
-echo "running defines.sh"
-. $SRCDIR/scripts/defines.sh
-
-if test $BACKEND != "bdb" ; then
- echo "BDB backend not available, test skipped"
- exit 0
-fi
-
-mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3 $TESTDIR/slapd.d
-
-ITS=4337
-ITSDIR=$DATADIR/regressions/its$ITS
-
-echo "Starting slapd on TCP/IP port $PORT1..."
-. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF1
-#$SLAPD -f $CONF1 -F $TESTDIR/slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
-PID=$!
-if test $WAIT != 0 ; then
- echo PID $PID
- read foo
-fi
-KILLPIDS="$PID"
-
-sleep 1
-
-echo "Using ldapsearch to check that slapd is running..."
-for i in 0 1 2 3 4 5; do
- $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
- 'objectclass=*' > /dev/null 2>&1
- RC=$?
- if test $RC = 0 ; then
- break
- fi
- echo "Waiting 5 seconds for slapd to start..."
- sleep 5
-done
-
-if test $RC != 0 ; then
- echo "ldapsearch failed ($RC)!"
- test $KILLSERVERS != no && kill -HUP $KILLPIDS
- exit $RC
-fi
-
-cat /dev/null > $TESTOUT
-cat /dev/null > $SEARCHOUT
-
-echo "Searching databases..."
-echo "# Searching databases __before__ append..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 \
- -D "cn=config" -w "config" -b "cn=config" \
- '(objectClass=olcDatabaseConfig)' >> $SEARCHOUT 2>> $TESTOUT
-RC=$?
-if test $RC != 0 ; then
- echo "ldapsearch failed ($RC)!"
- test $KILLSERVERS != no && kill -HUP $KILLPIDS
- exit $RC
-fi
-
-echo "Appending a database..."
-$LDAPADD -v -D "cn=config" -w "config" -h $LOCALHOST -p $PORT1 \
- >> $TESTOUT 2>&1 << EOMODS
-dn: olcDatabase=bdb,cn=config
-objectClass: olcDatabaseConfig
-objectClass: olcBdbConfig
-olcDatabase: bdb
-olcSuffix: dc=com
-olcDbDirectory: ./testrun/db.1.a
-EOMODS
-RC=$?
-if test $RC != 0 ; then
- echo "ldapadd failed ($RC)!"
- test $KILLSERVERS != no && kill -HUP $KILLPIDS
- exit $RC
-fi
-
-echo "Searching databases..."
-echo "# Searching databases __after__ append..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 \
- -D "cn=config" -w "config" -b "cn=config" \
- '(objectClass=olcDatabaseConfig)' >> $SEARCHOUT 2>> $TESTOUT
-RC=$?
-if test $RC != 0 ; then
- echo "ldapsearch failed ($RC)!"
- test $KILLSERVERS != no && kill -HUP $KILLPIDS
- exit $RC
-fi
-
-echo "Inserting a database..."
-$LDAPADD -v -D "cn=config" -w "config" -h $LOCALHOST -p $PORT1 \
- >> $TESTOUT 2>&1 << EOMODS
-dn: olcDatabase={1}bdb,cn=config
-objectClass: olcDatabaseConfig
-objectClass: olcBdbConfig
-olcDatabase: {1}bdb
-olcSuffix: dc=org
-olcDbDirectory: ./testrun/db.2.a
-EOMODS
-RC=$?
-if test $RC != 0 ; then
- echo "ldapadd failed ($RC)!"
- test $KILLSERVERS != no && kill -HUP $KILLPIDS
- if test $RC = 53 ; then
- echo "TODO"
- exit 0
- fi
- exit $RC
-fi
-
-echo "Searching databases..."
-echo "# Searching databases __after__ insert..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 \
- -D "cn=config" -w "config" -b "cn=config" \
- '(objectClass=olcDatabaseConfig)' >> $SEARCHOUT 2>> $TESTOUT
-RC=$?
-if test $RC != 0 ; then
- echo "ldapsearch failed ($RC)!"
- test $KILLSERVERS != no && kill -HUP $KILLPIDS
- exit $RC
-fi
-
-test $KILLSERVERS != no && kill -HUP $KILLPIDS
-
-LDIF=$ITSDIR/config.out
-
-echo "Filtering ldapsearch results..."
-$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
-echo "Filtering original ldif..."
-$LDIFFILTER < $LDIF > $LDIFFLT
-echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
-
-if test $? != 0 ; then
- echo "Comparison failed"
- exit 1
-fi
-
-echo ">>>>> Test succeeded"
-
-test $KILLSERVERS != no && wait
-
-exit 0
diff --git a/tests/data/regressions/its4337/slapd.conf b/tests/data/regressions/its4337/slapd.conf
deleted file mode 100644
index ee3108a..0000000
--- a/tests/data/regressions/its4337/slapd.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# stand-alone slapd config -- for testing (with indexing)
-# $OpenLDAP$
-## This work is part of OpenLDAP Software <http://www.openldap.org/>.
-##
-## Copyright 1998-2020 The OpenLDAP Foundation.
-## All rights reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted only as authorized by the OpenLDAP
-## Public License.
-##
-## A copy of this license is available in the file LICENSE in the
-## top-level directory of the distribution or, alternatively, at
-## <http://www.OpenLDAP.org/license.html>.
-
-include @SCHEMADIR@/core.schema
-include @SCHEMADIR@/cosine.schema
-include @SCHEMADIR@/inetorgperson.schema
-include @SCHEMADIR@/openldap.schema
-include @SCHEMADIR@/nis.schema
-include @DATADIR@/test.schema
-
-#
-pidfile @TESTDIR@/slapd.2.pid
-argsfile @TESTDIR@/slapd.2.args
-
-#mod#modulepath ../servers/slapd/back-@BACKEND@/:../servers/slapd/overlays
-#mod#moduleload back_@BACKEND@.la
-
-#monitormod#modulepath ../servers/slapd/back-monitor/
-#monitormod#moduleload back_monitor.la
-
-database config
-rootpw config
-
-#monitor#database monitor
--
2.19.1

1783
backport-ITS-9010-regenerate-configure.patch Normal file
View File

File diff suppressed because it is too large Load Diff

22206
backport-delete-back-bdb-back-hdb.patch Normal file
View File

File diff suppressed because it is too large Load Diff

23
openldap.spec
View File

@ -2,7 +2,7 @@
Name: openldap Name: openldap
Version: 2.4.50 Version: 2.4.50
Release: 5 Release: 6
Summary: LDAP support libraries Summary: LDAP support libraries
License: OpenLDAP License: OpenLDAP
URL: https://www.openldap.org/ URL: https://www.openldap.org/
@ -57,6 +57,11 @@ Patch36: CVE-2020-36227.patch
Patch37: CVE-2020-36228.patch Patch37: CVE-2020-36228.patch
Patch38: CVE-2020-36230.patch Patch38: CVE-2020-36230.patch
Patch39: CVE-2020-36229.patch Patch39: CVE-2020-36229.patch
Patch40: backport-delete-back-bdb-back-hdb.patch
Patch41: backport-Fix-test-suite.patch
Patch42: backport-ITS-9010-regenerate-configure.patch
Patch43: backport-ITS-9010-More-BDB-HDB-cleanup.patch
BuildRequires: cyrus-sasl-devel openssl-devel krb5-devel unixODBC-devel BuildRequires: cyrus-sasl-devel openssl-devel krb5-devel unixODBC-devel
BuildRequires: glibc-devel libtool libtool-ltdl-devel groff perl-interpreter perl-devel perl-generators perl-ExtUtils-Embed BuildRequires: glibc-devel libtool libtool-ltdl-devel groff perl-interpreter perl-devel perl-generators perl-ExtUtils-Embed
@ -85,11 +90,11 @@ customized LDAP clients.
%package servers %package servers
Summary: LDAP server Summary: LDAP server
License: OpenLDAP License: OpenLDAP
Requires: openldap = %{version}-%{release} libdb-utils Requires: openldap = %{version}-%{release}
Requires(pre): shadow-utils Requires(pre): shadow-utils
%{?systemd_requires} %{?systemd_requires}
BuildRequires: systemd BuildRequires: systemd
BuildRequires: libdb-devel cracklib-devel BuildRequires: cracklib-devel
Provides: ldif2ldbm Provides: ldif2ldbm
%description servers %description servers
@ -161,6 +166,10 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
%patch37 -p1 %patch37 -p1
%patch38 -p1 %patch38 -p1
%patch39 -p1 %patch39 -p1
%patch40 -p1
%patch41 -p1
%patch42 -p1
%patch43 -p1
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
@ -193,7 +202,7 @@ pushd openldap-%{version}
--enable-cleartext --enable-crypt --enable-lmpasswd \ --enable-cleartext --enable-crypt --enable-lmpasswd \
--enable-spasswd --enable-modules --enable-rewrite \ --enable-spasswd --enable-modules --enable-rewrite \
--enable-rlookups --enable-slapi --disable-slp \ --enable-rlookups --enable-slapi --disable-slp \
--enable-backends=mod --enable-bdb=yes --enable-hdb=yes \ --enable-backends=mod \
--enable-mdb=yes --enable-monitor=yes --disable-ndb \ --enable-mdb=yes --enable-monitor=yes --disable-ndb \
--disable-sql --enable-overlays=mod --disable-static \ --disable-sql --enable-overlays=mod --disable-static \
--with-cyrus-sasl --without-fetch --with-threads \ --with-cyrus-sasl --without-fetch --with-threads \
@ -288,13 +297,10 @@ install -m 0755 -d %{buildroot}%{_datadir}/openldap-servers
install -m 0644 %SOURCE3 %{buildroot}%{_datadir}/openldap-servers/slapd.ldif install -m 0644 %SOURCE3 %{buildroot}%{_datadir}/openldap-servers/slapd.ldif
install -m 0700 -d %{buildroot}%{_sysconfdir}/openldap/slapd.d install -m 0700 -d %{buildroot}%{_sysconfdir}/openldap/slapd.d
mv %{buildroot}%{_sysconfdir}/openldap/schema/README README.schema mv %{buildroot}%{_sysconfdir}/openldap/schema/README README.schema
mv %{buildroot}%{_sysconfdir}/openldap/DB_CONFIG.example %{buildroot}%{_datadir}/openldap-servers/DB_CONFIG.example
chmod 0644 %{buildroot}%{_datadir}/openldap-servers/DB_CONFIG.example
rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_localstatedir}/openldap-data/DB_CONFIG.example rm -f %{buildroot}%{_localstatedir}/openldap-data/DB_CONFIG.example
rmdir %{buildroot}%{_localstatedir}/openldap-data
%ldconfig_scriptlets %ldconfig_scriptlets
@ -443,6 +449,9 @@ popd
%doc ltb-project-openldap-ppolicy-check-password-1.1/README.check_pwd %doc ltb-project-openldap-ppolicy-check-password-1.1/README.check_pwd
%changelog %changelog
* Thu Feb 25 2021 orange-snn <songnannan2@huawei.com> - 2.4.50-6
- remove libdb-devel in buildrequires and requires.
* Thu Feb 18 2021 liulong <liulong20@huawei.com> - 2.4.50-5 * Thu Feb 18 2021 liulong <liulong20@huawei.com> - 2.4.50-5
- Type:cves - Type:cves
- ID:NA - ID:NA