!28 gdbm依赖替换libdb

From: @wangchen2020
Reviewed-by: @flysubmarine,@overweight,@zhujianwei001
Signed-off-by: @overweight,@zhujianwei001
This commit is contained in:
openeuler-ci-bot 2021-01-13 09:35:23 +08:00 committed by Gitee
commit a87c8efb90
2 changed files with 33 additions and 4 deletions

24
change-ndbm-to-gdbm.patch Normal file
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_stroe], 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
Name: pam
Version: 1.4.0
Release: 3
Release: 4
Summary: Pluggable Authentication Modules for Linux
License: BSD and GPLv2+
URL: http://www.linux-pam.org/
@ -25,10 +25,11 @@ Patch3: Move-check_user_in_passwd-from-pam_localuser.c-to-pa.patch
Patch4: pam_faillock-fix-build-on-musl.patch
Patch5: pam_modutil_check_user_in_passwd-avoid-timing-attack.patch
Patch6: Prevent-SEGFAULT-for-unknown-UID.patch
Patch7: 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: audit-libs-devel libselinux-devel libdb-devel
BuildRequires: audit-libs-devel libselinux-devel
BuildRequires: linuxdoc-tools elinks libxslt docbook-style-xsl docbook-dtds
Requires: cracklib libpwquality coreutils glibc audit libselinux
@ -65,7 +66,8 @@ autoreconf -i
--disable-prelude \
--enable-cracklib \
--enable-tally \
--enable-tally2
--enable-tally2 \
--enable-db=ndbm
make -C po update-gmo
%make_build
@ -175,6 +177,9 @@ fi
%changelog
* Fri Jan 8 2021 wangchen <wangchen137@huawei.com> - 1.4.0-4
- Use gdbm
* Sat Oct 31 2020 panxiaohe <panxiaohe@huawei.com> - 1.4.0-3
- Prevent SEGFAULT for unknown UID