8 files changed, 47 insertions, 31 deletions
diff --git a/newmoon/debian/_service b/newmoon/debian/_service
index e506ded..f12358a 100644
--- a/newmoon/debian/_service
+++ b/newmoon/debian/_service
@@ -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">33.0.0_Release</param>
+      <param name="revision">33.1.1_Release</param>
       <param name="version">_none_</param>
       <param name="submodules">enable</param>
    </service>
diff --git a/newmoon/debian/changelog b/newmoon/debian/changelog
index 875e2e4..3eac304 100644
--- a/newmoon/debian/changelog
+++ b/newmoon/debian/changelog
@@ -1,3 +1,19 @@
+newmoon (33.1.1-1+stackrpms) obs; urgency
+
+  * Upstream updates
+    * Made the nonce length for http digest auth configurable.
+    * Fixed various potential issues with font loading, parsing and
+      handling.
+    * Cleaned up error reporting for workers and normalized error messages.
+    * Security issues addressed: CVE-2024-4772 DiD, CVE-2024-4771,
+      CVE-2024-4769 and CVE-2024-4770.
+    * We've switched back to an older toolchain (17.3) for compiling 32-bit
+      Windows binaries (again) to hopefully address some of the intermittent
+      stability issues people continued to have on later Microsoft compiler
+      versions when running on older hardware.
+
+ -- B. Stack <bgstack15@gmail.com>  Fri, 21 Jun 2024 08:57:44 -0400
+
 newmoon (33.0.0-1+stackrpms) obs; urgency=medium
 
   * remove obsolete ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch
diff --git a/newmoon/debian/compare-stevenpusser.sh b/newmoon/debian/compare-stevenpusser.sh
new file mode 100755
index 0000000..9d5f187
--- /dev/null
+++ b/newmoon/debian/compare-stevenpusser.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Startdate: 2024-06-20-5 21:11
+# Purpose: oneliner to pull down stevenpusser's latest debian.tar.xz
+# Dependencies:
+#    obs-dl, my custom script
+# REAL https://build.opensuse.org/source/home:stevenpusser/palemoon/palemoon_33.1.1-1.gtk2.debian.tar.xz
+#      https://build.opensuse.org/package/show/home:stevenpusser/palemoon/palemoon_33_1_1-1_gtk2_debian.tar.xz
+inpage="https://build.opensuse.org/package/show/home:stevenpusser/palemoon"
+prefix="https://build.opensuse.org/source/home:stevenpusser/palemoon/"
+workdir=/usr/src/newmoon/
+
+# process
+# Improve: check if file exists already. if already exists, skip the download
+output="$( curl -L "${inpage}" )"
+debian_tar_xz_file="$( echo "${output}" | awk -F"'" '/tr id=.file-.*debian_tar_xz/{gsub("file-","",$2);gsub("_",".",$2);gsub("palemoon.","palemoon_",$2);print $2}' )"
+cd "${workdir}"
+# sometimes OBS gets hung up and never answers, so just cancel out after so long.
+timeout 10 obs-dl "${prefix%%/}/${debian_tar_xz_file}"
+tar -Jxf "${debian_tar_xz_file}"
+diff -aur /usr/src/newmoon/debian ~/dev/stackrpms/newmoon/debian > ~/foo-sp1
+echo "# Now run:"
+echo "vi ~/foo-sp1 ${workdir%%/}/debian/* ~/dev/stackrpms/newmoon/debian/*"
diff --git a/newmoon/debian/control b/newmoon/debian/control
index cb9cd4f..02d176f 100644
--- a/newmoon/debian/control
+++ b/newmoon/debian/control
@@ -19,6 +19,9 @@ Build-Depends: debhelper (>= 12),
    unzip,
    yasm (>= 1.1),
    zip,
+# Differences from stevenpusser:
+# we do not use libdbus-1-dev, redundant
+# libgconf2-dev, obsolete and disused
 #   libffi-dev,
 #   libssl-dev,
 #   libpixman-1-dev | libpixman-dev,
diff --git a/newmoon/debian/make.mk b/newmoon/debian/make.mk
deleted file mode 100644
index d53af62..0000000
--- a/newmoon/debian/make.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-lazy = $(eval $(1) = $$(if $$(___$(1)),,$$(eval ___$(1) := $(2)))$$(___$(1)))
-letters = a b c d e f g h i j k l m n o p q r s t u v w x y z
-lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))
-uc = $(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,$(subst f,F,$(subst g,G,$(subst h,H,$(subst i,I,$(subst j,J,$(subst k,K,$(subst l,L,$(subst m,M,$(subst n,N,$(subst o,O,$(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,$(subst z,Z,$1))))))))))))))))))))))))))
-
-__VARS := $(.VARIABLES)
-
-dump:
-	@$(foreach var,$(sort $(filter-out $(__VARS) __VARS preprocess system_lib ___%,$(.VARIABLES))),echo '$(var) = $(subst ','\'',$(subst \,\\,$($(var))))';)
-
-dump-%:
-	@echo $($*)
-
-.PHONY: dump
diff --git a/newmoon/debian/mozconfig b/newmoon/debian/mozconfig
index 61a7e75..e6e85a5 100644
--- a/newmoon/debian/mozconfig
+++ b/newmoon/debian/mozconfig
@@ -71,4 +71,8 @@ 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"
 
+# Allow packager to specify number of build threads in the build command:
+PARALLEL_BUILD=$(echo $DEB_BUILD_OPTIONS | sed -e '/parallel=/!s/.*/1/;s/.*parallel=\([0-9]\+\).*/\1/g')
+mk_add_options MOZ_MAKE_FLAGS="-j$PARALLEL_BUILD"
+
 #export MOZ_PKG_SPECIAL=gtk2
diff --git a/newmoon/debian/newmoon+stackrpms.dsc b/newmoon/debian/newmoon+stackrpms.dsc
index 62a6a81..2a82e10 100644
--- a/newmoon/debian/newmoon+stackrpms.dsc
+++ b/newmoon/debian/newmoon+stackrpms.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: newmoon
 Binary: newmoon
 Architecture: any
-Version: 33.0.0-1+stackrpms
+Version: 33.1.1-1+stackrpms
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: http://www.palemoon.org/
 Standards-Version: 4.1.4
diff --git a/newmoon/debian/rules b/newmoon/debian/rules
index 6f11f13..759d52d 100755
--- a/newmoon/debian/rules
+++ b/newmoon/debian/rules
@@ -8,21 +8,6 @@ MOZCONFIGFILE = debian/mozconfig
 # stackrpms,2 just do not need lsb_release
 #distrel := $(shell lsb_release --codename --short)
 
-# Reduce memory usage of the linker at the expense of processing time
-# This should help on lower-end architectures like arm and mips, which
-# spend an immense amount of time swapping.
-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
-
-ifneq (,$(filter $(DEB_HOST_ARCH), armhf))
-	export DEB_CFLAGS_MAINT_APPEND = -mfpu=neon -funsafe-math-optimizations
-	export DEB_CXXFLAGS_MAINT_APPEND = -mfpu=neon -funsafe-math-optimizations
-endif
-
 #stackrpms,7-->1 I do not need this distrel logic
 
 %: