Fixed nopie patch for 4.2 series (bug #434962)

Package-Manager: portage-2.2.0_alpha127/cvs/Linux x86_64

4 files changed, 141 insertions, 5 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index ffb8e1442847..ed7825eb2306 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.126 2012/09/13 19:44:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.127 2012/09/14 04:16:41 polynomial-c Exp $
+
+  14 Sep 2012; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.2.0.ebuild,
+  +files/virtualbox-4.2.0-nopie.patch:
+  Fixed nopie patch for 4.2 series. Thanks to Alphat-PC for reporting this in
+  bug #434962 and providing a working patch.
 
 *virtualbox-4.2.0 (13 Sep 2012)
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 610d2a26c8ec..da34321523a1 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -13,6 +13,7 @@ AUX virtualbox-4.1.20-nopie.patch 11250 SHA256 749ea59c1da4744ca6f79be940f630897
 AUX virtualbox-4.1.4-asneeded.patch 490 SHA256 9a932f4a50c8f520429f632f83b8c1cf740e14ee12d9348c1bbee95e52998e35 SHA512 13f68c4717b719c8519f179442a8fe8c7c251a1545a9b6c89756b6daa08e5e7ebf5b6b1d83eba009c7e20b80df3c36a9e54b5ebf86c84c0abb184d0705972275 WHIRLPOOL b7ba57e07dc1da453c1fddb5c7ef2b0a7ba04741b9c0eccf1d3556951a1fa4d7bd3595eaf4b229f3417ead317a7d859e2c724964c5a4ca271bf5b00ef0e02a39
 AUX virtualbox-4.1.6-yasm120-fix.patch 707 SHA256 2f073b45e796d7145c755ad7d92d58ce7255ede1d895e2f9f43d89687af0ce88 SHA512 855b217fc891c2deacf44bc22f8b343cdb6d6164bed7df256ae23ca2fcacf8a8ce092b53981e883cab0cf55e633a3c2097466651173073ab6c34b45f69d9f0c3 WHIRLPOOL 14a9dac54689fa4776ac55771412e0a83f9627908dc069832a28e76acb32b1858fd2f3ae96378149480bcde21f4ec5ce1d756daa3197b3ae13924f750003bc67
 AUX virtualbox-4.1.8-nopie.patch 11423 SHA256 c3a414c5b266071f4210949a5e6f57c3e8625c960a4252f690dc3de23faf6185 SHA512 fb74db51ecdc76387e7641e9a1350479ba267d1c358ee76a612961c98f03772fa0d68cded3c3702d439e8d3ac506af0fe4480fb2b482f762efc67155381acf65 WHIRLPOOL abeb0abc18dd9ed6e016fbc1710b325448a48de9c87f985225da9c08a3c31ebc7199aa7ba2ac1c24ecd67409cfdcbcfdc1de7e911f09973e8017f46cd9b5e822
+AUX virtualbox-4.2.0-nopie.patch 11933 SHA256 6c85c78eeece6b4c81460e6a0e7194fb93552d91ac60ff3adcaeab205ae6e935 SHA512 5b591c3481fe1b3417678a8e0cbe4ecf05ba93fcf720fa674c2f7e42da5e85f9892c0fb62ef599c731605f24a50f36a16d7ede41edcd97a3038b746d95abf3c2 WHIRLPOOL d31818ea3e41f070561073204c2cd5efecbabc560d88a7c737f2fc92a363c8b235697ebd9b766b301a05e1c44a98b87559fa627ab0da17bedbd0971d16f4811f
 AUX virtualbox-ose-3-config 38 SHA256 cc3cd896be49a421b06665683a22edb0fe17d6588fc259140b139c3d8a8581b5 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08 WHIRLPOOL c7f76904207198a77703c0a3866e10b1c646cf8b802ce2e01fc194f076d8ddcbe9862f55c376a385e6d81fa467fa867c08e1619046d27aa78fecf35398ce6db2
 AUX virtualbox-ose-3-wrapper 2931 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd054057d2ac4a46343a9966ff460644 SHA512 adb6ba2b3252b19b4c0331c10a025d05fd2399642530ba9aec2efa2dc8dbea4188a95806935532ad8229db29f0767c3098ef7646204f5e540e291ceb350b76ac WHIRLPOOL b7d7e454cd5642e59bdf973bbfb7f7d52597b32b440630ec4ba08b8b89f91e4e5296a723429e1c9c5c72e6760264d0477e1232559631e54c85c98351cf170db5
 AUX virtualbox-ose-3.2.8-mesa-check.patch 701 SHA256 6b4ce64673cda33631e7a60ac94f23ab2d020d52b6160bb072ad8d6f9547c251 SHA512 59fc6c412cb9e9b95d8bc93eb2a980296e3363890ca7663fcad46e61a442b453eeba4d90f00d06cacc37a52cc704af7d67b38303261c6bcda2d9c8c589740f64 WHIRLPOOL 4024356c7acd641cf4cc82ee772cdaae05f6dbf609f2f15f4c9807d2fb670f6d3de965d6c356e214ec5b7dacf9604cc4f077622162ce9d8cb4aebf3f1e7c3363
@@ -24,7 +25,7 @@ DIST VirtualBox-4.2.0.tar.bz2 76590194 SHA256 895426ecac371bef4c070e8bcc9306f0c5
 EBUILD virtualbox-4.1.12.ebuild 12139 SHA256 b6d7763b3034976c441f55ddb31242e494cb5ca6e2ba2f884aab674becc6c185 SHA512 bf7686d0826df09af134cc0bb98a0c08e732193ddc5eb8722fbcffe312056820828667825271cfa4ec95b3d1e75d92635ab1ce2c8018277f683f1334bced73ab WHIRLPOOL 8b8a02d7d80c0239cb31ab30fab64ff30677e2fc62cb09d4ad7ddb8c14fed962943e1b714cd09088db290763036c16d2dca49f02e5376f314f9a0e69be28f106
 EBUILD virtualbox-4.1.18.ebuild 12186 SHA256 93faaee997c49e88d7afc5e77e4dc7f572e562e6ec928aca7dab1052677f54e5 SHA512 63741deab99040f531f4815a606ca3e87f9779d2153c812e94568c7b9a561acbd46fb7292e930e80ef5541dc73a2d3a84fd54174bc94e7f2e48ae635106f8ba2 WHIRLPOOL a7bef087bccec76d2853cb971af269739576065984281de0871e8b8621731cf1b53f015b1152de70a153c67bcfc09e3233896d4e43a9ac778d2965439d81499b
 EBUILD virtualbox-4.1.22.ebuild 12305 SHA256 8eff79c90c3cfc988983da72ee142853cada9e1dcc0c5e753bb16463733241af SHA512 f41a52b4d657a7ec0164066d815fb88c8554b235283bd593588eef5cf08dabbc2033e19ad11be22aea4b366e1d69c39da6e1d655a58d7fd77a0a952348a26247 WHIRLPOOL edae522c8a6a4bcb5e73c251e44fd2a9f0bffb64b8fe3408fbed22f540cd65400ec73b3da6e4f6574995a8bec57199ddebbdc70ce3ad2e516852888d2ac639f2
-EBUILD virtualbox-4.2.0.ebuild 12269 SHA256 4e8341ac4e8d3e9351e34f012c288ced8aa6a4b3459301f5c45c9acf6635e30b SHA512 e8f636b385ce3aa9158a243ecdb7d27ce1f1cf866e8b56ffc8079ffaea5cc97fdbd4414c786e6f83cedc9406e3c5f64451b45bf9b2e423865f9267080f765d8a WHIRLPOOL 7932cdb0f187e0b44397c4109cda4624f21643e850b5c2631b811237f5863d62f9f9ca25d293178bfc003e9bb88ca884a48c70a2b2011c6656abdaf8a6eefa54
+EBUILD virtualbox-4.2.0.ebuild 12268 SHA256 0f8718903337e018343f9a91511861f0574ba5dd43ab91c42dcd1c452019ddb4 SHA512 95d533e73dc24fb89fe4261f4c8657c23d4e40e6438d9a697d30977cb5d2422709d4a348b55f226fd450e52443665a64630d82ca4dcbc7a9a9c45cd79e68811f WHIRLPOOL 737d51d29d62230ad0e46108ada44011d801841d7992e9097fefc10a794dbc5efff0863f89030013f898fab910a7c275b6a3e850fe0fb1acdc53ad9d12c7d415
 EBUILD virtualbox-9999.ebuild 5132 SHA256 220b4a0d0f7eeaa50a5904fa9effe75a8fdc8390555f18e5d762797d22e446a5 SHA512 be8f41729b8579ddba88134450937babfe1a2a95b115f5ca2cf9a8b7a31f0ae2f418ff43347adad85e1ea5989e2ad14551b3e65ebac92bbc9f4e9c05b2ab781e WHIRLPOOL 882c5c3e0949ffc375607f280384decaf7cb5910ff50757fbfb1a4f7671bb42a3bef7666305086f1a10514d949f79e60033e5f6630154b7d7e67f10108d48cf7
-MISC ChangeLog 16001 SHA256 7676da89f32d5c4f5c1d48ed76c2ef95ebf1c4b1ec3c345a67f16d547935cc5e SHA512 d4fc992d9b7e6cc2628dd4a78621afeb1fe867b0a9074bbe74992cf66518230448129b7ec040ca8041544b8ac6da1b7517f50ca591c2a01c356e6644f9540330 WHIRLPOOL c7dc0972e60fe6e1bf0b3504a7998e9e626e1eac12e2fb320b501ba0380c1f12c41c7294d0c85de64d0d3957a15781d9f7668c748f2ddc23b88723e5894616b1
+MISC ChangeLog 16243 SHA256 274cafe96c9cba8cc2307bb7eb8d6c4ec907fd6f02525ac4047d62aca8564756 SHA512 b2fbb8e4155f6a8362cc654abb850e915a4faaae8c75ebd6a27e5ef2338b90e3aae58465945274a2d275a18417ef0d5a8a55116f0b0d9c19df3f5f1bf80fc8ce WHIRLPOOL ff05d299037c605f0094e9ad8f66a31ea5e4aa54743b3def830051a66226c4493ddc09ea38c3a29341fad082a4a49594a3ae9de3ac5215635e12db6d217b4884
 MISC metadata.xml 766 SHA256 54cc5df43fbe674f4f04674566dfec523c0c912f8c94db26f4215727ab6850e5 SHA512 60fca14fc1e69c4385145e5390f202c57fe270537db31e5e7ca86ea77a1a6b30053dcdecb09dfa8386abd4e3776137028832fa188cda2d78ee42bed3189f2499 WHIRLPOOL ce722dc1c7248f0230bd298f4079945dba4271c6209c2d0c2cd9269748422b21bd69ae284354085120c6f6309d28c16dac4e35eb19cae64b2d49da3bb574c9ee
diff --git a/app-emulation/virtualbox/files/virtualbox-4.2.0-nopie.patch b/app-emulation/virtualbox/files/virtualbox-4.2.0-nopie.patch
new file mode 100644
index 000000000000..e24946c8df08
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-4.2.0-nopie.patch
@@ -0,0 +1,130 @@
+Index: Config.kmk
+===================================================================
+diff --git a/trunk/Config.kmk b/trunk/Config.kmk
+--- a/trunk/Config.kmk	(revision 43316)
++++ b/trunk/Config.kmk	(working copy)
+@@ -2230,6 +2230,7 @@ $(PATH_OUT)/GCCConfig.kmk: \
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-pointer-to-int-cast        ?= $(call VBOX_GCC_CHECK_CC,-Wno-pointer-to-int-cast,)'
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-variadic-macros   ?= $(call VBOX_GCC_CHECK_CXX,-Wno-variadic-macros,)'
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-stack-protector   ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)'
++	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_nopie                 ?= $(call VBOX_GCC_CHECK_CC,-nopie,)'
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-dwarf2-cfi-asm    ?= $(call VBOX_GCC_CHECK_CC,-fno-dwarf2-cfi-asm,)'
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fdiagnostics-show-option ?= $(call VBOX_GCC_CHECK_CC,-fdiagnostics-show-option,)'
+ # Produce code optimized for the most common IA32/AMD64/EM64T processors. Introduced with gcc version 4.2.
+@@ -2881,8 +2882,8 @@ ifdef VBOX_WITH_RAW_MODE
+ 
+  ifeq ($(VBOX_LDR_FMT32),elf)
+  TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
+- TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
+- TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
++ TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
++ TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden)
+   ifeq ($(KBUILD_TARGET),solaris)
+    TEMPLATE_VBoxRc_LDFLAGS           = -r
+   else
+@@ -2936,9 +2937,9 @@ ifdef VBOX_WITH_RAW_MODE
+  endif
+ 
+  ifeq ($(VBOX_LDR_FMT32),elf)
+-  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0
+-  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0
+-  TEMPLATE_VBoxRcExe_LDFLAGS  = -g
++  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0 $(VBOX_GCC_nopie)
++  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0 $(VBOX_GCC_nopie)
++  TEMPLATE_VBoxRcExe_LDFLAGS  = -g $(VBOX_GCC_nopie)
+   TEMPLATE_VBoxRcExe_LDFLAGS.dbgopt = -g
+   TEMPLATE_VBoxRcExe_LDFLAGS.strict = -g
+   TEMPLATE_VBoxRcExe_LDFLAGS.release = -g
+@@ -3009,8 +3010,8 @@ endif # pe
+ 
+ ifeq ($(VBOX_LDR_FMT),elf)
+ TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
+-TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99
+-TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti
++TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99
++TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti
+ TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
+ ifeq ($(KBUILD_TARGET),solaris)
+@@ -3039,12 +3040,12 @@ TEMPLATE_VBoxR0_TOOL                = GXX4MACHO
+ TEMPLATE_VBoxR0_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
+ TEMPLATE_VBoxR0_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) \
+ 	-fno-common -msoft-float -static -fno-rtti -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
+-	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector)
++	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
+ TEMPLATE_VBoxR0_CXXFLAGS.x86        = -m32
+ TEMPLATE_VBoxR0_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) \
+ 	-fno-common -msoft-float -static -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
+-	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector)
++	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
+ TEMPLATE_VBoxR0_CFLAGS.x86          = -m32
+ TEMPLATE_VBoxR0_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -nostdlib
+@@ -3114,7 +3115,7 @@ TEMPLATE_VBOXR0DRV_DEFS               += __KERNEL_
+ TEMPLATE_VBOXR0DRV_INCS                = $(VBOX_LINUX_INCS)
+ TEMPLATE_VBOXR0DRV_CFLAGS              = -nostdinc -iwithprefix include $(VBOX_LINUX_INCLUDE) \
+ 	$(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare $(VBOX_GCC_fdiagnostics-show-option) \
+-	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
++	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ 	-fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
+ TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -mpreferred-stack-boundary=2 -msoft-float
+ TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
+@@ -3242,7 +3243,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS              =  \
+ 	-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
+ 	-Wimplicit-function-declaration -Werror-implicit-function-declaration \
+ 	-O2 -fformat-extensions -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
+-	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
++	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ 	-nostdinc -std=c99
+ TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
+ TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
+@@ -3251,7 +3252,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 --pa
+ TEMPLATE_VBOXR0DRV_CXXFLAGS            = -fno-exceptions -fno-rtti \
+ 	$(VBOX_GCC_WARN) -Wpointer-arith -Winline \
+ 	-O2 -fno-format-extensions -fno-strict-aliasing -fno-common -finline-limit=8000 \
+-	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
++	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ 	-nostdinc
+ TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
+ TEMPLATE_VBOXR0DRV_CXXFLAGS.amd64      = $(TEMPLATE_VBOXR0DRV_CFLAGS.amd64)
+@@ -3827,8 +3828,8 @@ else
+  TEMPLATE_VBOXNOCRTGCC_TOOL             = $(VBOX_GCC_TOOL)
+  TEMPLATE_VBOXNOCRTGCC_ASTOOL           = $(VBOX_ASTOOL)
+  TEMPLATE_VBOXNOCRTGCC_ASFLAGS          = $(VBOX_ASFLAGS)
+- TEMPLATE_VBOXNOCRTGCC_CFLAGS          += $(VBOX_GCC_fno-stack-protector)
+- TEMPLATE_VBOXNOCRTGCC_CXXFLAGS        += $(VBOX_GCC_fno-stack-protector)
++ TEMPLATE_VBOXNOCRTGCC_CFLAGS          += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
++ TEMPLATE_VBOXNOCRTGCC_CXXFLAGS        += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+  ifeq ($(KBUILD_TARGET_ARCH),amd64)
+   # in 64-bit mode we'll build a sys-module (VBoxREM2).
+   if1of ($(KBUILD_TARGET), darwin solaris)
+@@ -4643,7 +4644,7 @@ TEMPLATE_VBOXLNXHOSTR3EXE_ASTOOL            = YASM
+ TEMPLATE_VBOXLNXHOSTR3EXE_ASFLAGS           = $(VBOX_ASFLAGS)
+ TEMPLATE_VBOXLNXHOSTR3EXE_DLLSUFF           = .so
+ TEMPLATE_VBOXLNXHOSTR3EXE_DEFS              = IN_RING3 $(ARCH_BITS_DEFS)
+-TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS          = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_fno-stack-protector)
++TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS          = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.debug    = -fno-inline
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release  = -O2 -fno-omit-frame-pointer -fno-strict-aliasing
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.profile  = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release)
+@@ -4652,7 +4653,7 @@ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.release    = $(TE
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.debug      = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.debug)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.profile    = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.profile)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.kprofile   = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.kprofile)
+-TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS            = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_fno-stack-protector)
++TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS            = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBOXLNXHOSTR3EXE_LIBS              = pthread m rt dl
+ 
+ TEMPLATE_VBOXLNXHOSTR3LIB                   = Template for linux host libraries.
+@@ -4836,8 +4837,8 @@ if1of ($(KBUILD_TARGET), dragonfly freebsd linux n
+  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86     = -m elf_i386
+  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64   = -m elf_x86_64
+ endif
+-TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)   -fno-merge-constants -std=c99 $(VBOX_GCC_fno-stack-protector) -ffreestanding
+-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants $(VBOX_GCC_fno-stack-protector) -ffreestanding
++TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)   -fno-merge-constants -std=c99 $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -ffreestanding
++TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -ffreestanding
+ TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
+ TEMPLATE_VBOXGUESTR3XF86MOD_LIBS  = \
+ 	$(VBOX_LIB_VBGL_R3_XFREE86)
diff --git a/app-emulation/virtualbox/virtualbox-4.2.0.ebuild b/app-emulation/virtualbox/virtualbox-4.2.0.ebuild
index 13ca1be19519..281e8ea4e7d3 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0.ebuild,v 1.1 2012/09/13 19:44:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0.ebuild,v 1.2 2012/09/14 04:16:41 polynomial-c Exp $
 
 EAPI=4
 
@@ -178,7 +178,7 @@ src_prepare() {
 
 	# Fix compile error on hardened bug 339914 (disable PIE)
 	if gcc-specs-pie ; then
-		epatch "${FILESDIR}"/virtualbox-4.1.20-nopie.patch
+		epatch "${FILESDIR}"/virtualbox-4.2.0-nopie.patch
 	fi
 }