!2 修改由于gcc升级导致编译失败问题。

From: @liheavy
Reviewed-by: @small_leek
Signed-off-by: @small_leek

0000-fix-compilation-failed.patch

@@ -0,0 +1,35 @@
+diff -Nur a/ldap/servers/plugins/acl/acl.h b/ldap/servers/plugins/acl/acl.h
+--- a/ldap/servers/plugins/acl/acl.h	2019-10-19 01:12:19.000000000 +0800
++++ b/ldap/servers/plugins/acl/acl.h	2021-08-04 16:43:24.182937500 +0800
+@@ -311,8 +311,8 @@
+ #define ATTR_ACLPB_MAX_SELECTED_ACLS    "nsslapd-aclpb-max-selected-acls"
+ #define DEFAULT_ACLPB_MAX_SELECTED_ACLS 200
+ 
+-int aclpb_max_selected_acls; /* initialized from plugin config entry */
+-int aclpb_max_cache_results; /* initialized from plugin config entry */
++extern int aclpb_max_selected_acls; /* initialized from plugin config entry */
++extern int aclpb_max_cache_results; /* initialized from plugin config entry */
+ 
+ typedef struct result_cache
+ {
+diff -Nur a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
+--- a/ldap/servers/slapd/slap.h	2019-11-14 09:00:40.000000000 +0800
++++ b/ldap/servers/slapd/slap.h	2021-08-04 15:57:03.260828000 +0800
+@@ -937,7 +937,7 @@
+     void **elements;   /* array of elements */
+     int element_count; /* number of elements in the array */
+     int alloc_count;   /* number of allocated nodes in the array */
+-} datalist;
++};
+ 
+ /* data available to plugins */
+ typedef struct target_data
+@@ -1739,7 +1739,7 @@
+     int task_refcount;
+     void *origin_plugin;       /* If this is a plugin create task, store the plugin object */
+     PRLock *task_log_lock;     /* To protect task_log to be realloced if it's in use */
+-} slapi_task;
++};
+ /* End of interface to support online tasks **********************************/
+ 
+ /*

389-ds-base.spec

@@ -6,13 +6,16 @@ ExcludeArch:   i686
 Name:          389-ds-base
 Summary:       Base 389 Directory Server
 Version:       1.4.0.31
-Release:       2
+Release:       3
 License:       GPLv3+
 URL:           https://www.port389.org
 Source0:       https://releases.pagure.org/389-ds-base/389-ds-base-%{version}.tar.bz2
 Source1:       389-ds-base-git.sh
 Source2:       389-ds-base-devel.README
 Source3:       https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2
+
+Patch0:        0000-fix-compilation-failed.patch
+
 BuildRequires: nspr-devel nss-devel >= 3.34 perl-generators openldap-devel libdb-devel cyrus-sasl-devel icu
 BuildRequires: libicu-devel pcre-devel cracklib-devel gcc-c++ net-snmp-devel lm_sensors-devel bzip2-devel
 BuildRequires: zlib-devel openssl-devel pam-devel systemd-units systemd-devel pkgconfig pkgconfig(systemd)
@@ -101,7 +104,7 @@ Documentation for 389 Directory Server.
 %prep
 %autosetup -n 389-ds-base-%{version} -p1
 
-%autosetup -n 389-ds-base-%{version} -T -D -b 3
+%setup -n 389-ds-base-%{version} -T -D -b 3
 
 cp %{SOURCE2} README.devel
 
@@ -344,5 +347,8 @@ exit 0
 %{_mandir}/*/*
 
 %changelog
+* Mon Aug 2 2021 Haiwei Li <lihaiwei8@huawei.com> - 1.4.0.31-3
+- Fix complication failed due to gcc upgrade
+
 * Wed Apr 29 2020 lizhenhua <lizhenhua21@huawei.com> - 1.4.0.31-2
 - Package init