This commit is contained in:
yangl777 2021-06-28 11:39:04 +08:00 committed by Zhiqiang Liu
parent eb2d4e3aaf
commit cbb703b263
2 changed files with 34 additions and 4 deletions

View File

@ -0,0 +1,24 @@
From c8ff297d3ca1d5a195147c32859b87dba820c281 Mon Sep 17 00:00:00 2001
From: gaoyi <gaoyi15$huawei.com>
Date: Wed, 28 Oct 2020 19:37:25 +0800
Subject: [PATCH] change ndbm to gdbm
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index d537907..ecbaa2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -435,7 +435,7 @@ if test x"$WITH_DB" !=xno ; then
LIBS=$old_libs
fi
if test -z "$LIBDB" ; then
- AC_CHECK_LIB([ndbm],[dbm_store], LIBDB="-lndbm", LIBDB="")
+ AC_CHECK_LIB([gdbm_compat],[dbm_store], LIBDB="-lgdbm_compat", LIBDB="")
if test -n "$LIBDB" ; then
AC_CHECK_HEADERS(ndbm.h)
fi
--
2.23.0

View File

@ -4,7 +4,7 @@
%define _pamconfdir %{_sysconfdir}/pam.d %define _pamconfdir %{_sysconfdir}/pam.d
Name: pam Name: pam
Version: 1.5.1 Version: 1.5.1
Release: 1 Release: 2
Summary: Pluggable Authentication Modules for Linux Summary: Pluggable Authentication Modules for Linux
License: BSD and GPLv2+ License: BSD and GPLv2+
URL: http://www.linux-pam.org/ URL: http://www.linux-pam.org/
@ -21,10 +21,11 @@ Source18: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
Patch0: bugfix-pam-1.1.8-faillock-failmessages.patch Patch0: bugfix-pam-1.1.8-faillock-failmessages.patch
Patch1: bugfix-pam-1.1.8-faillock-systemtime.patch Patch1: bugfix-pam-1.1.8-faillock-systemtime.patch
Patch2: fix-login-message.patch Patch2: fix-login-message.patch
Patch9000:openEuler-change-ndbm-to-gdbm.patch
BuildRequires: autoconf automake libtool bison flex sed cracklib-devel BuildRequires: autoconf automake libtool bison flex sed cracklib-devel gdbm-devel
BuildRequires: perl-interpreter pkgconfig gettext-devel libtirpc-devel libnsl2-devel BuildRequires: perl-interpreter pkgconfig gettext-devel libtirpc-devel libnsl2-devel
BuildRequires: audit-libs-devel libselinux-devel libdb-devel BuildRequires: audit-libs-devel libselinux-devel
BuildRequires: linuxdoc-tools elinks libxslt docbook-style-xsl docbook-dtds BuildRequires: linuxdoc-tools elinks libxslt docbook-style-xsl docbook-dtds
Requires: cracklib libpwquality coreutils glibc audit libselinux Requires: cracklib libpwquality coreutils glibc audit libselinux
@ -58,7 +59,8 @@ autoreconf -i
--libdir=%{_pamlibdir} \ --libdir=%{_pamlibdir} \
--includedir=%{_includedir}/security \ --includedir=%{_includedir}/security \
--disable-static \ --disable-static \
--disable-prelude --disable-prelude \
--enable-db=ndbm
make -C po update-gmo make -C po update-gmo
%make_build %make_build
@ -130,6 +132,7 @@ fi
%{_sbindir}/faillock %{_sbindir}/faillock
%{_sbindir}/mkhomedir_helper %{_sbindir}/mkhomedir_helper
%{_sbindir}/pam_namespace_helper %{_sbindir}/pam_namespace_helper
%attr(0755,root,root) %{_sbindir}/pam_namespace_helper
%dir %{_moduledir} %dir %{_moduledir}
%{_moduledir}/pam*.so %{_moduledir}/pam*.so
%{_moduledir}/pam_filter/ %{_moduledir}/pam_filter/
@ -167,6 +170,9 @@ fi
%changelog %changelog
* Fri Jul 9 2021 shangyibin <shangyibin1@huawei.com> - 1.5.1-2
- use gdbm
* Sat Jan 23 2021 panxiaohe <panxiaohe@huawei.com> - 1.5.1-1 * Sat Jan 23 2021 panxiaohe <panxiaohe@huawei.com> - 1.5.1-1
- update to 1.5.1 - update to 1.5.1