Accepting request 1075605 from editors

- Updated to version 9.0.1430, fixes the following problems
  * The included xdiff code is a bit outdated.
  * Lean files are not recognized.
  * Build failure because SIZE_MAX is not defined.
  * Nu files are not recognized.
  * Sage files are not recognized.
  * WebAssembly Interface Type files are not recognized.
  * Unused macros are defined.
  * "wat" and "wast" files are one filetype.
  * Indent wrong after "export namespace" in C++.
  * Warning for uninitialized variable. (Tony Mechelynck)
  * Cursor in wrong position when leaving insert mode.
  * Invalid memory access when ending insert mode.
  * Livebook files are not recognized.

- Create a standalone package for xxd
  * This is used by non-vim tools too

- Updated to version 9.0.1418, fixes the following problems
- fixes CVE-2023-1355
  * Using NULL pointer with nested :open command.
  * Cairo files are not recognized.
  * Unx Tal files are not recognized.
  * Odin files are not recognized.
  * sort(list, 'N') does not work in Vim9 script context.
  * Highlight for popupmenu kind and extra cannot be set.
  * Profile test repeats the headers many times.
  * Highlight test script has a few problems.
  * find_file_in_path() is not reentrant.
  * Condition is always true.

OBS-URL: https://build.opensuse.org/request/show/1075605
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=345

vim-9.0.1392.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca08fe6cac14d3cb37e6f1780e86e43ae83b9deacef81b102dfdecc697e584f2
-size 16975039

vim-9.0.1430.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ad53cee902c3311bf2028deffc3cdb25ad29b6716aa401bb1f193b2e9384792
+size 16979739

vim.changes

@@ -1,3 +1,59 @@
+-------------------------------------------------------------------
+Thu Mar 30 16:24:53 UTC 2023 - Ondřej Súkup <mimi.vx@gmail.com>
+
+- Updated to version 9.0.1430, fixes the following problems
+  * The included xdiff code is a bit outdated.
+  * Lean files are not recognized.
+  * Build failure because SIZE_MAX is not defined.
+  * Nu files are not recognized.
+  * Sage files are not recognized.
+  * WebAssembly Interface Type files are not recognized.
+  * Unused macros are defined.
+  * "wat" and "wast" files are one filetype.
+  * Indent wrong after "export namespace" in C++.
+  * Warning for uninitialized variable. (Tony Mechelynck)
+  * Cursor in wrong position when leaving insert mode.
+  * Invalid memory access when ending insert mode.
+  * Livebook files are not recognized.
+
+-------------------------------------------------------------------
+Tue Mar 28 08:48:31 UTC 2023 - Andreas Schneider <asn@cryptomilk.org>
+
+- Create a standalone package for xxd
+  * This is used by non-vim tools too
+
+-------------------------------------------------------------------
+Tue Mar 21 11:38:46 UTC 2023 - Ondřej Súkup <mimi.vx@gmail.com>
+
+- Updated to version 9.0.1418, fixes the following problems
+- fixes CVE-2023-1355
+  * Using NULL pointer with nested :open command.
+  * Cairo files are not recognized.
+  * Unx Tal files are not recognized.
+  * Odin files are not recognized.
+  * sort(list, 'N') does not work in Vim9 script context.
+  * Highlight for popupmenu kind and extra cannot be set.
+  * Profile test repeats the headers many times.
+  * Highlight test script has a few problems.
+  * find_file_in_path() is not reentrant.
+  * Condition is always true.
+  * Crash when using null_class.
+  * Unused variables and functions.
+  * Compilation error with some compilers.
+  * Missing check for out-of-memory.
+  * ILE RPG files are not recognized.
+  * TableGen files are not recognized.
+  * QMLdir files are not recognized.
+  * Racket files are recognized as scheme.
+  * Accuracy of profiling is not optimal.
+  * Pony files are not recognized.
+  * Compiler warning for unused variable.
+  * <M-S-x> in Kitty does not use the Shift modifier.
+  * Crystal files are not recognized.
+  * Crash when collection is modified when using filter().
+  * ESDL files are not recognized.
+  * The included xdiff code is a bit outdated.
+
 -------------------------------------------------------------------
 Mon Mar 13 15:15:13 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 

vim.spec

@@ -17,26 +17,24 @@
 
 
 %define pkg_version 9.0
-%define patchlevel 1392
+%define patchlevel 1430
 %define patchlevel_compact %{patchlevel}
 %define VIM_SUBDIR vim90
 %define site_runtimepath %{_datadir}/vim/site
 %define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags}
-%bcond_without python2
-
 %if 0%{?suse_version} > 1500
 %bcond_without libalternatives
 %else
 %bcond_with libalternatives
 %endif
-
+%bcond_without python2
 Name:           vim
 Version:        %{pkg_version}.%{patchlevel_compact}
 Release:        0
 Summary:        Vi IMproved
 License:        Vim
 Group:          Productivity/Text/Editors
-URL:            http://www.vim.org/
+URL:            https://www.vim.org/
 Source:         https://github.com/vim/vim/archive/v%{pkg_version}.%{patchlevel}.tar.gz#/vim-%{pkg_version}.%{patchlevel}.tar.gz
 Source3:        suse.vimrc
 Source4:        vimrc_example1
@@ -83,25 +81,31 @@ BuildRequires:  db-devel
 BuildRequires:  fdupes
 BuildRequires:  gettext-devel
 BuildRequires:  gpm-devel
-BuildRequires:  libacl-devel
 BuildRequires:  libtool
-BuildRequires:  ncurses-devel
 BuildRequires:  perl
 BuildRequires:  pkgconfig
 BuildRequires:  ruby-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(form)
+BuildRequires:  pkgconfig(formw)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(krb5)
+BuildRequires:  pkgconfig(libacl)
 BuildRequires:  pkgconfig(lua)
+BuildRequires:  pkgconfig(menu)
+BuildRequires:  pkgconfig(menuw)
+BuildRequires:  pkgconfig(ncurses)
+BuildRequires:  pkgconfig(ncurses++)
+BuildRequires:  pkgconfig(ncurses++w)
+BuildRequires:  pkgconfig(ncursesw)
+BuildRequires:  pkgconfig(panel)
+BuildRequires:  pkgconfig(panelw)
 BuildRequires:  pkgconfig(python3)
+BuildRequires:  pkgconfig(tic)
+BuildRequires:  pkgconfig(tinfo)
 BuildRequires:  pkgconfig(xt)
 Requires:       vim-data-common = %{version}-%{release}
-%if %{with libalternatives}
+Requires:       xxd = %{version}-%{release}
-Requires:       alts
-%else
-Requires(post): update-alternatives
-Requires(postun):update-alternatives
-%endif
 Recommends:     vim-data = %{version}-%{release}
 Conflicts:      vim-base < 8.2
 Provides:       vi
@@ -113,6 +117,12 @@ Obsoletes:      vim-enhanced < %{version}-%{release}
 Obsoletes:      vim-python < %{version}-%{release}
 Provides:       vim_client
 %{?libperl_requires}
+%if %{with libalternatives}
+Requires:       alts
+%else
+Requires(post): update-alternatives
+Requires(postun):update-alternatives
+%endif
 %if %{with python2}
 BuildRequires:  python2-devel
 %endif
@@ -134,7 +144,6 @@ Provides:       vim-plugin-matchit = 1.13.2
 # conflicts with nginx own plugin
 Obsoletes:      vim-plugin-nginx < %{version}
 Provides:       vim-plugin-nginx = %{version}
-
 BuildArch:      noarch
 
 %description data
@@ -153,13 +162,7 @@ Summary:        A GUI for Vi
 Group:          Productivity/Text/Editors
 Requires:       gvim_client
 Requires:       vim-data = %{version}-%{release}
-%if %{with libalternatives}
+Requires:       xxd = %{version}-%{release}
-BuildRequires:  alts
-Requires:       alts
-%else
-Requires(post): update-alternatives
-Requires(postun):update-alternatives
-%endif
 Conflicts:      gvim < 8.2
 Provides:       gvim-base = %{version}-%{release}
 Provides:       gvim-enhanced = %{version}-%{release}
@@ -168,6 +171,13 @@ Obsoletes:      gvim-enhanced < %{version}-%{release}
 Provides:       gvim_client
 Provides:       vi
 Provides:       vim_client
+%if %{with libalternatives}
+BuildRequires:  alts
+Requires:       alts
+%else
+Requires(post): update-alternatives
+Requires(postun):update-alternatives
+%endif
 
 %description -n gvim
 Package gvim contains the largest set of features of vim, which is
@@ -178,6 +188,9 @@ want less features, you might want to install vim instead.
 %package small
 Summary:        Vim with reduced features
 Group:          Productivity/Text/Editors
+Requires:       vim-data-common = %{version}-%{release}
+Provides:       vi
+Provides:       vim_client
 %if %{with libalternatives}
 BuildRequires:  alts
 Requires:       alts
@@ -185,14 +198,18 @@ Requires:       alts
 Requires(post): update-alternatives
 Requires(postun):update-alternatives
 %endif
-Provides:       vi
-Provides:       vim_client
-Requires:       vim-data-common = %{version}-%{release}
 
 %description small
 Vim compiled with reduced feature set such as no script
 interpreters built in
 
+%package -n xxd
+Summary:        A hex dump utility
+
+%description -n xxd
+xxd creates a hex dump of a given file or standard input.  It can also convert
+a hex dump back to its original binary form.
+
 %prep
 %setup -q -n %{name}-%{pkg_version}.%{patchlevel}
 
@@ -291,21 +308,21 @@ popd
 # build smaller vim
 %configure ${SMALL_OPTIONS} ${NOGUI_OPTIONS}
 sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
-make %{?_smp_mflags}
+%make_build
 cp src/vim vim-small
 
 # build normal vim
-make -j1 distclean
+%make_build -j1 distclean
 %configure ${HUGE_OPTIONS} ${NOGUI_OPTIONS}
 sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
-make %{?_smp_mflags}
+%make_build
 cp src/vim vim-nox11
 
 # build gvim
-make -j1 distclean
+%make_build -j1 distclean
 %configure ${HUGE_OPTIONS} ${GUI_OPTIONS}
 sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
-make %{?_smp_mflags}
+%make_build
 
 #
 # build vitmp
@@ -470,6 +487,7 @@ sed -i "s@%{_bindir}/env perl@%{_bindir}/perl@" %{buildroot}%{_datadir}/vim/%{VI
 sed -i "s@%{_bindir}/env perl@%{_bindir}/perl@" %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/doc/vim2html.pl
 
 %check
+%ifnarch %{ix86}
 # vim does quite an extensive test relying on a full fledged terminal
 # inside OBS, stdio is redirected to a serial console (where the build log
 # is being recorded/extracted. Systemd set non-local tty by default to vt220
@@ -478,6 +496,7 @@ export TERM=xterm
 # Reset the terminal scrolling region left behind by the testsuite
 trap "printf '\e[r'" EXIT
 TEST_IGNORE_FLAKY=1 LC_ALL=en_US.UTF-8 make -j1 test
+%endif
 
 %if %{with libalternatives}
 # with libalternatives
@@ -587,33 +606,48 @@ fi
 %{_bindir}/vitmp
 %{_bindir}/vimtutor
 %{_bindir}/gvimtutor
-%{_bindir}/xxd
 # man pages
-%{_mandir}/man1/*
+%{_mandir}/man1/eview.1%{?ext_man}
+%{_mandir}/man1/evim.1%{?ext_man}
+%{_mandir}/man1/ex.1%{?ext_man}
+%{_mandir}/man1/gview.1%{?ext_man}
+%{_mandir}/man1/gvim.1%{?ext_man}
+%{_mandir}/man1/gvimdiff.1%{?ext_man}
+%{_mandir}/man1/rgview.1%{?ext_man}
+%{_mandir}/man1/rgvim.1%{?ext_man}
+%{_mandir}/man1/rview.1%{?ext_man}
+%{_mandir}/man1/rvim.1%{?ext_man}
+%{_mandir}/man1/vi.1%{?ext_man}
+%{_mandir}/man1/view.1%{?ext_man}
+%{_mandir}/man1/vim.1%{?ext_man}
+%{_mandir}/man1/vimdiff.1%{?ext_man}
+%{_mandir}/man1/vimtutor.1%{?ext_man}
+%{_mandir}/man1/vitmp.1%{?ext_man}
 %dir %{_mandir}/da
 %dir %{_mandir}/da/man1/
-%{_mandir}/da/man1/*
+%{_mandir}/da/man1/*.1%{?ext_man}
 %dir %{_mandir}/de
 %dir %{_mandir}/de/man1/
-%{_mandir}/de/man1/*
+%{_mandir}/de/man1/*.1%{?ext_man}
 %dir %{_mandir}/fr
 %dir %{_mandir}/fr/man1/
-%{_mandir}/fr/man1/*
+%{_mandir}/fr/man1/*.1%{?ext_man}
 %dir %{_mandir}/it
 %dir %{_mandir}/it/man1/
-%{_mandir}/it/man1/*
+%{_mandir}/it/man1/*.1%{?ext_man}
 %dir %{_mandir}/ru
 %dir %{_mandir}/ru/man1/
-%{_mandir}/ru/man1/*
+%{_mandir}/ru/man1/*.1%{?ext_man}
 %dir %{_mandir}/pl
 %dir %{_mandir}/pl/man1/
-%{_mandir}/pl/man1/*
+%{_mandir}/pl/man1/*.1%{?ext_man}
 %dir %{_mandir}/ja
 %dir %{_mandir}/ja/man1/
-%{_mandir}/ja/man1/*
+%{_mandir}/ja/man1/*.1%{?ext_man}
 %dir %{_mandir}/tr
 %dir %{_mandir}/tr/man1/
-%{_mandir}/tr/man1/*
+%{_mandir}/tr/man1/*.1%{?ext_man}
+
 # docs and data file
 %license LICENSE
 %doc %{_docdir}/vim
@@ -782,4 +816,9 @@ fi
 %{_bindir}/vim
 %{_bindir}/vim-small
 
+%files -n xxd
+%license LICENSE
+%{_bindir}/xxd
+%{_mandir}/man1/xxd.1%{?ext_man}
+
 %changelog