rebase openldap patch to CentOS7.5
Story: 2003389 Task: 24468 Change-Id: Ib9e04a1fa46ef10dd3f63c2ec386f03dea1585e3 Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14
Lin Shuicheng
parent
cb67fa8330
commit
b76800636e
|
|
@ -1,7 +1,7 @@
|
|||
From d9b5bd4253c4c6965895adaceb08ade39f376165 Mon Sep 17 00:00:00 2001
|
||||
From 935686ff5e53cec008f129cc5d17146bd9365eb0 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 17:11:22 -0400
|
||||
Subject: [PATCH 5/5] WRS: 0001-Update-package-versioning-for-TIS-format.patch
|
||||
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
|
||||
|
||||
Conflicts:
|
||||
SPECS/openldap.spec
|
||||
|
|
@ -10,18 +10,18 @@ Conflicts:
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/openldap.spec b/SPECS/openldap.spec
|
||||
index 973c2db..50bb499 100644
|
||||
index c38f1bd..d35d73f 100644
|
||||
--- a/SPECS/openldap.spec
|
||||
+++ b/SPECS/openldap.spec
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
Name: openldap
|
||||
Version: 2.4.44
|
||||
-Release: 5%{?dist}
|
||||
+Release: 5.el7%{?_tis_dist}.%{tis_patch_ver}
|
||||
-Release: 15%{?dist}
|
||||
+Release: 15.el7_5%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: LDAP support libraries
|
||||
Group: System Environment/Daemons
|
||||
License: OpenLDAP
|
||||
--
|
||||
1.9.1
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
From 7e79fd683d458499fbaef1d3cdbf5654cfccf4ff Mon Sep 17 00:00:00 2001
|
||||
From 9fcb15e18f21acf3fef0fb59dccc3fa0dd37efd4 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 17:11:22 -0400
|
||||
Subject: [PATCH 4/5] WRS: openldap-enable-password-policy.patch
|
||||
Subject: [PATCH] WRS: openldap-enable-password-policy.patch
|
||||
|
||||
---
|
||||
SPECS/openldap.spec | 18 ++++++++++++------
|
||||
1 file changed, 12 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/SPECS/openldap.spec b/SPECS/openldap.spec
|
||||
index 5121f8a..973c2db 100644
|
||||
index 66a1377..468ca0e 100644
|
||||
--- a/SPECS/openldap.spec
|
||||
+++ b/SPECS/openldap.spec
|
||||
@@ -85,6 +85,9 @@ Patch92: check-password-loglevels.patch
|
||||
Patch100: openldap-autoconf-pkgconfig-nss.patch
|
||||
@@ -70,6 +70,9 @@ Patch101: openldap-tlsmc.patch
|
||||
# Fedora specific patches
|
||||
Patch102: openldap-fedora-systemd.patch
|
||||
|
||||
+# WRS specific patches
|
||||
+Patch200: rootdn-should-not-bypass-ppolicy.patch
|
||||
+
|
||||
BuildRequires: cyrus-sasl-devel, nss-devel, krb5-devel, tcp_wrappers-devel, unixODBC-devel
|
||||
BuildRequires: cyrus-sasl-devel, nss-devel, openssl-devel, krb5-devel, tcp_wrappers-devel, unixODBC-devel
|
||||
BuildRequires: glibc-devel, libtool, libtool-ltdl-devel, groff, perl, perl-devel, perl(ExtUtils::Embed)
|
||||
# smbk5pwd overlay:
|
||||
@@ -215,6 +218,9 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
|
||||
Requires: nss-tools
|
||||
@@ -184,6 +187,9 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
|
||||
|
||||
%patch102 -p1
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ index 5121f8a..973c2db 100644
|
|||
# build smbk5pwd with other overlays
|
||||
ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
|
||||
mv contrib/slapd-modules/smbk5pwd/README contrib/slapd-modules/smbk5pwd/README.smbk5pwd
|
||||
@@ -338,12 +344,12 @@ install -d -m 740 %{buildroot}%{_sysconfdir}/openldap
|
||||
@@ -308,12 +314,12 @@ install -d -m 740 %{buildroot}%{_sysconfdir}/openldap
|
||||
cat > %{buildroot}%{_sysconfdir}/openldap/check_password.conf <<EOF
|
||||
# OpenLDAP pwdChecker library configuration
|
||||
|
||||
|
|
@ -51,5 +51,5 @@ index 5121f8a..973c2db 100644
|
|||
mv README{,.check_pwd}
|
||||
popd
|
||||
--
|
||||
1.9.1
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +1,33 @@
|
|||
From e3b655b415b04559e558c6f5dadbd6c6e95af33f Mon Sep 17 00:00:00 2001
|
||||
From 388d312346bb408149f97b58287089a6754944c3 Mon Sep 17 00:00:00 2001
|
||||
From: Saju Oommen <saju.oommen@windriver.com>
|
||||
Date: Mon, 15 Jan 2018 13:59:26 -0500
|
||||
Subject: [PATCH 1/1] remove-ldap-conf-cgcs-file
|
||||
Subject: [PATCH] remove-ldap-conf-cgcs-file
|
||||
|
||||
---
|
||||
SPECS/openldap.spec | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/SPECS/openldap.spec b/SPECS/openldap.spec
|
||||
index 50bb499..50937c0 100644
|
||||
index 468ca0e..c38f1bd 100644
|
||||
--- a/SPECS/openldap.spec
|
||||
+++ b/SPECS/openldap.spec
|
||||
@@ -25,7 +25,6 @@ Source54: libexec-create-certdb.sh
|
||||
Source55: libexec-generate-server-cert.sh
|
||||
@@ -26,7 +26,6 @@ Source55: libexec-generate-server-cert.sh
|
||||
Source56: libexec-update-ppolicy-schema.sh
|
||||
|
||||
# WRS:
|
||||
-Source56: ldap.conf.cgcs
|
||||
Source57: slapd.conf.cgcs
|
||||
Source58: initial_config.ldif
|
||||
Source60: initscript
|
||||
@@ -446,7 +445,7 @@ rm -f %{buildroot}%{_localstatedir}/openldap-data/DB_CONFIG.example
|
||||
-Source100: ldap.conf.cgcs
|
||||
Source101: slapd.conf.cgcs
|
||||
Source102: initial_config.ldif
|
||||
Source103: initscript
|
||||
@@ -417,7 +416,7 @@ rm -f %{buildroot}%{_localstatedir}/openldap-data/DB_CONFIG.example
|
||||
rmdir %{buildroot}%{_localstatedir}/openldap-data
|
||||
|
||||
# WRS: slapd-config is backward compatible with slapd.conf
|
||||
-install -m 600 %{SOURCE56} %{buildroot}%{_sysconfdir}/openldap/ldap.conf
|
||||
+# WRS: SOURCE56 (ldap.conf.cgcs) is replaced by puppet template
|
||||
install -m 600 %{SOURCE57} %{buildroot}%{_sysconfdir}/openldap/slapd.conf
|
||||
install -m 600 %{SOURCE58} %{buildroot}%{_sysconfdir}/openldap/initial_config.ldif
|
||||
-install -m 600 %{SOURCE100} %{buildroot}%{_sysconfdir}/openldap/ldap.conf
|
||||
+# WRS: SOURCE100 (ldap.conf.cgcs) is replaced by puppet template
|
||||
install -m 600 %{SOURCE101} %{buildroot}%{_sysconfdir}/openldap/slapd.conf
|
||||
install -m 600 %{SOURCE102} %{buildroot}%{_sysconfdir}/openldap/initial_config.ldif
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From cf6357eb12c87dd70fc675b9d0420234eb0317db Mon Sep 17 00:00:00 2001
|
||||
From 31cec68ea9c887b363dc31255fb96e88c67c4b63 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 17:11:21 -0400
|
||||
Subject: [PATCH 1/5] WRS: openldap-spec-file.patch
|
||||
Subject: [PATCH] WRS: openldap-spec-file.patch
|
||||
|
||||
Conflicts:
|
||||
SPECS/openldap.spec
|
||||
|
|
@ -10,23 +10,23 @@ Conflicts:
|
|||
1 file changed, 28 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/SPECS/openldap.spec b/SPECS/openldap.spec
|
||||
index d8dbcbf..5121f8a 100644
|
||||
index 85abac9..66a1377 100644
|
||||
--- a/SPECS/openldap.spec
|
||||
+++ b/SPECS/openldap.spec
|
||||
@@ -24,6 +24,12 @@ Source53: libexec-upgrade-db.sh
|
||||
Source54: libexec-create-certdb.sh
|
||||
@@ -25,6 +25,12 @@ Source54: libexec-create-certdb.sh
|
||||
Source55: libexec-generate-server-cert.sh
|
||||
Source56: libexec-update-ppolicy-schema.sh
|
||||
|
||||
+# WRS:
|
||||
+Source56: ldap.conf.cgcs
|
||||
+Source57: slapd.conf.cgcs
|
||||
+Source58: initial_config.ldif
|
||||
+Source60: initscript
|
||||
+Source100: ldap.conf.cgcs
|
||||
+Source101: slapd.conf.cgcs
|
||||
+Source102: initial_config.ldif
|
||||
+Source103: initscript
|
||||
+
|
||||
# patches for 2.4
|
||||
Patch0: openldap-manpages.patch
|
||||
Patch1: openldap-ppolicy-loglevels.patch
|
||||
@@ -276,9 +282,11 @@ pushd openldap-%{version}
|
||||
@@ -245,9 +251,11 @@ pushd openldap-%{version}
|
||||
--enable-backends=mod \
|
||||
--enable-bdb=yes \
|
||||
--enable-hdb=yes \
|
||||
|
|
@ -39,7 +39,7 @@ index d8dbcbf..5121f8a 100644
|
|||
\
|
||||
--enable-overlays=mod \
|
||||
\
|
||||
@@ -326,7 +334,7 @@ mv check_password.so check_password.so.%{check_password_version}
|
||||
@@ -296,7 +304,7 @@ mv check_password.so check_password.so.%{check_password_version}
|
||||
ln -s check_password.so.%{check_password_version} %{buildroot}%{_libdir}/openldap/check_password.so
|
||||
install -m 755 check_password.so.%{check_password_version} %{buildroot}%{_libdir}/openldap/
|
||||
# install -m 644 README %{buildroot}%{_libdir}/openldap
|
||||
|
|
@ -48,30 +48,30 @@ index d8dbcbf..5121f8a 100644
|
|||
cat > %{buildroot}%{_sysconfdir}/openldap/check_password.conf <<EOF
|
||||
# OpenLDAP pwdChecker library configuration
|
||||
|
||||
@@ -375,6 +383,10 @@ mv %{buildroot}/usr/local/share/man/man1/mdb_{copy,dump,load,stat}.1 %{buildroot
|
||||
@@ -346,6 +354,10 @@ mv %{buildroot}/usr/local/share/man/man1/mdb_{copy,dump,load,stat}.1 %{buildroot
|
||||
rm -f %{buildroot}/usr/local/include/lmdb.h
|
||||
rm -f %{buildroot}/usr/local/lib/liblmdb.{a,so}
|
||||
|
||||
+# WRS
|
||||
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
|
||||
+install -m 0755 %SOURCE60 %{buildroot}%{_sysconfdir}/rc.d/init.d/openldap
|
||||
+install -m 0755 %SOURCE103 %{buildroot}%{_sysconfdir}/rc.d/init.d/openldap
|
||||
+
|
||||
# remove build root from config files and manual pages
|
||||
perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_sysconfdir}/openldap/*.conf
|
||||
perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_mandir}/*/*.*
|
||||
@@ -427,6 +439,11 @@ mv %{buildroot}%{_libdir}/openldap/check_password.so{.tmp,}
|
||||
@@ -398,6 +410,11 @@ mv %{buildroot}%{_libdir}/openldap/check_password.so{.tmp,}
|
||||
rm -f %{buildroot}%{_localstatedir}/openldap-data/DB_CONFIG.example
|
||||
rmdir %{buildroot}%{_localstatedir}/openldap-data
|
||||
|
||||
+# WRS: slapd-config is backward compatible with slapd.conf
|
||||
+install -m 600 %{SOURCE56} %{buildroot}%{_sysconfdir}/openldap/ldap.conf
|
||||
+install -m 600 %{SOURCE57} %{buildroot}%{_sysconfdir}/openldap/slapd.conf
|
||||
+install -m 600 %{SOURCE58} %{buildroot}%{_sysconfdir}/openldap/initial_config.ldif
|
||||
+install -m 600 %{SOURCE100} %{buildroot}%{_sysconfdir}/openldap/ldap.conf
|
||||
+install -m 600 %{SOURCE101} %{buildroot}%{_sysconfdir}/openldap/slapd.conf
|
||||
+install -m 600 %{SOURCE102} %{buildroot}%{_sysconfdir}/openldap/initial_config.ldif
|
||||
+
|
||||
%post
|
||||
# create certificate database
|
||||
%{_libexecdir}/openldap/create-certdb.sh >&/dev/null || :
|
||||
@@ -461,6 +478,7 @@ exit 0
|
||||
@@ -432,6 +449,7 @@ exit 0
|
||||
%post servers
|
||||
|
||||
/sbin/ldconfig -n %{_libdir}/openldap
|
||||
|
|
@ -79,7 +79,7 @@ index d8dbcbf..5121f8a 100644
|
|||
|
||||
%systemd_post slapd.service
|
||||
|
||||
@@ -471,7 +489,6 @@ exit 0
|
||||
@@ -442,7 +460,6 @@ exit 0
|
||||
if [ ! -f %{_sysconfdir}/openldap/slapd.d/cn=config.ldif ]; then
|
||||
if [ -f %{_sysconfdir}/openldap/slapd.conf ]; then
|
||||
%{_libexecdir}/openldap/convert-config.sh &>/dev/null
|
||||
|
|
@ -87,7 +87,7 @@ index d8dbcbf..5121f8a 100644
|
|||
else
|
||||
%{_libexecdir}/openldap/convert-config.sh -f %{_datadir}/openldap-servers/slapd.ldif &>/dev/null
|
||||
fi
|
||||
@@ -615,6 +632,7 @@ exit 0
|
||||
@@ -594,6 +611,7 @@ exit 0
|
||||
%dir %attr(0700,ldap,ldap) %{_sharedstatedir}/ldap
|
||||
%dir %attr(-,ldap,ldap) %{_localstatedir}/run/openldap
|
||||
%{_unitdir}/slapd.service
|
||||
|
|
@ -95,7 +95,7 @@ index d8dbcbf..5121f8a 100644
|
|||
%{_datadir}/openldap-servers/
|
||||
%{_libdir}/openldap/accesslog*
|
||||
%{_libdir}/openldap/auditlog*
|
||||
@@ -661,8 +679,13 @@ exit 0
|
||||
@@ -641,8 +659,13 @@ exit 0
|
||||
%{_mandir}/man5/slapd*.5*
|
||||
%{_mandir}/man5/slapo-*.5*
|
||||
# obsolete configuration
|
||||
|
|
@ -112,5 +112,5 @@ index d8dbcbf..5121f8a 100644
|
|||
%files servers-sql
|
||||
%doc openldap-%{version}/servers/slapd/back-sql/docs/*
|
||||
--
|
||||
1.9.1
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
mirror:Source/openldap-2.4.44-5.el7.src.rpm
|
||||
mirror:Source/openldap-2.4.44-15.el7_5.src.rpm
|
||||
|
|
|
|||
Loading…
Reference in New Issue