[lilac] updated to 97514-1

1 files changed, 52 insertions, 33 deletions

diff --git a/004-drop-Wno-format.patch b/004-drop-Wno-format.patch
index 858f69ecf74b..02440b9b2cd8 100644
--- a/004-drop-Wno-format.patch
+++ b/004-drop-Wno-format.patch
@@ -1,23 +1,24 @@
-From ff59d7f89a64a9386b3b97a3e7b062df59474192 Mon Sep 17 00:00:00 2001
+From 9736107f45a17f04e4a0f9ab14fe913660cde3ad Mon Sep 17 00:00:00 2001
 From: Christian Hesse <mail@eworm.de>
-Date: Tue, 18 Jan 2022 21:16:33 +0100
-Subject: [PATCH 1/1] drop -Wno-format
+Date: Mon, 17 Oct 2022 15:07:30 +0200
+Subject: [PATCH] drop -Wno-format
 
 ---
- src/VBox/Devices/EFI/Firmware/Config.kmk                      | 2 +-
- .../EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf  | 4 ++--
- .../CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf         | 4 ++--
- src/VBox/Devices/Makefile.kmk                                 | 2 +-
- src/VBox/Devices/PC/ipxe/Makefile.kmk                         | 2 +-
- src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk                     | 2 +-
- src/VBox/Main/webservice/Makefile.kmk                         | 2 --
- 7 files changed, 8 insertions(+), 10 deletions(-)
+ src/VBox/Devices/EFI/Firmware/Config.kmk                    | 2 +-
+ .../Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf    | 6 +++---
+ .../CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf       | 6 +++---
+ src/VBox/Devices/Makefile.kmk                               | 2 +-
+ src/VBox/Devices/PC/ipxe/Makefile.kmk                       | 2 +-
+ src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk                   | 2 +-
+ src/VBox/Main/webservice/Makefile.kmk                       | 3 +--
+ src/libs/xpcom18a4/Config.kmk                               | 6 +++---
+ 8 files changed, 14 insertions(+), 15 deletions(-)
 
 diff --git a/src/VBox/Devices/EFI/Firmware/Config.kmk b/src/VBox/Devices/EFI/Firmware/Config.kmk
-index a5affd4d..d8dd9ed0 100644
+index e2e537f1..de640194 100644
 --- a/src/VBox/Devices/EFI/Firmware/Config.kmk
 +++ b/src/VBox/Devices/EFI/Firmware/Config.kmk
-@@ -126,7 +126,7 @@ TEMPLATE_VBoxEfiBldProg_LIBS = \
+@@ -155,7 +155,7 @@ TEMPLATE_VBoxEfiBldProg_LIBS = \
  ifn1of ($(KBUILD_HOST),win) # This stuff isn't up to our standard at all! :/
   TEMPLATE_VBoxEfiBldProg_CFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CFLAGS)) \
   	-Wno-sign-compare -Wno-missing-prototypes -Wno-strict-prototypes \
@@ -27,7 +28,7 @@ index a5affd4d..d8dd9ed0 100644
   TEMPLATE_VBoxEfiBldProg_CXXFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CXXFLAGS)) \
   	-Wno-all -Wno-shadow -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable \
 diff --git a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf
-index 83831a1a..8b22fa0b 100644
+index 5300ea32..e9485765 100644
 --- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf
 +++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf
 @@ -618,10 +618,10 @@
@@ -44,9 +45,8 @@ index 83831a1a..8b22fa0b 100644
    GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
    GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
    GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
- 
 diff --git a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
-index fe28ee67..de03e6df 100644
+index 1b1d46b0..df9998a5 100644
 --- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
 +++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
 @@ -567,10 +567,10 @@
@@ -63,12 +63,11 @@ index fe28ee67..de03e6df 100644
    GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
    GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
    GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
- 
 diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk
-index bd64e790..136e203b 100644
+index 02da1255..c2cbbc1c 100644
 --- a/src/VBox/Devices/Makefile.kmk
 +++ b/src/VBox/Devices/Makefile.kmk
-@@ -727,7 +727,7 @@ endif
+@@ -836,7 +836,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
    ifeq ($(KBUILD_TARGET),win)
     $(file)_CFLAGS = -wd4018
    else
@@ -78,23 +77,23 @@ index bd64e790..136e203b 100644
   endef
  
 diff --git a/src/VBox/Devices/PC/ipxe/Makefile.kmk b/src/VBox/Devices/PC/ipxe/Makefile.kmk
-index d35d50c0..64d0079b 100644
+index 8a611f6d..c57f0454 100644
 --- a/src/VBox/Devices/PC/ipxe/Makefile.kmk
 +++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk
-@@ -358,7 +358,7 @@ endif
+@@ -401,7 +401,7 @@ endif
   #
   BLDPROGS += ipxezbin
   ipxezbin_TEMPLATE = VBoxBldProg
-- ipxezbin_CFLAGS   = -Wno-format -Wno-unused-function
-+ ipxezbin_CFLAGS   = -Wno-unused-function
+- ipxezbin_CFLAGS   = -Wno-format -Wno-unused-function -Wno-pointer-arith
++ ipxezbin_CFLAGS   = -Wno-unused-function -Wno-pointer-arith
   ipxezbin_SOURCES  = src/util/zbin.c
+  ipxezbin_LIBS     = lzma # @todo Can't assume liblzma on the build system
  
- endif
 diff --git a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
-index 4c1a863f..c1af03f6 100644
+index b2bd260b..133e7398 100644
 --- a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
 +++ b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
-@@ -107,7 +107,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) && defined(VBOX_WITH_EXTPACK)
+@@ -118,7 +118,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) && defined(VBOX_WITH_EXTPACK)
   VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0
   VBoxDTraceCmd_SDKS = VBOX_ZLIB
   ifn1of ($(KBUILD_TARGET), win)
@@ -104,10 +103,10 @@ index 4c1a863f..c1af03f6 100644
   VBoxDTraceCmd_INCS = \
   	include \
 diff --git a/src/VBox/Main/webservice/Makefile.kmk b/src/VBox/Main/webservice/Makefile.kmk
-index 6e088b14..3c1d9fa7 100644
+index 072d066e..d2feea75 100644
 --- a/src/VBox/Main/webservice/Makefile.kmk
 +++ b/src/VBox/Main/webservice/Makefile.kmk
-@@ -250,7 +250,7 @@ ifdef VBOX_GSOAP_INSTALLED
+@@ -260,7 +260,7 @@ ifdef VBOX_GSOAP_INSTALLED
    ifn1of ($(KBUILD_TARGET), win)
     vboxsoap_CXXFLAGS += -Wno-shadow -Wno-parentheses $(VBOX_GCC_Wno-literal-suffix) \
     	$(VBOX_GCC_Wno-stringop-overflow) $(VBOX_GCC_Wno-stringop-truncation) \
@@ -116,7 +115,7 @@ index 6e088b14..3c1d9fa7 100644
     ifn1of ($(KBUILD_TYPE), debug) # Save time+memory by using -O0 instead of -O2.
      vboxsoap_CXXFLAGS += -O0 ## @todo this could be interesting for g++ (not clang++): -fcprop-registers
     endif
-@@ -321,7 +321,6 @@ ifdef VBOX_GSOAP_INSTALLED
+@@ -331,7 +331,6 @@ ifdef VBOX_GSOAP_INSTALLED
    	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
    ifn1of ($(KBUILD_TARGET), win)
     $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS = \
@@ -124,7 +123,27 @@ index 6e088b14..3c1d9fa7 100644
  	$(VBOX_GCC_Wno-int-in-bool-context) \
  	$(VBOX_GCC_Wno-logical-op)
     # currently necessary when compiling against OpenSSL 1.0 due to a missing
-
--- 
-2.34.1
-
+diff --git a/src/libs/xpcom18a4/Config.kmk b/src/libs/xpcom18a4/Config.kmk
+index 3b0831e5..a83a080b 100644
+--- a/src/libs/xpcom18a4/Config.kmk
++++ b/src/libs/xpcom18a4/Config.kmk
+@@ -243,8 +243,8 @@ TEMPLATE_XPCOMEXE_LDFLAGS.darwin   = -bind_at_load $(filter-out -current_version
+ #
+ TEMPLATE_XPCOMTSTEXE               = XPCOM executable files (testcases)
+ TEMPLATE_XPCOMTSTEXE_EXTENDS       = XPCOMEXE
+-TEMPLATE_XPCOMTSTEXE_CXXFLAGS      = $(TEMPLATE_XPCOMEXE_CXXFLAGS) -Wno-format
+-TEMPLATE_XPCOMTSTEXE_CFLAGS        = $(TEMPLATE_XPCOMEXE_CFLAGS)   -Wno-format
++TEMPLATE_XPCOMTSTEXE_CXXFLAGS      = $(TEMPLATE_XPCOMEXE_CXXFLAGS)
++TEMPLATE_XPCOMTSTEXE_CFLAGS        = $(TEMPLATE_XPCOMEXE_CFLAGS)  
+ TEMPLATE_XPCOMTSTEXE_INST          = $(INST_TESTCASE)
+ ifdef VBOX_WITH_RUNPATH
+  TEMPLATE_XPCOMTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_XPCOMEXE_LDFLAGS)
+@@ -277,7 +277,7 @@ TEMPLATE_XPCOMBLDPROG_INCS                = \
+ 	$(VBOX_PATH_SDK)/bindings/xpcom/include/string \
+ 	$(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
+ 	$(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd
+-TEMPLATE_XPCOMBLDPROG_CFLAGS             = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) -Wno-format
++TEMPLATE_XPCOMBLDPROG_CFLAGS             = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast)
+ TEMPLATE_XPCOMBLDPROG_CXXFLAGS.darwin    = $(TEMPLATE_VBoxBldProg_CXXFLAGS.darwin)     -fpascal-strings -fshort-wchar -fno-common -fno-rtti
+ TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris   = $(TEMPLATE_VBoxBldProg_CXXFLAGS.solaris)    -fno-omit-frame-pointer # for now anyway.
+ TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin     = $(TEMPLATE_VBoxBldProg_LDFLAGS.darwin)      -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions