Merge branch 'ublock-origin-bump' into 'master'

Ublock origin bump

See merge request bgstack15/stackrpms!198

16 files changed, 329 insertions, 0 deletions

diff --git a/ublock-origin-combined/README.md b/ublock-origin-combined/README.md
new file mode 100644
index 0000000..1382bec
--- /dev/null
+++ b/ublock-origin-combined/README.md
@@ -0,0 +1,23 @@
+# README for uBlock Origin
+
+## uBlock Origin upstream
+https://github.com/gorhill/uBlock/tags
+Forked from deprecated project https://github.com/kororaproject/kp-mozilla-ublock-origin/blob/master/build/mozilla-ublock-origin.spec
+https://github.com/PhantomX/chinforpms/blob/master/waterfox-ublock-origin/waterfox-ublock-origin.spec
+
+## Reason for being in stackrpms
+I bundle uBlock Origin on the system level for the various Mozilla-based web browsers. There was some other distro (perhaps SolydXk or PCLinuxOS), that bundled uBlock Origin and gave me the idea of bundling this. Korora was one of them.
+This package is now maintained independently.
+As of October 2020, this package, ublock-origin-combined, replaces the following packages (both rpm and dpkg):
+* palemoon-ublock-origin
+* palemoon-stackrpms-ublock-origin
+* waterfox-ublock-origin
+* newmoon-ublock-origin
+
+## Reverse dependency matrix
+Distro     | uBlock Origin version
+---------- | ---------------
+All        | 1.16.4.25
+
+## Differences from upstream
+N/A
diff --git a/ublock-origin-combined/debian/Makefile b/ublock-origin-combined/debian/Makefile
new file mode 100644
index 0000000..fca5b8a
--- /dev/null
+++ b/ublock-origin-combined/debian/Makefile
@@ -0,0 +1,19 @@
+# Makefile for palemoon-ublock-origin for devuan
+SOURCE0=uBlock0.firefox-legacy.xpi
+extdir1=/usr/lib/palemoon/browser/extensions
+extdir3=/usr/lib/waterfox/browser/extensions
+extdir4=/usr/lib/newmoon/browser/extensions
+
+# this needs to be overwritten by the debian/rules file.
+DESTDIR=/tmp
+
+install:
+	unzip ${SOURCE0} install.rdf
+	mkdir -p $(DESTDIR)${extdir1}
+	newfilename="$$( grep 'em:id' install.rdf 2>/dev/null | head -n1 | sed -r -e 's/^.*<em:id>//;' -e 's/<\/em:id>.*$$//;' ).xpi" ; \
+		test -z "$${newfilename}" && newfilename="$$( basename $${SOURCE0} )" ; \
+		install -Dp -m0644 ${SOURCE0} $(DESTDIR)${extdir1}/$${newfilename}
+	rm -f install.rdf || :
+
+uninstall:
+	rm -f $(DESTDIR)${extdir1}/uBlock0@raymondhill.net.xpi
diff --git a/ublock-origin-combined/debian/README.Debian b/ublock-origin-combined/debian/README.Debian
new file mode 100644
index 0000000..3d345f5
--- /dev/null
+++ b/ublock-origin-combined/debian/README.Debian
@@ -0,0 +1,9 @@
+palemoon-ublock-origin for Devuan
+
+Initial release of palemoon-ublock-origin for devuan.
+Build orig tarball to resemble:
+$ tar -ztf palemoon-ublock-origin_1.16.4.8.orig.tar.gz 
+palemoon-ublock-origin/
+palemoon-ublock-origin/uBlock0.firefox-legacy.xpi
+
+ -- B Stack <bgstack15@gmail.com> Wed, 13 Feb 2019 17:38:58 -0500
diff --git a/ublock-origin-combined/debian/changelog b/ublock-origin-combined/debian/changelog
new file mode 100644
index 0000000..483fcf9
--- /dev/null
+++ b/ublock-origin-combined/debian/changelog
@@ -0,0 +1,90 @@
+ublock-origin-combined (1.16.4.25-1+devuan) obs; urgency=medium
+
+  * Combined package for all Mozilla-based browsers.
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 20 Oct 2020 13:26:34 -0400
+
+palemoon-ublock-origin (1.16.4.25-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 25 Aug 2020 14:33:11 -0400
+
+palemoon-ublock-origin (1.16.4.24-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 11 Aug 2020 09:09:33 -0400
+
+palemoon-ublock-origin (1.16.4.23-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Wed, 22 Jul 2020 21:08:22 -0400
+
+palemoon-ublock-origin (1.16.4.22-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Sat, 04 Jul 2020 11:51:55 -0400
+
+palemoon-ublock-origin (1.16.4.21-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Mon, 29 Jun 2020 10:21:52 -0400
+
+palemoon-ublock-origin (1.16.4.20-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Wed, 18 Mar 2020 08:33:02 -0400
+
+palemoon-ublock-origin (1.16.4.19-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 03 Mar 2020 14:30:03 -0500
+
+palemoon-ublock-origin (1.16.4.18-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 18 Feb 2020 13:44:00  -0500
+
+palemoon-ublock-origin (1.16.4.16-1+devuan) obs; urgency=medium
+
+  * Update
+  * Upstream changed locations
+
+ -- B Stack <bgstack15@gmail.com>  Mon, 27 Jan 2020 08:46:37 -0500
+
+palemoon-ublock-origin (1.16.4.14-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 14 Jan 2020 17:47:55 -0500
+
+palemoon-ublock-origin (1.16.4.12-1+devuan) obs; urgency=low
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Wed, 18 Dec 2019 10:09:15 -0500
+
+palemoon-ublock-origin (1.16.4.11-1+devuan) manual; urgency=low
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Mon, 11 Nov 2019 16:34:58 -0500
+
+palemoon-ublock-origin (1.16.4.8-2+devuan) manual; urgency=low
+
+  * Repack to have correct name
+
+ -- B Stack <bgstack15@gmail.com>  Sat, 29 Jun 2019 17:57:59 -0400
+
+palemoon-ublock-origin (1.16.4.8-1devuan) manual; urgency=low
+
+  * Initial release for devuan
+
+ -- B Stack <bgstack15@gmail.com>  Wed, 13 Feb 2019 17:38:58 -0500
diff --git a/ublock-origin-combined/debian/compat b/ublock-origin-combined/debian/compat
new file mode 100644
index 0000000..48082f7
--- /dev/null
+++ b/ublock-origin-combined/debian/compat
@@ -0,0 +1 @@
+12
diff --git a/ublock-origin-combined/debian/control b/ublock-origin-combined/debian/control
new file mode 100644
index 0000000..d491357
--- /dev/null
+++ b/ublock-origin-combined/debian/control
@@ -0,0 +1,23 @@
+Source: ublock-origin-combined
+Section: web
+Priority: optional
+Maintainer: B Stack <bgstack15@gmail.com>
+Build-Depends: debhelper (>=12~),
+   unzip,
+   make
+Standards-Version: 4.1.4
+Homepage: https://github.com/gorhill/uBlock/releases
+
+Package: ublock-origin-combined
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: palemoon-ublock-origin, waterfox-ublock-origin, newmoon-ublock-origin
+Breaks: palemoon-ublock-origin, waterfox-ublock-origin, newmoon-ublock-origin
+Provides: palemoon-ublock-origin, waterfox-ublock-origin, newmoon-ublock-origin
+Description: Efficient blocker for Chromium and Firefox. Fast and lean.
+ uBlock Origin is NOT an "ad blocker": it is a
+ wide-spectrum blocker -- which happens to be able
+ to function as a mere "ad blocker". The default
+ behavior of uBlock Origin when newly installed is
+ to block ads, trackers and malware sites
diff --git a/ublock-origin-combined/debian/copyright b/ublock-origin-combined/debian/copyright
new file mode 100644
index 0000000..bb755b9
--- /dev/null
+++ b/ublock-origin-combined/debian/copyright
@@ -0,0 +1,8 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: palemoon-ublock
+Source: https://github.com/gorhill/uBlock/releases/
+uBlock0.firefox-legacy.xpi GPLv3
+
+#----------------------------------------------------------------------------
+# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
+# license/copyright files.
diff --git a/ublock-origin-combined/debian/patches/series b/ublock-origin-combined/debian/patches/series
new file mode 100644
index 0000000..4a97dfa
--- /dev/null
+++ b/ublock-origin-combined/debian/patches/series
@@ -0,0 +1 @@
+# You must remove unused comment lines for the released package.
diff --git a/ublock-origin-combined/debian/rules b/ublock-origin-combined/debian/rules
new file mode 100755
index 0000000..f6069f7
--- /dev/null
+++ b/ublock-origin-combined/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+# You must remove unused comment lines for the released package.
+#export DH_VERBOSE = 1
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export NAME=ublock-origin-combined
+
+%:
+	dh $@
+
+override_dh_auto_install:
+	make -e -f debian/Makefile install -- DESTDIR=debian/${NAME}
+
+#override_dh_auto_clean:
+#	rm -rf debian/usr
diff --git a/ublock-origin-combined/debian/source/format b/ublock-origin-combined/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/ublock-origin-combined/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ublock-origin-combined/debian/source/lintian-overrides b/ublock-origin-combined/debian/source/lintian-overrides
new file mode 100644
index 0000000..fa34516
--- /dev/null
+++ b/ublock-origin-combined/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+syntax-error-in-dep5-copyright
+build-depends-on-build-essential-package-without-using-version make *
diff --git a/ublock-origin-combined/debian/source/local-options b/ublock-origin-combined/debian/source/local-options
new file mode 100644
index 0000000..00131ee
--- /dev/null
+++ b/ublock-origin-combined/debian/source/local-options
@@ -0,0 +1,2 @@
+#abort-on-upstream-changes
+#unapply-patches
diff --git a/ublock-origin-combined/debian/ublock-origin-combined.links b/ublock-origin-combined/debian/ublock-origin-combined.links
new file mode 100644
index 0000000..c558190
--- /dev/null
+++ b/ublock-origin-combined/debian/ublock-origin-combined.links
@@ -0,0 +1,2 @@
+/usr/lib/palemoon/browser/extensions/uBlock0@raymondhill.net.xpi /usr/lib/waterfox/browser/extensions/uBlock0@raymondhill.net.xpi
+/usr/lib/palemoon/browser/extensions/uBlock0@raymondhill.net.xpi /usr/lib/newmoon/browser/extensions/uBlock0@raymondhill.net.xpi
diff --git a/ublock-origin-combined/debian/ublock-origin-combined.lintian-overrides b/ublock-origin-combined/debian/ublock-origin-combined.lintian-overrides
new file mode 100644
index 0000000..882f2e1
--- /dev/null
+++ b/ublock-origin-combined/debian/ublock-origin-combined.lintian-overrides
@@ -0,0 +1,2 @@
+breakout-link
+copyright-without-copyright-notice
diff --git a/ublock-origin-combined/debian/watch b/ublock-origin-combined/debian/watch
new file mode 100644
index 0000000..e7e7f09
--- /dev/null
+++ b/ublock-origin-combined/debian/watch
@@ -0,0 +1,5 @@
+# This can pull in the source code, but not the real xpi file. Unfortunately you need to hand-assemble a tarball with the xpi file in it. See README.debian
+version=4
+# uscan will make a nice symlink, so no name mangling is required.
+#opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/firefox-legacy-$1\.tar\.gz/ \
+  https://github.com/gorhill/uBlock-for-firefox-legacy/tags .*/firefox-legacy-v?([\d\.]+)\.tar\.gz
diff --git a/ublock-origin-combined/ublock-origin-combined.spec b/ublock-origin-combined/ublock-origin-combined.spec
new file mode 100644
index 0000000..5b8eca6
--- /dev/null
+++ b/ublock-origin-combined/ublock-origin-combined.spec
@@ -0,0 +1,125 @@
+# palemoon
+%global extdir1 %{_libdir}/palemoon/browser/extensions
+%global extdir2 %{_libdir}/palemoon-stackrpms/browser/extensions
+# waterfox
+%global extdir3 %{_datadir}/waterfox/extensions/%{app_id}
+
+%global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
+
+Name:           ublock-origin-combined
+Version:        1.16.4.25
+Release:        1
+Summary:        uBlock Origin installed to the system Mozilla-based extensions directories
+
+Group:          Applications/Internet
+License:        GPLv3
+URL:            https://github.com/gorhill/uBlock
+Source0:        README.md
+Source1:        https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0_%{version}.firefox-legacy.xpi
+BuildRequires:  unzip
+BuildRequires:  coreutils
+BuildArch:      noarch
+
+Obsoletes:      palemoon-ublock-origin <= 1.16.4.25-1, palemoon-stackrpms-ublock-origin <= 1.16.4.25-1, waterfox-ublock-origin <= 1.16.4.25-1
+Conflicts:      palemoon-ublock-origin, palemoon-stackrpms-ublock-origin, waterfox-ublock-origin
+
+%if 0%{?fedora} || ( 0%{?rhel} >= 8 )
+Suggests:       mozilla-filesystem
+Suggests:       waterfox-filesystem
+%endif
+
+%description
+The "legacy" release of uBlock Origin (NPAPI) for tradional Mozilla-style
+web browsers. This deploys the extension for multiple Mozilla-based
+browsers.
+
+More than just an ad blocker, uBlock Origin provides the ability to block
+at will and easy defaults based on various common lists, such as EasyList,
+EasyPrivacy, and Peter Lowe's ad/tracking/malware servers.
+
+%prep
+#%setup -q -c
+
+%build
+
+%install
+# learn extension id to name the file
+%{__unzip} -o %{SOURCE1} install.rdf
+newfilename="$( grep 'em:id' install.rdf 2>/dev/null | head -n1 | sed -r -e 's/^.*<em:id>//;' -e 's/<\/em:id>.*$//;' ).xpi"
+test -z "${newfilename}" && newfilename="$( basename %{SOURCE1} )"
+rm -rf install.rdf
+
+# palemoon
+mkdir -p %{buildroot}%{extdir1} %{buildroot}%{extdir2} %{buildroot}%{extdir3}
+install -Dp -m0644 %{SOURCE1} %{buildroot}%{extdir1}/${newfilename}
+ln -s %{extdir1}/${newfilename} %{buildroot}%{extdir2}
+
+# waterfox
+ln -sf %{extdir1}/${newfilename} %{buildroot}%{extdir3}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{extdir1}/*.xpi
+%{extdir2}/*.xpi
+%{extdir3}/../*/*.xpi
+# something gets weird because of the curly braces in the expanded variable, but using the ../* syntax changes the evaluated string so it does not have to try to use curly braces in the owned filepath.
+
+%changelog
+* Tue Oct 20 2020 B Stack <bgstack15@gmail.com> - 1.16.4.25-1
+- Forked from palemoon-ublock-origin
+
+* Tue Aug 25 2020 B Stack <bgstack15@gmail.com> - 1.16.4.25-1
+- Update
+
+* Tue Aug 11 2020 B Stack <bgstack15@gmail.com> - 1.16.4.24-1
+- Update
+
+* Wed Jul 22 2020 B Stack <bgstack15@gmail.com> - 1.16.4.23-1
+- Update
+
+* Sat Jul 04 2020 B Stack <bgstack15@gmail.com> - 1.16.4.22-1
+- Update
+
+* Mon Jun 29 2020 B Stack <bgstack15@gmail.com> - 1.16.4.21-1
+- Update
+
+* Wed Mar 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.20-1
+- Update
+
+* Tue Mar 03 2020 B Stack <bgstack15@gmail.com> - 1.16.4.19-1
+- Update
+
+* Tue Feb 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.18-1
+- Update
+
+* Mon Jan 27 2020 B Stack <bgstack15@gmail.com> - 1.16.4.16-1
+- Update
+- Upstream changed locations
+
+* Tue Jan 14 2020 B Stack <bgstack15@gmail.com> - 1.16.4.14-1
+- Update
+
+* Wed Dec 18 2019 B Stack <bgstack15@gmail.com> - 1.16.4.12-1
+- Update
+
+* Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 1.16.4.11-1
+- Update
+
+* Sat Sep 15 2018 B Stack <bgstack15@gmail.com> 1.16.4.4-2
+- Customize for stackrpms
+
+* Wed Aug 2 2017 Ian Firns <firnsy@kororaproject.org>- 1.13.8-1
+- Update to 1.13.8 release
+
+* Thu Jan 7 2016 Chris Smart <csmart@kororaproject.org>- 1.9.16-1
+- Update to 1.9.16 release
+
+* Thu Jan 7 2016 Chris Smart <csmart@kororaproject.org>- 1.5.3-1
+- Update to 1.5.3 release
+- Use signed xpi from Mozilla so that it works in Firefox 43
+
+* Tue Nov 3 2015 Chris Smart <csmart@kororaproject.org>- 1.3.2-1
+- Initial build