SOURCES/0009-man-typo.patch

@@ -0,0 +1,19 @@
+commit 9b9d41eeeb037cca047feb93805a08a3e47c3dea
+Author: Andre Boscatto <aboscatt@aboscatt.remote.csb>
+Date:   Fri Apr 1 15:35:01 2022 +0200
+
+    man: Fixing typo in password
+
+diff --git a/apps/lchage.1 b/apps/lchage.1
+index c3dbf40..73cf5e0 100644
+--- a/apps/lchage.1
++++ b/apps/lchage.1
+@@ -72,7 +72,7 @@ Require at least \fIdays\fR days between password changes.
+ Set \fIdays\fR to 0 or -1 to disable this requirement.
+ 
+ If this value is larger than the value set by \fB\-\-maxdays\fP,
+-the user cannot change the pasword.
++the user cannot change the password.
+ 
+ .TP
+ \fB\-M\fR, \fB\-\-maxdays\fR=\fIdays\fR

SOURCES/0010-resource-leak.patch

@@ -0,0 +1,39 @@
+diff -up libuser-0.62/lib/user.c.orig libuser-0.62/lib/user.c
+--- libuser-0.62/lib/user.c.orig	2024-05-07 17:03:45.220514343 +0200
++++ libuser-0.62/lib/user.c	2024-05-07 17:05:17.855649386 +0200
+@@ -986,7 +986,10 @@ lu_dispatch(struct lu_context *context,
+ 	case user_default:
+ 	case group_default:
+ 		/* Make sure we have both name and boolean here. */
+-		g_return_val_if_fail(sdata != NULL, FALSE);
++		if (sdata == NULL) {
++			free(tmp);
++			return FALSE;
++		}
+ 		/* Run the checks and preps. */
+ 		if (run_list(context, context->create_module_names,
+ 			    logic_and, id,
+@@ -1065,7 +1068,10 @@ lu_dispatch(struct lu_context *context,
+ 	case user_setpass:
+ 	case group_setpass:
+ 		/* Make sure we have a valid password. */
+-		g_return_val_if_fail(sdata != NULL, FALSE);
++		if (sdata == NULL) {
++			free(tmp);
++			return FALSE;
++		}
+ 		/* no break: fall through */
+ 	case user_removepass:
+ 	case group_removepass:
+@@ -1094,7 +1100,10 @@ lu_dispatch(struct lu_context *context,
+ 	case users_enumerate_by_group:
+ 	case groups_enumerate_by_user:
+ 		/* Make sure we have both name and ID here. */
+-		g_return_val_if_fail(sdata != NULL, FALSE);
++		if (sdata == NULL) {
++			free(tmp);
++			return FALSE;
++		}
+ 		if (id == users_enumerate_by_group)
+ 			ldata = convert_group_name_to_id(context, sdata,
+ 							 error);

SPECS/libuser.spec

@@ -1,14 +1,14 @@
 Name: libuser
 Version: 0.62
-Release: 24%{?dist}
+Release: 26%{?dist}
 Group: System Environment/Base
 License: LGPLv2+
 URL: https://pagure.io/libuser
 Source: http://releases.pagure.org/libuser/libuser-%{version}.tar.xz
 # https://bugzilla.redhat.com/show_bug.cgi?id=1608321
-Source1:  libuser-0_62-jp.po
-Source2:  libuser-0_62-zh-Hans.po
-Source3:  libuser-0_62-zh-Hant.po
+Source1:  libuser-0_62-ja.po
+Source2:  libuser-0_62-zh_CN.po
+Source3:  libuser-0_62-zh_TW.po
 Source4:  libuser-0_62-fr.po
 Source5:  libuser-0_62-it.po
 Source6:  libuser-0_62-de.po
@@ -41,6 +41,8 @@ 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
+Patch9: 0009-man-typo.patch
+Patch10: 0010-resource-leak.patch
 
 %description
 The libuser library implements a standardized interface for manipulating
@@ -76,17 +78,19 @@ administering user and group accounts.
 %prep
 %setup -q -n libuser-%{version}
 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
+%patch -P 6 -p1
+%patch -P 7 -p1
+%patch -P 8 -p1
+%patch -P 9 -p1
+%patch -P 10 -p1
 cp %{SOURCE1}  po/ja.po
-cp %{SOURCE2}  po/zh-Hans.po
-cp %{SOURCE3}  po/zh-Hant.po
+cp %{SOURCE2}  po/zh_CN.po
+cp %{SOURCE3}  po/zh_TW.po
 cp %{SOURCE4}  po/fr.po
 cp %{SOURCE5}  po/it.po
 cp %{SOURCE6}  po/de.po
@@ -105,8 +109,8 @@ autoreconf -if
 make
 # (make all) only rebuilds .gmo files if the .pot file is updated, regardless of po/ja.po changes
 make -C po ja.gmo
-make -C po zh-Hans.gmo
-make -C po zh-Hant.gmo
+make -C po zh_CN.gmo
+make -C po zh_TW.gmo
 make -C po it.gmo
 make -C po de.gmo
 make -C po ko.gmo
@@ -166,6 +170,14 @@ LC_ALL=C.UTF-8 python3 -c "import libuser"
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Jul 23 2024 Michal Hlavinka <mhlavink@redhat.com> - 0.62-26
+- fix findings from static application security testing (#RHEL-35578)
+- translation update (#RHEL-12111)
+
+* Tue Nov 29 2022 Tomas Halman <thalman@redhat.com> - 0.62-25
+- Man-page update
+- Resolves: rhbz#2070941 - small typo in lchage man page
+
 * 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