[Pkg-virtualbox-commits] [SCM] UNNAMED PROJECT branch, master, updated. debian/0.1.98svn2318-2-48-g8608718

[Felix Geyer]

The following commit has been merged in the master branch:
commit 8608718c46163e2049f09cd18848588bc9bef250
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Jan 18 19:28:25 2013 +0100

    Stop hardcoding the -O3 optimization flag as it causes kmk_sed to miscompile.
    
    Closes: #697892
    
    Set urgency to high as it fixes an RC bug which blocks a virtualbox
    security fix.

diff --git a/debian/changelog b/debian/changelog
index bbeb5ed..9e00347 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kbuild (1:0.1.9998svn2543+dfsg-1) unstable; urgency=high
+
+  * Stop hardcoding the -O3 optimization flag as it causes kmk_sed to
+    miscompile. (Closes: #697892)
+    - Add 08_no_o3_optimization.diff
+  * Set urgency to high as it fixes an RC bug which blocks a virtualbox
+    security fix.
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Fri, 18 Jan 2013 19:00:28 +0100
+
 kbuild (1:0.1.9998svn2543+dfsg-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/08_no_o3_optimization.diff b/debian/patches/08_no_o3_optimization.diff
new file mode 100644
index 0000000..316f421
--- /dev/null
+++ b/debian/patches/08_no_o3_optimization.diff
@@ -0,0 +1,17 @@
+Description: Stop hardcoding the -O3 optimization flag as it causes kmk_sed to miscompile.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+Bug-Debian: http://bugs.debian.org/697892
+
+--- a/Config.kmk
++++ b/Config.kmk
+@@ -299,8 +299,8 @@ ifndef TEMPLATE_BIN_TOOL
+  endif
+  TEMPLATE_BIN_LDFLAGS           = -g
+  TEMPLATE_BIN_LDFLAGS.profile   = -pg -p
+- TEMPLATE_BIN_CFLAGS.release    = -O3
+- TEMPLATE_BIN_CFLAGS.profile    = -O3 -pg -p
++ TEMPLATE_BIN_CFLAGS.release    = -O2
++ TEMPLATE_BIN_CFLAGS.profile    = -O2 -pg -p
+  ifeq ($(KBUILD_TARGET),freebsd)
+   TEMPLATE_BIN_INCS            += $(PATH_GNUMAKE_SRC)/glob /usr/local/include
+  endif
diff --git a/debian/patches/series b/debian/patches/series
index e5b2699..64dd167 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 05_hppa-disable-threads.diff
 06_binutils-gold.diff
 07_special-chars-build-path.diff
+08_no_o3_optimization.diff

-- 
UNNAMED PROJECT