!31 【Mainline】update to 2.9.8
From: @yixiangzhike Reviewed-by: @houmingyong Signed-off-by: @houmingyong
This commit is contained in:
commit
53b44842e5
Binary file not shown.
BIN
cracklib-2.9.8.tar.gz
Normal file
BIN
cracklib-2.9.8.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -4,8 +4,8 @@
|
|||||||
%define dictpath %{dictdir}/pw_dict
|
%define dictpath %{dictdir}/pw_dict
|
||||||
|
|
||||||
Name: cracklib
|
Name: cracklib
|
||||||
Version: 2.9.7
|
Version: 2.9.8
|
||||||
Release: 8
|
Release: 1
|
||||||
Summary: A password-checking library
|
Summary: A password-checking library
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
@ -154,6 +154,9 @@ make test
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 21 2022 yixiangzhike <yixiangzhike007@163.com> - 2.9.8-1
|
||||||
|
- update to 2.9.8
|
||||||
|
|
||||||
* Sat Aug 13 2022 yixiangzhike <yixiangzhike007@163.com> - 2.9.7-8
|
* Sat Aug 13 2022 yixiangzhike <yixiangzhike007@163.com> - 2.9.7-8
|
||||||
- fix issue of truncating dict file without input data
|
- fix issue of truncating dict file without input data
|
||||||
- fix error length about simplistic password
|
- fix error length about simplistic password
|
||||||
|
|||||||
@ -6,8 +6,8 @@ Subject: [PATCH] fix problem of error message about simplistic password
|
|||||||
Signed-off-by: openEuler Buildteam <buildteam@openeuler.org>
|
Signed-off-by: openEuler Buildteam <buildteam@openeuler.org>
|
||||||
---
|
---
|
||||||
lib/fascist.c | 33 ++++++++++++++++++++++++++++-----
|
lib/fascist.c | 33 ++++++++++++++++++++++++++++-----
|
||||||
util/cracklib-format | 10 ++++++----
|
util/cracklib-format | 19 ++++++----
|
||||||
2 files changed, 34 insertions(+), 9 deletions(-)
|
2 files changed, 34 insertions(+), 18 deletions(-)
|
||||||
|
|
||||||
diff --git a/lib/fascist.c b/lib/fascist.c
|
diff --git a/lib/fascist.c b/lib/fascist.c
|
||||||
index c5a018c..a1a8564 100644
|
index c5a018c..a1a8564 100644
|
||||||
@ -103,19 +103,28 @@ index c5a018c..a1a8564 100644
|
|||||||
printf("%-16s (reversed dict)\n", a);
|
printf("%-16s (reversed dict)\n", a);
|
||||||
#endif
|
#endif
|
||||||
diff --git a/util/cracklib-format b/util/cracklib-format
|
diff --git a/util/cracklib-format b/util/cracklib-format
|
||||||
index 1d7be5b..360d109 100755
|
index c133d75..360d109 100755
|
||||||
--- a/util/cracklib-format
|
--- a/util/cracklib-format
|
||||||
+++ b/util/cracklib-format
|
+++ b/util/cracklib-format
|
||||||
@@ -3,8 +3,10 @@
|
@@ -3,17 +3,10 @@
|
||||||
# This preprocesses a set of word lists into a suitable form for input
|
# This preprocesses a set of word lists into a suitable form for input
|
||||||
# into cracklib-packer
|
# into cracklib-packer
|
||||||
#
|
#
|
||||||
|
-# Truncates lines longer than 1022 characters long as cracklib-packer
|
||||||
|
-# does not handle them correctly.
|
||||||
|
-#
|
||||||
|
-# The last part of the pipeline uses 'grep -v' to remove any blank
|
||||||
|
-# lines (possibly introduced by earlier parts of the pipeline) as
|
||||||
|
-# cracklib-packer will generate "skipping line" warnings otherwise.
|
||||||
|
-#
|
||||||
+LC_ALL=C
|
+LC_ALL=C
|
||||||
+export LC_ALL
|
+export LC_ALL
|
||||||
gzip -cdf "$@" |
|
gzip -cdf "$@" |
|
||||||
- grep -v '^\(#\|$\)' |
|
- grep -a -v '^#' |
|
||||||
- tr '[A-Z]' '[a-z]' |
|
- tr '[A-Z]' '[a-z]' |
|
||||||
- tr -cd '\012[a-z][0-9]' |
|
- tr -cd '\012[a-z][0-9]' |
|
||||||
|
- cut -c 1-1022 |
|
||||||
|
- grep -v '^$' |
|
||||||
- env LC_ALL=C sort -u
|
- env LC_ALL=C sort -u
|
||||||
+ grep -a -E -v '^.{30,}$' |
|
+ grep -a -E -v '^.{30,}$' |
|
||||||
+ tr '[:upper:]' '[:lower:]' |
|
+ tr '[:upper:]' '[:lower:]' |
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user