diff --git a/cracklib-2.9.7.tar.gz b/cracklib-2.9.7.tar.gz deleted file mode 100644 index ff087385f4246778e0d7dfdd603330b25445d00e..0000000000000000000000000000000000000000 Binary files a/cracklib-2.9.7.tar.gz and /dev/null differ diff --git a/cracklib-2.9.8.tar.gz b/cracklib-2.9.8.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f97200c5d07cf6efc51019bee73f2212e9a4e89a Binary files /dev/null and b/cracklib-2.9.8.tar.gz differ diff --git a/cracklib-words-2.9.7.gz b/cracklib-words-2.9.8.gz similarity index 99% rename from cracklib-words-2.9.7.gz rename to cracklib-words-2.9.8.gz index 6f0e7ca678e85368214a52e93c729dc9e0dcebb6..edef8b20ed5b97dbe507ef0f22dcc33249c5d169 100644 Binary files a/cracklib-words-2.9.7.gz and b/cracklib-words-2.9.8.gz differ diff --git a/cracklib.spec b/cracklib.spec index 8bf872d3cae96fa0efd841b77d130275455d9698..8fe72394813ec73b5d6de7c24ee1c6dd3fcb380a 100644 --- a/cracklib.spec +++ b/cracklib.spec @@ -4,8 +4,8 @@ %define dictpath %{dictdir}/pw_dict Name: cracklib -Version: 2.9.7 -Release: 10 +Version: 2.9.8 +Release: 1 Summary: A password-checking library License: LGPLv2+ @@ -164,6 +164,9 @@ make test %endif %changelog +* Fri Oct 21 2022 yixiangzhike - 2.9.8-1 +- update to 2.9.8 + * Sat Aug 13 2022 yixiangzhike - 2.9.7-10 - fix issue of truncating dict file without input data - fix error length about simplistic password diff --git a/fix-problem-of-error-message-about-simplistic-passwo.patch b/fix-problem-of-error-message-about-simplistic-passwo.patch index 986a6484f688d676b2137dc8c5edd3d6077f7307..e6730e15086f5200c7e84bcd2c4dfbcaa84902da 100644 --- a/fix-problem-of-error-message-about-simplistic-passwo.patch +++ b/fix-problem-of-error-message-about-simplistic-passwo.patch @@ -6,8 +6,8 @@ Subject: [PATCH] fix problem of error message about simplistic password Signed-off-by: openEuler Buildteam --- lib/fascist.c | 33 ++++++++++++++++++++++++++++----- - util/cracklib-format | 10 ++++++---- - 2 files changed, 34 insertions(+), 9 deletions(-) + util/cracklib-format | 19 ++++++---- + 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/lib/fascist.c b/lib/fascist.c index c5a018c..a1a8564 100644 @@ -103,19 +103,28 @@ index c5a018c..a1a8564 100644 printf("%-16s (reversed dict)\n", a); #endif diff --git a/util/cracklib-format b/util/cracklib-format -index 1d7be5b..360d109 100755 +index c133d75..360d109 100755 --- a/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 # 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 +export LC_ALL gzip -cdf "$@" | -- grep -v '^\(#\|$\)' | +- grep -a -v '^#' | - tr '[A-Z]' '[a-z]' | - tr -cd '\012[a-z][0-9]' | +- cut -c 1-1022 | +- grep -v '^$' | - env LC_ALL=C sort -u + grep -a -E -v '^.{30,}$' | + tr '[:upper:]' '[:lower:]' |