rpms/vim
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix conflicts in vim-crypto-warning.patch

Browse Source
This commit is contained in:
Zdenek Dohnal 2021-06-24 09:30:40 +02:00
parent 706601d84f
commit 1efb730ae4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vim-crypto-warning.patch
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-03-01 12:20:20.887162181 +0100
+++ vim82/src/config.h.in 2021-03-01 12:20:42.520977438 +0100
@@ -499,3 +499,12 @@
--- 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 @@
/* Define if _SC_SIGSTKSZ is available via sysconf() */
#undef HAVE_SYSCONF_SIGSTKSZ
@ -15,8 +15,8 @@ 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-03-01 12:20:20.885162198 +0100
+++ vim82/src/configure.ac 2021-03-01 12:20:20.888162173 +0100
--- 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)
fi
@ -57,9 +57,9 @@ 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-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)
--- 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
@@ -603,6 +603,21 @@ crypt_check_method(int method)
msg_scroll = TRUE;
msg(_("Warning: Using a weak encryption method; see :help 'cm'"));
}
@ -80,4 +80,4 @@ diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c
+#endif
}
void
#ifdef FEAT_SODIUM