From cf8ebaef724743a8e37e83b768a378e02140b2fc Mon Sep 17 00:00:00 2001 From: Sertonix Date: Thu, 14 Mar 2024 15:25:24 +0100 Subject: [PATCH] testing/librewolf: upgrade to 123.0.1_p1 --- testing/librewolf/APKBUILD | 20 +++++------ testing/librewolf/disable-moz-stackwalk.patch | 34 ++++++++++++------- .../sandbox-sched_setscheduler.patch | 16 ++++++--- 3 files changed, 44 insertions(+), 26 deletions(-) diff --git a/testing/librewolf/APKBUILD b/testing/librewolf/APKBUILD index ca41f89f7ff..6695e9026f3 100644 --- a/testing/librewolf/APKBUILD +++ b/testing/librewolf/APKBUILD @@ -6,10 +6,8 @@ # Maintainer: Sertonix _pkgname=Librewolf pkgname=librewolf -_pkgver=123.0 -_pkgrel=1 -pkgver="$_pkgver"_p"$_pkgrel" -_releasedate=2024-02-24 +pkgver=123.0.1_p1 +_releasedate=2024-03-13 pkgrel=0 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." url="https://librewolf.net/" @@ -82,7 +80,7 @@ riscv64) ;; esac # The source has to change once the codeberg migration is done. -source="$pkgname-$_pkgver-$_pkgrel.tar.gz::https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$_pkgver-$_pkgrel/librewolf-$_pkgver-$_pkgrel.source.tar.gz +source="$pkgname-$pkgver.tar.gz::https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${pkgver/_p/-}/librewolf-${pkgver/_p/-}.source.tar.gz disable-moz-stackwalk.patch fix-fortify-system-wrappers.patch fix-rust-target.patch @@ -108,7 +106,7 @@ source="$pkgname-$_pkgver-$_pkgrel.tar.gz::https://gitlab.com/api/v4/projects/32 # tests are hard to run options="!check" -builddir="$srcdir"/$pkgname-$_pkgver-$_pkgrel +builddir="$srcdir"/$pkgname-${pkgver/_p/-} _mozappdir=/usr/lib/$pkgname # help our shared-object scanner to find the libs @@ -685,7 +683,9 @@ package() { for _png in ./browser/branding/librewolf/default*.png; do local i=${_png%.png} i=${i##*/default} - install -Dm644 "$_png" "$pkgdir"/usr/share/icons/hicolor/"$i"x"$i"/apps/$pkgname.png + install -d "$pkgdir"/usr/share/icons/hicolor/"$i"x"$i"/apps/ + ln -s "$_mozappdir"/browser/chrome/icons/default/default"$i".png \ + "$pkgdir"/usr/share/icons/hicolor/"$i"x"$i"/apps/$pkgname.png done case "$CARCH" in @@ -728,8 +728,8 @@ intl() { } sha512sums=" -839ad1033b8ff397770a374aa16c5b749ff29497db49d738e2d5b04a4af5b365b178fa0b1e6e6be796d41039e39a84399b7344c9fb266e3a6572409c7148e375 librewolf-123.0-1.tar.gz -454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch +42f3cc9e6dc70c745456123b63fbe6a5f93ba7bb21c66e98facbaeea884c8e887e3400bb49a0b9a5e797ffafe4de7ef649dd3a96195fb8c4959a8f52849f535b librewolf-123.0.1_p1.tar.gz +eb49b791280a8d765e6b056816ad6d7ec20a3b13723ebe648a8ecd2c086a5bc83277a3b4c127a470e7bb7105cfa4ed7611c19ac683545140190cafaa880ad515 disable-moz-stackwalk.patch 19eea840aa9c1c21e7bd1f832ec078989fe6f08fca40baa271be7e74f1cffeb5ab8d3218a93e664b8d90a41506dede524e2a5174cd47580866109bc6711ea969 fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch 305c874fdea3096e9c4c6aa6520ac64bb1c347c4b59db8360096646593fe684c3b5377874d91cecd33d56d1410b4714fbdea2b514923723ecbeff79d51265d9b fix-webrtc-glibcisms.patch @@ -744,7 +744,7 @@ f635243e587b5be2c82e96d8ad11e93f99e3130765e4b9e329ff7424f685d8f7bf385de66ca26980 b12dbff6513ac8c231d91c257a9accecc034d9ea9c31d99ca0454334ccf80fe7b50d6a356182dc46a9f25064366ea9a177f463cb2544b1cf5368ee6bd71bc095 riscv64-no-lto.patch 2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609 sandbox-fork.patch b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e sandbox-largefile.patch -94433c5ffdbe579c456d95c5f053f61fcbab2f652fa90bc69dcc27d9a1507a8e5c677adeadae9a7a75cc9a55184c1040737f4dfd10b279c088ef016561e6f135 sandbox-sched_setscheduler.patch +f8c3555ef6207933cbffbf4fc101a9b4c0d2990c0063162f0f0bde70ef0b46f86bfac42e7110695183424a87948de593f3927b2d8509ede3e4fc7bd8a1fad1ce sandbox-sched_setscheduler.patch 67bc0be3da973e6859256bf9be4df7100837430e6076fc0bd623f504c35e02e6c191e9c5a3a1d202e5ad4d89f874f254a09e164e39c7bfd97bbc8d4c8d0632a5 sqlite-ppc.patch 73e9c51977d1a675c38fafeaa7478499d002d0dbfc8741ed7d9810ac39fb190870bd3295b86f7c9f7e8191f0fda7b7d6454d0a4cc1d7c61f3810a4d3a165180f librewolf.desktop b6ceaf541ecb16a91398e1f629c7479e37c42c467e78980895ade8fe16feeb307ead50c839bac72f18bf74b7be46382c431a1361b3194cf3dffc6d58d67f82e5 distribution.ini diff --git a/testing/librewolf/disable-moz-stackwalk.patch b/testing/librewolf/disable-moz-stackwalk.patch index b6bc756d2be..54990d799fc 100644 --- a/testing/librewolf/disable-moz-stackwalk.patch +++ b/testing/librewolf/disable-moz-stackwalk.patch @@ -1,18 +1,28 @@ +upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1882329 diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp -index 7d62921..adcfa44 100644 +index 2fefc5b..57c56e6 100644 --- a/mozglue/misc/StackWalk.cpp +++ b/mozglue/misc/StackWalk.cpp -@@ -33,13 +33,7 @@ using namespace mozilla; - # define MOZ_STACKWALK_SUPPORTS_MACOSX 0 - #endif +@@ -46,5 +46,12 @@ using namespace mozilla; --#if (defined(linux) && \ -- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ ++#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) ++# define HAVE___LIBC_STACK_END 1 ++#else ++# define HAVE___LIBC_STACK_END 0 ++#endif ++ + #if (defined(linux) && \ + ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ - defined(HAVE__UNWIND_BACKTRACE))) --# define MOZ_STACKWALK_SUPPORTS_LINUX 1 --#else - # define MOZ_STACKWALK_SUPPORTS_LINUX 0 --#endif ++ defined(HAVE__UNWIND_BACKTRACE)) && \ ++ (HAVE___LIBC_STACK_END || ANDROID)) + # define MOZ_STACKWALK_SUPPORTS_LINUX 1 +@@ -54,8 +61,2 @@ using namespace mozilla; - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) - # define HAVE___LIBC_STACK_END 1 +-#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) +-# define HAVE___LIBC_STACK_END 1 +-#else +-# define HAVE___LIBC_STACK_END 0 +-#endif +- + #if HAVE___LIBC_STACK_END diff --git a/testing/librewolf/sandbox-sched_setscheduler.patch b/testing/librewolf/sandbox-sched_setscheduler.patch index 3163c9e61c6..ffdf12678bc 100644 --- a/testing/librewolf/sandbox-sched_setscheduler.patch +++ b/testing/librewolf/sandbox-sched_setscheduler.patch @@ -1,9 +1,9 @@ upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1657849 +diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp +index ed958bc..9824433 100644 --- a/security/sandbox/linux/SandboxFilter.cpp +++ b/security/sandbox/linux/SandboxFilter.cpp -@@ -1694,10 +1694,10 @@ - return Allow(); - case __NR_sched_get_priority_min: +@@ -1751,6 +1751,6 @@ class GMPSandboxPolicy : public SandboxPolicyCommon { case __NR_sched_get_priority_max: + case __NR_sched_setscheduler: return Allow(); @@ -12,5 +12,13 @@ upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1657849 - case __NR_sched_setscheduler: { + case __NR_sched_getscheduler: { Arg pid(0); - return If(pid == 0, Allow()).Else(Trap(SchedTrap, nullptr)); +@@ -1926,3 +1926,2 @@ class RDDSandboxPolicy final : public SandboxPolicyCommon { + case __NR_sched_getscheduler: +- case __NR_sched_setscheduler: + case __NR_sched_getattr: +@@ -1932,2 +1931,5 @@ class RDDSandboxPolicy final : public SandboxPolicyCommon { } ++ // sched_setscheduler gets special treatment here (bug 1657849): ++ case __NR_sched_setscheduler: ++ return Allow(); +