diff --git a/.gitignore b/.gitignore index 91ab079..1d01351 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libpwquality-1.4.0.tar.bz2 +SOURCES/libpwquality-1.4.4.tar.bz2 diff --git a/.libpwquality.metadata b/.libpwquality.metadata index 39be5ab..79b3e4d 100644 --- a/.libpwquality.metadata +++ b/.libpwquality.metadata @@ -1 +1 @@ -28092904a722b42ec98f9831355857387d21242e SOURCES/libpwquality-1.4.0.tar.bz2 +94e3f2eb67ccff1823e727d6770c3f39acbd954d SOURCES/libpwquality-1.4.4.tar.bz2 diff --git a/SOURCES/libpwquality-1.4.0-covscan.patch b/SOURCES/libpwquality-1.4.0-covscan.patch deleted file mode 100644 index 2b3fd5f..0000000 --- a/SOURCES/libpwquality-1.4.0-covscan.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fbf963dde2cbe34dba1df269b9506f4a55c39357 Mon Sep 17 00:00:00 2001 -From: Tomas Mraz -Date: Mon, 22 Oct 2018 16:29:31 +0200 -Subject: [PATCH] Use calloc() instead of malloc() in distcalculate to - initialize the memory. - ---- - src/check.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/check.c b/src/check.c -index ac7cbd5..61218a7 100644 ---- a/src/check.c -+++ b/src/check.c -@@ -96,12 +96,12 @@ distance(const char *old, const char *new) - - m = strlen(old); - n = strlen(new); -- distances = malloc(sizeof(int*) * (m + 1)); -+ distances = calloc(m + 1, sizeof(int*)); - if (distances == NULL) - return -1; - - for (i = 0; i <= m; i++) { -- distances[i] = malloc(sizeof(int) * (n + 1)); -+ distances[i] = calloc(n + 1, sizeof(int)); - if (distances[i] == NULL) - goto allocfail; - --- -2.14.5 - diff --git a/SPECS/libpwquality.spec b/SPECS/libpwquality.spec index db07c0b..b849919 100644 --- a/SPECS/libpwquality.spec +++ b/SPECS/libpwquality.spec @@ -5,7 +5,7 @@ %bcond_with python3 %endif -%if 0%{?rhel} > 7 && %{with python3} +%if 0%{?rhel} > 7 || 0%{?fedora} > 30 # Disable python2 build by default %bcond_with python2 %else @@ -14,22 +14,20 @@ Summary: A library for password generation and password quality checking Name: libpwquality -Version: 1.4.0 -Release: 9%{?dist} +Version: 1.4.4 +Release: 3%{?dist} # The package is BSD licensed with option to relicense as GPLv2+ # - this option is redundant as the BSD license allows that anyway. License: BSD or GPLv2+ -Group: System Environment/Base Source0: https://github.com/libpwquality/libpwquality/releases/download/libpwquality-%{version}/libpwquality-%{version}.tar.bz2 -Patch1: libpwquality-1.4.0-covscan.patch %global _pwqlibdir %{_libdir} %global _moduledir %{_libdir}/security %global _secconfdir %{_sysconfdir}/security -Recommends: cracklib-dicts >= 2.8 +Requires: cracklib-dicts >= 2.8 Requires: pam%{?_isa} -BuildRequires: gcc +BuildRequires: gcc make BuildRequires: cracklib-devel BuildRequires: gettext BuildRequires: pam-devel @@ -52,7 +50,6 @@ This library uses the cracklib and cracklib dictionaries to perform some of the checks. %package devel -Group: Development/Libraries Summary: Support for development of applications using the libpwquality library Requires: libpwquality%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -65,7 +62,6 @@ See the pwquality.h header file for the API. %if %{with python2} %package -n python2-pwquality %{?python_provide:%python_provide python2-pwquality} -Group: Development/Libraries Summary: Python bindings for the libpwquality library Requires: libpwquality%{?_isa} = %{version}-%{release} @@ -78,7 +74,6 @@ pronounceable passwords from Python applications. %if %{with python3} %package -n python3-pwquality -Group: Development/Libraries Summary: Python bindings for the libpwquality library Requires: libpwquality%{?_isa} = %{version}-%{release} @@ -91,7 +86,6 @@ pronounceable passwords from Python applications. %prep %setup -q -%patch1 -p1 -b .covscan %if %{with python3} && %{with python2} rm -rf %{py3dir} @@ -152,7 +146,6 @@ mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d %ldconfig_scriptlets %files -f libpwquality.lang -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license COPYING %doc README NEWS AUTHORS @@ -167,7 +160,6 @@ mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d %{_mandir}/man8/* %files devel -%defattr(-,root,root,-) %{_includedir}/pwquality.h %{_libdir}/libpwquality.so %{_libdir}/pkgconfig/*.pc @@ -175,19 +167,31 @@ mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d %if %{with python2} %files -n python2-pwquality -%defattr(-,root,root,-) -%{python_sitearch}/pwquality.so -%{python_sitearch}/*.egg-info +%{python2_sitearch}/pwquality.so +%{python2_sitearch}/*.egg-info %endif %if %{with python3} %files -n python3-pwquality -%defattr(-,root,root,-) %{python3_sitearch}/*.so %{python3_sitearch}/*.egg-info %endif %changelog +* Mon Feb 22 2021 Dmitry Belyavskiy - 1.4.4-3 +- Resolves: rhbz#1919026 libpwquaily rpm requires cracklib to function but RPM missing requirement [updated] + +* Wed Feb 17 2021 Dmitry Belyavskiy - 1.4.4-2 +- Resolves: rhbz#1919026 libpwquaily rpm requires cracklib to function but RPM missing requirement + +* Tue Oct 13 2020 Tomáš Mráz 1.4.4-1 +- Translation updates +- Add usersubstr check for substrings of N characters from the username + patch by Danny Sauer +- pam_pwquality: Abort the retry loop if user requests it +- Allow setting retry, enforce_for_root, and local_users_only options + in the pwquality.conf config file + * Mon Oct 22 2018 Tomáš Mráz 1.4.0-9 - Fix an issue found in Coverity scan