From b6afd335b92250cbe2e85d1ffb88dd6b77891591 Mon Sep 17 00:00:00 2001
From: yixiangzhike <yixiangzhike007@163.com>
Date: Fri, 23 May 2025 10:34:27 +0800
Subject: [PATCH] Remove redundant inclusion of libintl.h

Buglink:https://github.com/libpwquality/libpwquality/issues/59
---
 ...-inclusion-of-libintl.h-in-pam_pwqua.patch | 28 +++++++++++++++++++
 libpwquality.spec                             |  9 +++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 backport-Remove-redundant-inclusion-of-libintl.h-in-pam_pwqua.patch

diff --git a/backport-Remove-redundant-inclusion-of-libintl.h-in-pam_pwqua.patch b/backport-Remove-redundant-inclusion-of-libintl.h-in-pam_pwqua.patch
new file mode 100644
index 0000000..118773d
--- /dev/null
+++ b/backport-Remove-redundant-inclusion-of-libintl.h-in-pam_pwqua.patch
@@ -0,0 +1,28 @@
+From 8336063b1aecfcdcc88763d288f6701c98e54b0c Mon Sep 17 00:00:00 2001
+From: yixiangzhike <yixiangzhike007@163.com>
+Date: Thu, 27 Feb 2025 20:50:53 +0800
+Subject: [PATCH] Remove redundant inclusion of libintl.h in pam_pwquality.c
+
+The header file libintl.h has been included by config.h
+with macro ENABLE_NLS.It is redundant inclusion in pam_pwquality.
+
+Signed-off-by: yixiangzhike <yixiangzhike007@163.com>
+---
+ src/pam_pwquality.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/pam_pwquality.c b/src/pam_pwquality.c
+index d68118a..7db7a65 100644
+--- a/src/pam_pwquality.c
++++ b/src/pam_pwquality.c
+@@ -15,7 +15,6 @@
+ #include <ctype.h>
+ #include <limits.h>
+ #include <syslog.h>
+-#include <libintl.h>
+ #include <stdio.h>
+ #include <pwd.h>
+ #include <errno.h>
+-- 
+2.43.0
+
diff --git a/libpwquality.spec b/libpwquality.spec
index 7801a95..900fc4a 100644
--- a/libpwquality.spec
+++ b/libpwquality.spec
@@ -3,7 +3,7 @@
 
 Name: libpwquality
 Version: 1.4.2
-Release: 4
+Release: 5
 Summary: Library for password quality checking and generating random passwords.
 License: BSD or GPLv2+
 URL:     https://github.com/libpwquality/libpwquality/
@@ -13,6 +13,7 @@ Patch0: modify-pwquality_conf.patch
 Patch1: fix-password-similarity.patch
 Patch2: fix-doc-about-difok.patch
 Patch3: backport-Make-maxclassrepeat-1-behavior-consistent-with-docs.patch
+Patch4: backport-Remove-redundant-inclusion-of-libintl.h-in-pam_pwqua.patch
 
 BuildRequires: gcc cracklib-devel gettext pam-devel
 BuildRequires: python2-devel python3-devel
@@ -125,6 +126,12 @@ mkdir %{buildroot}%{_secconfdir}/pwquality.conf.d
 %{_mandir}/man8/*
 
 %changelog
+* Fri May 23 2025 yixiangzhike <yixiangzhike007@163.com> - 1.4.2-5
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:backport upstream patch to remove redundant inclusion of libintl.h
+
 * Tue Jul 2 2024 yixiangzhike <yixiangzhike007@163.com> - 1.4.2-4
 - Type:bugfix
 - ID:NA
-- 
Gitee