From 80ed527c8bea4950e1eb4636570288b3a3db5430 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Tue, 22 Mar 2022 16:18:50 +0800 Subject: [PATCH] remove dependency of libdb and remove unknown macros Signed-off-by: Chunmei Xu --- 0001-use-gdbm-instead-of-libdb.patch | 26 ++++++++++++++++++++++++++ macros.pam | 2 +- pam.spec | 11 +++++++++-- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 0001-use-gdbm-instead-of-libdb.patch diff --git a/0001-use-gdbm-instead-of-libdb.patch b/0001-use-gdbm-instead-of-libdb.patch new file mode 100644 index 0000000..530d43c --- /dev/null +++ b/0001-use-gdbm-instead-of-libdb.patch @@ -0,0 +1,26 @@ +From a8273bea993a199b34f51385ed5ad3a726d297d6 Mon Sep 17 00:00:00 2001 +From: Chunmei Xu +Date: Tue, 22 Mar 2022 15:19:01 +0800 +Subject: [PATCH] use gdbm instead of libdb + +Signed-off-by: Chunmei Xu +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c06bc7d..d25fed9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -412,7 +412,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.34.1 + diff --git a/macros.pam b/macros.pam index a020190..95b47db 100644 --- a/macros.pam +++ b/macros.pam @@ -2,6 +2,6 @@ %_pam_moduledir %{_libdir}/security %_pam_secconfdir %{_sysconfdir}/security %_pam_confdir %{_sysconfdir}/pam.d -%_pam_vendordir %{_distconfdir}/pam.d +%_pam_vendordir %{_datadir}/pam.d # legacy, to be retired %_pamdir %{_pam_moduledir} diff --git a/pam.spec b/pam.spec index 230a9e7..53be430 100644 --- a/pam.spec +++ b/pam.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 4 %global soname_version 0 Name: pam @@ -25,6 +25,8 @@ Source100: system-auth.5 Source101: config-util.5 Source102: postlogin.5 +Patch1: 0001-use-gdbm-instead-of-libdb.patch + BuildRequires: audit-libs-devel BuildRequires: autoconf BuildRequires: automake @@ -32,7 +34,6 @@ BuildRequires: bison BuildRequires: flex BuildRequires: gcc BuildRequires: gettext-devel -BuildRequires: libdb-devel BuildRequires: libeconf-devel BuildRequires: libnsl2-devel BuildRequires: libtirpc-devel @@ -46,6 +47,7 @@ BuildRequires: sed BuildRequires: systemd BuildRequires: xz BuildRequires: libselinux-devel +BuildRequires: gdbm-devel Requires: libpwquality%{?_isa} Requires: setup @@ -116,6 +118,8 @@ perl -pi -e "s/\/lib \/usr\/lib/\/lib \/usr\/lib \/lib64 \/usr\/lib64/" m4/libto #Add GPL license cp %{SOURCE4} . +%patch1 -p1 + %build autoreconf -i %configure \ @@ -337,6 +341,9 @@ done %changelog +* Tue Mar 22 2022 Chunmei Xu - 1.5.2-4 +- remove dependency of libdb and remove unknown macros + * Mon Mar 21 2022 Chunmei Xu - 1.5.2-3 - optimise conflicts version -- Gitee