开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:extract_file:libuser.spec Deleted

@@ -1,129 +0,0 @@
-Name:    libuser
-Version: 0.63
-Release: 3
-Summary: A user and group account administration library
-License: LGPLv2+
-URL:     https://pagure.io/libuser
-Source:  http://releases.pagure.org/libuser/libuser-%{version}.tar.xz
-
-Patch0:  libuser-0.63-PR49_add_yescrypt.patch
-Patch1:  libuser-0.63-downstream_test_xcrypt.patch
-Patch2:  fix-ldap-test-because-openldap-was-upgraded.patch
-
-Patch9000:  add-sm3-crypt-support.patch
-
-BuildRequires: cyrus-sasl-devel,, linuxdoc-tools, pam-devel, popt-devel, gcc
-BuildRequires: libselinux-devel, openldap-devel, python3-devel, glib2-devel
-BuildRequires: openldap-clients, openldap-servers, openssl
-BuildRequires: bison, make, libtool, gettext-devel, gtk-doc, audit-libs-devel
-
-%description
-The libuser library implements a standardized interface for manipulating
-and administering user and group accounts. The library uses pluggable
-back-ends to interface to its data sources. Sample applications modeled
-after those included with the shadow password suite are included.
-
-%package devel
-Summary: Development libraries and files for %{name}
-Requires: glib2-devel%{?_isa}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-The package contains lib and header files for developing application
-that use %{name}
-
-%package python3
-Summary: the libuser library used for binding Python 3
-Requires: libuser%{?_isa} = %{version}-%{release}
-
-%description python3
-The libuser library which provides a Python 3 API implements a
-standardized interface for manipulating and administering user
-and group accounts.
-
-%package help
-Summary:        Documents files for %{name}
-Requires:       man, info
-
-%description help
-Man pages and other related documents for %{name}
-
-%prep
-%autosetup -n libuser-%{version} -p1
-
-%build
-./autogen.sh
-%configure --with-ldap --with-selinux --with-html-dir=%{_prefix}/share/gtk-doc/html \
-	PYTHON=%{_bindir}/python3
-make
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' || :
-
-%find_lang %{name}
-
-%check
-%make_build check || { cat test-suite.log; false; }
-
-LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_prefix}/%{_lib}:${LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH
-cd $RPM_BUILD_ROOT/%{python3_sitearch}
-python3 -c "import libuser"
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files -f %{name}.lang
-%{!?_licensedir:%global license %%doc}
-%license COPYING
-%doc AUTHORS NEWS README TODO docs/*.txt
-%config(noreplace) %{_sysconfdir}/libuser.conf
-%attr(0755,root,root) %{_exec_prefix}/bin/*
-%{_prefix}/%{_lib}/%{name}/*.so
-%{_prefix}/%{_lib}/*.so.*
-%dir %{_prefix}/%{_lib}/%{name}
-%attr(0755,root,root) %{_exec_prefix}/sbin/*
-%exclude %{_prefix}/%{_lib}/%{name}/*.la
-%exclude %{_prefix}/%{_lib}/*.la
-
-%files python3
-%doc python/modules.txt
-%{python3_sitearch}/*.so
-%exclude %{python3_sitearch}/*.la
-
-%files devel
-%{_exec_prefix}/%{_lib}/*.so
-%{_exec_prefix}/%{_lib}/pkgconfig/*
-%{_includedir}/libuser
-
-%files help
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-
-%changelog
-* Tue Feb 22 2022 jiangheng <jiangheng12@huawei.com> - 0.63-3
-- remove nscd dependency
-
-* Mon Jan 17 2022 luhuaxin <luhuaxin1@huawei.com> - 0.63-2
-- add sm3 crypt support
-
-* Tue Dec 28 2021 fuanan <fuanan3@huawei.com> - 0.63-1
-- update version to 0.63
-
-* Tue Jul 20 2021 fuanan <fuanan3@huawei.com> - 0.62-23
-- Remove redundant gdb from BuildRequires
-
-* Thu Oct 29 2020 wangchen <wangchen137@huawei.com> - 0.62-22
-- remove python2
-
-* Thu Jul 30 2020 zhangxingliang <zhangxingliang3@huawei.com> - 0.62-21
-- do not use deprecated flask.h and av_permissions.h
-
-* Sat Mar 21 2020 chengquan<chengquan3@huawei.com> - 0.62-20
-- add necessary BuildRequires
-
-* Tue Sep 10 2019 caomeng<caomeng5@huawei.com> - 0.62-19
-- Package init

_service:tar_scm:libuser.spec Added

@@ -0,0 +1,138 @@
+Name:    libuser
+Version: 0.63
+Release: 5
+Summary: A user and group account administration library
+License: LGPLv2+
+URL:     https://pagure.io/libuser
+Source:  http://releases.pagure.org/libuser/libuser-%{version}.tar.xz
+
+Patch0:  libuser-0.63-PR49_add_yescrypt.patch
+Patch1:  libuser-0.63-downstream_test_xcrypt.patch
+Patch2:  fix-ldap-test-because-openldap-was-upgraded.patch
+
+Patch9000:  add-sm3-crypt-support.patch
+
+BuildRequires: cyrus-sasl-devel, linuxdoc-tools, pam-devel, popt-devel, gcc
+BuildRequires: libselinux-devel, openldap-devel, python3-devel, glib2-devel
+BuildRequires: openldap-clients, openldap-servers, openssl
+BuildRequires: bison, make, libtool, gettext-devel, gtk-doc, audit-libs-devel
+
+%description
+The libuser library implements a standardized interface for manipulating
+and administering user and group accounts. The library uses pluggable
+back-ends to interface to its data sources. Sample applications modeled
+after those included with the shadow password suite are included.
+
+%package devel
+Summary: Development libraries and files for %{name}
+Requires: glib2-devel%{?_isa}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The package contains lib and header files for developing application
+that use %{name}
+
+%package python3
+Summary: the libuser library used for binding Python 3
+Requires: libuser%{?_isa} = %{version}-%{release}
+
+%description python3
+The libuser library which provides a Python 3 API implements a
+standardized interface for manipulating and administering user
+and group accounts.
+
+%package help
+Summary:        Documents files for %{name}
+Requires:       man, info
+
+%description help
+Man pages and other related documents for %{name}
+
+%prep
+%autosetup -n libuser-%{version} -p1
+
+%build
+./autogen.sh
+%configure --with-ldap --with-selinux --with-html-dir=%{_prefix}/share/gtk-doc/html \
+	PYTHON=%{_bindir}/python3
+make %{?_smp_mflags}
+
+%install
+make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' || :
+
+%find_lang %{name}
+
+%check
+%make_build check || { cat test-suite.log; false; }
+
+LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_prefix}/%{_lib}:${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH
+cd $RPM_BUILD_ROOT/%{python3_sitearch}
+python3 -c "import libuser"
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files -f %{name}.lang
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc AUTHORS NEWS README TODO docs/*.txt
+%config(noreplace) %{_sysconfdir}/libuser.conf
+%attr(0755,root,root) %{_exec_prefix}/bin/*
+%{_prefix}/%{_lib}/%{name}/*.so
+%{_prefix}/%{_lib}/*.so.*
+%dir %{_prefix}/%{_lib}/%{name}
+%attr(0755,root,root) %{_exec_prefix}/sbin/*
+%exclude %{_prefix}/%{_lib}/%{name}/*.la
+%exclude %{_prefix}/%{_lib}/*.la
+
+%files python3
+%doc python/modules.txt
+%{python3_sitearch}/*.so
+%exclude %{python3_sitearch}/*.la
+
+%files devel
+%{_exec_prefix}/%{_lib}/*.so
+%{_exec_prefix}/%{_lib}/pkgconfig/*
+%{_includedir}/libuser
+
+%files help
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+
+%changelog
+* Wed Oct 19 2022 fuanan <fuanan3@h-partners.com> - 0.63-5
+- DESC:optimize compilation by running make in parallel
+
+* Thu Jul 28 2022 fuanan <fuanan3@h-partners.com> - 0.63-4
+- Type:requirements
+- ID:NA
+- SUG:NA
+- DESC:Bump release and Minor revise format
+
+* Tue Feb 22 2022 jiangheng <jiangheng12@huawei.com> - 0.63-3
+- remove nscd dependency
+
+* Mon Jan 17 2022 luhuaxin <luhuaxin1@huawei.com> - 0.63-2
+- add sm3 crypt support
+
+* Tue Dec 28 2021 fuanan <fuanan3@huawei.com> - 0.63-1
+- update version to 0.63
+
+* Tue Jul 20 2021 fuanan <fuanan3@huawei.com> - 0.62-23
+- Remove redundant gdb from BuildRequires
+
+* Thu Oct 29 2020 wangchen <wangchen137@huawei.com> - 0.62-22
+- remove python2
+
+* Thu Jul 30 2020 zhangxingliang <zhangxingliang3@huawei.com> - 0.62-21
+- do not use deprecated flask.h and av_permissions.h
+
+* Sat Mar 21 2020 chengquan<chengquan3@huawei.com> - 0.62-20
+- add necessary BuildRequires
+
+* Tue Sep 10 2019 caomeng<caomeng5@huawei.com> - 0.62-19
+- Package init

_service:extract_file:add-sm3-crypt-support.patch Deleted

@@ -1,626 +0,0 @@
-From 4c77b98870ee4b2c3bd49e00205cca22689c0e53 Mon Sep 17 00:00:00 2001
-From: lujie42 <lujie42@huawei.com>
-Date: Fri, 29 Oct 2021 15:56:12 +0800
-Subject: PATCH add sm3 crypt support
-
-Signed-off-by: lujie42 <lujie42@huawei.com>
-Signed-off-by: luhuaxin <1539327763@qq.com>
----
- Makefile.am             |   3 +-
- docs/libuser.conf.5.in  |   4 +-
- lib/util.c              |   4 +-
- tests/files_sm3.conf.in |  25 +++
- tests/sm3_test          |  43 +++++
- tests/sm3_test.py       | 446 ++++++++++++++++++++++++++++++++++++++++++++++++
- 6 files changed, 521 insertions(+), 4 deletions(-)
- create mode 100644 tests/files_sm3.conf.in
- create mode 100755 tests/sm3_test
- create mode 100755 tests/sm3_test.py
-
-diff --git a/Makefile.am b/Makefile.am
-index 9f099bd..8977c45 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,7 +26,7 @@ VG_ENVIRONMENT = G_SLICE=always-malloc \
- ## Targets
- SUBDIRS = po docs
- TESTS = tests/config_test.sh tests/fs_test tests/files_test tests/pwhash_test \
--	tests/utils_test
-+	tests/utils_test tests/sm3_test
- if LDAP
- TESTS += tests/default_pw_test tests/ldap_test
- endif
-@@ -40,6 +40,7 @@ EXTRA_DIST = \
- 	tests/config_login.defs tests/config_login2.defs \
- 	tests/config_override.conf.in tests/config_test.py \
- 	tests/config_test.sh \
-+	tests/files_sm3.conf.in tests/sm3_test tests/sm3_test.py \
- 	tests/default_pw.conf.in tests/default_pw_test tests/default_pw_test.py \
- 	tests/files.conf.in tests/files_test tests/files_test.py \
- 	tests/fs.conf.in tests/fs_test tests/fs_test.py \
-diff --git a/docs/libuser.conf.5.in b/docs/libuser.conf.5.in
-index bd1daa7..bdd1384 100644
---- a/docs/libuser.conf.5.in
-+++ b/docs/libuser.conf.5.in
-@@ -68,7 +68,7 @@ The algorithm to use for password encryption when creating new passwords.
- The current algorithm may be retained
- when changing a password of an existing user, depending on the application.
- 
--Possible values are \fBdes\fR, \fBmd5\fR, \fBblowfish\fR,
-+Possible values are \fBdes\fR, \fBmd5\fR, \fBblowfish\fR, \fBsm3\fR
- .B sha256,
- \fBsha512\fR, and \fByescrypt\fR, all case-insensitive.
- Unrecognized values are treated as \fBdes\fR.
-@@ -80,7 +80,7 @@ These variables specify an inclusive range of hash rounds used when
- .B crypt_style
- is
- .B sha256
--or \fBsha512\fR.
-+or \fBsha512\fR or \fBsm3\fR.
- A number of hash rounds is chosen from this interval randomly.
- A larger number of rounds makes password checking, and brute-force attempts
- to guess the password by reversing the hash, more CPU-intensive.
-diff --git a/lib/util.c b/lib/util.c
-index bba9420..354a991 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -134,7 +134,7 @@ fill_urandom(char *output, size_t length)
- #endif
- 
- static const struct {
--	const char initial5;
-+	const char initial6;
- 	char separator2;
- 	size_t salt_length;
- 	gboolean sha_rounds;
-@@ -144,6 +144,7 @@ static const struct {
- 	{"$2b$", "$", 8, FALSE },
- 	{"$5$", "$", 16, TRUE },
- 	{"$6$", "$", 16, TRUE },
-+	{"$sm3$", "$", 16, TRUE },
- #if HAVE_YESCRYPT
- 	{"$y$", "$", 24, FALSE },
- #endif
-@@ -275,6 +276,7 @@ lu_util_default_salt_specifier(struct lu_context *context)
- 		{ "blowfish", "$2b$", FALSE },
- 		{ "sha256", "$5$", TRUE },
- 		{ "sha512", "$6$", TRUE },
-+		{ "sm3", "$sm3$", TRUE },
- #if HAVE_YESCRYPT
- 		{ "yescrypt", "$y$", FALSE },
- #endif
-diff --git a/tests/files_sm3.conf.in b/tests/files_sm3.conf.in
-new file mode 100644
-index 0000000..3831d0f
---- /dev/null
-+++ b/tests/files_sm3.conf.in
-@@ -0,0 +1,25 @@
-+defaults
-+# non-portable
-+moduledir = @TOP_BUILDDIR@/modules/.libs
-+skeleton = /etc/skel
-+mailspooldir = /var/mail
-+modules = files shadow
-+create_modules = files shadow
-+crypt_style = sm3
-+
-+userdefaults
-+LU_USERNAME = %n
-+LU_UIDNUMBER = 500
-+LU_GIDNUMBER = %u
-+
-+groupdefaults
-+LU_GROUPNAME = %n
-+LU_GIDNUMBER = 500
-+
-+files
-+directory = @WORKDIR@/sm3
-+nonroot = yes
-+
-+shadow
-+directory = @WORKDIR@/sm3
-+nonroot = yes
-diff --git a/tests/sm3_test b/tests/sm3_test
-new file mode 100755
-index 0000000..bdb2034
---- /dev/null
-+++ b/tests/sm3_test
-@@ -0,0 +1,43 @@
-+#!/bin/bash
-+# Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved.
-+# Description: Automated files/shadow regression tester for sm3 crypt
-+# Create: 2021-07-26
-+
-+srcdir=$srcdir/tests
-+
-+workdir=$(pwd)/test_sm3
-+
-+trap 'status=$?; rm -rf "$workdir"; exit $status' 0
-+trap '(exit 1); exit 1' 1 2 13 15
-+
-+rm -rf "$workdir"
-+mkdir "$workdir"
-+
-+# Set up an the environment
-+mkdir "$workdir"/sm3
-+
-+cat > "$workdir"/sm3/passwd <<\EOF
-+empty_user::42:43:::
-+EOF
-+cat > "$workdir"/sm3/shadow <<\EOF
-+empty_user::::::::
-+EOF
-+cat > "$workdir"/sm3/group <<\EOF
-+empty_group::44:
-+EOF
-+cat > "$workdir"/sm3/gshadow <<\EOF
-+empty_group:::
-+EOF
-+
-+# Set up the client
-+LIBUSER_CONF=$workdir/libuser.conf
-+export LIBUSER_CONF
-+sed "s|@WORKDIR@|$workdir|g; s|@TOP_BUILDDIR@|$(pwd)|g" \
-+    < "$srcdir"/files_sm3.conf.in > "$LIBUSER_CONF"
-+# Ugly non-portable hacks
-+LD_LIBRARY_PATH=$(pwd)/lib/.libs
-+export LD_LIBRARY_PATH
-+PYTHONPATH=$(pwd)/python/.libs
-+export PYTHONPATH
-+
-+workdir="$workdir" $VALGRIND $PYTHON "$srcdir"/sm3_test.py
-diff --git a/tests/sm3_test.py b/tests/sm3_test.py
-new file mode 100755
-index 0000000..e680dd7
---- /dev/null
-+++ b/tests/sm3_test.py
-@@ -0,0 +1,446 @@
-+#!/usr/bin/python
-+# Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved.
-+# Description: sm3 crypt testcase
-+# Create: 2021-07-26
-+
-+import crypt
-+import libuser
-+import os
-+import os.path
-+import sys
-+import unittest
-+
-+#sm3
-+crypt_flag="$sm3$"
-+crypt_flag_len=5
-+crypt_t="sm3"
-+
-+
-+class Tests(unittest.TestCase):
-+    def setUp(self):
-+        self.a = libuser.admin()
-+

_service:extract_file:fix-ldap-test-because-openldap-was-upgraded.patch Deleted

@@ -1,67 +0,0 @@
-From 85bcf0efc3d3e6453f6e50da877dc7eb1a4d1ae1 Mon Sep 17 00:00:00 2001
-From: panxiaohe <panxiaohe@huawei.com>
-Date: Mon, 10 Jan 2022 13:17:22 +0800
-Subject: PATCH fix ldap test because openldap was upgraded to 2.6.0
-
-The new version of openldap has removed deprecated -h and -p options
-to client tools. And it has deleted back-bdb, so this patch uses mdb.
----
- tests/default_pw_test | 6 ++++--
- tests/ldap_test       | 3 ++-
- tests/slapd.conf.in   | 2 +-
- 3 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/tests/default_pw_test b/tests/default_pw_test
-index 733c85c..932dcb2 100755
---- a/tests/default_pw_test
-+++ b/tests/default_pw_test
-@@ -69,7 +69,8 @@ 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" \
-+    URI="ldap://127.0.0.1:$ldap_port/"
-+    ldapsearch -LLL -H "$URI" -x -b 'dc=libuser' "$1" \
- 	userPassword | sed -n 's/userPassword:: //p'
- }
- 
-@@ -103,7 +104,8 @@ 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 \
-+	    URI="ldap://127.0.0.1:$ldap_port/"
-+	    ldapadd -H "$URI" -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..de9308c 100755
---- a/tests/ldap_test
-+++ b/tests/ldap_test
-@@ -56,7 +56,8 @@ 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 \
-+URI="ldap://127.0.0.1:$ldap_port/"
-+ldapadd -H "$URI" -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
--- 
-1.8.3.1
-

_service:extract_file:libuser-0.63-PR49_add_yescrypt.patch Deleted

@@ -1,260 +0,0 @@
-From 3b8a2aa52bcee6e03f047840251ae42ab971a8a0 Mon Sep 17 00:00:00 2001
-From: Björn Esser <besser82@fedoraproject.org>
-Date: Jun 07 2021 20:25:41 +0000
-Subject: PATCH 1/5 lib/util.c: bcrypt should use $2b$ as prefix for setting.
-
-
-This prefix is the recommended one for new bcrypt hashes
-for a long time.
-
-Signed-off-by: Björn Esser <besser82@fedoraproject.org>
-
----
-
-diff --git a/lib/util.c b/lib/util.c
-index 1b03f7d..e549a35 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -124,7 +124,7 @@ static const struct {
- } salt_type_info = {
- 	{"$1$", "$", 8, FALSE },
- 	/* FIXME: number of rounds, base64 of 128 bits */
--	{"$2a$", "$", 8, FALSE },
-+	{"$2b$", "$", 8, FALSE },
- 	{"$5$", "$", 16, TRUE },
- 	{"$6$", "$", 16, TRUE },
- 	{ "", "", 2 },
-@@ -231,7 +231,7 @@ lu_util_default_salt_specifier(struct lu_context *context)
- 	} salt_types = {
- 		{ "des", "", FALSE },
- 		{ "md5", "$1$", FALSE },
--		{ "blowfish", "$2a$", FALSE },
-+		{ "blowfish", "$2b$", FALSE },
- 		{ "sha256", "$5$", TRUE },
- 		{ "sha512", "$6$", TRUE },
- 	};
-
-From 9dcc69425677cf510ec6da5ababfdd295f875c1a Mon Sep 17 00:00:00 2001
-From: Björn Esser <besser82@fedoraproject.org>
-Date: Jun 17 2021 15:34:02 +0000
-Subject: PATCH 2/5 lib/util.c: Use crypt_gensalt(), if available in libcrypt.
-
-
-Most Linux distributions, including Fedora and RHEL 8, are shipping
-with libxcrypt >= 4.0.
-
-Since that version of libxcrypt the provided family of crypt_gensalt()
-functions are able to use automatic entropy drawn from secure system
-ressources, like arc4random(), getentropy() or getrandom().
-
-Anyways, the settings generated by crypt_gensalt() are always
-guaranteed to works with the crypt() function.
-
-Using crypt_gesalt() is also needed to make proper use of newer
-hashing methods, like yescrypt, provided by libxcrypt.
-
-Signed-off-by: Björn Esser <besser82@fedoraproject.org>
-
----
-
-diff --git a/lib/util.c b/lib/util.c
-index e549a35..b6db2af 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -43,6 +43,13 @@
- #define HASH_ROUNDS_MIN 1000
- #define HASH_ROUNDS_MAX 999999999
- 
-+#if (defined CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY && \
-+     CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY)
-+#define USE_XCRYPT_GENSALT 1
-+#else
-+#define USE_XCRYPT_GENSALT 0
-+#endif
-+
- struct lu_lock {
- 	int fd;
- 	struct flock lock;
-@@ -66,6 +73,7 @@ lu_strcmp(gconstpointer v1, gconstpointer v2)
- 	return strcmp((char *) v1, (char *) v2);
- }
- 
-+#if !USE_XCRYPT_GENSALT
- /* A list of allowed salt characters, according to SUSv2. */
- #define ACCEPTABLE "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
- 		   "abcdefghijklmnopqrstuvwxyz" \
-@@ -115,6 +123,7 @@ fill_urandom(char *output, size_t length)
- 	close(fd);
- 	return TRUE;
- }
-+#endif
- 
- static const struct {
- 	const char initial5;
-@@ -135,6 +144,9 @@ lu_make_crypted(const char *plain, const char *previous)
- {
- 	char salt2048;
- 	size_t i, len = 0;
-+#if USE_XCRYPT_GENSALT
-+	unsigned long rounds = 0;
-+#endif
- 
- 	if (previous == NULL) {
- 		previous = LU_DEFAULT_SALT_TYPE;
-@@ -151,6 +163,23 @@ lu_make_crypted(const char *plain, const char *previous)
- 
- 	if (salt_type_infoi.sha_rounds != FALSE
- 	    && strncmp(previous + len, "rounds=", strlen("rounds=")) == 0) {
-+#if USE_XCRYPT_GENSALT
-+		const char *start;
-+		char *end;
-+
-+		start = previous + len + strlen("rounds=");
-+		rounds = strtoul (start, &end, 10);
-+
-+		if (rounds < HASH_ROUNDS_MIN)
-+			rounds = HASH_ROUNDS_MIN;
-+		else if (rounds > HASH_ROUNDS_MAX)
-+			rounds = HASH_ROUNDS_MAX;
-+	}
-+
-+	g_assert(CRYPT_GENSALT_OUTPUT_SIZE <= sizeof(salt));
-+
-+	crypt_gensalt_rn(previous, rounds, NULL, 0, salt, sizeof(salt));
-+#else
- 		const char *start, *end;
- 
- 		start = previous + len + strlen("rounds=");
-@@ -168,6 +197,7 @@ lu_make_crypted(const char *plain, const char *previous)
- 		return NULL;
- 	strcpy(salt + len + salt_type_infoi.salt_length,
- 	       salt_type_infoi.separator);
-+#endif
- 
- 	return crypt(plain, salt);
- }
-@@ -251,13 +281,18 @@ lu_util_default_salt_specifier(struct lu_context *context)
- 
- found:
- 	if (salt_typesi.sha_rounds != FALSE) {
--		unsigned long rounds;
-+		unsigned long rounds = 0;
- 
- 		rounds = select_hash_rounds(context);
-+#if USE_XCRYPT_GENSALT
-+		return g_strdup(crypt_gensalt(salt_typesi.initializer,
-+					      rounds, NULL, 0));
-+#else
- 		if (rounds != 0)
- 			return g_strdup_printf("%srounds=%lu$",
- 					       salt_typesi.initializer,
- 					       rounds);
-+#endif
- 	}
- 	return g_strdup(salt_typesi.initializer);
- }
-
-From 2d40503977df3855f1415db995833ae4231e7944 Mon Sep 17 00:00:00 2001
-From: Björn Esser <besser82@fedoraproject.org>
-Date: Jun 17 2021 15:34:02 +0000
-Subject: PATCH 3/5 lib/util.c: Add yescrypt hashing method for user passwords.
-
-
-The yescrypt hashing method is considered to be much stronger than
-sha512crypt and fully supported by libxcrypt >= 4.3.  It is based
-on NIST-approved primitives and on par with argon2 in strength.
-
-Signed-off-by: Björn Esser <besser82@fedoraproject.org>
-
----
-
-diff --git a/lib/util.c b/lib/util.c
-index b6db2af..bba9420 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -50,6 +50,14 @@
- #define USE_XCRYPT_GENSALT 0
- #endif
- 
-+#if ((defined XCRYPT_VERSION_NUM && \
-+      XCRYPT_VERSION_NUM >= ((4 << 16) | 3)) && \
-+      USE_XCRYPT_GENSALT)
-+#define HAVE_YESCRYPT 1
-+#else
-+#define HAVE_YESCRYPT 0
-+#endif
-+
- struct lu_lock {
- 	int fd;
- 	struct flock lock;
-@@ -136,6 +144,9 @@ static const struct {
- 	{"$2b$", "$", 8, FALSE },
- 	{"$5$", "$", 16, TRUE },
- 	{"$6$", "$", 16, TRUE },
-+#if HAVE_YESCRYPT
-+	{"$y$", "$", 24, FALSE },
-+#endif
- 	{ "", "", 2 },
- };
-

_service:extract_file:libuser-0.63-downstream_test_xcrypt.patch Deleted

_service:tar_scm:add-sm3-crypt-support.patch Added

@@ -0,0 +1,626 @@
+From 4c77b98870ee4b2c3bd49e00205cca22689c0e53 Mon Sep 17 00:00:00 2001
+From: lujie42 <lujie42@huawei.com>
+Date: Fri, 29 Oct 2021 15:56:12 +0800
+Subject: PATCH add sm3 crypt support
+
+Signed-off-by: lujie42 <lujie42@huawei.com>
+Signed-off-by: luhuaxin <1539327763@qq.com>
+---
+ Makefile.am             |   3 +-
+ docs/libuser.conf.5.in  |   4 +-
+ lib/util.c              |   4 +-
+ tests/files_sm3.conf.in |  25 +++
+ tests/sm3_test          |  43 +++++
+ tests/sm3_test.py       | 446 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 6 files changed, 521 insertions(+), 4 deletions(-)
+ create mode 100644 tests/files_sm3.conf.in
+ create mode 100755 tests/sm3_test
+ create mode 100755 tests/sm3_test.py
+
+diff --git a/Makefile.am b/Makefile.am
+index 9f099bd..8977c45 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -26,7 +26,7 @@ VG_ENVIRONMENT = G_SLICE=always-malloc \
+ ## Targets
+ SUBDIRS = po docs
+ TESTS = tests/config_test.sh tests/fs_test tests/files_test tests/pwhash_test \
+-	tests/utils_test
++	tests/utils_test tests/sm3_test
+ if LDAP
+ TESTS += tests/default_pw_test tests/ldap_test
+ endif
+@@ -40,6 +40,7 @@ EXTRA_DIST = \
+ 	tests/config_login.defs tests/config_login2.defs \
+ 	tests/config_override.conf.in tests/config_test.py \
+ 	tests/config_test.sh \
++	tests/files_sm3.conf.in tests/sm3_test tests/sm3_test.py \
+ 	tests/default_pw.conf.in tests/default_pw_test tests/default_pw_test.py \
+ 	tests/files.conf.in tests/files_test tests/files_test.py \
+ 	tests/fs.conf.in tests/fs_test tests/fs_test.py \
+diff --git a/docs/libuser.conf.5.in b/docs/libuser.conf.5.in
+index bd1daa7..bdd1384 100644
+--- a/docs/libuser.conf.5.in
++++ b/docs/libuser.conf.5.in
+@@ -68,7 +68,7 @@ The algorithm to use for password encryption when creating new passwords.
+ The current algorithm may be retained
+ when changing a password of an existing user, depending on the application.
+ 
+-Possible values are \fBdes\fR, \fBmd5\fR, \fBblowfish\fR,
++Possible values are \fBdes\fR, \fBmd5\fR, \fBblowfish\fR, \fBsm3\fR
+ .B sha256,
+ \fBsha512\fR, and \fByescrypt\fR, all case-insensitive.
+ Unrecognized values are treated as \fBdes\fR.
+@@ -80,7 +80,7 @@ These variables specify an inclusive range of hash rounds used when
+ .B crypt_style
+ is
+ .B sha256
+-or \fBsha512\fR.
++or \fBsha512\fR or \fBsm3\fR.
+ A number of hash rounds is chosen from this interval randomly.
+ A larger number of rounds makes password checking, and brute-force attempts
+ to guess the password by reversing the hash, more CPU-intensive.
+diff --git a/lib/util.c b/lib/util.c
+index bba9420..354a991 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -134,7 +134,7 @@ fill_urandom(char *output, size_t length)
+ #endif
+ 
+ static const struct {
+-	const char initial5;
++	const char initial6;
+ 	char separator2;
+ 	size_t salt_length;
+ 	gboolean sha_rounds;
+@@ -144,6 +144,7 @@ static const struct {
+ 	{"$2b$", "$", 8, FALSE },
+ 	{"$5$", "$", 16, TRUE },
+ 	{"$6$", "$", 16, TRUE },
++	{"$sm3$", "$", 16, TRUE },
+ #if HAVE_YESCRYPT
+ 	{"$y$", "$", 24, FALSE },
+ #endif
+@@ -275,6 +276,7 @@ lu_util_default_salt_specifier(struct lu_context *context)
+ 		{ "blowfish", "$2b$", FALSE },
+ 		{ "sha256", "$5$", TRUE },
+ 		{ "sha512", "$6$", TRUE },
++		{ "sm3", "$sm3$", TRUE },
+ #if HAVE_YESCRYPT
+ 		{ "yescrypt", "$y$", FALSE },
+ #endif
+diff --git a/tests/files_sm3.conf.in b/tests/files_sm3.conf.in
+new file mode 100644
+index 0000000..3831d0f
+--- /dev/null
++++ b/tests/files_sm3.conf.in
+@@ -0,0 +1,25 @@
++defaults
++# non-portable
++moduledir = @TOP_BUILDDIR@/modules/.libs
++skeleton = /etc/skel
++mailspooldir = /var/mail
++modules = files shadow
++create_modules = files shadow
++crypt_style = sm3
++
++userdefaults
++LU_USERNAME = %n
++LU_UIDNUMBER = 500
++LU_GIDNUMBER = %u
++
++groupdefaults
++LU_GROUPNAME = %n
++LU_GIDNUMBER = 500
++
++files
++directory = @WORKDIR@/sm3
++nonroot = yes
++
++shadow
++directory = @WORKDIR@/sm3
++nonroot = yes
+diff --git a/tests/sm3_test b/tests/sm3_test
+new file mode 100755
+index 0000000..bdb2034
+--- /dev/null
++++ b/tests/sm3_test
+@@ -0,0 +1,43 @@
++#!/bin/bash
++# Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved.
++# Description: Automated files/shadow regression tester for sm3 crypt
++# Create: 2021-07-26
++
++srcdir=$srcdir/tests
++
++workdir=$(pwd)/test_sm3
++
++trap 'status=$?; rm -rf "$workdir"; exit $status' 0
++trap '(exit 1); exit 1' 1 2 13 15
++
++rm -rf "$workdir"
++mkdir "$workdir"
++
++# Set up an the environment
++mkdir "$workdir"/sm3
++
++cat > "$workdir"/sm3/passwd <<\EOF
++empty_user::42:43:::
++EOF
++cat > "$workdir"/sm3/shadow <<\EOF
++empty_user::::::::
++EOF
++cat > "$workdir"/sm3/group <<\EOF
++empty_group::44:
++EOF
++cat > "$workdir"/sm3/gshadow <<\EOF
++empty_group:::
++EOF
++
++# Set up the client
++LIBUSER_CONF=$workdir/libuser.conf
++export LIBUSER_CONF
++sed "s|@WORKDIR@|$workdir|g; s|@TOP_BUILDDIR@|$(pwd)|g" \
++    < "$srcdir"/files_sm3.conf.in > "$LIBUSER_CONF"
++# Ugly non-portable hacks
++LD_LIBRARY_PATH=$(pwd)/lib/.libs
++export LD_LIBRARY_PATH
++PYTHONPATH=$(pwd)/python/.libs
++export PYTHONPATH
++
++workdir="$workdir" $VALGRIND $PYTHON "$srcdir"/sm3_test.py
+diff --git a/tests/sm3_test.py b/tests/sm3_test.py
+new file mode 100755
+index 0000000..e680dd7
+--- /dev/null
++++ b/tests/sm3_test.py
+@@ -0,0 +1,446 @@
++#!/usr/bin/python
++# Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved.
++# Description: sm3 crypt testcase
++# Create: 2021-07-26
++
++import crypt
++import libuser
++import os
++import os.path
++import sys
++import unittest
++
++#sm3
++crypt_flag="$sm3$"
++crypt_flag_len=5
++crypt_t="sm3"
++
++
++class Tests(unittest.TestCase):
++    def setUp(self):
++        self.a = libuser.admin()
++

_service:tar_scm:fix-ldap-test-because-openldap-was-upgraded.patch Added

@@ -0,0 +1,67 @@
+From 85bcf0efc3d3e6453f6e50da877dc7eb1a4d1ae1 Mon Sep 17 00:00:00 2001
+From: panxiaohe <panxiaohe@huawei.com>
+Date: Mon, 10 Jan 2022 13:17:22 +0800
+Subject: PATCH fix ldap test because openldap was upgraded to 2.6.0
+
+The new version of openldap has removed deprecated -h and -p options
+to client tools. And it has deleted back-bdb, so this patch uses mdb.
+---
+ tests/default_pw_test | 6 ++++--
+ tests/ldap_test       | 3 ++-
+ tests/slapd.conf.in   | 2 +-
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/tests/default_pw_test b/tests/default_pw_test
+index 733c85c..932dcb2 100755
+--- a/tests/default_pw_test
++++ b/tests/default_pw_test
+@@ -69,7 +69,8 @@ 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" \
++    URI="ldap://127.0.0.1:$ldap_port/"
++    ldapsearch -LLL -H "$URI" -x -b 'dc=libuser' "$1" \
+ 	userPassword | sed -n 's/userPassword:: //p'
+ }
+ 
+@@ -103,7 +104,8 @@ 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 \
++	    URI="ldap://127.0.0.1:$ldap_port/"
++	    ldapadd -H "$URI" -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..de9308c 100755
+--- a/tests/ldap_test
++++ b/tests/ldap_test
+@@ -56,7 +56,8 @@ 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 \
++URI="ldap://127.0.0.1:$ldap_port/"
++ldapadd -H "$URI" -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
+-- 
+1.8.3.1
+

_service:tar_scm:libuser-0.63-PR49_add_yescrypt.patch Added

@@ -0,0 +1,260 @@
+From 3b8a2aa52bcee6e03f047840251ae42ab971a8a0 Mon Sep 17 00:00:00 2001
+From: Björn Esser <besser82@fedoraproject.org>
+Date: Jun 07 2021 20:25:41 +0000
+Subject: PATCH 1/5 lib/util.c: bcrypt should use $2b$ as prefix for setting.
+
+
+This prefix is the recommended one for new bcrypt hashes
+for a long time.
+
+Signed-off-by: Björn Esser <besser82@fedoraproject.org>
+
+---
+
+diff --git a/lib/util.c b/lib/util.c
+index 1b03f7d..e549a35 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -124,7 +124,7 @@ static const struct {
+ } salt_type_info = {
+ 	{"$1$", "$", 8, FALSE },
+ 	/* FIXME: number of rounds, base64 of 128 bits */
+-	{"$2a$", "$", 8, FALSE },
++	{"$2b$", "$", 8, FALSE },
+ 	{"$5$", "$", 16, TRUE },
+ 	{"$6$", "$", 16, TRUE },
+ 	{ "", "", 2 },
+@@ -231,7 +231,7 @@ lu_util_default_salt_specifier(struct lu_context *context)
+ 	} salt_types = {
+ 		{ "des", "", FALSE },
+ 		{ "md5", "$1$", FALSE },
+-		{ "blowfish", "$2a$", FALSE },
++		{ "blowfish", "$2b$", FALSE },
+ 		{ "sha256", "$5$", TRUE },
+ 		{ "sha512", "$6$", TRUE },
+ 	};
+
+From 9dcc69425677cf510ec6da5ababfdd295f875c1a Mon Sep 17 00:00:00 2001
+From: Björn Esser <besser82@fedoraproject.org>
+Date: Jun 17 2021 15:34:02 +0000
+Subject: PATCH 2/5 lib/util.c: Use crypt_gensalt(), if available in libcrypt.
+
+
+Most Linux distributions, including Fedora and RHEL 8, are shipping
+with libxcrypt >= 4.0.
+
+Since that version of libxcrypt the provided family of crypt_gensalt()
+functions are able to use automatic entropy drawn from secure system
+ressources, like arc4random(), getentropy() or getrandom().
+
+Anyways, the settings generated by crypt_gensalt() are always
+guaranteed to works with the crypt() function.
+
+Using crypt_gesalt() is also needed to make proper use of newer
+hashing methods, like yescrypt, provided by libxcrypt.
+
+Signed-off-by: Björn Esser <besser82@fedoraproject.org>
+
+---
+
+diff --git a/lib/util.c b/lib/util.c
+index e549a35..b6db2af 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -43,6 +43,13 @@
+ #define HASH_ROUNDS_MIN 1000
+ #define HASH_ROUNDS_MAX 999999999
+ 
++#if (defined CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY && \
++     CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY)
++#define USE_XCRYPT_GENSALT 1
++#else
++#define USE_XCRYPT_GENSALT 0
++#endif
++
+ struct lu_lock {
+ 	int fd;
+ 	struct flock lock;
+@@ -66,6 +73,7 @@ lu_strcmp(gconstpointer v1, gconstpointer v2)
+ 	return strcmp((char *) v1, (char *) v2);
+ }
+ 
++#if !USE_XCRYPT_GENSALT
+ /* A list of allowed salt characters, according to SUSv2. */
+ #define ACCEPTABLE "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+ 		   "abcdefghijklmnopqrstuvwxyz" \
+@@ -115,6 +123,7 @@ fill_urandom(char *output, size_t length)
+ 	close(fd);
+ 	return TRUE;
+ }
++#endif
+ 
+ static const struct {
+ 	const char initial5;
+@@ -135,6 +144,9 @@ lu_make_crypted(const char *plain, const char *previous)
+ {
+ 	char salt2048;
+ 	size_t i, len = 0;
++#if USE_XCRYPT_GENSALT
++	unsigned long rounds = 0;
++#endif
+ 
+ 	if (previous == NULL) {
+ 		previous = LU_DEFAULT_SALT_TYPE;
+@@ -151,6 +163,23 @@ lu_make_crypted(const char *plain, const char *previous)
+ 
+ 	if (salt_type_infoi.sha_rounds != FALSE
+ 	    && strncmp(previous + len, "rounds=", strlen("rounds=")) == 0) {
++#if USE_XCRYPT_GENSALT
++		const char *start;
++		char *end;
++
++		start = previous + len + strlen("rounds=");
++		rounds = strtoul (start, &end, 10);
++
++		if (rounds < HASH_ROUNDS_MIN)
++			rounds = HASH_ROUNDS_MIN;
++		else if (rounds > HASH_ROUNDS_MAX)
++			rounds = HASH_ROUNDS_MAX;
++	}
++
++	g_assert(CRYPT_GENSALT_OUTPUT_SIZE <= sizeof(salt));
++
++	crypt_gensalt_rn(previous, rounds, NULL, 0, salt, sizeof(salt));
++#else
+ 		const char *start, *end;
+ 
+ 		start = previous + len + strlen("rounds=");
+@@ -168,6 +197,7 @@ lu_make_crypted(const char *plain, const char *previous)
+ 		return NULL;
+ 	strcpy(salt + len + salt_type_infoi.salt_length,
+ 	       salt_type_infoi.separator);
++#endif
+ 
+ 	return crypt(plain, salt);
+ }
+@@ -251,13 +281,18 @@ lu_util_default_salt_specifier(struct lu_context *context)
+ 
+ found:
+ 	if (salt_typesi.sha_rounds != FALSE) {
+-		unsigned long rounds;
++		unsigned long rounds = 0;
+ 
+ 		rounds = select_hash_rounds(context);
++#if USE_XCRYPT_GENSALT
++		return g_strdup(crypt_gensalt(salt_typesi.initializer,
++					      rounds, NULL, 0));
++#else
+ 		if (rounds != 0)
+ 			return g_strdup_printf("%srounds=%lu$",
+ 					       salt_typesi.initializer,
+ 					       rounds);
++#endif
+ 	}
+ 	return g_strdup(salt_typesi.initializer);
+ }
+
+From 2d40503977df3855f1415db995833ae4231e7944 Mon Sep 17 00:00:00 2001
+From: Björn Esser <besser82@fedoraproject.org>
+Date: Jun 17 2021 15:34:02 +0000
+Subject: PATCH 3/5 lib/util.c: Add yescrypt hashing method for user passwords.
+
+
+The yescrypt hashing method is considered to be much stronger than
+sha512crypt and fully supported by libxcrypt >= 4.3.  It is based
+on NIST-approved primitives and on par with argon2 in strength.
+
+Signed-off-by: Björn Esser <besser82@fedoraproject.org>
+
+---
+
+diff --git a/lib/util.c b/lib/util.c
+index b6db2af..bba9420 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -50,6 +50,14 @@
+ #define USE_XCRYPT_GENSALT 0
+ #endif
+ 
++#if ((defined XCRYPT_VERSION_NUM && \
++      XCRYPT_VERSION_NUM >= ((4 << 16) | 3)) && \
++      USE_XCRYPT_GENSALT)
++#define HAVE_YESCRYPT 1
++#else
++#define HAVE_YESCRYPT 0
++#endif
++
+ struct lu_lock {
+ 	int fd;
+ 	struct flock lock;
+@@ -136,6 +144,9 @@ static const struct {
+ 	{"$2b$", "$", 8, FALSE },
+ 	{"$5$", "$", 16, TRUE },
+ 	{"$6$", "$", 16, TRUE },
++#if HAVE_YESCRYPT
++	{"$y$", "$", 24, FALSE },
++#endif
+ 	{ "", "", 2 },
+ };
+

_service:tar_scm:libuser-0.63-downstream_test_xcrypt.patch Added

_service Changed

_service:extract_file:libuser-0.63.tar.xz Deleted

_service:extract_file:libuser.yaml Deleted

_service:tar_scm:libuser-1645510430.6c0a01e.tar -> _service:tar_scm:libuser-0.63.tar.xz Changed

_service:tar_scm:libuser.yaml Added