[lilac] updated to 98942-2

4 files changed, 27 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05faff360dcc..934361556dc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = virtualbox-svn
-	pkgver = 98339
+	pkgver = 98942
 	pkgrel = 2
 	url = http://virtualbox.org
 	arch = x86_64
@@ -79,8 +79,8 @@ pkgbase = virtualbox-svn
 	sha256sums = e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f
 	sha256sums = 4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d
 	sha256sums = 9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b
-	sha256sums = 96d51a3d828155c1ffb1434be8d7befd127108261cd9c86217888c46f38ce9d9
-	sha256sums = 7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46
+	sha256sums = e80f042ac123e77a1ebd17b4e50e9e0bdf894cb316baa2a9f38666dc2b15a963
+	sha256sums = 9b2863373ad5cb3aa7bcd5984538e2d5d4b0c1f07e3a9cbca2c919cb9661511f
 	sha256sums = 053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491
 	sha256sums = 92df121e1c8a1a967b4928a4d5c6f7ba8c91e43902ecd6d8f5fecc9df4184413
 	sha256sums = 81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024
diff --git a/004-drop-Wno-format.patch b/004-drop-Wno-format.patch
index 55651b74b2a7..0ca828cc1c34 100644
--- a/004-drop-Wno-format.patch
+++ b/004-drop-Wno-format.patch
@@ -19,12 +19,12 @@ index e2e537f1..de640194 100644
 --- a/src/VBox/Devices/EFI/Firmware/Config.kmk
 +++ b/src/VBox/Devices/EFI/Firmware/Config.kmk
 @@ -155,7 +155,7 @@ TEMPLATE_VBoxEfiBldProg_LIBS = \
- ifn1of ($(KBUILD_HOST),win) # This stuff isn't up to our standard at all! :/
+ 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
+- 	-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
@@ -93,20 +93,20 @@ diff --git a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk b/src/VBox/ExtPacks/VBoxD
 index b2bd260b..133e7398 100644
 --- a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
 +++ b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
-@@ -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)
--  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 \
+@@ -118,7 +118,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
+   VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0
+   VBoxDTraceCmd_SDKS = VBoxZlib
+   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 072d066e..d2feea75 100644
 --- a/src/VBox/Main/webservice/Makefile.kmk
 +++ b/src/VBox/Main/webservice/Makefile.kmk
-@@ -260,7 +260,7 @@ ifdef VBOX_GSOAP_INSTALLED
+@@ -264,7 +264,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) \
@@ -115,13 +115,13 @@ index 072d066e..d2feea75 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
-@@ -331,7 +331,6 @@ ifdef VBOX_GSOAP_INSTALLED
+@@ -335,7 +335,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) \
- 	$(VBOX_GCC_Wno-logical-op)
+-   	-Wno-format \
+    	$(VBOX_GCC_Wno-int-in-bool-context) \
+    	$(VBOX_GCC_Wno-logical-op)
     # currently necessary when compiling against OpenSSL 1.0 due to a missing
 diff --git a/src/libs/xpcom18a4/Config.kmk b/src/libs/xpcom18a4/Config.kmk
 index 3b0831e5..a83a080b 100644
diff --git a/005-gsoap-build.patch b/005-gsoap-build.patch
index bba4f0ec7557..4502c6d6a9ee 100644
--- a/005-gsoap-build.patch
+++ b/005-gsoap-build.patch
@@ -1,11 +1,11 @@
 --- a/src/VBox/Main/webservice/Makefile.kmk	2013-11-21 19:00:46.812761628 +0100
 +++ b/src/VBox/Main/webservice/Makefile.kmk	2016-08-18 15:16:05.803599026 +0100
-@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \
- 		$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
+@@ -847,7 +847,7 @@ ifdef VBOX_GSOAP_INSTALLED
+  		$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
  	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
  	$(RM) -f $@
 -	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
 +	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
- ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
+  ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
  	$(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
  	$(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
diff --git a/PKGBUILD b/PKGBUILD
index 59a25da2fd85..c049d6c717e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('virtualbox-svn'
          'virtualbox-guest-utils-svn'
          'virtualbox-guest-utils-nox-svn'
          'virtualbox-ext-vnc-svn')
-pkgver=98339
+pkgver=98942
 _tarver=${pkgver}
 pkgrel=2
 arch=('x86_64')
@@ -354,8 +354,8 @@ sha256sums=('SKIP'
             'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
             '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d'
             '9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b'
-            '96d51a3d828155c1ffb1434be8d7befd127108261cd9c86217888c46f38ce9d9'
-            '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
+            'e80f042ac123e77a1ebd17b4e50e9e0bdf894cb316baa2a9f38666dc2b15a963'
+            '9b2863373ad5cb3aa7bcd5984538e2d5d4b0c1f07e3a9cbca2c919cb9661511f'
             '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491'
             '92df121e1c8a1a967b4928a4d5c6f7ba8c91e43902ecd6d8f5fecc9df4184413'
             '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'