[Pkg-privacy-commits] [ricochet-im] 04/05: No longer disable sanitize=vptr, it seems to work again now on Debian unstable

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository ricochet-im.

commit 694ca99a8a33a9f2cac168e11a610833b182e7c5
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Feb 19 18:44:55 2016 +0100

    No longer disable sanitize=vptr, it seems to work again now on Debian unstable
---
 debian/changelog                             |  2 ++
 debian/patches/disable-nonworking-flag.patch | 17 -----------------
 debian/patches/series                        |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 695e1a6..9341f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ricochet-im (1.1.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * No longer disable sanitize=vptr during builds; it was previously breaking
+    ricochet at runtime but now seems OK with latest unstable Qt libs.
 
   [ Petter Reinholdtsen ]
   * Relax dependencies to allow backporting on jessie. (Closes: #805745)
diff --git a/debian/patches/disable-nonworking-flag.patch b/debian/patches/disable-nonworking-flag.patch
deleted file mode 100644
index 2b139e5..0000000
--- a/debian/patches/disable-nonworking-flag.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Disable non-working hardening flag
- Recommended by upstream as a temporary workaround
-Author: Ximin Luo <infinity0 at debian.org>
-Bug: https://github.com/ricochet-im/ricochet/issues/269
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/hardened.pri
-+++ b/hardened.pri
-@@ -6,7 +6,7 @@
- # Supported in gcc 4.9+
- HARDENED_SANITIZE_UBSAN_FLAGS = -fsanitize=undefined -fsanitize=integer-divide-by-zero -fsanitize=bounds -fsanitize=alignment -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize-recover
- # Supported in gcc 5.0+
--HARDENED_SANITIZE_UBSAN_MORE_FLAGS = -fsanitize=vptr -fsanitize=object-size
-+HARDENED_SANITIZE_UBSAN_MORE_FLAGS = -fno-sanitize=vptr -fsanitize=object-size
- # vtable-verify requires some OS support; see https://bugzilla.novell.com/show_bug.cgi?id=877239
- HARDENED_VTABLE_VERIFY_FLAGS = -fvtable-verify=std
- 
diff --git a/debian/patches/series b/debian/patches/series
index 611dcb8..08b29a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-disable-nonworking-flag.patch
 rename-desktop-file.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/ricochet-im.git