From f3a9f6f012d27a2af9d79ef9c8295f577d1153fe Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Wed, 4 Feb 2026 17:31:58 +0100
Subject: [PATCH] patchlevel 2128

Make /usr/bin/vi binary again to be able to use NOEXEC sudo option on it
---
 sources      |  2 +-
 vi_wrapper   | 23 -----------------------
 view_wrapper |  2 +-
 vim.spec     | 26 +++++++++++++-------------
 4 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 vi_wrapper

diff --git a/sources b/sources
index 7fa82d30..8645fbda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-9.1-2114.tar.bz2) = 7ef6964cd35130512f52459467bbee86a2afcce9dd1d95cea3a5efa02b856493b231f3df4c592ba554e2312553b1eaa5756ad0087eae1456892cace00cb617da
+SHA512 (vim-9.1-2128.tar.bz2) = 287209147ad9c63ba351fc63ad3257c8f8bfa1062595003695e12bd0de9518b19a46d04bb3735bc7f482ded751a85ecf7f67941b2b3ed2dd716acc26d5496cdf
diff --git a/vi_wrapper b/vi_wrapper
deleted file mode 100644
index 1bb1aece..00000000
--- a/vi_wrapper
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/sh
-
-# run vim if:
-# - 'vi' command is used and 'vim' binary is available
-# - 'vim' command is used
-# NOTE: Set up a local alias if you want vim -> vi functionality. We will not
-# do it globally, because it messes up with available startup options (see 
-# ':help starting', 'vi' is not capable of '-d'). The introducing an environment
-# variable, which an user must set to get the feature, will do the same trick
-# as setting an alias (needs user input, does not work with sudo), so it is left
-# on user whether he decides to use an alias:
-#
-# alias vim=vi
-#
-# in bashrc file.
-
-if test -f /usr/bin/vim
-then
-  exec /usr/bin/vim "$@"
-fi
-
-# run vi otherwise
-exec /usr/libexec/vi "$@"
diff --git a/view_wrapper b/view_wrapper
index 9e8d7207..a0b24c9d 100644
--- a/view_wrapper
+++ b/view_wrapper
@@ -7,4 +7,4 @@ then
 fi
 
 # run vi otherwise
-exec /usr/libexec/vi -R "$@"
+exec /usr/bin/vi -R "$@"
diff --git a/vim.spec b/vim.spec
index b9c2740b..675ffbec 100644
--- a/vim.spec
+++ b/vim.spec
@@ -12,7 +12,7 @@
 %endif
 
 
-%define patchlevel 2114
+%define patchlevel 2128
 %define withnetbeans 1
 
 %define withhunspell 0
@@ -54,7 +54,7 @@ Summary: The VIM editor
 URL:     https://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 # swift.vim contains Apache 2.0 with runtime library exception:
 # which is taken as Apache-2.0 WITH Swift-exception - reported to legal as https://gitlab.com/fedora/legal/fedora-license-data/-/issues/188
@@ -78,7 +78,6 @@ Source9: vim-default-editor.sh
 Source10: vim-default-editor.csh
 Source11: vim-default-editor.fish
 Source12: view_wrapper
-Source13: vi_wrapper
 
 
 Patch1: vim-7.0-fixkeys.patch
@@ -601,15 +600,10 @@ cd src
 # does it for us, so there is no need to do it in Vim
 %make_install BINDIR=%{_bindir} STRIP=/bin/true
 
-# make install creates vim binary and view symlink, they will be wrappers
-# so remove them here
-rm -f %{buildroot}%{_bindir}/{vim,view}
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
-mkdir -p %{buildroot}%{_libexecdir}
-install -m755 minimal-vim %{buildroot}%{_libexecdir}/vi
+install -m755 minimal-vim %{buildroot}%{_bindir}/vi
 install -m755 enhanced-vim %{buildroot}%{_bindir}/vim
 install -m755 %{SOURCE12} %{buildroot}%{_bindir}/view
-install -m755 %{SOURCE13} %{buildroot}%{_bindir}/vi
 
 %if %{with gui}
 make installgtutorbin  DESTDIR=%{buildroot} BINDIR=%{_bindir}
@@ -702,9 +696,9 @@ rm %{buildroot}/%{_datadir}/icons/{hicolor,locolor}/*/apps/gvim.png
 %endif
 
 ( cd %{buildroot}
-  ln -sf ../..%{_libexecdir}/vi .%{_bindir}/rvi
-  ln -sf ../..%{_libexecdir}/vi .%{_bindir}/rview
-  ln -sf ../..%{_libexecdir}/vi .%{_bindir}/ex
+  ln -sf ../..%{_bindir}/vi .%{_bindir}/rvi
+  ln -sf ../..%{_bindir}/vi .%{_bindir}/rview
+  ln -sf ../..%{_bindir}/vi .%{_bindir}/ex
   ln -sf vim .%{_bindir}/rvim
   ln -sf vim .%{_bindir}/vimdiff
   perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1
@@ -873,6 +867,7 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %lang(sk.cp1250) %{_datadir}/%{name}/%{vimdir}/lang/sk.cp1250
 %lang(sr) %{_datadir}/%{name}/%{vimdir}/lang/sr
 %lang(sv) %{_datadir}/%{name}/%{vimdir}/lang/sv
+%lang(ta) %{_datadir}/%{name}/%{vimdir}/lang/ta
 %lang(tr) %{_datadir}/%{name}/%{vimdir}/lang/tr
 %lang(uk) %{_datadir}/%{name}/%{vimdir}/lang/uk
 %lang(uk.cp1251) %{_datadir}/%{name}/%{vimdir}/lang/uk.cp1251
@@ -916,7 +911,6 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %{_bindir}/rview
 %{_bindir}/vi
 %{_bindir}/view
-%{_libexecdir}/vi
 %{_mandir}/man1/vi.*
 %{_mandir}/man1/ex.*
 %{_mandir}/man1/rvi.*
@@ -1004,6 +998,12 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 
 
 %changelog
+* Wed Feb 04 2026 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.2128-1
+- patchlevel 2128
+
+* Tue Feb 03 2026 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.2114-2
+- make /usr/bin/vi executable again to be able to use it with sudo option NOEXEC
+
 * Fri Jan 30 2026 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.2114-1
 - patchlevel 2114
 - added Swedish translation