From 571f01917f945353e263c99926da10d6cd09515c Mon Sep 17 00:00:00 2001
From: wjiang <app@cameyan.com>
Date: Thu, 21 Aug 2025 17:14:46 +0800
Subject: [PATCH] sync changes to the tar#Read() function call

---
 backport-CVE-2025-53905.patch | 30 +++++++++++++++++++++++++++---
 vim.spec                      |  8 +++++++-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/backport-CVE-2025-53905.patch b/backport-CVE-2025-53905.patch
index d92009f..e9f9392 100644
--- a/backport-CVE-2025-53905.patch
+++ b/backport-CVE-2025-53905.patch
@@ -22,10 +22,11 @@ functionality
 closes: #17733
 
 Reference: https://github.com/vim/vim/commit/87757c6b0a4b2c1f71c72ea8e1438b8fb116b239
-Conflict: only change runtime/autoload/tar.vim
+Conflict: only change runtime/autoload/tar.vim runtime/plugin/tarPlugin.vim
 ---
- runtime/autoload/tar.vim | 242 ++++++++++++++++-----------------------
- 1 file changed, 101 insertions(+), 141 deletions(-)
+ runtime/autoload/tar.vim     | 242 +++++++++++++++--------------------
+ runtime/plugin/tarPlugin.vim |   8 +-
+ 2 files changed, 105 insertions(+), 145 deletions(-)
 
 diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
 index e7b2738..01f488f 100644
@@ -572,4 +573,27 @@ index e7b2738..01f488f 100644
  endfun
  
  " ---------------------------------------------------------------------
+diff --git a/runtime/plugin/tarPlugin.vim b/runtime/plugin/tarPlugin.vim
+index a9b4689..274092f 100644
+--- a/runtime/plugin/tarPlugin.vim
++++ b/runtime/plugin/tarPlugin.vim
+@@ -22,14 +22,14 @@ set cpo&vim
+ "  Public Interface: {{{1
+ augroup tar
+   au!
+-  au BufReadCmd   tarfile::*	call tar#Read(expand("<amatch>"), 1)
+-  au FileReadCmd  tarfile::*	call tar#Read(expand("<amatch>"), 0)
++  au BufReadCmd   tarfile::*	call tar#Read(expand("<amatch>"))
++  au FileReadCmd  tarfile::*	call tar#Read(expand("<amatch>"))
+   au BufWriteCmd  tarfile::*	call tar#Write(expand("<amatch>"))
+   au FileWriteCmd tarfile::*	call tar#Write(expand("<amatch>"))
+ 
+   if has("unix")
+-   au BufReadCmd   tarfile::*/*	call tar#Read(expand("<amatch>"), 1)
+-   au FileReadCmd  tarfile::*/*	call tar#Read(expand("<amatch>"), 0)
++   au BufReadCmd   tarfile::*/*	call tar#Read(expand("<amatch>"))
++   au FileReadCmd  tarfile::*/*	call tar#Read(expand("<amatch>"))
+    au BufWriteCmd  tarfile::*/*	call tar#Write(expand("<amatch>"))
+    au FileWriteCmd tarfile::*/*	call tar#Write(expand("<amatch>"))
+   endif
 
diff --git a/vim.spec b/vim.spec
index 308a230..d7db869 100644
--- a/vim.spec
+++ b/vim.spec
@@ -12,7 +12,7 @@
 Name:           vim
 Epoch:          2
 Version:        9.0
-Release:        35
+Release:        36
 Summary:        Vim is a highly configurable text editor for efficiently creating and changing any kind of text.
 License:        Vim and MIT
 URL:            http://www.vim.org
@@ -559,6 +559,12 @@ LANG=en_US.UTF-8 make -j1 test
 %{_mandir}/man1/evim.*
 
 %changelog
+* Thu Aug 21 2025 wangjiang <app@cameyan.com> - 2:9.0-36
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:sync changes to the tar#Read() function call
+
 * Thu Jul 24 2025 wangjiang <app@cameyan.com> - 2:9.0-35
 - Type:CVE
 - ID:CVE-2025-53905 CVE-2025-53906
-- 
Gitee