Update the patch for newer Vim patchlevel

This commit is contained in:
Zdenek Dohnal 2022-01-10 14:21:55 +01:00
parent dbb3fed824
commit 4cd05b3115

View File

@ -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 2021-06-23 11:46:55.000000000 +0200
+++ vim82/src/config.h.in 2021-06-23 11:55:03.165480970 +0200
@@ -501,3 +501,12 @@
--- vim82/src/config.h.in.fips-warning 2022-01-10 14:14:44.000000000 +0100
+++ vim82/src/config.h.in 2022-01-10 14:18:55.997105654 +0100
@@ -507,3 +507,12 @@
/* Define if _SC_SIGSTKSZ is available via sysconf() */
#undef HAVE_SYSCONF_SIGSTKSZ
@ -15,10 +15,10 @@ diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in
+/* Link to fips_enabled file */
+#undef FIPS_ENABLED_FILE_LINK
diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac
--- vim82/src/configure.ac.fips-warning 2021-06-23 11:55:03.163480985 +0200
+++ vim82/src/configure.ac 2021-06-23 11:55:03.166480962 +0200
@@ -541,6 +541,38 @@ else
AC_MSG_RESULT(yes)
--- vim82/src/configure.ac.fips-warning 2022-01-10 14:18:55.998105657 +0100
+++ vim82/src/configure.ac 2022-01-10 14:20:11.030342249 +0100
@@ -577,6 +577,38 @@ else
AC_SUBST(XDIFF_OBJS_USED)
fi
+dnl Checking if we want FIPS warning
@ -57,8 +57,8 @@ diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac
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 2021-06-23 11:55:03.166480962 +0200
+++ vim82/src/crypt.c 2021-06-23 12:36:22.295488425 +0200
--- vim82/src/crypt.c.fips-warning 2022-01-10 14:14:44.000000000 +0100
+++ vim82/src/crypt.c 2022-01-10 14:18:55.999105660 +0100
@@ -603,6 +603,21 @@ crypt_check_method(int method)
msg_scroll = TRUE;
msg(_("Warning: Using a weak encryption method; see :help 'cm'"));