From d7b66cfd3202995d9f3ca34cf88592008ff8df23 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: May 29 2023 07:53:57 +0000
Subject: - patchlevel 1587


---

diff --git a/.gitignore b/.gitignore
index a0c97ed..9250802 100644
--- a/.gitignore
+++ b/.gitignore
@@ -442,3 +442,4 @@
 /vim-9.0-1491.tar.bz2
 /vim-9.0-1562.tar.bz2
 /vim-9.0-1575.tar.bz2
+/vim-9.0-1587.tar.bz2
diff --git a/sources b/sources
index 7f871c6..a229a61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-9.0-1575.tar.bz2) = 375851dc02e71c02894e2af0fce9d9bc389fb8f1ea61da79a3622c235dfe18d5d875cab53db1f9563eb355b30ae6078328a0a2303542c3c895b9083d7f5b5247
+SHA512 (vim-9.0-1587.tar.bz2) = 84da8c43c9529726307e4bdab25db31cb85e1767ca7d7cda80094a40cb94d27e95ea0f991d1d779a395eba33044bbe342517d80d1534c9eb0d82b4f0a8c59226
diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch
index 3b66423..195d702 100644
--- a/vim-crypto-warning.patch
+++ b/vim-crypto-warning.patch
@@ -1,7 +1,7 @@
-diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in
---- vim82/src/config.h.in.fips-warning	2022-02-24 08:13:59.017280243 +0100
-+++ vim82/src/config.h.in	2022-02-24 08:14:33.085580298 +0100
-@@ -508,5 +508,14 @@
+diff -up vim90/src/config.h.in.fips-warning vim90/src/config.h.in
+--- vim90/src/config.h.in.fips-warning	2023-05-29 09:30:59.000000000 +0200
++++ vim90/src/config.h.in	2023-05-29 09:34:47.261645612 +0200
+@@ -498,5 +498,14 @@
  /* Define if _SC_SIGSTKSZ is available via sysconf() */
  #undef HAVE_SYSCONF_SIGSTKSZ
  
@@ -16,10 +16,10 @@ diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in
 +
  /* Define if you want to load libgpm dynamically */
  #undef DYNAMIC_GPM
-diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac
---- vim82/src/configure.ac.fips-warning	2022-02-24 08:13:59.014280304 +0100
-+++ vim82/src/configure.ac	2022-02-24 08:13:59.018280222 +0100
-@@ -583,6 +583,38 @@ else
+diff -up vim90/src/configure.ac.fips-warning vim90/src/configure.ac
+--- vim90/src/configure.ac.fips-warning	2023-05-29 09:34:47.257645645 +0200
++++ vim90/src/configure.ac	2023-05-29 09:34:47.262645604 +0200
+@@ -589,6 +589,38 @@ else
    AC_SUBST(XDIFF_OBJS_USED)
  fi
  
@@ -58,17 +58,17 @@ diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac
  dnl Check for Lua feature.
  AC_MSG_CHECKING(--enable-luainterp argument)
  AC_ARG_ENABLE(luainterp,
-diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c
---- vim82/src/crypt.c.fips-warning	2022-02-24 08:09:29.000000000 +0100
-+++ vim82/src/crypt.c	2022-02-24 08:13:59.018280222 +0100
-@@ -740,6 +740,21 @@ crypt_check_method(int method)
+diff -up vim90/src/crypt.c.fips-warning vim90/src/crypt.c
+--- vim90/src/crypt.c.fips-warning	2023-05-29 09:34:47.263645596 +0200
++++ vim90/src/crypt.c	2023-05-29 09:51:23.209779115 +0200
+@@ -795,6 +795,21 @@ crypt_check_method(int method)
  	msg_scroll = TRUE;
  	msg(_("Warning: Using a weak encryption method; see :help 'cm'"));
      }
 +#ifdef HAVE_FIPS_WARNING
 +    FILE *fips_enable_fd = fopen(FIPS_ENABLED_FILE_LINK, "r");
 +    if (fips_enable_fd == NULL)
-+      return;
++	return;
 +
 +    int enabled = fgetc(fips_enable_fd);
 +
@@ -82,4 +82,4 @@ diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c
 +#endif
  }
  
- #ifdef FEAT_SODIUM
+ /*
diff --git a/vim.spec b/vim.spec
index d714da9..3e0183c 100644
--- a/vim.spec
+++ b/vim.spec
@@ -8,7 +8,7 @@
 %bcond_with libsodium_crypt
 %endif
 
-%define patchlevel 1575
+%define patchlevel 1587
 
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
@@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 
 
 %changelog
+* Mon May 29 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1587-1
+- patchlevel 1587
+
 * Wed May 24 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1575-1
 - patchlevel 1575