开源软件构建与测试

_service:extract_file:libpwquality.spec Deleted

@@ -1,121 +0,0 @@
-%define _moduledir %{_libdir}/security
-%define _secconfdir %{_sysconfdir}/security
-
-Name: libpwquality
-Version: 1.4.4
-Release: 2
-Summary: Library for password quality checking and generating random passwords.
-License: BSD or GPLv2+
-URL:     https://github.com/libpwquality/libpwquality/
-Source0: https://github.com/libpwquality/libpwquality/releases/download/libpwquality-%{version}/libpwquality-%{version}.tar.bz2
-
-Patch0: modify-pwquality_conf.patch
-Patch1: fix-password-similarity.patch
-
-BuildRequires: gcc cracklib-devel gettext pam-devel
-BuildRequires: python3-devel
-
-Recommends: cracklib >= 2.8
-Requires: pam
-
-%description
-The libpwquality library purpose is to provide common functions for password quality checking and also scoring them based on their apparent randomness. 
-The library also provides a function for generating random passwords with good pronounceability.
-The library supports reading and parsing of a configuration file.
-
-%package devel
-Summary: Support for development of applications using the libpwquality library
-Requires: libpwquality = %{version}-%{release}
-Requires: pkgconfig
-
-%description devel
-Files needed for development of applications using the libpwquality library.
-See the pwquality.h header file for the API.
-
-%package -n python3-pwquality
-Summary: Python3 bindings for the libpwquality library
-Requires: libpwquality = %{version}-%{release}
-
-%description -n python3-pwquality
-This package provides Python3 bindings for the libpwquality library.
-
-%package_help
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-%build
-#python3
-%configure --with-securedir=%{_moduledir} \
-	   --with-pythonsitedir=%{python3_sitearch} \
-	   --with-python-binary=%{__python3} \
-	   --disable-static
-
-%make_build
-
-%install
-%make_install
-
-rm -f %{buildroot}%{_libdir}/*.la
-rm -f %{buildroot}%{_moduledir}/*.la
-
-mkdir %{buildroot}%{_secconfdir}/pwquality.conf.d
-
-%find_lang libpwquality
-
-%check
-
-%ldconfig_scriptlets
-
-%files -f libpwquality.lang
-%license COPYING
-%doc README NEWS AUTHORS
-%{_bindir}/pwmake
-%{_bindir}/pwscore
-%{_moduledir}/pam_pwquality.so
-%{_libdir}/libpwquality.so.*
-%config(noreplace) %{_secconfdir}/pwquality.conf
-%{_secconfdir}/pwquality.conf.d
-
-%files devel
-%{_includedir}/pwquality.h
-%{_libdir}/libpwquality.so
-%{_libdir}/pkgconfig/*.pc
-
-%files -n python3-pwquality
-%{python3_sitearch}/*.so
-%{python3_sitearch}/*.egg-info
-
-%files help
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-%{_mandir}/man3/*
-%{_mandir}/man8/*
-
-%changelog
-* Tue Apr 26 2022 zhangruifang2020 <zhangruifang1@h-partners.com> - 1.4.4-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:modify the changelog
-
-* Sat Jan 23 2021 zoulin <zoulin13@huawei.com> - 1.4.4-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update to 1.4.4
-
-* Thu Oct 29 2020 Hugel <gengqihu1@huawei.com> - 1.4.2-2
-- Type:requirement
-- ID:NA
-- SUG:NA
-- DESC:delete python2 package
-
-* Thu Jul 23 2020 Hugel <gengqihu1@huawei.com> - 1.4.2-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update to 1.4.2
-
-* Wed Sep 4 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.4.0-11
-- Package init

_service:tar_scm:libpwquality.spec Added

@@ -0,0 +1,151 @@
+%define _moduledir %{_libdir}/security
+%define _secconfdir %{_sysconfdir}/security
+
+Name: libpwquality
+Version: 1.4.5
+Release: 1
+Summary: Library for password quality checking and generating random passwords.
+License: BSD or GPLv2+
+URL:     https://github.com/libpwquality/libpwquality/
+Source0: https://github.com/libpwquality/libpwquality/releases/download/libpwquality-%{version}/libpwquality-%{version}.tar.bz2
+
+Patch0: modify-pwquality_conf.patch
+Patch1: fix-password-similarity.patch
+Patch2: fix-doc-about-difok.patch
+
+BuildRequires: gcc cracklib-devel gettext pam-devel
+BuildRequires: python3-devel
+
+Recommends: cracklib >= 2.8
+Requires: pam
+
+%description
+The libpwquality library purpose is to provide common functions for password quality checking and also scoring them based on their apparent randomness. 
+The library also provides a function for generating random passwords with good pronounceability.
+The library supports reading and parsing of a configuration file.
+
+%package devel
+Summary: Support for development of applications using the libpwquality library
+Requires: libpwquality = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+Files needed for development of applications using the libpwquality library.
+See the pwquality.h header file for the API.
+
+%package -n python3-pwquality
+Summary: Python3 bindings for the libpwquality library
+Requires: libpwquality = %{version}-%{release}
+
+%description -n python3-pwquality
+This package provides Python3 bindings for the libpwquality library.
+
+%package_help
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+#python3
+%configure --with-securedir=%{_moduledir} \
+	   --with-pythonsitedir=%{python3_sitearch} \
+	   --with-python-binary=%{__python3} \
+	   --disable-static
+
+%make_build
+
+%install
+# python-setuptools >= v60.0.0 changes the SETUPTOOLS_USE_DISTUTILS default value to local,
+# it does't use Python's standard library distutils default.
+# As a result, failed to build libpwquality.
+# Now, set SETUPTOOLS_USE_DISTUTILS value to stdlib
+export SETUPTOOLS_USE_DISTUTILS=stdlib
+%make_install
+
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_moduledir}/*.la
+
+mkdir %{buildroot}%{_secconfdir}/pwquality.conf.d
+
+%find_lang libpwquality
+
+%check
+
+%ldconfig_scriptlets
+
+%files -f libpwquality.lang
+%license COPYING
+%doc README NEWS AUTHORS
+%{_bindir}/pwmake
+%{_bindir}/pwscore
+%{_moduledir}/pam_pwquality.so
+%{_libdir}/libpwquality.so.*
+%config(noreplace) %{_secconfdir}/pwquality.conf
+%{_secconfdir}/pwquality.conf.d
+
+%files devel
+%{_includedir}/pwquality.h
+%{_libdir}/libpwquality.so
+%{_libdir}/pkgconfig/*.pc
+
+%files -n python3-pwquality
+%{python3_sitearch}/*.so
+%{python3_sitearch}/*.egg-info
+
+%files help
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man3/*
+%{_mandir}/man8/*
+
+%changelog
+* Wed Dec 28 2022 yixiangzhike <yixiangzhike007@163.com> - 1.4.5-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:update to 1.4.5
+
+* Tue Aug 23 2022 yixiangzhike <yixiangzhike007@163.com> - 1.4.4-5
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:change the files order in patch file fix-doc-about-difok.patch
+
+* Wed Aug 10 2022 yixiangzhike <yixiangzhike007@163.com> - 1.4.4-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix doc about difok
+
+* Tue Jul 26 2022 yixiangzhike <yixiangzhike007@163.com> - 1.4.4-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix the libpwquality build failure issue
+
+* Tue Apr 26 2022 zhangruifang2020 <zhangruifang1@h-partners.com> - 1.4.4-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:modify the changelog
+
+* Sat Jan 23 2021 zoulin <zoulin13@huawei.com> - 1.4.4-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:update to 1.4.4
+
+* Thu Oct 29 2020 Hugel <gengqihu1@huawei.com> - 1.4.2-2
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:delete python2 package
+
+* Thu Jul 23 2020 Hugel <gengqihu1@huawei.com> - 1.4.2-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:update to 1.4.2
+
+* Wed Sep 4 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.4.0-11
+- Package init

_service:extract_file:fix-password-similarity.patch Deleted

_service:extract_file:modify-pwquality_conf.patch Deleted

@@ -1,40 +0,0 @@
-diff -Nupr libpwquality-1.2.3.orig/src/pwquality.conf libpwquality-1.2.3/src/pwquality.conf
---- libpwquality-1.2.3.orig/src/pwquality.conf	2015-08-18 10:29:38.000000000 +0800
-+++ libpwquality-1.2.3/src/pwquality.conf	2015-08-18 10:30:57.000000000 +0800
-@@ -8,30 +8,30 @@
- # Minimum acceptable size for the new password (plus one if
- # credits are not disabled which is the default). (See pam_cracklib manual.)
- # Cannot be set to lower value than 6.
--# minlen = 8
-+minlen = 8
- #
- # The maximum credit for having digits in the new password. If less than 0
- # it is the minimum number of digits in the new password.
--# dcredit = 0
-+dcredit = 0
- #
- # The maximum credit for having uppercase characters in the new password.
- # If less than 0 it is the minimum number of uppercase characters in the new
- # password.
--# ucredit = 0
-+ucredit = 0
- #
- # The maximum credit for having lowercase characters in the new password.
- # If less than 0 it is the minimum number of lowercase characters in the new
- # password.
--# lcredit = 0
-+lcredit = 0
- #
- # The maximum credit for having other characters in the new password.
- # If less than 0 it is the minimum number of other characters in the new
- # password.
--# ocredit = 0
-+ocredit = 0
- #
- # The minimum number of required classes of characters for the new
- # password (digits, uppercase, lowercase, others).
--# minclass = 0
-+minclass = 3
- #
- # The maximum number of allowed consecutive same characters in the new password.
- # The check is disabled if the value is 0.

_service:tar_scm:fix-doc-about-difok.patch Added

@@ -0,0 +1,81 @@
+From 950ef20f494efad610dcd150db8c8b004c2b1c0d Mon Sep 17 00:00:00 2001
+From: yixiangzhike <yixiangzhike007@163.com>
+Date: Wed, 10 Aug 2022 15:34:03 +0800
+Subject: PATCH fix doc about difok
+
+---
+ doc/man/pam_pwquality.8.pod  | 2 +-
+ doc/man/pam_pwquality.8      | 2 +-
+ doc/man/pwquality.conf.5.pod | 2 +-
+ doc/man/pwquality.conf.5     | 2 +-
+ src/pwquality.conf           | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/man/pam_pwquality.8.pod b/doc/man/pam_pwquality.8.pod
+index 7a74b48..4734a24 100644
+--- a/doc/man/pam_pwquality.8.pod
++++ b/doc/man/pam_pwquality.8.pod
+@@ -102,7 +102,7 @@ I<1>.
+ 
+ =item B<difok=>I<N>
+ 
+-This argument will change the default of I<1> for the number of changes in
++This argument will change the default of I<5> for the number of changes in
+ the new password from the old password.
+ 
+ The special value of I<0> disables all checks of similarity of the new password
+diff --git a/doc/man/pam_pwquality.8 b/doc/man/pam_pwquality.8
+index 030223d..670d562 100644
+--- a/doc/man/pam_pwquality.8
++++ b/doc/man/pam_pwquality.8
+@@ -156,7 +156,7 @@ Prompt user at most \fIN\fR times before returning with error. The default is
+ \&\fI1\fR.
+ .IP "\fBdifok=\fR\fIN\fR" 4
+ .IX Item "difok=N"
+-This argument will change the default of \fI1\fR for the number of changes in
++This argument will change the default of \fI5\fR for the number of changes in
+ the new password from the old password.
+ .Sp
+ The special value of \fI0\fR disables all checks of similarity of the new password
+diff --git a/doc/man/pwquality.conf.5.pod b/doc/man/pwquality.conf.5.pod
+index ada22d0..c7c44cb 100644
+--- a/doc/man/pwquality.conf.5.pod
++++ b/doc/man/pwquality.conf.5.pod
+@@ -34,7 +34,7 @@ The possible options in the file are:
+ =item B<difok>
+ 
+ Number of characters in the new password that must not be present in the
+-old password. (default 1)
++old password. (default 5)
+ 
+ The special value of 0 disables all checks of similarity of the new password
+ with the old password except the new password being exactly the same as
+diff --git a/doc/man/pwquality.conf.5 b/doc/man/pwquality.conf.5
+index 1093aeb..7ed1992 100644
+--- a/doc/man/pwquality.conf.5
++++ b/doc/man/pwquality.conf.5
+@@ -103,7 +103,7 @@ The possible options in the file are:
+ .IP "\fBdifok\fR" 4
+ .IX Item "difok"
+ Number of characters in the new password that must not be present in the
+-old password. (default 1)
++old password. (default 5)
+ .Sp
+ The special value of 0 disables all checks of similarity of the new password
+ with the old password except the new password being exactly the same as
+diff --git a/src/pwquality.conf b/src/pwquality.conf
+index ace3d5f..cb3e99c 100644
+--- a/src/pwquality.conf
++++ b/src/pwquality.conf
+@@ -3,7 +3,7 @@
+ #
+ # Number of characters in the new password that must not be present in the
+ # old password.
+-# difok = 1
++# difok = 5
+ #
+ # Minimum acceptable size for the new password (plus one if
+ # credits are not disabled which is the default). (See pam_cracklib manual.)
+-- 
+2.27.0
+

_service:tar_scm:fix-password-similarity.patch Added

_service:tar_scm:modify-pwquality_conf.patch Added

@@ -0,0 +1,40 @@
+diff -Nupr libpwquality-1.2.3.orig/src/pwquality.conf libpwquality-1.2.3/src/pwquality.conf
+--- libpwquality-1.2.3.orig/src/pwquality.conf	2015-08-18 10:29:38.000000000 +0800
++++ libpwquality-1.2.3/src/pwquality.conf	2015-08-18 10:30:57.000000000 +0800
+@@ -8,30 +8,30 @@
+ # Minimum acceptable size for the new password (plus one if
+ # credits are not disabled which is the default). (See pam_cracklib manual.)
+ # Cannot be set to lower value than 6.
+-# minlen = 8
++minlen = 8
+ #
+ # The maximum credit for having digits in the new password. If less than 0
+ # it is the minimum number of digits in the new password.
+-# dcredit = 0
++dcredit = 0
+ #
+ # The maximum credit for having uppercase characters in the new password.
+ # If less than 0 it is the minimum number of uppercase characters in the new
+ # password.
+-# ucredit = 0
++ucredit = 0
+ #
+ # The maximum credit for having lowercase characters in the new password.
+ # If less than 0 it is the minimum number of lowercase characters in the new
+ # password.
+-# lcredit = 0
++lcredit = 0
+ #
+ # The maximum credit for having other characters in the new password.
+ # If less than 0 it is the minimum number of other characters in the new
+ # password.
+-# ocredit = 0
++ocredit = 0
+ #
+ # The minimum number of required classes of characters for the new
+ # password (digits, uppercase, lowercase, others).
+-# minclass = 0
++minclass = 3
+ #
+ # The maximum number of allowed consecutive same characters in the new password.
+ # The check is disabled if the value is 0.

_service Changed

_service:extract_file:libpwquality-1.4.4.tar.bz2 Deleted

_service:extract_file:libpwquality.yaml Deleted

_service:tar_scm:libpwquality-1651109589.c046d1d.tar -> _service:tar_scm:libpwquality-1.4.5.tar.bz2 Changed

_service:tar_scm:libpwquality.yaml Added

Changes of Revision 2