diff --git a/vim.spec b/vim.spec index af63749a62950e0800f91c8d908b53b3058c7fd6..4b32b533439c2805f450ae1270847c470e2d55f3 100644 --- a/vim.spec +++ b/vim.spec @@ -157,6 +157,7 @@ Patch6120: backport-CVE-2022-2210.patch Patch6121: backport-CVE-2022-2289.patch Patch9000: bugfix-rm-modify-info-version.patch +Patch9001: vim82-sw.patch BuildRequires: autoconf python3-devel ncurses-devel gettext perl-devel perl-generators gcc BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) libacl-devel gpm-devel file @@ -543,6 +544,9 @@ popd %{_mandir}/man1/evim.* %changelog +* Wed Jul 20 2022 wuzx - 2:8.2-54 +- add sw64 patch + * Fri Jul 15 2022 shangyibin - 2:8.2-53 - Type:CVE - ID:CVE-2022-2289 diff --git a/vim82-sw.patch b/vim82-sw.patch new file mode 100755 index 0000000000000000000000000000000000000000..6b5701863301350f6fc2717ec2ef76b3cf78bc94 --- /dev/null +++ b/vim82-sw.patch @@ -0,0 +1,24 @@ +diff -Nuar vim82.org/runtime/syntax/debcontrol.vim vim82.sw/runtime/syntax/debcontrol.vim +--- vim82.org/runtime/syntax/debcontrol.vim 2021-10-23 10:07:49.989274196 +0800 ++++ vim82.sw/runtime/syntax/debcontrol.vim 2021-10-23 10:19:20.256320784 +0800 +@@ -28,7 +28,7 @@ + + let s:kernels = ['linux', 'hurd', 'kfreebsd', 'knetbsd', 'kopensolaris', 'netbsd'] + let s:archs = [ +- \ 'alpha', 'amd64', 'armeb', 'armel', 'armhf', 'arm64', 'avr32', 'hppa' ++ \ 'alpha', 'sw_64', 'amd64', 'armeb', 'armel', 'armhf', 'arm64', 'avr32', 'hppa' + \, 'i386', 'ia64', 'lpia', 'm32r', 'm68k', 'mipsel', 'mips64el', 'mips' + \, 'powerpcspe', 'powerpc', 'ppc64el', 'ppc64', 'riscv64', 's390x', 's390', 'sh3eb' + \, 'sh3', 'sh4eb', 'sh4', 'sh', 'sparc64', 'sparc', 'x32' +diff -Nuar vim82.org/src/osdef1.h.in vim82.sw/src/osdef1.h.in +--- vim82.org/src/osdef1.h.in 2021-10-23 10:07:49.939274193 +0800 ++++ vim82.sw/src/osdef1.h.in 2021-10-24 11:00:49.045320141 +0800 +@@ -132,7 +132,7 @@ + #else + extern char *getwd(char *); + #endif +-#ifndef __alpha /* suggested by Campbell */ ++#if !defined __alpha && !defined __sw_64 /* suggested by Campbell */ + extern int ioctl(int, int, ...); + #endif + extern int chmod(const char *, mode_t);