7 files changed, 85 insertions, 46 deletions
diff --git a/newmoon/debian/changelog b/newmoon/debian/changelog
index 29bf091..ad2863e 100644
--- a/newmoon/debian/changelog
+++ b/newmoon/debian/changelog
@@ -1,3 +1,31 @@
+newmoon (28.15.0-1+devuan) obs; urgency=low
+
+  * This is a standard development and bugfix release.
+    - Implemented support for CSS caret-color.
+    - Implemented support for un-prefixed ::selection CSS pseudo-element styling.
+    - Fixed another potential crashing scenario in ResizeObservers.
+    - Fixed several crashes in the DOM Fetch API.
+    - Fixed a crash in table pagination.
+    - Security issues fixed: CVE-2020-15680 (VG-VD-20-115) and several memory safety hazards.
+    - Unified XUL Platform Mozilla Security Patch Summary: 1 fixed, 2 defense-in-depth, 12 not applicable.
+  * reenable jemalloc to match palemoon.
+  * disable eme to match palemoon.
+  * so now newmoon's only changes are config location and branding.
+
+ -- Ben Stack <bgstack15@gmail.com>  Tue, 27 Oct 2020 20:05:31 -0400
+
+newmoon (28.14.2-3+devuan) obs; urgency=low
+
+  * disable all use-system options to see if stability returns
+
+ -- Ben Stack <bgstack15@gmail.com>  Fri, 23 Oct 2020 14:58:17 -0400
+
+newmoon (28.14.2-2+devuan) obs; urgency=low
+
+  * revert to gtk2 to see if stability returns
+
+ -- Ben Stack <bgstack15@gmail.com>  Fri, 23 Oct 2020 22:40:55 -0400
+
 newmoon (28.14.2-1+devuan) obs; urgency=low
 
   * Update version
diff --git a/newmoon/debian/control b/newmoon/debian/control
index f5f6304..0af5406 100644
--- a/newmoon/debian/control
+++ b/newmoon/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 12),
    libasound2-dev,
    libdbus-glib-1-dev (>= 0.60),
    libgconf2-dev (>= 1.2.1),
-   libgtk-3-dev,
+   libgtk2.0-dev (>= 2.14),
    libssl-dev,
    libx11-xcb-dev,
    libxt-dev,
@@ -18,15 +18,15 @@ Build-Depends: debhelper (>= 12),
    unzip,
    yasm (>= 1.1),
    zip,
-   libffi-dev,
-   libpixman-1-dev | libpixman-dev,
-   libbz2-dev,
-   zlib1g-dev,
-   libjpeg-dev,
-   libnspr-dev | libnspr4-dev,
-   libicu-dev,
-   libhunspell-dev,
-   libsqlite3-dev
+#   libffi-dev,
+#   libpixman-1-dev | libpixman-dev,
+#   libbz2-dev,
+#   zlib1g-dev,
+#   libjpeg-dev,
+#   libnspr-dev | libnspr4-dev,
+#   libicu-dev,
+#   libhunspell-dev,
+#   libsqlite3-dev
 Standards-Version: 3.9.6
 Homepage: http://www.palemoon.org/
 
diff --git a/newmoon/debian/mozconfig b/newmoon/debian/mozconfig
index 097882d..c21b677 100644
--- a/newmoon/debian/mozconfig
+++ b/newmoon/debian/mozconfig
@@ -21,15 +21,15 @@ MOZ_REQUIRE_SIGNING=
 ac_add_options --enable-av1
 ac_add_options --enable-optimize="-O2 -Wl,--no-keep-memory -Wl,--reduce-memory-overhead"
 # accepts either gtk2 or gtk3 here, but gtk2 is only officially supported option
-ac_add_options --enable-default-toolkit=cairo-gtk3
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-devtools
-ac_add_options --disable-jemalloc
+ac_add_options --enable-jemalloc
 ac_add_options --with-pthreads
 ac_add_options --enable-strip
 ac_add_options --enable-phoenix-extensions
 # Disables
 ac_add_options --disable-debug
-ac_add_options --enable-eme
+ac_add_options --disable-eme
 ac_add_options --disable-gamepad
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-tests
@@ -55,18 +55,15 @@ ac_add_options --disable-gnomeui
 ac_add_options --disable-gconf
 ac_add_options --disable-sync
 ac_add_options --disable-personas
-ac_add_options --with-system-ffi
-ac_add_options --with-system-cairo
-ac_add_options --with-system-pixman
-ac_add_options --with-system-bz2
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-#ac_add_options --with-system-nspr
+#ac_add_options --with-system-ffi
+#ac_add_options --with-system-cairo
+#ac_add_options --with-system-pixman
+#ac_add_options --with-system-bz2
+#ac_add_options --with-system-zlib
+#ac_add_options --with-system-jpeg
 # my own research into the codebase
-#ac_add_options --with-system-icu
-ac_add_options --with-system-hunspell
-ac_add_options --with-system-extension-dirs
-#ac_add_options --with-system-sqlite
+#ac_add_options --with-system-hunspell
+#ac_add_options --with-system-extension-dirs
 
 # primarily for 32-bit but tolerated for 64-bit
 ac_add_options --x-libraries=/usr/lib
@@ -75,4 +72,4 @@ ac_add_options --x-libraries=/usr/lib
 # Debian Sid/Devuan Ceres is mildly broken as of 2020-07 and will fail to compile on anything higher than -j1
 mk_add_options MOZ_MAKE_FLAGS="-j1"
 
-export MOZ_PKG_SPECIAL=gtk3
+export MOZ_PKG_SPECIAL=gtk2
diff --git a/newmoon/debian/newmoon+devuan.dsc b/newmoon/debian/newmoon+devuan.dsc
index f382e80..88b504a 100644
--- a/newmoon/debian/newmoon+devuan.dsc
+++ b/newmoon/debian/newmoon+devuan.dsc
@@ -2,11 +2,11 @@ Format: 3.0 (quilt)
 Source: newmoon
 Binary: newmoon
 Architecture: any
-Version: 28.14.2-1+devuan
+Version: 28.15.0-1+devuan
 Maintainer: B Stack <bgstack15@gmail.com>
 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), libgtk-3-dev, libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7), unzip, yasm (>= 1.1), zip, libffi-dev, libpixman-1-dev | libpixman-dev, libbz2-dev, zlib1g-dev, libjpeg-dev, libnspr-dev | libnspr4-dev, libicu-dev, libhunspell-dev, libsqlite3-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, python2 (>= 2.7.18-2~) | python (>= 2.7), unzip, yasm (>= 1.1), zip
 Package-List:
  newmoon deb web optional arch=any
 Files:
diff --git a/newmoon/debian/patches/pm-to-nm.patch b/newmoon/debian/patches/pm-to-nm.patch
index ac7904b..f667644 100644
--- a/newmoon/debian/patches/pm-to-nm.patch
+++ b/newmoon/debian/patches/pm-to-nm.patch
@@ -1,5 +1,5 @@
 Date: 2020-10-01
-Upstream version: 28.14.1
+Upstream version: 28.15.0
 Purpose: Use newmoon branding instead of palemoon
 Message: Some of the changes include using ~/.config/newmoon for the profile location, using "newmoon" branding instead of "palemoon" or "browser", some bookmark tweaks to hide the old branding,
 I used newmoon itself to save a bookmark, and then export the bookmarks to an html file. Then I grabbed the relevant entries and placed them here. Also, I move the "Most Visited" link to bookmarks menu and not on the toolbar.
@@ -29,16 +29,14 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/app/application.ini Pale-Moon-28.1
 \ No newline at end of file
 +#endif
 diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/shared/locales/browserconfig.properties Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/locales/browserconfig.properties
---- Pale-Moon-28.14.1_Release/palemoon/branding/shared/locales/browserconfig.properties	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/locales/browserconfig.properties	2020-10-01 17:14:16.203289213 -0400
-@@ -3,5 +3,5 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
+--- pale-moon.orig/palemoon/branding/shared/locales/browserconfig.properties  2020-10-24 07:14:54.000000000 -0400
++++ pale-moon/palemoon/branding/shared/locales/browserconfig.properties 2020-10-27 20:35:29.301883148 -0400
+@@ -1,3 +1,3 @@
  # Do NOT localize or otherwise change these values
 -browser.startup.homepage=http://start.palemoon.org/
 -browser.startup.homepage_reset=http://start.palemoon.org/
-+browser.startup.homepage=https://start.duckduckgo.com/
-+browser.startup.homepage_reset=https://start.duckduckgo.com/
++browser.startup.homepage=http://start.duckduckgo.com/
++browser.startup.homepage_reset=http://start.duckduckgo.com/
 diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/shared/pref/preferences.inc Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/pref/preferences.inc
 --- Pale-Moon-28.14.1_Release/palemoon/branding/shared/pref/preferences.inc	2020-09-29 17:11:51.000000000 -0400
 +++ Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/pref/preferences.inc	2020-10-01 17:14:16.203289213 -0400
@@ -168,21 +166,36 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/
  
  syncBrandShortName=Sync
 diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/pref/palemoon-branding.js Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/pref/palemoon-branding.js
---- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/pref/palemoon-branding.js	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/pref/palemoon-branding.js	2020-10-01 17:16:43.813154771 -0400
-@@ -3,9 +3,9 @@
- #include ../../shared/pref/preferences.inc
- #include ../../shared/pref/uaoverrides.inc
+--- pale-moon.orig/palemoon/branding/unofficial/pref/palemoon-branding.js	2020-10-24 07:14:54.000000000 -0400
++++ pale-moon/palemoon/branding/unofficial/pref/palemoon-branding.js	2020-10-27 21:06:40.837761688 -0400
+@@ -18,18 +18,18 @@
+ pref("image.mem.max_ms_before_yield", 50);
+ pref("image.mem.decode_bytes_at_a_time", 65536);
  
+-pref("services.sync.serverURL","https://pmsync.palemoon.org/sync/index.php/");
+-pref("services.sync.jpake.serverURL","https://keyserver.palemoon.org/");
+-pref("services.sync.termsURL", "http://www.palemoon.org/sync/terms.shtml");
+-pref("services.sync.privacyURL", "http://www.palemoon.org/sync/privacy.shtml");
+-pref("services.sync.statusURL", "https://pmsync.palemoon.org/status/");
+-pref("services.sync.syncKeyHelpURL", "http://www.palemoon.org/sync/help/recoverykey.shtml");
++pref("services.sync.serverURL","https://example.com/sync/index.php/");
++pref("services.sync.jpake.serverURL","https://example.com/");
++pref("services.sync.termsURL", "https://example.com/sync/terms.shtml");
++pref("services.sync.privacyURL", "https://example.com/sync/privacy.shtml");
++pref("services.sync.statusURL", "https://example.com/status/");
++pref("services.sync.syncKeyHelpURL", "https://example.com/sync/help/recoverykey.shtml");
+ pref("services.sync.APILevel", 1);
+ 
+ pref("accessibility.force_disabled", 1);
+ pref("devtools.selfxss.count", 5);
 -pref("startup.homepage_welcome_url","http://www.palemoon.org/unofficial.shtml");
 -pref("startup.homepage_override_url","http://www.palemoon.org/unofficial.shtml");
 -pref("app.releaseNotesURL", "http://www.palemoon.org/releasenotes.shtml");
-+pref("startup.homepage_welcome_url","https://start.duckduckgo.com");
-+pref("startup.homepage_override_url","http://start.duckduckgo.com");
++pref("startup.homepage_welcome_url","http://start.duckduckgo.com/unofficial.shtml");
++pref("startup.homepage_override_url","http://start.duckduckgo.com/unofficial.shtml");
 +pref("app.releaseNotesURL", "");
- 
- // Updates disabled
  pref("app.update.enabled", false);
+ pref("app.update.url", "");
 diff -Naur Pale-Moon-28.14.1_Release/palemoon/components/nsBrowserGlue.js Pale-Moon-28.14.1_Release.new/palemoon/components/nsBrowserGlue.js
 --- Pale-Moon-28.14.1_Release/palemoon/components/nsBrowserGlue.js	2020-09-29 17:11:51.000000000 -0400
 +++ Pale-Moon-28.14.1_Release.new/palemoon/components/nsBrowserGlue.js	2020-10-01 17:14:16.203289213 -0400
diff --git a/newmoon/debian/patches/series b/newmoon/debian/patches/series
index 660c64a..d8bf9aa 100644
--- a/newmoon/debian/patches/series
+++ b/newmoon/debian/patches/series
@@ -1,6 +1,6 @@
 small-icons.patch
 pm-devuan.patch
 pm-to-nm.patch
-UXP-eliminate-need-for-GTK-2.patch
-UXP-GTK-3-interface-Ensure-horizontal-scrollbars-are-not-too-tall.patch
+#UXP-GTK-3-interface-Ensure-horizontal-scrollbars-are-not-too-tall.patch
+#UXP-eliminate-need-for-GTK-2.patch
 UXP-strip-object-files-before-shared-library-linking.patch
diff --git a/newmoon/debian/watch b/newmoon/debian/watch
index cc46979..3baddaf 100644
--- a/newmoon/debian/watch
+++ b/newmoon/debian/watch
@@ -2,6 +2,7 @@
 version=4
 opts=filenamemangle=s/.+\/v?(\d\S+)_Release\.tar\.gz/palemoon_$1.orig\.tar\.gz/ \
   https://github.com/MoonchildProductions/Pale-Moon/tags .*/v?(\d\S+)_Release\.tar\.gz
+# Improve: added for 28.14.2-2 need to learn how to use https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/28.14.2_Release now that it is gone from github
 # not working. Uscan does not want to download specific, untagged git commits.
 #opts="component=platform" \
 #  https://github.com/MoonchildProductions/UXP/archive/41e5925b4271c598601fdc77238bbf6497576594.tar.gz