diff --git a/backport-tests-fix-ldap-test-for-new-Fedora.patch b/backport-tests-fix-ldap-test-for-new-Fedora.patch new file mode 100644 index 0000000000000000000000000000000000000000..722bfefb9b0202fdcbb15443bdd8cc5a33bd33df --- /dev/null +++ b/backport-tests-fix-ldap-test-for-new-Fedora.patch @@ -0,0 +1,64 @@ +From b854e3da65dbf264511579b93c0e001d9ef03371 Mon Sep 17 00:00:00 2001 +From: Tomas Halman +Date: Feb 23 2022 14:18:57 +0000 +Subject: tests: fix ldap test for new Fedora + + +Openldap has changed in fedora and command line option -h is +no longer available in utilities like ldapadd. Solution here is +to switch to URI (-H) + +Support for bdb backend is dropped, test are using mdb backend since +this update + +--- + +diff --git a/tests/default_pw_test b/tests/default_pw_test +index 733c85c..9c76b95 100755 +--- a/tests/default_pw_test ++++ b/tests/default_pw_test +@@ -69,7 +69,7 @@ get_file_password() # file under $workdir/files, entry name + get_ldap_password() # entry filter + { + echo "Checking $1 ..." >&2 +- ldapsearch -LLL -h 127.0.0.1 -p "$ldap_port" -x -b 'dc=libuser' "$1" \ ++ ldapsearch -LLL -H ldap://127.0.0.1:$ldap_port -x -b 'dc=libuser' "$1" \ + userPassword | sed -n 's/userPassword:: //p' + } + +@@ -103,7 +103,7 @@ for modules in \ + tests/wait_for_slapd_start "$workdir"/slapd.pid "$ldap_port" + slapd_pid=$(cat "$workdir"/slapd.pid) + trap 'status=$?; kill $slapd_pid; rm -rf "$workdir"; exit $status' 0 +- ldapadd -h 127.0.0.1 -p "$ldap_port" -f "$srcdir/ldap_skel.ldif" -x \ ++ ldapadd -H ldap://127.0.0.1:$ldap_port -f "$srcdir/ldap_skel.ldif" -x \ + -D cn=Manager,dc=libuser -w password + ;; + esac +diff --git a/tests/ldap_test b/tests/ldap_test +index 54609b1..c7ac377 100755 +--- a/tests/ldap_test ++++ b/tests/ldap_test +@@ -56,7 +56,7 @@ slapd_pid=$(cat "$workdir"/slapd.pid) + trap 'status=$?; kill $slapd_pid + tests/wait_for_slapd_exit "$workdir"/slapd.pid "$ldap_port" + rm -rf "$workdir"; exit $status' 0 +-ldapadd -h 127.0.0.1 -p "$ldap_port" -f "$srcdir/ldap_skel.ldif" -x \ ++ldapadd -H "ldap://127.0.0.1:$ldap_port" -f "$srcdir/ldap_skel.ldif" -x \ + -D cn=Manager,dc=libuser -w password + + +diff --git a/tests/slapd.conf.in b/tests/slapd.conf.in +index 06ef10d..8e49a36 100644 +--- a/tests/slapd.conf.in ++++ b/tests/slapd.conf.in +@@ -10,7 +10,7 @@ pidfile @WORKDIR@/slapd.pid + TLSCertificateFile @WORKDIR@/key.pem + TLSCertificateKeyFile @WORKDIR@/key.pem + +-database bdb ++database mdb + suffix "dc=libuser" + rootdn "cn=Manager,dc=libuser" + rootpw {SSHA}ABgelmLFZQ/OJzVEp3OM5MzWQ9rt3b4F + diff --git a/libuser.spec b/libuser.spec index 80b3704488a7f7c475a39e6d55d4ff4b1d8577b5..a0d2a40deeb6e520d28c4d061a1974214a5acc07 100644 --- a/libuser.spec +++ b/libuser.spec @@ -1,6 +1,6 @@ Name: libuser Version: 0.62 -Release: 22 +Release: 23 Summary: A user and group account administration library License: LGPLv2+ URL: https://pagure.io/libuser @@ -13,6 +13,7 @@ Patch2: 0010-files.c-Init-char-name-to-NULL.patch Patch3: 0011-merge_ent_array_duplicates-Only-use-values-if-valid.patch Patch4: 0012-editing_open-close-fd-after-we-ve-established-its-va.patch Patch5: libuser-do-not-use-deprecated-flask.h-and-av_permissions.patch +Patch6: backport-tests-fix-ldap-test-for-new-Fedora.patch Patch9000: add-sm3-crypt-support.patch @@ -75,6 +76,7 @@ pushd libuser-%{version} %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch9000 -p1 popd @@ -107,16 +109,15 @@ make -C python2 install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' || : %find_lang %{name} %check - -#make -C python2 check || { cat python2/test-suite.log; false; } -#LC_ALL=C.UTF-8 make -C python3 check \ -# || { cat python3/test-suite.log; false; } -#LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_prefix}/%{_lib}:${LD_LIBRARY_PATH} -#export LD_LIBRARY_PATH -#cd $RPM_BUILD_ROOT/%{python2_sitearch} -#python2 -c "import libuser" -#cd $RPM_BUILD_ROOT/%{python3_sitearch} -#LC_ALL=C.UTF-8 python3 -c "import libuser" +make -C python2 check || { cat python2/test-suite.log; false; } +LC_ALL=C.UTF-8 make -C python3 check \ + || { cat python3/test-suite.log; false; } +LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_prefix}/%{_lib}:${LD_LIBRARY_PATH} +export LD_LIBRARY_PATH +cd $RPM_BUILD_ROOT/%{python2_sitearch} +python2 -c "import libuser" +cd $RPM_BUILD_ROOT/%{python3_sitearch} +LC_ALL=C.UTF-8 python3 -c "import libuser" %post /sbin/ldconfig @@ -158,6 +159,9 @@ make -C python2 install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' || : %{_mandir}/man5/* %changelog +* Thu Feb 09 2023 fuanan - 0.62-23 +- enable make check + * Fri Oct 29 2021 lujie - 0.62-22 - add sm3 crypt support