From 383fc5efe1ed5e72f412c78b393c5444d163752b Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sat, 19 Nov 2022 23:08:22 -0500 Subject: [PATCH] libpwquality: update to 1.4.5. --- .../libpwquality/patches/0001-musl-pam.patch | 49 ------------------- .../libpwquality/patches/0002-musl-pam.patch | 39 --------------- srcpkgs/libpwquality/template | 6 +-- 3 files changed, 3 insertions(+), 91 deletions(-) delete mode 100644 srcpkgs/libpwquality/patches/0001-musl-pam.patch delete mode 100644 srcpkgs/libpwquality/patches/0002-musl-pam.patch diff --git a/srcpkgs/libpwquality/patches/0001-musl-pam.patch b/srcpkgs/libpwquality/patches/0001-musl-pam.patch deleted file mode 100644 index 1b8d15e3920e..000000000000 --- a/srcpkgs/libpwquality/patches/0001-musl-pam.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9084c1b032161cdb53d5f66132a91bdc207faecf Mon Sep 17 00:00:00 2001 -From: Noel Kuntze -Date: Mon, 24 May 2021 14:15:34 +0200 -Subject: [PATCH] pam_pwquality.c: Use pam_modutil_check_user_in_passwd instead - of fgetpwent_r (not available on musl) - ---- - configure.ac | 5 +++++ - src/pam_pwquality.c | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 201a2e6..f995294 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -97,6 +97,11 @@ if test "$enable_pam" != "no"; then - test $fail = 1 && - AC_MSG_ERROR([You must install the PAM development package in order to compile libpwquality]) - fi -+ AC_CHECK_FUNC( -+ [pam_modutil_check_user_in_passwd], -+ [AC_DEFINE([HAVE_PAM_CHECK_USER_IN_PASSWD], [], [have pam_modutil_check_user_in_passwd])], -+ [] -+ ) - fi - - if test "$enable_pam" = "yes"; then -diff --git a/src/pam_pwquality.c b/src/pam_pwquality.c -index 53a9b66..5c09bc7 100644 ---- a/src/pam_pwquality.c -+++ b/src/pam_pwquality.c -@@ -98,6 +98,9 @@ static int - check_local_user (pam_handle_t *pamh, - const char *user) - { -+#ifdef HAVE_PAM_CHECK_USER_IN_PASSWD -+ return pam_modutil_check_user_in_passwd(pamh, user, NULL) == PAM_SUCCESS; -+#else - struct passwd pw, *pwp; - char buf[4096]; - int found = 0; -@@ -136,6 +139,7 @@ check_local_user (pam_handle_t *pamh, - } else { - return found; - } -+#endif - } - - PAM_EXTERN int diff --git a/srcpkgs/libpwquality/patches/0002-musl-pam.patch b/srcpkgs/libpwquality/patches/0002-musl-pam.patch deleted file mode 100644 index 9900eec93826..000000000000 --- a/srcpkgs/libpwquality/patches/0002-musl-pam.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 25b7b37fd65df957c24c46ed06884ef19e2852cb Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Wed, 7 Sep 2022 05:42:17 +0100 -Subject: [PATCH] pam_pwquality: add include for - pam_modutil_check_user_in_passwd - -After 9084c1b032161cdb53d5f66132a91bdc207faecf, one gets: -``` -pam_pwquality.c: In function 'check_local_user': -pam_pwquality.c:102:16: error: implicit declaration of function 'pam_modutil_check_user_in_passwd' [-Werror=implicit-function-declaration] - 102 | return pam_modutil_check_user_in_passwd(pamh, user, NULL) == PAM_SUCCESS; - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -cc1: some warnings being treated as errors -make[2]: *** [Makefile:634: pam_pwquality.lo] Error 1 -make[2]: *** Waiting for unfinished jobs.... -``` - -We need to include security/pam_modutil.h when appropriate. - -Signed-off-by: Sam James ---- - src/pam_pwquality.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/pam_pwquality.c b/src/pam_pwquality.c -index 5c09bc7..d68118a 100644 ---- a/src/pam_pwquality.c -+++ b/src/pam_pwquality.c -@@ -34,6 +34,10 @@ - #include - #include - -+#ifdef HAVE_PAM_CHECK_USER_IN_PASSWD -+#include -+#endif -+ - /* argument parsing */ - #define PAM_DEBUG_ARG 0x0001 - diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template index c66f32af8c1e..1669fe255dc7 100644 --- a/srcpkgs/libpwquality/template +++ b/srcpkgs/libpwquality/template @@ -1,7 +1,7 @@ # Template file for 'libpwquality' pkgname=libpwquality -version=1.4.4 -revision=3 +version=1.4.5 +revision=1 build_style=gnu-configure build_helper=python3 configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://github.com/libpwquality/libpwquality" changelog="https://raw.githubusercontent.com/libpwquality/libpwquality/master/NEWS" distfiles="https://github.com/libpwquality/libpwquality/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2" -checksum=d43baf23dc6887fe8f8e9b75cabaabc5f4bbbaa0f9eff44278d276141752a545 +checksum=6fcf18b75d305d99d04d2e42982ed5b787a081af2842220ed63287a2d6a10988 pre_configure() { autoreconf -fi