mirror of
https://git.yoctoproject.org/poky
synced 2026-03-09 16:59:40 +01:00
9f689b3049
Handles CVE-2025-53905, CVE-2025-53906, CVE-2025-55157, CVE-2025-55158. Changes between 9.1.1198 -> 9.1.1652 ==================================== https://github.com/vim/vim/compare/v9.1.1198...v9.1.1652 Refresh patches. Disable newly introduced wayland support (in patch version 1485). To this belongs also adding recursion in delete command for dir auto which was newly failing as there is wayland directory inside now. If someone is interested, this can be probably enabled, but without additional work it results in compilation error due to function redefinition conflicts. (From OE-Core rev: e87d427d928234ef0441f9ce1fe8631fbe471094) (From OE-Core rev: bd2dc808baec7e940a09f80afa2c2997efe7cbfe) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com>
44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
From 133ab27cdb17ca20ef6b0304cf30621d2bcbe757 Mon Sep 17 00:00:00 2001
|
|
From: Mingli Yu <mingli.yu@windriver.com>
|
|
Date: Thu, 31 Jan 2019 21:32:26 -0800
|
|
Subject: [PATCH] src/Makefile: improve reproducibility
|
|
|
|
Clear all_cflags, all_lflags, compiled_user
|
|
and compiled_sys to avoid introducing build
|
|
info to improve reproducibility as below:
|
|
|
|
WARNING: vim-8.1.0347-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/vim/8.1.0347-r0/packages-split/vim/usr/bin/vim.vim in package contained reference to tmpdir [buildpaths]
|
|
|
|
Upstream-Status: Inappropriate [oe specific]
|
|
|
|
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|
---
|
|
src/Makefile | 14 ++++----------
|
|
1 file changed, 4 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index 32c0d97d1..97c754673 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -3138,16 +3138,10 @@ auto/pathdef.c: Makefile auto/config.mk
|
|
-@echo '#include "vim.h"' >> $@
|
|
-@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@
|
|
-@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@
|
|
- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@
|
|
- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@
|
|
- -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@
|
|
- -@if test -n "$(COMPILEDBY)"; then \
|
|
- echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \
|
|
- else ((logname) 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi
|
|
- -@echo '";' >> $@
|
|
- -@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@
|
|
- -@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi
|
|
- -@echo '";' >> $@
|
|
+ -@echo 'char_u *all_cflags = (char_u *)"";' | $(QUOTESED) >> $@
|
|
+ -@echo 'char_u *all_lflags = (char_u *)"";' | $(QUOTESED) >> $@
|
|
+ -@echo 'char_u *compiled_user = (char_u *)"";' >> $@
|
|
+ -@echo 'char_u *compiled_sys = (char_u *)"";' >> $@
|
|
-@sh $(srcdir)/pathdef.sh
|
|
|
|
GUI_GTK_RES_INPUTS = \
|