X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.ovgu.de (mail.ovgu.de [141.44.1.66]) by lists.alpinelinux.org (Postfix) with ESMTP id 276425C4C8E for ; Sat, 19 Aug 2017 08:08:42 +0000 (GMT) Received: from mail.ovgu.de (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id A37A240064 for ; Sat, 19 Aug 2017 10:08:41 +0200 (CEST) Received: from notebook-marian.fritz.box (p5B15F903.dip0.t-ipconnect.de [91.21.249.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.ovgu.de (Postfix) with ESMTPSA id 7D09F40062; Sat, 19 Aug 2017 10:08:40 +0200 (CEST) From: Marian Buschsieweke To: alpine-aports@lists.alpinelinux.org Cc: Marian Buschsieweke Subject: [alpine-aports] [PATCH] testing/firefox: Update to version 55.0.2 Date: Sat, 19 Aug 2017 10:08:37 +0200 Message-Id: <20170819080837.24201-1-marian.buschsieweke@ovgu.de> X-Mailer: git-send-email 2.14.1 X-PMX-Version: 6.3.3.2656215, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.8.19.80016, AntiVirus-Engine: 5.40.0, AntiVirus-Data: 2017.8.18.5400000 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, LEGITIMATE_SIGNS 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, RDNS_POOLED 0, RDNS_SUSP 0, RDNS_SUSP_SPECIFIC 0, __ANY_URI 0, __C230066_P5 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_MONEY_CURRENCY 0, __FRAUD_MONEY_CURRENCY_DOLLAR 0, __FRAUD_WEBMAIL 0, __FROM_DOMAIN_IN_ANY_CC1 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __INT_PROD_COMP 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_URI_TEXT 0, __RDNS_POOLED_10 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NOT_IMG 0, __URI_NO_PATH 0, __URI_NS , __URI_WITHOUT_PATH 0' X-Spam-Score: Gauge=IIIIIIII X-PMX-consideredAsSpam: no X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: fix-tools.patch: Updated due to upstream changes fix-bug-1041962.patch: Replaced basename() as in Bug 1041962 (with minor changes: LulElf.cpp was moved from tools/profiler to tools/profiler/lul) --- testing/firefox/APKBUILD | 11 ++++++----- testing/firefox/fix-bug-1041962.patch | 33 +++++++++++++++++++++++++++++++++ testing/firefox/fix-tools.patch | 35 ++++++----------------------------- 3 files changed, 45 insertions(+), 34 deletions(-) create mode 100644 testing/firefox/fix-bug-1041962.patch diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD index 39ed093eeb..58c81eb875 100644 --- a/testing/firefox/APKBUILD +++ b/testing/firefox/APKBUILD @@ -1,10 +1,10 @@ # Contributor: William Pitcock # Maintainer: Natanael Copa pkgname=firefox -pkgver=54.0.1 +pkgver=55.0.2 _pkgver=$pkgver _xulver=$pkgver -pkgrel=2 +pkgrel=0 pkgdesc="Firefox web browser" url="http://www.firefox.com" # limited by rust and cargo @@ -68,6 +68,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkg disable-moz-stackwalk.patch fix-rust-target.patch fix-bug-1261392.patch + fix-bug-1041962.patch firefox.desktop firefox-safe.desktop" @@ -119,7 +120,6 @@ build() { \ --enable-alsa \ --enable-default-toolkit=cairo-gtk3 \ - --enable-gio \ --enable-gold=no \ --enable-official-branding \ --enable-optimize="$CFLAGS" \ @@ -217,14 +217,14 @@ __EOF__ rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so } -sha512sums="43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2 firefox-54.0.1.source.tar.xz +sha512sums="a27722cb5840aac89752fea0880a7e093e84b50dc78a36dc8c4bd493ffda10fa61446007f680bfe65db7a0debe4c21e6f0bf9f0de9876bba067abdda6fed7be4 firefox-55.0.2.source.tar.xz 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h 7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8 0002-Use-C99-math-isfinite.patch 09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5 fix-fortify-inline.patch 0fcc647af53a3ce21c2bc36e5631eb0935e7243ebb3ab59b5719542cc54a6ac023a4a857b43b75756efb9ed80c0aecaa94dc5679a3b3792f82e87bf2c1af82e1 disable-hunspell_hooks.patch 5e7722b8899bf25f5a941980de9a4e9e9a1efcfa9ce12edb70e525e6022bc0e8ef284804be622e8d17eb3bbc1d99c1554b54cfd4d066ea639de810d30005267f fix-seccomp-bpf.patch a2925045154f4fd34e5fc056656f4f9da100341529e5d4104d249154db0c7863384083f421ce6e47e0f20566a8b20787fa35444c7933c03cd03f96f06dcd4532 fix-toolkit.patch -94884c11ff4b38ed33cd890c21956f956fadc9b53c78891074501388cb2c95674a143a0109cbd7cc2b7f4035d6514cd800686f56778fc3711603dc0187c1b703 fix-tools.patch +ad5c094c5914fd8b51a1b3f4f772f71673363d79b50e180e443a3288be1d15490d0dfd6dae978f1abec8563b56a274bfd07433d254c77ded628388aedbfb8dc8 fix-tools.patch bdcd1b402d2ec94957ba5d08cbad7b1a7f59c251c311be9095208491a05abb05a956c79f27908e1f26b54a3679387b2f33a51e945b650671ad85c0a2d59a5a29 mallinfo.patch 2a967e4619fd89a046bd40be7fdcef646fcb1eba5e47afc96aa1d59c25bcc8747cb07baee6c11f3b803db0981aced181534b806778e4d21e74958f5f4d74c784 fix-fortify-system-wrappers.patch ed0d344c66fc8e1cc83a11e9858b32c42e841cbeedd9eb9438811e9fcc3593dc824a8336d00058d55836cedc970aeadd6a82c6dcd7bc0fb746e564d8b478cc6c fix-arm-atomics-grsec.patch @@ -233,5 +233,6 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb1 4797d2d89ac63a57abb826b8ea9f751314ce66946194033deb9d78c2ff377b88106fd2c7bc5034dc13ad03dd5085b1893c3ccae1a9e63fde35655bb0921f7188 disable-moz-stackwalk.patch 09d73d9058fbdb0992758e3377d8d4ea0b01cd291bdfbb918ec8b7b1ffb118bba3ff71efaca6107a0510fad295dd8de3102d8933b80d3a3546d7423e707e37b2 fix-rust-target.patch a50b412edf9573a0bd04a43578b1c927967a616b73a5995eefb15bfa78fd2bd14e36ec05315a0703f6370ecd524e6bcb012e7285beb1245e9add9b8553acb79e fix-bug-1261392.patch +fcc972091766a01afd21c9defcde62cbafaa1b6da359bb1a1cccee84d0cc9a18c1da4acfd643fdf098962ce47dcabff6fbe2d3768ed48595d730cc424e406327 fix-bug-1041962.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/testing/firefox/fix-bug-1041962.patch b/testing/firefox/fix-bug-1041962.patch new file mode 100644 index 0000000000..dc5b399a23 --- /dev/null +++ b/testing/firefox/fix-bug-1041962.patch @@ -0,0 +1,33 @@ +# HG changeset patch +# User Natanael Copa +# Date 1415045270 18000 +# Mon Nov 03 15:07:50 2014 -0500 +# Node ID 2c36fdc7e1ff63e7343d2e95d80b33d124d02114 +# Parent 26339fab8ca996255534b1f58bf0b8def975e0de +--- a/tools/profiler/lul/LulElf.cpp ++++ b/tools/profiler/lul/LulElf.cpp +@@ -574,20 +574,20 @@ string FormatIdentifier(unsigned char id + // really used or necessary on other platforms, but be consistent. + id_no_dash += '0'; + return id_no_dash; + } + + // Return the non-directory portion of FILENAME: the portion after the + // last slash, or the whole filename if there are no slashes. + string BaseFileName(const string &filename) { +- // Lots of copies! basename's behavior is less than ideal. +- char *c_filename = strdup(filename.c_str()); +- string base = basename(c_filename); +- free(c_filename); ++ // basename's behavior is less than ideal so avoid it ++ const char *c_filename = filename.c_str(); ++ const char *p = strrchr(c_filename, '/'); ++ string base = p ? p + 1 : c_filename; + return base; + } + + template + bool ReadSymbolDataElfClass(const typename ElfClass::Ehdr* elf_header, + const string& obj_filename, + const vector& debug_dirs, + SecMap* smap, void* rx_avma, diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch index c7357b6f7e..c876fe0056 100644 --- a/testing/firefox/fix-tools.patch +++ b/testing/firefox/fix-tools.patch @@ -1,36 +1,13 @@ --- a/tools/profiler/core/platform-linux-android.cpp +++ b/tools/profiler/core/platform-linux-android.cpp -@@ -715,11 +715,13 @@ - void TickSample::PopulateContext(void* aContext) - { +@@ -505,8 +505,10 @@ + MOZ_ASSERT(mIsSynchronous); MOZ_ASSERT(aContext); -+#if defined(__GLIBC__) - ucontext_t* pContext = reinterpret_cast(aContext); - if (!getcontext(pContext)) { - context = pContext; - SetSampleContext(this, - reinterpret_cast(aContext)->uc_mcontext); + ++#ifdef __GLIBC__ + if (!getcontext(aContext)) { + FillInSample(*this, aContext); } +#endif } - void OS::SleepMicro(int microseconds) -diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.cpp -index a922137..d01dde1 100644 ---- a/tools/profiler/lul/LulElf.cpp -+++ b/tools/profiler/lul/LulElf.cpp -@@ -483,10 +483,10 @@ string FormatIdentifier(unsigned char identifier[16]) { - // Return the non-directory portion of FILENAME: the portion after the - // last slash, or the whole filename if there are no slashes. - string BaseFileName(const string &filename) { -- // Lots of copies! basename's behavior is less than ideal. -- char *c_filename = strdup(filename.c_str()); -- string base = basename(c_filename); -- free(c_filename); -+ // basename's behavior is less than ideal so avoid it -+ const char *c_filename = filename.c_str(); -+ const char *p = strrchr(c_filename, '/'); -+ string base = p ? p+1 : c_filename; - return base; - } - -- 2.14.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---