Date: Tuesday, January 18, 2022 @ 20:37:59 Author: eworm Revision: 1110145
upgpkg: virtualbox 6.1.32-1: new upstream release Added: virtualbox/trunk/004-drop-Wno-format.patch Modified: virtualbox/trunk/PKGBUILD ---------------------------+ 004-drop-Wno-format.patch | 122 ++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 8 +- 2 files changed, 127 insertions(+), 3 deletions(-) Added: 004-drop-Wno-format.patch =================================================================== --- 004-drop-Wno-format.patch (rev 0) +++ 004-drop-Wno-format.patch 2022-01-18 20:37:59 UTC (rev 1110145) @@ -0,0 +1,122 @@ +From ff59d7f89a64a9386b3b97a3e7b062df59474192 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <[email protected]> +Date: Tue, 18 Jan 2022 21:16:33 +0100 +Subject: [PATCH 1/1] 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(-) + +diff --git a/src/VBox/Devices/EFI/Firmware/Config.kmk b/src/VBox/Devices/EFI/Firmware/Config.kmk +index a5affd4d..d8dd9ed0 100644 +--- a/src/VBox/Devices/EFI/Firmware/Config.kmk ++++ b/src/VBox/Devices/EFI/Firmware/Config.kmk +@@ -126,7 +126,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 \ +- -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow -Wno-format \ ++ -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow \ + -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-label + 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 +--- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf ++++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf +@@ -657,9 +657,9 @@ + # -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration). + # + GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable +- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS ++ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS + GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable +- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable ++ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable + GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized + GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized + +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 +--- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf ++++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +@@ -605,9 +605,9 @@ + # -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration). + # + GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable +- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS ++ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS + GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable +- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable ++ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable + GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized + GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized + +diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk +index bd64e790..136e203b 100644 +--- a/src/VBox/Devices/Makefile.kmk ++++ b/src/VBox/Devices/Makefile.kmk +@@ -727,7 +727,7 @@ endif + ifeq ($(KBUILD_TARGET),win) + $(file)_CFLAGS = -wd4018 + else +- $(file)_CFLAGS += -Wno-sign-compare -Wno-format -Wno-bad-function-cast ++ $(file)_CFLAGS += -Wno-sign-compare -Wno-bad-function-cast + endif + endef + +diff --git a/src/VBox/Devices/PC/ipxe/Makefile.kmk b/src/VBox/Devices/PC/ipxe/Makefile.kmk +index d35d50c0..64d0079b 100644 +--- a/src/VBox/Devices/PC/ipxe/Makefile.kmk ++++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk +@@ -358,7 +358,7 @@ endif + # + BLDPROGS += ipxezbin + ipxezbin_TEMPLATE = VBoxBldProg +- ipxezbin_CFLAGS = -Wno-format -Wno-unused-function ++ ipxezbin_CFLAGS = -Wno-unused-function + ipxezbin_SOURCES = src/util/zbin.c + + endif +diff --git a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +index 4c1a863f..c1af03f6 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) + VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0 + VBoxDTraceCmd_SDKS = VBOX_ZLIB + ifn1of ($(KBUILD_TARGET), win) +- VBoxDTraceCmd_CFLAGS = -Wno-format $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow ++ VBoxDTraceCmd_CFLAGS = $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow + endif + VBoxDTraceCmd_INCS = \ + include \ +diff --git a/src/VBox/Main/webservice/Makefile.kmk b/src/VBox/Main/webservice/Makefile.kmk +index 6e088b14..3c1d9fa7 100644 +--- a/src/VBox/Main/webservice/Makefile.kmk ++++ b/src/VBox/Main/webservice/Makefile.kmk +@@ -273,7 +273,6 @@ ifdef VBOX_GSOAP_INSTALLED + $(VBOXWEB_OUT_DIR)/soapC-29.cpp + vboxsoap_CXXFLAGS += \ + $(VBOX_GCC_Wno-vla) \ +- $(if-expr $(KBUILD_TARGET) == "win",,-Wno-format) \ + $(if-expr $(KBUILD_TARGET) == "win",,-Wno-deprecated-declarations) + endif + vboxsoap_CLEAN := $(vboxsoap_SOURCES) # lazy bird +@@ -284,7 +283,6 @@ ifdef VBOX_GSOAP_INSTALLED + $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts + ifn1of ($(KBUILD_TARGET), win) + $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS = \ +- -Wno-format \ + $(VBOX_GCC_Wno-int-in-bool-context) \ + $(if $(VBOX_GCC_Wlogical-op),-Wno-error=logical-op,) + # currently necessary when compiling against OpenSSL 1.0 due to a missing +-- +2.34.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-18 20:37:59 UTC (rev 1110144) +++ PKGBUILD 2022-01-18 20:37:59 UTC (rev 1110145) @@ -8,9 +8,9 @@ 'virtualbox-guest-utils' 'virtualbox-guest-utils-nox' 'virtualbox-ext-vnc') -pkgver=6.1.30 +pkgver=6.1.32 _tarver=${pkgver} -pkgrel=3 +pkgrel=1 arch=('x86_64') url='https://virtualbox.org/' license=('GPL' 'custom') @@ -67,6 +67,7 @@ '001-disable-update.patch' '002-python310.patch' '003-pyunicode.patch' + '004-drop-Wno-format.patch' '005-gsoap-build.patch' '006-rdesktop-vrdp-keymap-path.patch' '008-no-vboxvideo.patch' @@ -75,7 +76,7 @@ '013-Makefile.patch' '017-fix-narrowing-conversion.patch' '018-xclient.patch') -sha256sums=('3c60a29375549ffc148aaebe859be91b27c19d6fa2deefde1373c4f6da8f18ef' +sha256sums=('5d11384200b4e943ad0056d2cf75980ae4bee852c89650e2914e1b34eedc2d2c' '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db' '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' 'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e' @@ -91,6 +92,7 @@ '9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b' '361a6de4fd91070f3e34d4a59b086a84c8a38c707f44b6db82b658d9076f69ce' '3bb1643a212b9ecb4d75e31add984a6b206f71a9f46f460007812d1ce648c1a0' + '2ef32b9f6df4c5489751de36446f29825b4602048ee6d5e59573e4b01c8f4846' '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46' '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab' '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491'
