Merge branch 'newmoon-bump' into 'master'

Newmoon bump

See merge request bgstack15/stackrpms!264

5 files changed, 41 insertions, 18 deletions

diff --git a/newmoon/debian/changelog b/newmoon/debian/changelog
index b58d84c..1de4132 100644
--- a/newmoon/debian/changelog
+++ b/newmoon/debian/changelog
@@ -1,3 +1,20 @@
+newmoon (29.4.1-1+devuan) obs; urgency=medium
+
+  - This is a security update.
+    * Fixed potential crashes. DiD
+    * Fixed a potential indirect exploit of Microsoft Internet Explorer.
+      (CVE-2021-38492)
+    * Unified XUL Platform Mozilla Security Patch Summary: 1 fixed, 2 DiD,
+      8 not applicable.
+
+ -- B. Stack <bgstack15@gmail.com>  Tue, 14 Sep 2021 21:02:17 -0400
+
+newmoon (29.4.0-2+devuan) obs; urgency=medium
+
+  - Rebuild, with dh $@ --without autoreconf so it can actually build.
+
+ -- B. Stack <bgstack15@gmail.com>  Sat, 11 Sep 2021 22:33:42 -0400
+
 newmoon (29.4.0-1+devuan) obs; urgency=medium
 
   - This is a development, bugfix and security release
@@ -17,28 +34,28 @@ newmoon (29.3.0-1+devuan) obs; urgency=medium
 
   - This is a development, bugfix and security release.
     * "Web Developer" is now called "Developer Tools" in the menus.
-    * Updated and aligned about:home, the QuickDial page and logopage 
+    * Updated and aligned about:home, the QuickDial page and logopage
       styling.
     * Re-organized the privacy category in the preferences window.
-    * Enabled brotli compression for http for sites that support it. See 
+    * Enabled brotli compression for http for sites that support it. See
       implementation notes.
     * Implemented EventTarget as a constructor.
     * Updated Windows 10 toolkit styling.
     * Updated the port blacklist (removed 10080). See implementation notes.
     * CSS: Implemented calc() and animation support for stroke-dashoffset.
-    * Added support for checking boolean preferences to chrome CSS style 
+    * Added support for checking boolean preferences to chrome CSS style
       sheets, to support more advanced theming options.
     * Added support for dynamic dark color capable themes in CSS.
-    * Updated ResizeObserver implementation to a more recent specification. 
+    * Updated ResizeObserver implementation to a more recent specification.
       See implementation notes.
     * Removed a metric ton of Macintosh code.
     * Removed obsolete system theme support from the layout engine.
     * Fixed several crashes.
-    * Linux: blocked particularly old versions of Mesa/Nouveau drivers due 
+    * Linux: blocked particularly old versions of Mesa/Nouveau drivers due
       to issues.
-    * Security issues addressed: CVE-2021-30547 and several other issues 
+    * Security issues addressed: CVE-2021-30547 and several other issues
       that don't have a CVE number.
-    * Unified XUL Platform Mozilla Security Patch Summary: 3 fixed, 3 DiD, 
+    * Unified XUL Platform Mozilla Security Patch Summary: 3 fixed, 3 DiD,
       2 deferred (DiD), 12 not applicable.
 
  -- B. Stack <bgstack15@gmail.com>  Mon, 19 Jul 2021 19:11:44 -0400
diff --git a/newmoon/debian/newmoon+devuan.dsc b/newmoon/debian/newmoon+devuan.dsc
index f52e753..00e3d16 100644
--- a/newmoon/debian/newmoon+devuan.dsc
+++ b/newmoon/debian/newmoon+devuan.dsc
@@ -2,8 +2,8 @@ Format: 3.0 (quilt)
 Source: newmoon
 Binary: newmoon
 Architecture: any
-Version: 29.4.0-1+devuan
-Maintainer: B Stack <bgstack15@gmail.com>
+Version: 29.4.1-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), 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
diff --git a/newmoon/debian/rules b/newmoon/debian/rules
index a3a6073..f47e5cc 100755
--- a/newmoon/debian/rules
+++ b/newmoon/debian/rules
@@ -16,7 +16,7 @@ export SHELL=/bin/bash
 export MCFILE=debian/mozconfig
 
 %:
-	dh $@
+	dh $@ --without autoreconf
 
 override_dh_auto_clean:
 	dh_auto_clean
diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec
index 5d22a22..fda941f 100644
--- a/newmoon/newmoon.spec
+++ b/newmoon/newmoon.spec
@@ -1,12 +1,13 @@
-%global tarballdir pale-moon
 %global dummy_package   0
 %global appname newmoon
 %global prettyname Newmoon web browser
 %global stackrpms_custom 1
 # derive from inside the source tree or from https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases
 # git submodule | awk -v "name=platform" '$2 == name {gsub("-","",$1); print $1}'
-%global submodule_platform_tag RELBASE_20210817
+#%%global submodule_platform_tag RELBASE_20210817
 %global badname palemoon
+%global git_commit 05056e7cd4b3b8b3b4d6248aafb4c10744f00538
+%global tarballdir %{badname}-%{git_commit}
 
 # additional repos to get python27 and devtoolset-7
 # for el6 and el7: Software Collection;, for x86_64 only
@@ -43,14 +44,15 @@ Name:		newmoon
 Name:    newmoon
 %endif
 Summary:	Newmoon web browser
-Version:	29.4.0
+Version:	29.4.1
 Release:	1
 
 Group:	Networking/Web
 License:	MPLv2.0
 URL:		http://linux.palemoon.org/
-Source0: https://repo.palemoon.org/MoonChildProductions/Pale-Moon/archive/%{version}_Release.tar.gz
-Source1:	https://repo.palemoon.org/MoonchildProductions/UXP/archive/%{submodule_platform_tag}.tar.gz
+#Source0: https://repo.palemoon.org/MoonChildProductions/Pale-Moon/archive/%%{version}_Release.tar.gz
+Source0: https://gitlab.com/opensource-tracking/palemoon/-/archive/%{git_commit}/palemoon-%{git_commit}.tar.gz
+#Source1:	https://repo.palemoon.org/MoonchildProductions/UXP/archive/%%{submodule_platform_tag}.tar.gz
 Source2: newmoon-mozconfig
 Source3: newmoon.desktop
 Source4: newmoon-mimeinfo.xml
@@ -61,7 +63,7 @@ Patch0: small-icons.patch
 Patch1: pm-fedora.patch
 Patch2: pm-to-nm.patch
 %endif
-Packager:	Bgstack15 <bgstack15@gmail.com>
+Packager:	B. Stack <bgstack15@gmail.com>
 
 %if "%{?scl_env}" != ""
 BuildRequires: %{scl_buildreq}
@@ -111,7 +113,7 @@ and themes to make the browser truly your own.
 
 %prep
 %setup -q -n %{tarballdir}
-tar -C platform --strip-components=1 -zxf %{SOURCE1} # git submodule
+#tar -C platform --strip-components=1 -zxf %%{SOURCE1} # git submodule
 %{__cp} %{SOURCE2} ./.mozconfig
 %if 0%{?fedora} >= 30
 sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig
@@ -298,6 +300,10 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %doc AUTHORS LICENSE
 
 %changelog
+* Wed Sep 15 2021 B. Stack <bgstack15@gmail.com> - 29.4.1-1
+- Use new intermediate git source because upstream
+  has stopped sharing git.
+
 * Tue Aug 17 2021 B. Stack <bgstack15@gmail.com> - 29.4.0-1
 - update version
 
diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc
index 21ca3b0..7623fe6 100644
--- a/waterfox/debian/waterfox+devuan.dsc
+++ b/waterfox/debian/waterfox+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: waterfox
 Binary: waterfox
 Architecture: any
-Version: 2021.08-1+devuan
+Version: 2021.08-2+devuan
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://www.waterfox.net/
 Standards-Version: 4.1.4