!39 [sync] PR-37: correct patch names and commit messages

From: @openeuler-sync-bot 
Reviewed-by: @robertxw 
Signed-off-by: @robertxw

backport-add-fclose-operation-to-fix-file-pointer-not-closed.patch

@@ -1,8 +1,15 @@
-From 894fd6a7ba225936f7711ef9a9413bba65f83b92 Mon Sep 17 00:00:00 2001
-From: Wei Xing <skyxwwalker@gmail.com>
-Date: Thu, 2 Mar 2023 21:07:10 +0800
-Subject: [PATCH] Add fclose operation to fix file pointer not closed after use
- Signed-off-by: Wei Xing <skyxwwalker@gmail.com>
+From 883a65eee0ea9de6aa843614bc2a97bc1dd3ccd2 Mon Sep 17 00:00:00 2001
+From: Bmo <35866749+XWwalker@users.noreply.github.com>
+Date: Sat, 18 Mar 2023 06:20:43 +0800
+Subject: [PATCH] radius plugin: add fclose operation to fix file pointer not
+ closed after use (#401)
+
+Signed-off-by: Wei Xing <skyxwwalker@gmail.com>
+
+Co-authored-by: Wei Xing <skyxwwalker@gmail.com>
+
+Conflict: NA
+Reference: https://github.com/ppp-project/ppp/commit/883a65eee0ea9de6aa843614bc2a97bc1dd3ccd2
 
 ---
  pppd/plugins/radius/clientid.c | 2 ++
@@ -10,7 +17,7 @@ Subject: [PATCH] Add fclose operation to fix file pointer not closed after use
  2 files changed, 8 insertions(+)
 
 diff --git a/pppd/plugins/radius/clientid.c b/pppd/plugins/radius/clientid.c
-index b1bbc47..eea5165 100644
+index b1bbc474..eea51650 100644
 --- a/pppd/plugins/radius/clientid.c
 +++ b/pppd/plugins/radius/clientid.c
 @@ -68,6 +68,7 @@ int rc_read_mapfile(char *filename)
@@ -30,7 +37,7 @@ index b1bbc47..eea5165 100644
  
  		}
 diff --git a/pppd/plugins/radius/config.c b/pppd/plugins/radius/config.c
-index 47c172c..39744fc 100644
+index 47c172cc..39744fca 100644
 --- a/pppd/plugins/radius/config.c
 +++ b/pppd/plugins/radius/config.c
 @@ -212,6 +212,7 @@ int rc_read_config(char *filename)
@@ -72,6 +79,6 @@ index 47c172c..39744fc 100644
  					return (-1);
  				break;
  			default:
--- 
-2.33.0
+
+
 

ppp.spec

@@ -1,6 +1,6 @@
 Name:           ppp
 Version:        2.4.9
-Release:        5
+Release:        6
 Summary:        The Point-to-Point Protocol
 
 License:        BSD and LGPLv2+ and GPLv2+ and Public Domain
@@ -46,7 +46,7 @@ Patch0016:      backport-ppp-2.4.9-configure-cflags-allow-commas.patch
 Patch0017:      backport-0027-Set-LIBDIR-for-RISCV.patch
 Patch0018:      backport-pppd-Negotiate-IP-address-when-only-peer-addresses-are-provided.patch
 Patch0019:      backport-CVE-2022-4603.patch
-Patch0020:      add-fclose-operation-to-fix-file-pointer-not-closed.patch
+Patch0020:      backport-add-fclose-operation-to-fix-file-pointer-not-closed.patch
 
 %description
 The Point-to-Point Protocol (PPP) provides a standard way to establish
@@ -142,8 +142,14 @@ mkdir -p %{buildroot}%{_rundir}/lock/ppp
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* Mon Sep 11 2023 xingwei <xingwei14@h-partners.com> - 2.4.9-6
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:correct patch names and commit messages
+
 * Fri Mar 10 2023 xingwei <xingwei14@h-partners.com> - 2.4.9-5
-- Type:bufix
+- Type:bugfix
 - ID:NA
 - SUG:NA
 - DESC:add fclose operation to fix file pointer not closed after use