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

vim-crypto-messages.patch: update the patch

Browse Source
This commit is contained in:
Zdenek Dohnal 2021-03-01 12:30:41 +01:00
parent 79e14ea728
commit 181cf84eba
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vim-crypto-warning.patch
View File

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

2
vim.spec
View File

@ -268,7 +268,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3014 -p1 %patch3014 -p1
%patch3016 -p1 -b .copypaste %patch3016 -p1 -b .copypaste
%patch3017 -p1 -b .python-tests %patch3017 -p1 -b .python-tests
%patch3018 -p1 %patch3018 -p1 -b .fips-warning
%build %build
cd src cd src