X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mx1.tetrasec.net (mx1.tetrasec.net [74.117.190.25]) by lists.alpinelinux.org (Postfix) with ESMTP id 258FA5C4C93 for ; Fri, 18 Aug 2017 22:31:37 +0000 (GMT) Received: from mx1.tetrasec.net (mail.local [127.0.0.1]) by mx1.tetrasec.net (Postfix) with ESMTP id D3FFA9E287A; Fri, 18 Aug 2017 22:31:36 +0000 (GMT) Received: from ncopa-macbook.copa.dup.pw (50-233-46-100-static.hfc.comcastbusiness.net [50.233.46.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by mx1.tetrasec.net (Postfix) with ESMTPSA id 8CE8B9E211D; Fri, 18 Aug 2017 22:31:36 +0000 (GMT) Date: Fri, 18 Aug 2017 15:31:35 -0700 From: Natanael Copa To: Marian Buschsieweke Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] testing/firefox: Update to version 55.0.2 Message-ID: <20170818153135.45050ed0@ncopa-macbook.copa.dup.pw> In-Reply-To: <20170817220731.19849-1-marian.buschsieweke@ovgu.de> References: <20170817220731.19849-1-marian.buschsieweke@ovgu.de> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Fri, 18 Aug 2017 00:07:31 +0200 Marian Buschsieweke wrote: > fix-tools.patch: Can no longer be applied, source changed significantly > getcontext.patch: Solves the same problem fix-tools.patch solved previous= ly > tools_profiler_missing_header.patch: Adds a missing #include (obviously t= his > header was pulled in on glibc by an > unrelated #include) > --- > testing/firefox/APKBUILD | 13 ++++---- > testing/firefox/fix-tools.patch | 36 ----------------= ------ > testing/firefox/getcontext.patch | 15 +++++++++ > .../firefox/tools_profiler_missing_header.patch | 10 ++++++ > 4 files changed, 32 insertions(+), 42 deletions(-) > delete mode 100644 testing/firefox/fix-tools.patch > create mode 100644 testing/firefox/getcontext.patch > create mode 100644 testing/firefox/tools_profiler_missing_header.patch >=20 > diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD > index 39ed093eeb..4ea56409dc 100644 > --- a/testing/firefox/APKBUILD > +++ b/testing/firefox/APKBUILD > @@ -1,10 +1,10 @@ > # Contributor: William Pitcock > # Maintainer: Natanael Copa > pkgname=3Dfirefox > -pkgver=3D54.0.1 > +pkgver=3D55.0.2 > _pkgver=3D$pkgver > _xulver=3D$pkgver > -pkgrel=3D2 > +pkgrel=3D0 > pkgdesc=3D"Firefox web browser" > url=3D"http://www.firefox.com" > # limited by rust and cargo > @@ -58,7 +58,6 @@ source=3D"https://ftp.mozilla.org/pub/firefox/releases/= $pkgver/source/firefox-$pkg > disable-hunspell_hooks.patch > fix-seccomp-bpf.patch > fix-toolkit.patch > - fix-tools.patch > mallinfo.patch > =20 > fix-fortify-system-wrappers.patch > @@ -68,6 +67,8 @@ source=3D"https://ftp.mozilla.org/pub/firefox/releases/= $pkgver/source/firefox-$pkg > disable-moz-stackwalk.patch > fix-rust-target.patch > fix-bug-1261392.patch > + tools_profiler_missing_header.patch > + getcontext.patch > =20 > firefox.desktop > firefox-safe.desktop" > @@ -119,7 +120,6 @@ build() { > \ > --enable-alsa \ > --enable-default-toolkit=3Dcairo-gtk3 \ > - --enable-gio \ > --enable-gold=3Dno \ > --enable-official-branding \ > --enable-optimize=3D"$CFLAGS" \ > @@ -217,14 +217,13 @@ __EOF__ > rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so > } > =20 > -sha512sums=3D"43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4= d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2 fir= efox-54.0.1.source.tar.xz > +sha512sums=3D"a27722cb5840aac89752fea0880a7e093e84b50dc78a36dc8c4bd493ff= da10fa61446007f680bfe65db7a0debe4c21e6f0bf9f0de9876bba067abdda6fed7be4 fir= efox-55.0.2.source.tar.xz > 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce129= 1aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h > 7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c3= 6980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8 0002-Use-C99-math= -isfinite.patch > 09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e017215323= 1db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5 fix-fortify-inlin= e.patch > 0fcc647af53a3ce21c2bc36e5631eb0935e7243ebb3ab59b5719542cc54a6ac023a4a857= b43b75756efb9ed80c0aecaa94dc5679a3b3792f82e87bf2c1af82e1 disable-hunspell_= hooks.patch > 5e7722b8899bf25f5a941980de9a4e9e9a1efcfa9ce12edb70e525e6022bc0e8ef284804= be622e8d17eb3bbc1d99c1554b54cfd4d066ea639de810d30005267f fix-seccomp-bpf.p= atch > a2925045154f4fd34e5fc056656f4f9da100341529e5d4104d249154db0c7863384083f4= 21ce6e47e0f20566a8b20787fa35444c7933c03cd03f96f06dcd4532 fix-toolkit.patch > -94884c11ff4b38ed33cd890c21956f956fadc9b53c78891074501388cb2c95674a143a01= 09cbd7cc2b7f4035d6514cd800686f56778fc3711603dc0187c1b703 fix-tools.patch > bdcd1b402d2ec94957ba5d08cbad7b1a7f59c251c311be9095208491a05abb05a956c79f= 27908e1f26b54a3679387b2f33a51e945b650671ad85c0a2d59a5a29 mallinfo.patch > 2a967e4619fd89a046bd40be7fdcef646fcb1eba5e47afc96aa1d59c25bcc8747cb07bae= e6c11f3b803db0981aced181534b806778e4d21e74958f5f4d74c784 fix-fortify-syste= m-wrappers.patch > ed0d344c66fc8e1cc83a11e9858b32c42e841cbeedd9eb9438811e9fcc3593dc824a8336= d00058d55836cedc970aeadd6a82c6dcd7bc0fb746e564d8b478cc6c fix-arm-atomics-g= rsec.patch > @@ -233,5 +232,7 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef26133= 80d7b369c6fd305fb34f83b5eb1 > 4797d2d89ac63a57abb826b8ea9f751314ce66946194033deb9d78c2ff377b88106fd2c7= bc5034dc13ad03dd5085b1893c3ccae1a9e63fde35655bb0921f7188 disable-moz-stack= walk.patch > 09d73d9058fbdb0992758e3377d8d4ea0b01cd291bdfbb918ec8b7b1ffb118bba3ff71ef= aca6107a0510fad295dd8de3102d8933b80d3a3546d7423e707e37b2 fix-rust-target.p= atch > a50b412edf9573a0bd04a43578b1c927967a616b73a5995eefb15bfa78fd2bd14e36ec05= 315a0703f6370ecd524e6bcb012e7285beb1245e9add9b8553acb79e fix-bug-1261392.p= atch > +67b3587a9434e61b7b013b3dce266d516d3658f094c393b3e02278c4d6b670a7acb391b1= 0e07dce55613338107c18958b209d769aa9cbe05e2dd9eef27f23eeb tools_profiler_mi= ssing_header.patch > +6bcd37a44e6ba89fe62108a7d96591cf2fe36ce9149ced00e9086f38ef4529c7c4feb1cf= 9c64693c7ddd9f0a9580a6dc67227ebfbdac925dfb46577a9241d2fa getcontext.patch > f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9= ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop > 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c916= 27a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desk= top" > diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.= patch > deleted file mode 100644 > index c7357b6f7e..0000000000 > --- a/testing/firefox/fix-tools.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > ---- 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) > - { > - MOZ_ASSERT(aContext); > -+#if defined(__GLIBC__) > - ucontext_t* pContext =3D reinterpret_cast(aContext); > - if (!getcontext(pContext)) { > - context =3D pContext; > - SetSampleContext(this, > - reinterpret_cast(aContext)->uc_mconte= xt); > - } > -+#endif > - } > -=20 > - void OS::SleepMicro(int microseconds) > -diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.c= pp > -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[1= 6]) { > - // 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 =3D strdup(filename.c_str()); > -- string base =3D basename(c_filename); > -- free(c_filename); > -+ // basename's behavior is less than ideal so avoid it > -+ const char *c_filename =3D filename.c_str(); > -+ const char *p =3D strrchr(c_filename, '/'); > -+ string base =3D p ? p+1 : c_filename; > - return base; > - } > -=20 > diff --git a/testing/firefox/getcontext.patch b/testing/firefox/getcontex= t.patch > new file mode 100644 > index 0000000000..a6e933ba1a > --- /dev/null > +++ b/testing/firefox/getcontext.patch > @@ -0,0 +1,15 @@ > +--- old/tools/profiler/core/platform-linux-android.cpp > ++++ new/tools/profiler/core/platform-linux-android.cpp > +@@ -505,8 +505,12 @@ > + MOZ_ASSERT(mIsSynchronous); > + MOZ_ASSERT(aContext); > +=20 > ++#ifdef __GLIBC__ > + if (!getcontext(aContext)) { > ++#endif > + FillInSample(*this, aContext); > ++#ifdef __GLIBC__ > + } > ++#endif > + } > +=20 This patch looks wrong to me. Why would you FillInSample with an uninitialized aContext? =46rom tools/profiler/core/platfom.cpp: ucontext_t context; sample.PopulateContext(&context); Would make more sense to: #ifdef __GLIBC__ if (!getcontext(aContext)) { FillInSample(*this, aContext); } #endif --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---