Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/vim.git#58548886ab26cb9a9faf570adf109198b71fd930

.gitignore

@@ -344,3 +344,5 @@
 /vim-8.2-2488.tar.bz2
 /vim-8.2-2529.tar.bz2
 /vim-8.2-2541.tar.bz2
+/vim-8.2-2559.tar.bz2
+/vim-8.2-2576.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (vim-8.2-2541.tar.bz2) = dbe254c609dac6fecd96ab8347f04bc6260efe0bf6703cc835dc46d952186db58508b5810adedc2e05ddccc663e67a14353f21ec8b712aded9921953af54be80
+SHA512 (vim-8.2-2576.tar.bz2) = a3e0fa23c5ba99678741e4852e46f221e75917be30d5b3fe00e9ac63bd6cdfcc0e7167f59fc43efe6e6918466851c74ee310380c4da7b23ae8f31b40e3272164

vim-crypto-warning.patch

@@ -1,10 +1,10 @@
-diff -up vim81/src/config.h.in.crypto vim81/src/config.h.in
---- vim81/src/config.h.in.crypto	2019-07-26 07:58:51.000000000 +0200
-+++ vim81/src/config.h.in	2019-09-16 14:18:32.994110646 +0200
-@@ -490,3 +490,12 @@
+diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in
+--- vim82/src/config.h.in.fips-warning	2021-03-01 12:20:20.887162181 +0100
++++ vim82/src/config.h.in	2021-03-01 12:20:42.520977438 +0100
+@@ -499,3 +499,12 @@
  
- /* Define to inline symbol or empty */
- #undef inline
+ /* Define if _SC_SIGSTKSZ is available via sysconf() */
+ #undef HAVE_SYSCONF_SIGSTKSZ
 +
 +/* Do we need FIPS warning? */
 +#undef HAVE_FIPS_WARNING
@@ -14,10 +14,10 @@ diff -up vim81/src/config.h.in.crypto vim81/src/config.h.in
 +
 +/* Link to fips_enabled file */
 +#undef FIPS_ENABLED_FILE_LINK
-diff -up vim81/src/configure.ac.crypto vim81/src/configure.ac
---- vim81/src/configure.ac.crypto	2019-09-16 14:18:32.990110675 +0200
-+++ vim81/src/configure.ac	2019-09-16 14:18:32.996110631 +0200
-@@ -534,6 +534,38 @@ else
+diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac
+--- vim82/src/configure.ac.fips-warning	2021-03-01 12:20:20.885162198 +0100
++++ vim82/src/configure.ac	2021-03-01 12:20:20.888162173 +0100
+@@ -541,6 +541,38 @@ else
    AC_MSG_RESULT(yes)
  fi
  
@@ -56,10 +56,10 @@ diff -up vim81/src/configure.ac.crypto vim81/src/configure.ac
  dnl Check for Lua feature.
  AC_MSG_CHECKING(--enable-luainterp argument)
  AC_ARG_ENABLE(luainterp,
-diff -up vim81/src/crypt.c.crypto vim81/src/crypt.c
---- vim81/src/crypt.c.crypto	2019-09-16 14:18:32.996110631 +0200
-+++ vim81/src/crypt.c	2019-09-16 14:19:48.953550617 +0200
-@@ -524,6 +524,21 @@ crypt_check_method(int method)
+diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c
+--- vim82/src/crypt.c.fips-warning	2021-03-01 12:13:11.000000000 +0100
++++ vim82/src/crypt.c	2021-03-01 12:20:20.888162173 +0100
+@@ -523,6 +523,21 @@ crypt_check_method(int method)
  	msg_scroll = TRUE;
  	msg(_("Warning: Using a weak encryption method; see :help 'cm'"));
      }

vim-update.sh

@@ -4,7 +4,7 @@ debug=""
 branches=( "rawhide" "f34" "f33" "f32" )
 releases=( "fc35" "fc34" "fc33" "fc32" )
 regexps=( "fc35" "\|fc34" "\|fc33" "\|fc32" )
-bodhi_enabled=( "0" "0" "1" "1" )
+bodhi_enabled=( "0" "1" "1" "1" )
 #releases_regexp=fc28\\\|fc27\\\|fc28
 
 branches_index=0

vim.spec

@@ -1,4 +1,4 @@
-%define patchlevel 2541
+%define patchlevel 2576
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -143,7 +143,6 @@ only available when the vim-common package is installed.
 %package enhanced
 Summary: A version of the VIM editor which includes recent enhancements
 Conflicts: vim-wrappers < 2:8.2.2488-1
-Obsoletes: vim-wrappers < 2:8.2.2488-1
 # vim bundles libvterm, which is used during build - so we need to provide
 # bundled libvterm for catching possible libvterm CVEs
 Provides: bundled(libvterm)
@@ -269,7 +268,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3014 -p1
 %patch3016 -p1 -b .copypaste
 %patch3017 -p1 -b .python-tests
-%patch3018 -p1
+%patch3018 -p1 -b .fips-warning
 
 %build
 cd src
@@ -820,6 +819,15 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
 
 %changelog
+* Mon Mar 08 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2576-1
+- patchlevel 2576
+
+* Mon Mar 01 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2559-1
+- patchlevel 2559
+
+* Mon Mar 01 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2541-2
+- 1928442 - vim-enhanced is replacing vim-wrappers-8.2.2465-1
+
 * Mon Feb 22 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2541-1
 - patchlevel 2541
 - 1931099 - Build version numbers don't match the actual build patchlevel