From ca72e1f704f4c62b22a824196bc9e8469d484ae715241daa18a4e74bec024df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Thu, 8 Oct 2020 08:51:25 +0000 Subject: [PATCH] Accepting request 840140 from home:sbrabec:branches:util-linux-multibuild - pam-login_defs-check.sh: Fix the regexp to get a real variable list (boo#1164274). OBS-URL: https://build.opensuse.org/request/show/840140 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=220 --- pam-login_defs-check.sh | 4 ++-- pam.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pam-login_defs-check.sh b/pam-login_defs-check.sh index d1f9e38..b559d79 100644 --- a/pam-login_defs-check.sh +++ b/pam-login_defs-check.sh @@ -9,10 +9,10 @@ set -o errexit echo -n "Checking login.defs variables in pam... " >&2 grep -rh LOGIN_DEFS . | - sed -n 's/^.*search_key *("\([A-Z0-9_]*\)", *LOGIN_DEFS).*$/\1/p' | + sed -n 's/^.*search_key *([A-Za-z_]*, *[A-Z_]*LOGIN_DEFS, *"\([A-Z0-9_]*\)").*$/\1/p' | LC_ALL=C sort -u >pam-login_defs-vars.lst -if test $(sha1sum pam-login_defs-vars.lst | sed 's/ .*$//') != da39a3ee5e6b4b0d3255bfef95601890afd80709 ; then +if test $(sha1sum pam-login_defs-vars.lst | sed 's/ .*$//') != 3c6e0020c31609690b69ef391654df930b74151d ; then echo "does not match!" >&2 echo "Checksum is: $(sha1sum pam-login_defs-vars.lst | sed 's/ .*$//')" >&2 diff --git a/pam.changes b/pam.changes index 6a13b9b..a7a0279 100644 --- a/pam.changes +++ b/pam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 8 02:33:16 UTC 2020 - Stanislav Brabec + +- pam-login_defs-check.sh: Fix the regexp to get a real variable + list (boo#1164274). + ------------------------------------------------------------------- Wed Jun 24 13:06:33 UTC 2020 - Josef Möllers