From b3168ad9139ec942d4b1a0dd0b9c2584d32cbd5c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 05 2019 21:59:57 +0000
Subject: import libuser-0.62-23.el8


---

diff --git a/SOURCES/0008-lgroupmod-Emit-AUDIT_GRP_CHAUTHTOK-not-AUDIT_GRP_MGM.patch b/SOURCES/0008-lgroupmod-Emit-AUDIT_GRP_CHAUTHTOK-not-AUDIT_GRP_MGM.patch
new file mode 100644
index 0000000..2f8f975
--- /dev/null
+++ b/SOURCES/0008-lgroupmod-Emit-AUDIT_GRP_CHAUTHTOK-not-AUDIT_GRP_MGM.patch
@@ -0,0 +1,48 @@
+From c6a4e9f596c976f71894269e3168567e6118236c Mon Sep 17 00:00:00 2001
+From: Steve Grubb <sgrubb@redhat.com>
+Date: Wed, 5 Jun 2019 22:16:51 +0200
+Subject: [PATCH] lgroupmod: Emit AUDIT_GRP_CHAUTHTOK, not AUDIT_GRP_MGMT when
+ changing group password
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1670997
+---
+ apps/lgroupmod.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/apps/lgroupmod.c b/apps/lgroupmod.c
+index 0ad0ae4..20be85f 100644
+--- a/apps/lgroupmod.c
++++ b/apps/lgroupmod.c
+@@ -138,12 +138,12 @@ main(int argc, const char **argv)
+ 		    == FALSE) {
+ 			fprintf(stderr, _("Failed to set password for group "
+ 				"%s: %s\n"), group, lu_strerror(error));
+-			lu_audit_logger(AUDIT_GRP_MGMT,
++			lu_audit_logger(AUDIT_GRP_CHAUTHTOK,
+ 					"changing-group-passwd", group,
+ 					AUDIT_NO_ID, 0);
+ 			return 4;
+ 		}
+-		lu_audit_logger(AUDIT_GRP_MGMT,
++		lu_audit_logger(AUDIT_GRP_CHAUTHTOK,
+ 				"changing-group-passwd", group,
+ 				AUDIT_NO_ID, 1);
+ 	}
+@@ -153,12 +153,12 @@ main(int argc, const char **argv)
+ 				     &error) == FALSE) {
+ 			fprintf(stderr, _("Failed to set password for group "
+ 				"%s: %s\n"), group, lu_strerror(error));
+-			lu_audit_logger(AUDIT_GRP_MGMT,
++			lu_audit_logger(AUDIT_GRP_CHAUTHTOK,
+ 					"changing-group-passwd", group,
+ 					AUDIT_NO_ID, 0);
+ 			return 5;
+ 		}
+-		lu_audit_logger(AUDIT_GRP_MGMT,
++		lu_audit_logger(AUDIT_GRP_CHAUTHTOK,
+ 				"changing-group-passwd", group,
+ 				AUDIT_NO_ID, 1);
+ 	}
+-- 
+2.20.1
+
diff --git a/SPECS/libuser.spec b/SPECS/libuser.spec
index 549e691..34a9727 100644
--- a/SPECS/libuser.spec
+++ b/SPECS/libuser.spec
@@ -1,6 +1,6 @@
 Name: libuser
 Version: 0.62
-Release: 21%{?dist}
+Release: 23%{?dist}
 Group: System Environment/Base
 License: LGPLv2+
 URL: https://pagure.io/libuser
@@ -40,6 +40,7 @@ Patch4: 0004-Check-negative-return-of-PyList_Size.patch
 Patch5: 0005-files.c-Init-char-name-to-NULL.patch
 Patch6: 0006-merge_ent_array_duplicates-Only-use-values-if-valid.patch
 Patch7: 0007-editing_open-close-fd-after-we-ve-established-its-va.patch
+Patch8: 0008-lgroupmod-Emit-AUDIT_GRP_CHAUTHTOK-not-AUDIT_GRP_MGM.patch
 
 %description
 The libuser library implements a standardized interface for manipulating
@@ -82,6 +83,7 @@ administering user and group accounts.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 cp %{SOURCE1}  po/ja.po
 cp %{SOURCE2}  po/zh-Hans.po
 cp %{SOURCE3}  po/zh-Hant.po
@@ -164,6 +166,13 @@ LC_ALL=C.UTF-8 python3 -c "import libuser"
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Jun 26 2019 Jakub Hrozek <jhrozek@redhat.com> - 0.62-23
+- Actually apply the patch from the previous build
+- Resolves: rhbz#1670997 - Amend the user lifecycle auditing
+
+* Fri Jun  7 2019 Jakub Hrozek <jhrozek@redhat.com> - 0.62-22
+- Resolves: rhbz#1670997 - Amend the user lifecycle auditing
+
 * Fri Nov 30 2018 Jakub Hrozek <jhrozek@redhat.com> - 0.62-21
 - Resolves: rhbz#1608321 - [libuser] RHEL 8.0 Tier 0 Localization