[Pkg-virtualbox-commits] [virtualbox] 01/01: Fix DTrace bug

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository virtualbox.

commit c2533ff2cc029b69a9ec76ec44a5d6330d95edd7
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Aug 17 18:05:04 2015 +0200

    Fix DTrace bug
---
 debian/rules                        | 6 +++---
 debian/virtualbox.lintian-overrides | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 83fbae7..c24da27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,8 @@ override_dh_auto_build:
 	    VBOX_WITH_UPDATE_REQUEST= \
 	    KBUILD_VERBOSE=2 \
 	    VBOX_WITH_VMSVGA= \
-	    VBOX_WITH_VMSVGA3D=
+	    VBOX_WITH_VMSVGA3D= \
+	    VBOX_WITH_EXTPACK_VBOXDTRACE=
 
 # VBOX_WITH_VMSVGA and VBOX_WITH_VMSVGA3D are only for versions prior to 4.3.20 to fix CVE-2014-6595, CVE-2014-6590, CVE-2014-6589, CVE-2014-6588 and CVE-2015-0427
 
@@ -173,14 +174,13 @@ override_dh_strip:
 
 	# strip files not handled by dh_strip
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	set -e && for file in debian/$(sname)/usr/lib/virtualbox/*.rc debian/$(sname)/usr/lib/virtualbox/*.r0 debian/$(sname)/usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/*.r0; do \
+	set -e && for file in debian/$(sname)/usr/lib/virtualbox/*.rc debian/$(sname)/usr/lib/virtualbox/*.r0; do \
 	    strip --strip-debug --remove-section=.comment --remove-section=.note $${file}; \
 	done
 endif
 	# I don't see a reason to have these. If any user complains, we can try ship it.
 	rm -f debian/$(sname)/usr/lib/virtualbox/VMMRC.debug
 	rm -f debian/$(sname)/usr/lib/virtualbox/VMMR0.debug
-	rm -f debian/$(sname)/usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/VBoxDTraceR0.debug
 
 override_dh_shlibdeps:
 	dh_shlibdeps -p$(sname) -X debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -- \
diff --git a/debian/virtualbox.lintian-overrides b/debian/virtualbox.lintian-overrides
index e2e14a8..2578e2b 100644
--- a/debian/virtualbox.lintian-overrides
+++ b/debian/virtualbox.lintian-overrides
@@ -12,11 +12,9 @@ virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDRC.rc
 virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDR0.r0
 virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VMMRC.rc
 virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VMMR0.r0
-virtualbox: unstripped-binary-or-object usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/VBoxDTraceR0.r0
 virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxHeadless 6755 root/root
 virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxNetAdpCtl 6755 root/root
 virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxNetDHCP 6755 root/root
 virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxSDL 6755 root/root
 virtualbox: jar-not-in-usr-share usr/lib/virtualbox/sdk/bindings/xpcom/java/vboxjxpcom.jar
 virtualbox: embedded-library usr/lib/virtualbox/VBoxXPCOM.so: nspr
-virtualbox: library-not-linked-against-libc usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/VBoxDTraceMain.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git