summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--newmoon/debian/_service4
-rw-r--r--newmoon/debian/changelog23
-rw-r--r--newmoon/debian/control7
-rw-r--r--newmoon/debian/mozconfig16
-rw-r--r--newmoon/debian/newmoon+stackrpms.dsc4
-rw-r--r--newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch78
-rw-r--r--newmoon/debian/patches/fix-armhf-FTBFS.patch20
-rw-r--r--newmoon/debian/patches/pm-devuan.patch26
-rw-r--r--newmoon/debian/patches/series4
-rwxr-xr-xnewmoon/debian/rules8
10 files changed, 157 insertions, 33 deletions
diff --git a/newmoon/debian/_service b/newmoon/debian/_service
index d1ee13f..f6b9f70 100644
--- a/newmoon/debian/_service
+++ b/newmoon/debian/_service
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm">
<param name="scm">git</param>
- <param name="url">https://gitlab.com/bgstack15/stackrpms.git</param>
+ <param name="url">https://bgstack15.ddns.net/cgit/stackrpms</param>
<param name="subdir">newmoon/debian</param>
<param name="filename">debian</param>
<param name="revision">newmoon-bump</param>
@@ -14,7 +14,7 @@
<service name="tar_scm">
<param name="scm">git</param>
<param name="url">https://repo.palemoon.org/MoonchildProductions/Pale-Moon.git</param>
- <param name="revision">32.1.0_Release</param>
+ <param name="revision">32.5.2_Release</param>
<param name="version">_none_</param>
<param name="submodules">enable</param>
</service>
diff --git a/newmoon/debian/changelog b/newmoon/debian/changelog
index 0be2e43..7918cc9 100644
--- a/newmoon/debian/changelog
+++ b/newmoon/debian/changelog
@@ -1,3 +1,26 @@
+newmoon (32.5.2-1+stackrpms) obs; urgency=medium
+
+ * Bugfix and security update:
+ - Removed the standard Twitter/X user-agent override because they decided
+ to block us on it.
+ - Added preferences for the user to control whether or not the tab page
+ title should be included in the window title or not. In Private Browsing
+ mode, the default is now to not show the title in the window. This was
+ done to avoid potential leakage to system logs (e.g. GNOME shell logs or
+ Windows event logs) of websites visited through the recorded window
+ title. The new preferences are privacy.exposeContentTitleInWindow and
+ privacy.exposeContentTitleInWindow.pbm for normal mode and Private
+ Browsing mode, respectively.
+ - Fixed several crashes in DOM and relating to dynamic JavaScript
+ module imports.
+ - Removed a restriction on Fetch preflight redirects, following a spec
+ update.
+ - Improved the handling of web workers if they get aborted mid-action.
+ - Security issues addressed: CVE-2023-6863, CVE-2023-6858 and several
+ others that do not have a CVE number.
+
+ -- B. Stack <bgstack15@gmail.com> Fri, 26 Jan 2024 19:50:47 -0500
+
newmoon (32.1.0-1+stackrpms) obs; urgency=low
* Shadow DOM and CustomElements, collectively making up WebComponents,
diff --git a/newmoon/debian/control b/newmoon/debian/control
index d2604b5..cb9cd4f 100644
--- a/newmoon/debian/control
+++ b/newmoon/debian/control
@@ -1,15 +1,16 @@
Source: newmoon
Section: web
Priority: optional
-Maintainer: B Stack <bgstack15@gmail.com>
+Maintainer: B. Stack <bgstack15@gmail.com>
Bugs: mailto: <bgstack15@gmail.com>
Build-Depends: debhelper (>= 12),
autoconf2.13,
g++ (>= 7),
libasound2-dev,
libdbus-glib-1-dev (>= 0.60),
- libgconf2-dev (>= 1.2.1),
- libgtk2.0-dev (>= 2.14),
+ libfontconfig1-dev,
+ libgtk2.0-dev (>= 2.18),
+ libpulse-dev,
libx11-xcb-dev,
libxt-dev,
mesa-common-dev,
diff --git a/newmoon/debian/mozconfig b/newmoon/debian/mozconfig
index aa24383..61a7e75 100644
--- a/newmoon/debian/mozconfig
+++ b/newmoon/debian/mozconfig
@@ -8,15 +8,16 @@ export MOZ_NOSPAM=1
# If you want to control where the built objects go
#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/pmbuild
+# Official Pale Moon branding. Please see https://www.palemoon.org/redist.shtml
+# for restrictions when using the official branding.
ac_add_options --enable-application=palemoon
ac_add_options --disable-official-branding
ac_add_options --enable-official-vendor
-# Standard
-# Enables
+# Standard, approved Pale Moon build options.
+# Enable stuff
ac_add_options --enable-av1
ac_add_options --enable-optimize="-O2 -w"
-# accepts either gtk2 or gtk3 here, but gtk2 is only officially supported option
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --enable-devtools
ac_add_options --enable-jemalloc
@@ -24,12 +25,11 @@ ac_add_options --enable-jxl
ac_add_options --with-pthreads
ac_add_options --enable-strip
-# Disables
+# Disable stuff
# disable-debug-symbols removes the ability to do a stack trace. I do not do any stack traces anyways. ?f=5&t=28254
ac_add_options --disable-debug-symbols
ac_add_options --disable-debug
-ac_add_options --disable-debug
-ac_add_options --disable-eme
+#ac_add_options --disable-eme
ac_add_options --disable-gamepad
ac_add_options --disable-necko-wifi
ac_add_options --disable-tests
@@ -48,7 +48,7 @@ ac_add_options --x-libraries=/usr/lib
ac_add_options --prefix=/usr
# Devuan style
ac_add_options --disable-dbus
-ac_add_options --disable-pulseaudio
+#ac_add_options --disable-pulseaudio
# even though this is redundant
ac_add_options --enable-alsa
@@ -71,4 +71,4 @@ ac_add_options --disable-personas
# Debian Sid/Devuan Ceres; 2020-07 only -j1 works due to a bug.
#mk_add_options MOZ_MAKE_FLAGS="-j1"
-export MOZ_PKG_SPECIAL=gtk2
+#export MOZ_PKG_SPECIAL=gtk2
diff --git a/newmoon/debian/newmoon+stackrpms.dsc b/newmoon/debian/newmoon+stackrpms.dsc
index d06db01..f4decea 100644
--- a/newmoon/debian/newmoon+stackrpms.dsc
+++ b/newmoon/debian/newmoon+stackrpms.dsc
@@ -2,11 +2,11 @@ Format: 3.0 (quilt)
Source: newmoon
Binary: newmoon
Architecture: any
-Version: 32.1.0-1+stackrpms
+Version: 32.5.2-1+stackrpms
Maintainer: B. Stack <bgstack15@gmail.com>
Homepage: http://www.palemoon.org/
Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 12), gcc (<< 11) | gcc-10, g++ (<< 11) | g++-10, autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7) | python2.7, unzip, yasm (>= 1.1), zip
+Build-Depends: debhelper (>= 12), gcc (<< 11) | gcc-10, g++ (<< 11) | g++-10, autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libfontconfig1-dev, libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libpulse-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7) | python2.7, unzip, yasm (>= 1.1), zip
Package-List:
newmoon deb web optional arch=any
Files:
diff --git a/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch b/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch
new file mode 100644
index 0000000..2929219
--- /dev/null
+++ b/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch
@@ -0,0 +1,78 @@
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
+ instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+Signed-off-by: James Almer <jamrial@gmail.com>
+---
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+Source: https://git.videolan.org/?p=ffmpeg.git;a=patch;h=effadce6c756247ea8bae32dc13bb3e6f464f0eb
+
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
+index 6298f5ed19..ca7e2dffc1 100644
+--- a/platform/media/ffvpx/libavcodec/x86/mathops.h
++++ b/platform/media/ffvpx/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+ int rt, dummy;
++ if (__builtin_constant_p(shift))
+ __asm__ (
+ "imull %3 \n\t"
+ "shrdl %4, %%edx, %%eax \n\t"
+ :"=a"(rt), "=d"(dummy)
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
+ );
++ else
++ __asm__ (
++ "imull %3 \n\t"
++ "shrdl %4, %%edx, %%eax \n\t"
++ :"=a"(rt), "=d"(dummy)
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
++ );
+ return rt;
+ }
+
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("sarl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("sarl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("shrl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("shrl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+--
+2.30.2
+
diff --git a/newmoon/debian/patches/fix-armhf-FTBFS.patch b/newmoon/debian/patches/fix-armhf-FTBFS.patch
new file mode 100644
index 0000000..e15be32
--- /dev/null
+++ b/newmoon/debian/patches/fix-armhf-FTBFS.patch
@@ -0,0 +1,20 @@
+--- palemoon-32.4.1.orig/platform/js/src/jit/arm/MacroAssembler-arm.cpp
++++ palemoon-32.4.1/platform/js/src/jit/arm/MacroAssembler-arm.cpp
+@@ -3013,7 +3013,7 @@ MacroAssemblerARMCompat::testInt32(Condi
+ return cond;
+ }
+
+-+Assembler::Condition
++Assembler::Condition
+ MacroAssemblerARMCompat::testBigInt(Condition cond,const BaseIndex& src)
+ {
+ MOZ_ASSERT(cond == Equal || cond == NotEqual);
+@@ -3766,7 +3766,7 @@ MacroAssemblerARMCompat::testStringTruth
+ return truthy ? Assembler::NotEqual : Assembler::Equal;
+ }
+
+-+Assembler::Condition
++Assembler::Condition
+ MacroAssemblerARMCompat::testBigIntTruthy(bool truthy, const ValueOperand& value)
+ {
+ Register bi = value.payloadReg();
diff --git a/newmoon/debian/patches/pm-devuan.patch b/newmoon/debian/patches/pm-devuan.patch
index 97d7471..cff8e26 100644
--- a/newmoon/debian/patches/pm-devuan.patch
+++ b/newmoon/debian/patches/pm-devuan.patch
@@ -1,6 +1,5 @@
-diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul Pale-Moon-28.9.0.2_Release-new/palemoon/base/content/aboutDialog.xul
---- Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul 2020-03-25 09:49:13.000000000 -0400
-+++ Pale-Moon-28.9.0.2_Release-new/palemoon/base/content/aboutDialog.xul 2020-05-05 09:12:48.776096853 -0400
+--- a/palemoon/base/content/aboutDialog.xul
++++ b/palemoon/base/content/aboutDialog.xul
@@ -39,9 +39,9 @@
<vbox id="aboutHeaderBox" />
<vbox id="aboutVersionBox" flex="3">
@@ -17,26 +16,24 @@ diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul Pale
#ifdef MC_PRIVATE_BUILD
This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
#else
-- <label class="text-link" href="http://www.palemoon.org">Pale Moon</label> is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
-+ This build of newmoon is released by custom.
+- <label class="text-link" href="http://www.palemoon.org">Pale Moon</label> is released by Moonchild Productions.
++ This build of newmoon is released by stackrpms.
</description>
<description class="text-credits text-center">
Special thanks to all our supporters and donors for making this browser possible!
-diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/content/aboutDialog.css Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/content/aboutDialog.css
---- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/content/aboutDialog.css 2020-03-25 09:49:13.000000000 -0400
-+++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/content/aboutDialog.css 2020-05-05 09:02:38.318463672 -0400
+--- a/palemoon/branding/official/content/aboutDialog.css
++++ b/palemoon/branding/official/content/aboutDialog.css
@@ -21,8 +21,6 @@
- }
#aboutTextBox {
+ position: relative;
- animation: 3s fadeIn;
- animation-fill-mode: forwards;
text-shadow: 1px 1px 0px #9ABCD5;
color: #101020;
}
-diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.dtd Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.dtd
---- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.dtd 2020-03-25 09:49:13.000000000 -0400
-+++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.dtd 2020-05-05 08:28:53.071897555 -0400
+--- a/palemoon/branding/official/locales/en-US/brand.dtd
++++ b/palemoon/branding/official/locales/en-US/brand.dtd
@@ -1,4 +1,4 @@
-<!ENTITY brandShortName "Pale Moon">
-<!ENTITY brandFullName "Pale Moon">
@@ -45,9 +42,8 @@ diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/b
+<!ENTITY brandFullName "newmoon">
+<!ENTITY vendorShortName "custom">
<!ENTITY trademarkInfo.part1 "The Pale Moon logo and project names are trademarks of Moonchild Productions (M.C. Straver BASc). All rights reserved.">
-diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.properties Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.properties
---- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.properties 2020-03-25 09:49:13.000000000 -0400
-+++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.properties 2020-05-05 08:28:07.923487413 -0400
+--- a/palemoon/branding/official/locales/en-US/brand.properties
++++ b/palemoon/branding/official/locales/en-US/brand.properties
@@ -1,5 +1,5 @@
-brandShortName=Pale Moon
-brandFullName=Pale Moon
diff --git a/newmoon/debian/patches/series b/newmoon/debian/patches/series
index 85f30b8..4cd1aab 100644
--- a/newmoon/debian/patches/series
+++ b/newmoon/debian/patches/series
@@ -1,6 +1,6 @@
-# from stevepusser for 29.4.3:
-#revert-mach-file.patch
+fix-armhf-FTBFS.patch
# stackrpms
small-icons.patch
pm-devuan.patch
pm-to-nm.patch
+ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch
diff --git a/newmoon/debian/rules b/newmoon/debian/rules
index 3d4ed6f..6f11f13 100755
--- a/newmoon/debian/rules
+++ b/newmoon/debian/rules
@@ -3,6 +3,8 @@
# Some Debian build tools clear out some variables
export SHELL=/bin/bash
+MOZCONFIGFILE = debian/mozconfig
+
# stackrpms,2 just do not need lsb_release
#distrel := $(shell lsb_release --codename --short)
@@ -12,6 +14,7 @@ export SHELL=/bin/bash
LDFLAGS += -Wl,--reduce-memory-overheads
LDFLAGS += -Wl,--no-keep-memory
+# stackrpms,3 must be legacy and sounds interesting
# Add execution time and memory usage stats in the logs
LDFLAGS += -Wl,--stats
@@ -20,6 +23,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armhf))
export DEB_CXXFLAGS_MAINT_APPEND = -mfpu=neon -funsafe-math-optimizations
endif
+#stackrpms,7-->1 I do not need this distrel logic
+
%:
dh $@
@@ -33,10 +38,11 @@ override_dh_auto_clean:
mv palemoon/branding/unofficial.unbuilt palemoon/branding/unofficial ; \
} || :
+# Don't run the "autoreconfigure by default" added to debhelper >= 10.
override_dh_autoreconf:
override_dh_auto_configure:
- cp debian/mozconfig mozconfig
+ cp $(MOZCONFIGFILE) .
#stackrpms,4
! test -d palemoon/branding/unofficial.unbuilt && { \
cp -pr palemoon/branding/unofficial palemoon/branding/unofficial.unbuilt && \
bgstack15