diff options
| author | Mikkel Kroman | 2016-04-18 18:42:20 +0200 |
|---|---|---|
| committer | Mario Finelli | 2016-04-18 20:56:28 -0400 |
| commit | 1b413a2a4134fffae7a8a3718e38305176630849 (patch) | |
| tree | d10f47d107975456771cbc382591edf08ccc652e | |
| parent | 8af434cadb8b2c8723ec1255eddcc681db3eedd1 (diff) | |
| download | aur-1b413a2a4134fffae7a8a3718e38305176630849.tar.gz | |
Disable ASAN for release builds as per request in issue #402
https://github.com/ricochet-im/ricochet/issues/402#issuecomment-209840363
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | disable-ASAN-by-default-for-release-builds.patch | 31 |
4 files changed, 41 insertions, 3 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Tue Feb 16 13:06:01 UTC 2016 +# Mon Apr 18 16:42:14 UTC 2016 pkgbase = ricochet pkgdesc = Anonymous peer-to-peer instant messaging. pkgver = 1.1.2 @@ -17,8 +17,10 @@ pkgbase = ricochet depends = openssl depends = protobuf depends = qt5-multimedia + source = disable-ASAN-by-default-for-release-builds.patch source = https://ricochet.im/releases/1.1.2/ricochet-1.1.2-src.tar.bz2 source = https://ricochet.im/releases/1.1.2/ricochet-1.1.2-src.tar.bz2.asc + sha256sums = ed72e9b2a2d22861c00edb9effdab1e15150137a7e70767a9fbd580b28d0a99c sha256sums = 97c78d088892e84c95a3e3a4a982883d8e44028848a513a5d7e0231d36325cc3 sha256sums = SKIP diff --git a/.gitignore b/.gitignore index f71c635dafda..0afbe8c110c8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ !.gitignore !PKGBUILD !.SRCINFO +!disable-ASAN-by-default-for-release-builds.patch @@ -11,13 +11,17 @@ url="https://ricochet.im/" license=('custom') depends=('tor' 'qt5-quick1' 'qt5-quickcontrols' 'qt5-declarative' 'openssl' 'protobuf' 'qt5-multimedia') makedepends=('qt5-tools' 'pkg-config') -source=(https://ricochet.im/releases/$pkgver/$pkgname-$pkgver-src.tar.bz2{,.asc}) -sha256sums=('97c78d088892e84c95a3e3a4a982883d8e44028848a513a5d7e0231d36325cc3' +source=('disable-ASAN-by-default-for-release-builds.patch' + https://ricochet.im/releases/$pkgver/$pkgname-$pkgver-src.tar.bz2{,.asc}) + +sha256sums=('ed72e9b2a2d22861c00edb9effdab1e15150137a7e70767a9fbd580b28d0a99c' + '97c78d088892e84c95a3e3a4a982883d8e44028848a513a5d7e0231d36325cc3' 'SKIP') validpgpkeys=('9032CAE4CBFA933A5A2145D5FF97C53F183C045D') build() { cd "$srcdir"/$pkgname-$pkgver + patch -p1 < "${srcdir}/disable-ASAN-by-default-for-release-builds.patch" QT_SELECT=5 qmake CONFIG+=release DEFINES+=RICOCHET_NO_PORTABLE make } diff --git a/disable-ASAN-by-default-for-release-builds.patch b/disable-ASAN-by-default-for-release-builds.patch new file mode 100644 index 000000000000..ffe7ca34d282 --- /dev/null +++ b/disable-ASAN-by-default-for-release-builds.patch @@ -0,0 +1,31 @@ +From 3031a5607a1659cd38e876004007e1a56ace50f8 Mon Sep 17 00:00:00 2001 +From: Jacob Appelbaum <jacob@appelbaum.net> +Date: Mon, 21 Mar 2016 13:33:07 +0000 +Subject: [PATCH] disable ASAN by default for release builds + +--- + hardened.pri | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/hardened.pri b/hardened.pri +index 1b6c3b0..1bd3aaf 100644 +--- a/hardened.pri ++++ b/hardened.pri +@@ -15,12 +15,13 @@ HARDENED_STACK_PROTECTOR_FLAGS = -fstack-protector --param=ssp-buffer-size=4 + + HARDENED_MINGW_64ASLR_FLAGS = -Wl,--dynamicbase -Wl,--high-entropy-va + ++ + # Run tests and apply options where possible + CONFIG(hardened) { + # mingw is always PIC, and complains about the flag + !mingw:HARDEN_FLAGS = -fPIC + +- qtCompileTest(sanitize):HARDEN_FLAGS += $$HARDENED_SANITIZE_FLAGS ++ CONFIG(debug,debug|release): qtCompileTest(sanitize):HARDEN_FLAGS += $$HARDENED_SANITIZE_FLAGS + qtCompileTest(sanitize-ubsan):HARDEN_FLAGS += $$HARDENED_SANITIZE_UBSAN_FLAGS + qtCompileTest(sanitize-ubsan-more):HARDEN_FLAGS += $$HARDENED_SANITIZE_UBSAN_MORE_FLAGS + qtCompileTest(vtable-verify):HARDEN_FLAGS += $$HARDENED_VTABLE_VERIFY_FLAGS +-- +2.8.0 + |