Merge branch 'updates' into 'master'

palemoon 28.8.1 and ublock-origin

See merge request bgstack15/stackrpms!114

5 files changed, 35 insertions, 19 deletions

diff --git a/palemoon/debian/changelog b/palemoon/debian/changelog
index 9e48da7..67fa7cf 100644
--- a/palemoon/debian/changelog
+++ b/palemoon/debian/changelog
@@ -1,3 +1,16 @@
+palemoon (28.8.1-1+devuan) obs; urgency=medium
+
+  * From releasenotes.shtml: This is an important security and stability release.
+  * Changes/fixes
+    - Fixed a sampling issue in libsoundtouch (DiD)
+    - Fixed an issue with a new upcoming Windows 10 feature not honoring Private Browsing mode by default (DiD)
+    - Fixed several stability and memory safety hazards. (DiD)
+    - Fixed an issue where files could inadvertently be executed with the designated file type handler instead of opened. (CVE-2019-17019)
+    - Fixed an issue with the JavaScript JIT compiler that could lead to exploitable crashes. (CVE-2019-17026) actively exploited
+    - Unified XUL Platform Mozilla Security Patch Summary: 2 fixed, 7 DiD, 12 not applicable.
+
+ -- B Stack <bgstack15@gmail.com>  Mon, 13 Jan 2020 10:24:21 -0500
+
 palemoon (28.8.0-1+devuan) obs; urgency=medium
 
   * From releasenotes.shtml:  This is a major development release. Many things have been improved, some landmark features have been added/enabled, and many libraries have been updated for added stability and performance.
diff --git a/palemoon/debian/control b/palemoon/debian/control
index 194753e..29b9108 100644
--- a/palemoon/debian/control
+++ b/palemoon/debian/control
@@ -6,22 +6,17 @@ Bugs: mailto: <bgstack15@gmail.com>
 XSBC-Original-Maintainer: Steven Pusser <stevep@mxlinux.org>
 Build-Depends: debhelper (>= 12),
    autoconf2.13,
-   build-essential,
-   gcc-8, g++-8, cpp-8,
    libasound2-dev,
-   libbz2-dev,
    libdbus-glib-1-dev (>= 0.60),
-   libegl1-mesa-dev,
    libgconf2-dev (>= 1.2.1),
    libgtk2.0-dev (>= 2.14),
-   libsqlite3-dev,
    libssl-dev,
    libx11-xcb-dev,
    libxt-dev,
    lsb-release,
+   mesa-common-dev,
    pkg-config,
    python (>= 2.7),
-   python-dbus,
    unzip,
    yasm (>= 1.1),
    zip,
diff --git a/palemoon/debian/rules b/palemoon/debian/rules
index b56d4f7..5705c90 100755
--- a/palemoon/debian/rules
+++ b/palemoon/debian/rules
@@ -2,15 +2,15 @@
 
 export SHELL=/bin/bash
 
-# borrowed from stevepusser's logic
-# Build with gcc-8 on Buster (beowulf/ceres)
-distrelease := $(shell lsb_release -cs)
-ifeq ($(distrelease),$(filter $(distrelease),buster beowulf/ceres))
-export CC=gcc-8
-export CXX=g++-8
-export CPP=cpp-8
-export LD=gcc-8
-endif
+## borrowed from stevepusser's logic
+## Build with gcc-8 on Buster (beowulf/ceres)
+#distrelease := $(shell lsb_release -cs)
+#ifeq ($(distrelease),$(filter $(distrelease),buster beowulf/ceres))
+#export CC=gcc-8
+#export CXX=g++-8
+#export CPP=cpp-8
+#export LD=gcc-8
+#endif
 
 %:
 	dh $@
diff --git a/palemoon/palemoon-stackrpms.spec b/palemoon/palemoon-stackrpms.spec
index 9e1fdca..5ab1a42 100644
--- a/palemoon/palemoon-stackrpms.spec
+++ b/palemoon/palemoon-stackrpms.spec
@@ -40,7 +40,7 @@ Summary:	Pale Moon web browser with stackrpms prefs
 Name:    palemoon
 Summary:	Pale Moon web browser
 %endif
-Version:	28.8.0
+Version:	28.8.1
 Release:	1
 
 Group:	Networking/Web
@@ -142,7 +142,7 @@ rm -rf %{buildroot}
 %endif
 %if !%{dummy_package}
    make -f client.mk \
-      DESTDIR=%{buildroot} \
+      DESTDIR=%{buildroot} prefix=/usr \
       idldir=%{_datadir}/idl/%{name} \
       includedir=%{_includedir}/%{name} \
       installdir=%{_libdir}/%{name} \
@@ -279,6 +279,10 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %doc AUTHORS LICENSE
 
 %changelog
+* Mon Jan 13 2020 B Stack <bgstack15@gmail.com> - 28.8.1-1
+- update version
+- place binary in /usr/bin instead of /usr/local/bin
+
 * Wed Dec 11 2019 B Stack <bgstack15@gmail.com> - 28.8.0-1
 - update version
 - fc30 now also explicitly requires python2-devel. Fc31 already did.
diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec
index 868b388..4f7f58b 100644
--- a/palemoon/palemoon.spec
+++ b/palemoon/palemoon.spec
@@ -40,7 +40,7 @@ Summary:	Pale Moon web browser with stackrpms prefs
 Name:    palemoon
 Summary:	Pale Moon web browser
 %endif
-Version:	28.8.0
+Version:	28.8.1
 Release:	1
 
 Group:	Networking/Web
@@ -142,7 +142,7 @@ rm -rf %{buildroot}
 %endif
 %if !%{dummy_package}
    make -f client.mk \
-      DESTDIR=%{buildroot} \
+      DESTDIR=%{buildroot} prefix=/usr \
       idldir=%{_datadir}/idl/%{name} \
       includedir=%{_includedir}/%{name} \
       installdir=%{_libdir}/%{name} \
@@ -279,6 +279,10 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %doc AUTHORS LICENSE
 
 %changelog
+* Mon Jan 13 2020 B Stack <bgstack15@gmail.com> - 28.8.1-1
+- update version
+- place binary in /usr/bin instead of /usr/local/bin
+
 * Wed Dec 11 2019 B Stack <bgstack15@gmail.com> - 28.8.0-1
 - update version
 - fc30 now also explicitly requires python2-devel. Fc31 already did.