From 54d75c7653d66732864aa9d755cdb89d6e5862d7 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 14 Jul 2020 14:41:31 -0400 Subject: pm 28.11.0-1 rc1, dpkg and rpm bring in 32-bit memory mod for rpm, to match dpkg, from https://forum.palemoon.org/viewtopic.php?f=37&t=24737&p=193746 --- palemoon/debian/changelog | 81 ++++++++++++++++++++++++----- palemoon/debian/control | 6 +-- palemoon/debian/palemoon_devuan.dsc | 4 +- palemoon/debian/patches/fix_arm_FTBFS.patch | 78 +++++++++++++++++++++++++++ palemoon/debian/patches/series | 1 + palemoon/debian/rules | 1 + 6 files changed, 151 insertions(+), 20 deletions(-) create mode 100644 palemoon/debian/patches/fix_arm_FTBFS.patch (limited to 'palemoon/debian') diff --git a/palemoon/debian/changelog b/palemoon/debian/changelog index 192aad6..0d57595 100644 --- a/palemoon/debian/changelog +++ b/palemoon/debian/changelog @@ -1,3 +1,58 @@ +palemoon (28.11.0-1+devuan) obs; urgency=medium + + * This is a development, bugfix and security update. + - Changed storage format for certificates and passwords to SQLite. + - Added a preference (browser.tabs.insertAllAfterCurrent) to enable + always adding new tabs after the current tab, whether related or not. + - Changed the way Firefox extensions are displayed in the add-on + manager (provide a clear warning). + - Denied other types of add-ons that aren't explicitly targeting + Pale Moon's ID. + - Improved the browser's DPI-awareness to be per-monitor instead of + system-wide, on supported Windows operating systems. + - Updated bookmark backups code with the other half of what should + have been done way back when, so they work fully as-intended. + - Added a preference + (browser.bookmarks.editDialog.showForNewBookmarks) to enable + immediately showing the edit dialog for new bookmarks. + - If set to true, clicking the star in the address bar will pop + open the edit dialog immediately for changing details/sorting. + - Fixed the useragent string in native mode, and updated UA code to + properly respond to live changes to some preferences. + - Tidied up front-end browser JavaScript. + - Changed the way sources are compiled (on-going de-unification). + - Improved compatibility with gcc v10 + - Removed support for the obsolete and unmaintained NVidia 3DVision + stereoscopic interface. + - Fixed some build issues in non-standard configurations. + - Fixed wrong positions when calculating the position for + position:absolute child inside a table. + - Aligned file name extension of saved url files with other + applications (lower case) + - Fixed building with --disable-webspeech (to disable speech + synthesis) + - Added global menubar support for GTK. + - Implemented node.getRootNode + - Implemented AbortController (Abort API) + - Improved the uninstaller to use elevation when prudent and + actually remove program files. + - Fixed a rare issue with editable page content. + - Fixed a crash related to ES module scripts. + - Aligned ES module scripting better with the current spec and + removed eager instantiation. + - Fixed a potential issue with the JPEG encoder. (CVE-2020-12422) + DiD + - Fixed a potential issue with AppCache manifests. DiD + - Fixed a potential crash in JavaScript date parsing. + - Fixed a problem with RSA key generation that would make it + potentially vulnerable to side-channel attacks. (CVE-2020-12402) + - Fixed a potential crash due to multithread race condition. DiD + - Fixed a correctness issue in URL handling. (CVE-2020-12418) DiD + - Unified XUL Platform Mozilla Security Patch Summary: 2 fixed, 4 + defense-in-depth, 10 not applicable. + + -- Ben Stack Tue, 14 Jul 2020 14:28:53 -0400 + palemoon (28.10.0-1+devuan) obs; urgency=medium * This is a development, bugfix and security update. @@ -755,7 +810,7 @@ palemoon (28.1.0~repack-1) obs; urgency=medium - Fixed toolbar styling in toolkit themes. - Fixed viewing the source of a selection. - * Now has full support for gcc-8, so stop forcing gcc-7 build on Buster and + * Now has full support for gcc-8, so stop forcing gcc-7 build on Buster and recent Ubuntus where gcc-8 is default. -- Steven Pusser Mon, 17 Sep 2018 19:05:20 -0700 @@ -834,8 +889,8 @@ palemoon (27.9.4~repack-1~mx17+1) mx; urgency=medium - Prevented various location-based threats. DiD - Fixed a potential vulnerability with plugins being redirected to different origins (CVE-2018-12364). - - Improved the security check for launching executable files - (by association) on Windows from the browser. For users who have (most + - Improved the security check for launching executable files + (by association) on Windows from the browser. For users who have (most likely accidentally) granted a system-wide waiver for opening these kinds of files without being prompted, this permission has been reset. - Fixed an issue with invalid qcms transforms (CVE-2018-12366). @@ -852,13 +907,13 @@ palemoon (27.9.4~repack-1~mx17+1) mx; urgency=medium palemoon (27.9.3~repack-1~mx17+1) mx; urgency=medium * New upstream security update: - + - Changes/fixes: - - (CVE-2017-0381) Ported a patch from libopus upstream. Note, contrary to - that report, the libopus maintainers state they don't believe remote + - (CVE-2017-0381) Ported a patch from libopus upstream. Note, contrary to + that report, the libopus maintainers state they don't believe remote code execution was possible, so this was not a critical patch. - Fixed an issue with task counting in JS GC. - - Fixed a use-after-free in DOMProxyHandler::EnsureExpandoObject (thanks + - Fixed a use-after-free in DOMProxyHandler::EnsureExpandoObject (thanks to Berk Cem Göksel for reporting). -- Steven Pusser Tue, 12 Jun 2018 11:12:06 -0700 @@ -871,18 +926,18 @@ palemoon (27.9.2~repack-1~mx17+1) mx; urgency=medium - We changed the language strings for softblocked items so people will cry less when we do our job. - (CVE-2018-5174) Prevent potential SmartScreen bypass on Windows 10. - - (CVE-2018-5173) Fixed an issue in the Downloads panel improperly - rendering some Unicode characters, allowing for the file name to be - spoofed. This could be used to obscure the file extension of potentially + - (CVE-2018-5173) Fixed an issue in the Downloads panel improperly + rendering some Unicode characters, allowing for the file name to be + spoofed. This could be used to obscure the file extension of potentially executable files from user view in the panel. - (CVE-2018-5177) Fixed a vulnerability in the XSLT component leading to a buffer overflow and crash if it occurs. - - (CVE-2018-5159) Fixed an integer overflow vulnerability in the Skia + - (CVE-2018-5159) Fixed an integer overflow vulnerability in the Skia library resulting in possible out-of-bounds writes. - (CVE-2018-5154) Fixed a use-after-free vulnerability while enumerating attributes during SVG animations with clip paths. - - (CVE-2018-5178) Fixed a buffer overflow during UTF8 to Unicode string - conversion within JavaScript with extremely large amounts of data. This + - (CVE-2018-5178) Fixed a buffer overflow during UTF8 to Unicode string + conversion within JavaScript with extremely large amounts of data. This vulnerability requires the use of a malicious or vulnerable extension in order to occur. - Fixed several stability issues (crashes) and memory safety hazards. diff --git a/palemoon/debian/control b/palemoon/debian/control index e9fa32b..e532400 100644 --- a/palemoon/debian/control +++ b/palemoon/debian/control @@ -8,21 +8,17 @@ Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), - libfontconfig-dev, libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, - lsb-release, mesa-common-dev, pkg-config, python (>= 2.7), unzip, yasm (>= 1.1), zip, - zlib1g-dev, -# libfontconfig-dev only added for Debian OBS which is choking as of 2020-04 on libfontconfig-dev | libfontconfig1-dev for deps: libgtk-3-dev, libpango1.0-dev, libcairo2-dev, libxft-dev Standards-Version: 3.9.6 Homepage: http://www.palemoon.org/ @@ -30,7 +26,7 @@ Package: palemoon Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libavcodec54 | libavcodec-extra54 |libavcodec55 | libavcodec-extra55 | libavcodec56 | libavcodec-extra56 | libavcodec57 | libavcodec-extra57 | libavcodec58 | libavcodec-extra58 | libavcodec-ffmpeg56 | libavcodec-ffmpeg-extra56 -Provides: x-www-browser +Provides: gnome-www-browser, www-browser, x-www-browser Conflicts: palemoon-nonsse2 Replaces: palemoon-nonsse2 Description: Firefox-based, efficient and easy to use web browser diff --git a/palemoon/debian/palemoon_devuan.dsc b/palemoon/debian/palemoon_devuan.dsc index 3e314ec..e373faf 100644 --- a/palemoon/debian/palemoon_devuan.dsc +++ b/palemoon/debian/palemoon_devuan.dsc @@ -2,11 +2,11 @@ Format: 3.0 (quilt) Source: palemoon Binary: palemoon Architecture: any -Version: 28.10.0-1+devuan +Version: 28.11.0-1+devuan Maintainer: B Stack Homepage: http://www.palemoon.org/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, lsb-release, mesa-common-dev, pkg-config, python (>= 2.7), unzip, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev +Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python (>= 2.7), unzip, yasm (>= 1.1), zip Package-List: palemoon deb web optional arch=any Files: diff --git a/palemoon/debian/patches/fix_arm_FTBFS.patch b/palemoon/debian/patches/fix_arm_FTBFS.patch new file mode 100644 index 0000000..a8b1582 --- /dev/null +++ b/palemoon/debian/patches/fix_arm_FTBFS.patch @@ -0,0 +1,78 @@ +Description: Fix build failure on armhf arch +Author: Steven Pusser +Last-Update: 2020-06-09 + +--- palemoon-28.10.0.orig/platform/js/src/wasm/WasmBaselineCompile.cpp ++++ palemoon-28.10.0/platform/js/src/wasm/WasmBaselineCompile.cpp +@@ -3391,7 +3391,7 @@ class BaseCompiler + #ifdef JS_CODEGEN_ARM + void + loadI32(MemoryAccessDesc access, bool isSigned, RegI32 ptr, Register rt) { +- if (access.byteSize() > 1 && IsUnaligned(ins->access())) { ++ if (access.byteSize() > 1 && IsUnaligned(access)) { + masm.add32(HeapReg, ptr.reg); + SecondScratchRegisterScope scratch(*this); + masm.emitUnalignedLoad(isSigned, access.byteSize(), ptr.reg, scratch, rt, 0); +@@ -3405,7 +3405,7 @@ class BaseCompiler + + void + storeI32(MemoryAccessDesc access, RegI32 ptr, Register rt) { +- if (access.byteSize() > 1 && IsUnaligned(ins->access())) { ++ if (access.byteSize() > 1 && IsUnaligned(access)) { + masm.add32(HeapReg, ptr.reg); + masm.emitUnalignedStore(access.byteSize(), ptr.reg, rt, 0); + } else { +@@ -3419,7 +3419,7 @@ class BaseCompiler + + void + loadI64(MemoryAccessDesc access, RegI32 ptr, RegI64 dest) { +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + masm.add32(HeapReg, ptr.reg); + SecondScratchRegisterScope scratch(*this); + masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, dest.reg.low, +@@ -3440,7 +3440,7 @@ class BaseCompiler + + void + storeI64(MemoryAccessDesc access, RegI32 ptr, RegI64 src) { +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + masm.add32(HeapReg, ptr.reg); + masm.emitUnalignedStore(ByteSize(4), ptr.reg, src.reg.low, 0); + masm.emitUnalignedStore(ByteSize(4), ptr.reg, src.reg.high, 4); +@@ -3459,7 +3459,7 @@ class BaseCompiler + void + loadF32(MemoryAccessDesc access, RegI32 ptr, RegF32 dest, RegI32 tmp1) { + masm.add32(HeapReg, ptr.reg); +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + SecondScratchRegisterScope scratch(*this); + masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, tmp1.reg, 0); + masm.ma_vxfer(tmp1.reg, dest.reg); +@@ -3473,7 +3473,7 @@ class BaseCompiler + void + storeF32(MemoryAccessDesc access, RegI32 ptr, RegF32 src, RegI32 tmp1) { + masm.add32(HeapReg, ptr.reg); +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + masm.ma_vxfer(src.reg, tmp1.reg); + masm.emitUnalignedStore(ByteSize(4), ptr.reg, tmp1.reg, 0); + } else { +@@ -3486,7 +3486,7 @@ class BaseCompiler + void + loadF64(MemoryAccessDesc access, RegI32 ptr, RegF64 dest, RegI32 tmp1, RegI32 tmp2) { + masm.add32(HeapReg, ptr.reg); +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + SecondScratchRegisterScope scratch(*this); + masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, tmp1.reg, 0); + masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, tmp2.reg, 4); +@@ -3501,7 +3501,7 @@ class BaseCompiler + void + storeF64(MemoryAccessDesc access, RegI32 ptr, RegF64 src, RegI32 tmp1, RegI32 tmp2) { + masm.add32(HeapReg, ptr.reg); +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + masm.ma_vxfer(src.reg, tmp1.reg, tmp2.reg); + masm.emitUnalignedStore(ByteSize(4), ptr.reg, tmp1.reg, 0); + masm.emitUnalignedStore(ByteSize(4), ptr.reg, tmp2.reg, 4); diff --git a/palemoon/debian/patches/series b/palemoon/debian/patches/series index 054d3bf..0a417be 100644 --- a/palemoon/debian/patches/series +++ b/palemoon/debian/patches/series @@ -1,3 +1,4 @@ small-icons.patch bgstack15-palemoon.patch pm-devuan.patch +fix_arm_FTBFS.patch diff --git a/palemoon/debian/rules b/palemoon/debian/rules index 5705c90..d970f5e 100755 --- a/palemoon/debian/rules +++ b/palemoon/debian/rules @@ -4,6 +4,7 @@ export SHELL=/bin/bash ## borrowed from stevepusser's logic ## Build with gcc-8 on Buster (beowulf/ceres) +## If you enable this, then d/control needs lsb-release as a build dependency. #distrelease := $(shell lsb_release -cs) #ifeq ($(distrelease),$(filter $(distrelease),buster beowulf/ceres)) #export CC=gcc-8 -- cgit From ee86074a964bcc13643cf1d693c0a384132db3f2 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 14 Jul 2020 14:41:31 -0400 Subject: pm 28.11.0-1 rc1, dpkg and rpm bring in 32-bit memory mod for rpm, to match dpkg, from https://forum.palemoon.org/viewtopic.php?f=37&t=24737&p=193746 --- palemoon/debian/changelog | 81 ++++++++++++++++++++++++----- palemoon/debian/control | 6 +-- palemoon/debian/palemoon_devuan.dsc | 4 +- palemoon/debian/patches/fix_arm_FTBFS.patch | 78 +++++++++++++++++++++++++++ palemoon/debian/patches/series | 1 + palemoon/debian/rules | 1 + 6 files changed, 151 insertions(+), 20 deletions(-) create mode 100644 palemoon/debian/patches/fix_arm_FTBFS.patch (limited to 'palemoon/debian') diff --git a/palemoon/debian/changelog b/palemoon/debian/changelog index 192aad6..0d57595 100644 --- a/palemoon/debian/changelog +++ b/palemoon/debian/changelog @@ -1,3 +1,58 @@ +palemoon (28.11.0-1+devuan) obs; urgency=medium + + * This is a development, bugfix and security update. + - Changed storage format for certificates and passwords to SQLite. + - Added a preference (browser.tabs.insertAllAfterCurrent) to enable + always adding new tabs after the current tab, whether related or not. + - Changed the way Firefox extensions are displayed in the add-on + manager (provide a clear warning). + - Denied other types of add-ons that aren't explicitly targeting + Pale Moon's ID. + - Improved the browser's DPI-awareness to be per-monitor instead of + system-wide, on supported Windows operating systems. + - Updated bookmark backups code with the other half of what should + have been done way back when, so they work fully as-intended. + - Added a preference + (browser.bookmarks.editDialog.showForNewBookmarks) to enable + immediately showing the edit dialog for new bookmarks. + - If set to true, clicking the star in the address bar will pop + open the edit dialog immediately for changing details/sorting. + - Fixed the useragent string in native mode, and updated UA code to + properly respond to live changes to some preferences. + - Tidied up front-end browser JavaScript. + - Changed the way sources are compiled (on-going de-unification). + - Improved compatibility with gcc v10 + - Removed support for the obsolete and unmaintained NVidia 3DVision + stereoscopic interface. + - Fixed some build issues in non-standard configurations. + - Fixed wrong positions when calculating the position for + position:absolute child inside a table. + - Aligned file name extension of saved url files with other + applications (lower case) + - Fixed building with --disable-webspeech (to disable speech + synthesis) + - Added global menubar support for GTK. + - Implemented node.getRootNode + - Implemented AbortController (Abort API) + - Improved the uninstaller to use elevation when prudent and + actually remove program files. + - Fixed a rare issue with editable page content. + - Fixed a crash related to ES module scripts. + - Aligned ES module scripting better with the current spec and + removed eager instantiation. + - Fixed a potential issue with the JPEG encoder. (CVE-2020-12422) + DiD + - Fixed a potential issue with AppCache manifests. DiD + - Fixed a potential crash in JavaScript date parsing. + - Fixed a problem with RSA key generation that would make it + potentially vulnerable to side-channel attacks. (CVE-2020-12402) + - Fixed a potential crash due to multithread race condition. DiD + - Fixed a correctness issue in URL handling. (CVE-2020-12418) DiD + - Unified XUL Platform Mozilla Security Patch Summary: 2 fixed, 4 + defense-in-depth, 10 not applicable. + + -- Ben Stack Tue, 14 Jul 2020 14:28:53 -0400 + palemoon (28.10.0-1+devuan) obs; urgency=medium * This is a development, bugfix and security update. @@ -755,7 +810,7 @@ palemoon (28.1.0~repack-1) obs; urgency=medium - Fixed toolbar styling in toolkit themes. - Fixed viewing the source of a selection. - * Now has full support for gcc-8, so stop forcing gcc-7 build on Buster and + * Now has full support for gcc-8, so stop forcing gcc-7 build on Buster and recent Ubuntus where gcc-8 is default. -- Steven Pusser Mon, 17 Sep 2018 19:05:20 -0700 @@ -834,8 +889,8 @@ palemoon (27.9.4~repack-1~mx17+1) mx; urgency=medium - Prevented various location-based threats. DiD - Fixed a potential vulnerability with plugins being redirected to different origins (CVE-2018-12364). - - Improved the security check for launching executable files - (by association) on Windows from the browser. For users who have (most + - Improved the security check for launching executable files + (by association) on Windows from the browser. For users who have (most likely accidentally) granted a system-wide waiver for opening these kinds of files without being prompted, this permission has been reset. - Fixed an issue with invalid qcms transforms (CVE-2018-12366). @@ -852,13 +907,13 @@ palemoon (27.9.4~repack-1~mx17+1) mx; urgency=medium palemoon (27.9.3~repack-1~mx17+1) mx; urgency=medium * New upstream security update: - + - Changes/fixes: - - (CVE-2017-0381) Ported a patch from libopus upstream. Note, contrary to - that report, the libopus maintainers state they don't believe remote + - (CVE-2017-0381) Ported a patch from libopus upstream. Note, contrary to + that report, the libopus maintainers state they don't believe remote code execution was possible, so this was not a critical patch. - Fixed an issue with task counting in JS GC. - - Fixed a use-after-free in DOMProxyHandler::EnsureExpandoObject (thanks + - Fixed a use-after-free in DOMProxyHandler::EnsureExpandoObject (thanks to Berk Cem Göksel for reporting). -- Steven Pusser Tue, 12 Jun 2018 11:12:06 -0700 @@ -871,18 +926,18 @@ palemoon (27.9.2~repack-1~mx17+1) mx; urgency=medium - We changed the language strings for softblocked items so people will cry less when we do our job. - (CVE-2018-5174) Prevent potential SmartScreen bypass on Windows 10. - - (CVE-2018-5173) Fixed an issue in the Downloads panel improperly - rendering some Unicode characters, allowing for the file name to be - spoofed. This could be used to obscure the file extension of potentially + - (CVE-2018-5173) Fixed an issue in the Downloads panel improperly + rendering some Unicode characters, allowing for the file name to be + spoofed. This could be used to obscure the file extension of potentially executable files from user view in the panel. - (CVE-2018-5177) Fixed a vulnerability in the XSLT component leading to a buffer overflow and crash if it occurs. - - (CVE-2018-5159) Fixed an integer overflow vulnerability in the Skia + - (CVE-2018-5159) Fixed an integer overflow vulnerability in the Skia library resulting in possible out-of-bounds writes. - (CVE-2018-5154) Fixed a use-after-free vulnerability while enumerating attributes during SVG animations with clip paths. - - (CVE-2018-5178) Fixed a buffer overflow during UTF8 to Unicode string - conversion within JavaScript with extremely large amounts of data. This + - (CVE-2018-5178) Fixed a buffer overflow during UTF8 to Unicode string + conversion within JavaScript with extremely large amounts of data. This vulnerability requires the use of a malicious or vulnerable extension in order to occur. - Fixed several stability issues (crashes) and memory safety hazards. diff --git a/palemoon/debian/control b/palemoon/debian/control index e9fa32b..e532400 100644 --- a/palemoon/debian/control +++ b/palemoon/debian/control @@ -8,21 +8,17 @@ Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), - libfontconfig-dev, libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, - lsb-release, mesa-common-dev, pkg-config, python (>= 2.7), unzip, yasm (>= 1.1), zip, - zlib1g-dev, -# libfontconfig-dev only added for Debian OBS which is choking as of 2020-04 on libfontconfig-dev | libfontconfig1-dev for deps: libgtk-3-dev, libpango1.0-dev, libcairo2-dev, libxft-dev Standards-Version: 3.9.6 Homepage: http://www.palemoon.org/ @@ -30,7 +26,7 @@ Package: palemoon Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libavcodec54 | libavcodec-extra54 |libavcodec55 | libavcodec-extra55 | libavcodec56 | libavcodec-extra56 | libavcodec57 | libavcodec-extra57 | libavcodec58 | libavcodec-extra58 | libavcodec-ffmpeg56 | libavcodec-ffmpeg-extra56 -Provides: x-www-browser +Provides: gnome-www-browser, www-browser, x-www-browser Conflicts: palemoon-nonsse2 Replaces: palemoon-nonsse2 Description: Firefox-based, efficient and easy to use web browser diff --git a/palemoon/debian/palemoon_devuan.dsc b/palemoon/debian/palemoon_devuan.dsc index 3e314ec..e373faf 100644 --- a/palemoon/debian/palemoon_devuan.dsc +++ b/palemoon/debian/palemoon_devuan.dsc @@ -2,11 +2,11 @@ Format: 3.0 (quilt) Source: palemoon Binary: palemoon Architecture: any -Version: 28.10.0-1+devuan +Version: 28.11.0-1+devuan Maintainer: B Stack Homepage: http://www.palemoon.org/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, lsb-release, mesa-common-dev, pkg-config, python (>= 2.7), unzip, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev +Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python (>= 2.7), unzip, yasm (>= 1.1), zip Package-List: palemoon deb web optional arch=any Files: diff --git a/palemoon/debian/patches/fix_arm_FTBFS.patch b/palemoon/debian/patches/fix_arm_FTBFS.patch new file mode 100644 index 0000000..a8b1582 --- /dev/null +++ b/palemoon/debian/patches/fix_arm_FTBFS.patch @@ -0,0 +1,78 @@ +Description: Fix build failure on armhf arch +Author: Steven Pusser +Last-Update: 2020-06-09 + +--- palemoon-28.10.0.orig/platform/js/src/wasm/WasmBaselineCompile.cpp ++++ palemoon-28.10.0/platform/js/src/wasm/WasmBaselineCompile.cpp +@@ -3391,7 +3391,7 @@ class BaseCompiler + #ifdef JS_CODEGEN_ARM + void + loadI32(MemoryAccessDesc access, bool isSigned, RegI32 ptr, Register rt) { +- if (access.byteSize() > 1 && IsUnaligned(ins->access())) { ++ if (access.byteSize() > 1 && IsUnaligned(access)) { + masm.add32(HeapReg, ptr.reg); + SecondScratchRegisterScope scratch(*this); + masm.emitUnalignedLoad(isSigned, access.byteSize(), ptr.reg, scratch, rt, 0); +@@ -3405,7 +3405,7 @@ class BaseCompiler + + void + storeI32(MemoryAccessDesc access, RegI32 ptr, Register rt) { +- if (access.byteSize() > 1 && IsUnaligned(ins->access())) { ++ if (access.byteSize() > 1 && IsUnaligned(access)) { + masm.add32(HeapReg, ptr.reg); + masm.emitUnalignedStore(access.byteSize(), ptr.reg, rt, 0); + } else { +@@ -3419,7 +3419,7 @@ class BaseCompiler + + void + loadI64(MemoryAccessDesc access, RegI32 ptr, RegI64 dest) { +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + masm.add32(HeapReg, ptr.reg); + SecondScratchRegisterScope scratch(*this); + masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, dest.reg.low, +@@ -3440,7 +3440,7 @@ class BaseCompiler + + void + storeI64(MemoryAccessDesc access, RegI32 ptr, RegI64 src) { +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + masm.add32(HeapReg, ptr.reg); + masm.emitUnalignedStore(ByteSize(4), ptr.reg, src.reg.low, 0); + masm.emitUnalignedStore(ByteSize(4), ptr.reg, src.reg.high, 4); +@@ -3459,7 +3459,7 @@ class BaseCompiler + void + loadF32(MemoryAccessDesc access, RegI32 ptr, RegF32 dest, RegI32 tmp1) { + masm.add32(HeapReg, ptr.reg); +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + SecondScratchRegisterScope scratch(*this); + masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, tmp1.reg, 0); + masm.ma_vxfer(tmp1.reg, dest.reg); +@@ -3473,7 +3473,7 @@ class BaseCompiler + void + storeF32(MemoryAccessDesc access, RegI32 ptr, RegF32 src, RegI32 tmp1) { + masm.add32(HeapReg, ptr.reg); +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + masm.ma_vxfer(src.reg, tmp1.reg); + masm.emitUnalignedStore(ByteSize(4), ptr.reg, tmp1.reg, 0); + } else { +@@ -3486,7 +3486,7 @@ class BaseCompiler + void + loadF64(MemoryAccessDesc access, RegI32 ptr, RegF64 dest, RegI32 tmp1, RegI32 tmp2) { + masm.add32(HeapReg, ptr.reg); +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + SecondScratchRegisterScope scratch(*this); + masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, tmp1.reg, 0); + masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, tmp2.reg, 4); +@@ -3501,7 +3501,7 @@ class BaseCompiler + void + storeF64(MemoryAccessDesc access, RegI32 ptr, RegF64 src, RegI32 tmp1, RegI32 tmp2) { + masm.add32(HeapReg, ptr.reg); +- if (IsUnaligned(ins->access())) { ++ if (IsUnaligned(access)) { + masm.ma_vxfer(src.reg, tmp1.reg, tmp2.reg); + masm.emitUnalignedStore(ByteSize(4), ptr.reg, tmp1.reg, 0); + masm.emitUnalignedStore(ByteSize(4), ptr.reg, tmp2.reg, 4); diff --git a/palemoon/debian/patches/series b/palemoon/debian/patches/series index 054d3bf..0a417be 100644 --- a/palemoon/debian/patches/series +++ b/palemoon/debian/patches/series @@ -1,3 +1,4 @@ small-icons.patch bgstack15-palemoon.patch pm-devuan.patch +fix_arm_FTBFS.patch diff --git a/palemoon/debian/rules b/palemoon/debian/rules index 5705c90..d970f5e 100755 --- a/palemoon/debian/rules +++ b/palemoon/debian/rules @@ -4,6 +4,7 @@ export SHELL=/bin/bash ## borrowed from stevepusser's logic ## Build with gcc-8 on Buster (beowulf/ceres) +## If you enable this, then d/control needs lsb-release as a build dependency. #distrelease := $(shell lsb_release -cs) #ifeq ($(distrelease),$(filter $(distrelease),buster beowulf/ceres)) #export CC=gcc-8 -- cgit From 73df46c30ed676ec02fee2f09f04e5e592402a28 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 23 Jul 2020 10:17:55 -0400 Subject: use lsb_release = sid for -j1 compile flag --- palemoon/debian/mozconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'palemoon/debian') diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig index 6513132..d1ceb6f 100644 --- a/palemoon/debian/mozconfig +++ b/palemoon/debian/mozconfig @@ -50,6 +50,10 @@ ac_add_options --enable-alsa # primarily for 32-bit but tolerated for 64-bit ac_add_options --x-libraries=/usr/lib -# TESTING FOR OBS +if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then +# single-threaded for sid because of jobserver problem in OBS +mk_add_options MOZ_MAKE_FLAGS="-j1" +else # limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread) mk_add_options MOZ_MAKE_FLAGS="-j4" +fi -- cgit From 11d48d201e5c4f2d63f26d18a7b33e53cbc3ef21 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 23 Jul 2020 10:21:13 -0400 Subject: require lsb-release for lsb_release command --- palemoon/debian/control | 1 + palemoon/debian/palemoon_devuan.dsc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'palemoon/debian') diff --git a/palemoon/debian/control b/palemoon/debian/control index e532400..862f239 100644 --- a/palemoon/debian/control +++ b/palemoon/debian/control @@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 12), libssl-dev, libx11-xcb-dev, libxt-dev, + lsb-release, mesa-common-dev, pkg-config, python (>= 2.7), diff --git a/palemoon/debian/palemoon_devuan.dsc b/palemoon/debian/palemoon_devuan.dsc index e373faf..40684b0 100644 --- a/palemoon/debian/palemoon_devuan.dsc +++ b/palemoon/debian/palemoon_devuan.dsc @@ -6,7 +6,7 @@ Version: 28.11.0-1+devuan Maintainer: B Stack Homepage: http://www.palemoon.org/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python (>= 2.7), unzip, yasm (>= 1.1), zip +Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, lsb-release, mesa-common-dev, pkg-config, python (>= 2.7), unzip, yasm (>= 1.1), zip Package-List: palemoon deb web optional arch=any Files: -- cgit From fba4407a782eb5c718f7d65e00e134039e1b5e09 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 23 Jul 2020 11:51:30 -0400 Subject: do only an export in the shell "if" statement --- palemoon/debian/mozconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'palemoon/debian') diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig index d1ceb6f..93f26cd 100644 --- a/palemoon/debian/mozconfig +++ b/palemoon/debian/mozconfig @@ -52,8 +52,9 @@ ac_add_options --x-libraries=/usr/lib if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then # single-threaded for sid because of jobserver problem in OBS -mk_add_options MOZ_MAKE_FLAGS="-j1" +export JCOUNT=1 else # limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread) -mk_add_options MOZ_MAKE_FLAGS="-j4" +export JCOUNT=4 fi +mk_add_options MOZ_MAKE_FLAGS="-j${JCOUNT}" -- cgit From bafbb8d345bd2ee9fd67fbd3618b94758ea7f10a Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 23 Jul 2020 14:02:42 -0400 Subject: try new layout for mozconfig for -j flag --- palemoon/debian/mozconfig | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'palemoon/debian') diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig index 93f26cd..3b78f53 100644 --- a/palemoon/debian/mozconfig +++ b/palemoon/debian/mozconfig @@ -1,3 +1,11 @@ +if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then +# single-threaded for sid because of jobserver problem in OBS +export JCOUNT=1 +else +# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread) +export JCOUNT=4 +fi + mk_add_options AUTOCLOBBER=1 export BUILDING_RELEASE=1 export MC_OFFICIAL=1 @@ -50,11 +58,4 @@ ac_add_options --enable-alsa # primarily for 32-bit but tolerated for 64-bit ac_add_options --x-libraries=/usr/lib -if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then -# single-threaded for sid because of jobserver problem in OBS -export JCOUNT=1 -else -# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread) -export JCOUNT=4 -fi -mk_add_options MOZ_MAKE_FLAGS="-j${JCOUNT}" +mk_add_options MOZ_MAKE_FLAGS=-j${JCOUNT} -- cgit From 917a213b9cc2488a553951f7dfe9f4133c756100 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 23 Jul 2020 14:21:46 -0400 Subject: adjust mozconfig again --- palemoon/debian/mozconfig | 2 -- 1 file changed, 2 deletions(-) (limited to 'palemoon/debian') diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig index 3b78f53..89b2796 100644 --- a/palemoon/debian/mozconfig +++ b/palemoon/debian/mozconfig @@ -1,8 +1,6 @@ if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then -# single-threaded for sid because of jobserver problem in OBS export JCOUNT=1 else -# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread) export JCOUNT=4 fi -- cgit From 51735f7a03d9f1e83ed3410b0174dd07ce63b4bb Mon Sep 17 00:00:00 2001 From: B Stack Date: Sun, 26 Jul 2020 15:22:13 -0400 Subject: try export MOZCONFIG in d/rules --- palemoon/debian/mozconfig | 9 ++----- palemoon/debian/mozconfig-unstable | 55 ++++++++++++++++++++++++++++++++++++++ palemoon/debian/rules | 9 ++++--- 3 files changed, 63 insertions(+), 10 deletions(-) create mode 100644 palemoon/debian/mozconfig-unstable (limited to 'palemoon/debian') diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig index 89b2796..445c209 100644 --- a/palemoon/debian/mozconfig +++ b/palemoon/debian/mozconfig @@ -1,9 +1,3 @@ -if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then -export JCOUNT=1 -else -export JCOUNT=4 -fi - mk_add_options AUTOCLOBBER=1 export BUILDING_RELEASE=1 export MC_OFFICIAL=1 @@ -56,4 +50,5 @@ ac_add_options --enable-alsa # primarily for 32-bit but tolerated for 64-bit ac_add_options --x-libraries=/usr/lib -mk_add_options MOZ_MAKE_FLAGS=-j${JCOUNT} +# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread) +mk_add_options MOZ_MAKE_FLAGS="-j4" diff --git a/palemoon/debian/mozconfig-unstable b/palemoon/debian/mozconfig-unstable new file mode 100644 index 0000000..aa04e06 --- /dev/null +++ b/palemoon/debian/mozconfig-unstable @@ -0,0 +1,55 @@ +mk_add_options AUTOCLOBBER=1 +export BUILDING_RELEASE=1 +export MC_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +export MC_PALEMOON=1 + +#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/pmbuild + +ac_add_options --enable-application=palemoon +ac_add_options --enable-official-branding +ac_add_options --enable-official-vendor + +# Disable add-ons signing +# Disable checking that add-ons are signed by the trusted root +MOZ_ADDON_SIGNING= +# Disable enforcing that add-ons are signed by the trusted root +MOZ_REQUIRE_SIGNING= + +# Standard +# Enables +ac_add_options --enable-av1 +ac_add_options --enable-optimize="-O2 -Wl,--no-keep-memory -Wl,--reduce-memory-overhead" +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-devtools +ac_add_options --enable-jemalloc +ac_add_options --with-pthreads +ac_add_options --enable-strip +# Disables +ac_add_options --disable-debug +ac_add_options --disable-eme +ac_add_options --disable-gamepad +ac_add_options --disable-necko-wifi +ac_add_options --disable-tests +ac_add_options --disable-updater +ac_add_options --disable-webrtc +# Disable temeletry +export MOZ_TELEMETRY_REPORTING= +ac_add_options --disable-crashreporter +ac_add_options --disable-parental-controls +ac_add_options --disable-accessibility + +# Debian style +ac_add_options --prefix=/usr +# Devuan style +ac_add_options --disable-dbus +ac_add_options --disable-pulseaudio +# even though this is redundant +ac_add_options --enable-alsa + +# primarily for 32-bit but tolerated for 64-bit +ac_add_options --x-libraries=/usr/lib + +# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread) +# single-threaded for Devuan unstable +mk_add_options MOZ_MAKE_FLAGS="-j1" diff --git a/palemoon/debian/rules b/palemoon/debian/rules index d970f5e..0a5c388 100755 --- a/palemoon/debian/rules +++ b/palemoon/debian/rules @@ -13,6 +13,12 @@ export SHELL=/bin/bash #export LD=gcc-8 #endif +export MOZCONFIG=debian/mozconfig +distrelease := $(shell lsb_release -cs) +ifeq ($(distrelease),$(filter $(distrelease),sid unstable ceres)) +export MOZCONFIG=debian/mozconfig-unstable +endif + %: dh $@ @@ -21,9 +27,6 @@ override_dh_auto_clean: dh_auto_clean find . -name '*.pyc' -delete -override_dh_auto_configure: - cp debian/mozconfig mozconfig - override_dh_auto_build: make -f client.mk build -- cgit From 636b72557da275708a65d32cf9d30acfcd89c485 Mon Sep 17 00:00:00 2001 From: B Stack Date: Sun, 26 Jul 2020 20:02:14 -0400 Subject: use dh_auto_configure for MCFILE --- palemoon/debian/rules | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'palemoon/debian') diff --git a/palemoon/debian/rules b/palemoon/debian/rules index 0a5c388..2efbbcf 100755 --- a/palemoon/debian/rules +++ b/palemoon/debian/rules @@ -13,10 +13,10 @@ export SHELL=/bin/bash #export LD=gcc-8 #endif -export MOZCONFIG=debian/mozconfig +export MCFILE=debian/mozconfig distrelease := $(shell lsb_release -cs) ifeq ($(distrelease),$(filter $(distrelease),sid unstable ceres)) -export MOZCONFIG=debian/mozconfig-unstable +export MCFILE=debian/mozconfig-unstable endif %: @@ -27,6 +27,9 @@ override_dh_auto_clean: dh_auto_clean find . -name '*.pyc' -delete +override_dh_auto_configure: + cp ${MCFILE} mozconfig + override_dh_auto_build: make -f client.mk build -- cgit