diff options
24 files changed, 136 insertions, 28 deletions
diff --git a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec index f87206d..b698452 100644 --- a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec +++ b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec @@ -4,7 +4,7 @@ #%%global app_id Name: %{app_name}-ublock-origin -Version: 1.16.4.12 +Version: 1.16.4.14 Release: 1 Summary: uBlock Origin installed to the system Pale Moon extensions directory @@ -51,6 +51,9 @@ rm -rf %{buildroot} %{moz_extensions}/*.xpi %changelog +* 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 diff --git a/palemoon-ublock-origin/debian/changelog b/palemoon-ublock-origin/debian/changelog index 2f33e6a..2b701a7 100644 --- a/palemoon-ublock-origin/debian/changelog +++ b/palemoon-ublock-origin/debian/changelog @@ -1,3 +1,9 @@ +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 diff --git a/palemoon-ublock-origin/debian/debhelper-build-stamp b/palemoon-ublock-origin/debian/debhelper-build-stamp deleted file mode 100644 index cdc3502..0000000 --- a/palemoon-ublock-origin/debian/debhelper-build-stamp +++ /dev/null @@ -1 +0,0 @@ -palemoon-ublock-origin diff --git a/palemoon-ublock-origin/debian/files b/palemoon-ublock-origin/debian/files deleted file mode 100644 index a04d3ec..0000000 --- a/palemoon-ublock-origin/debian/files +++ /dev/null @@ -1,2 +0,0 @@ -palemoon-ublock-origin_1.16.4.12-1+devuan_all.deb web optional -palemoon-ublock-origin_1.16.4.12-1+devuan_amd64.buildinfo web optional diff --git a/palemoon-ublock-origin/debian/palemoon-ublock-origin.substvars b/palemoon-ublock-origin/debian/palemoon-ublock-origin.substvars deleted file mode 100644 index 978fc8b..0000000 --- a/palemoon-ublock-origin/debian/palemoon-ublock-origin.substvars +++ /dev/null @@ -1,2 +0,0 @@ -misc:Depends= -misc:Pre-Depends= diff --git a/palemoon-ublock-origin/debian/watch b/palemoon-ublock-origin/debian/watch index 069939d..23b0381 100644 --- a/palemoon-ublock-origin/debian/watch +++ b/palemoon-ublock-origin/debian/watch @@ -1,4 +1,4 @@ -# You must remove unused comment lines for the released package. +# 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/ \ diff --git a/palemoon-ublock-origin/palemoon-ublock-origin.spec b/palemoon-ublock-origin/palemoon-ublock-origin.spec index 8b45344..ae7ea7a 100644 --- a/palemoon-ublock-origin/palemoon-ublock-origin.spec +++ b/palemoon-ublock-origin/palemoon-ublock-origin.spec @@ -4,7 +4,7 @@ #%%global app_id Name: %{app_name}-ublock-origin -Version: 1.16.4.12 +Version: 1.16.4.14 Release: 1 Summary: uBlock Origin installed to the system Pale Moon extensions directory @@ -51,6 +51,9 @@ rm -rf %{buildroot} %{moz_extensions}/*.xpi %changelog +* 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 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. diff --git a/waterfox-ublock-origin/debian/Makefile b/waterfox-ublock-origin/debian/Makefile new file mode 100644 index 0000000..4717e98 --- /dev/null +++ b/waterfox-ublock-origin/debian/Makefile @@ -0,0 +1,17 @@ +# Makefile for waterfox-ublock-origin for devuan +SOURCE0=uBlock0.firefox-legacy.xpi +MOZ_EXTENSIONS=/usr/lib/waterfox/browser/extensions + +# this needs to be overwritten by the debian/rules file. +DESTDIR=/tmp + +install: + unzip ${SOURCE0} install.rdf + mkdir -p $(DESTDIR)${MOZ_EXTENSIONS} + 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)${MOZ_EXTENSIONS}/$${newfilename} + rm -f install.rdf || : + +uninstall: + rm -f $(DESTDIR)${MOZ_EXTENSIONS}/uBlock0@raymondhill.net.xpi diff --git a/waterfox-ublock-origin/debian/README.Debian b/waterfox-ublock-origin/debian/README.Debian new file mode 100644 index 0000000..e2b7e3c --- /dev/null +++ b/waterfox-ublock-origin/debian/README.Debian @@ -0,0 +1,9 @@ +waterfox-ublock-origin for Devuan + +Initial release of waterfox-ublock-origin for devuan. +Build orig tarball to resemble: +$ tar -ztf waterfox-ublock-origin_1.16.4.8.orig.tar.gz +waterfox-ublock-origin/ +waterfox-ublock-origin/uBlock0.firefox-legacy.xpi + + -- B Stack <bgstack15@gmail.com> Wed, 13 Feb 2019 17:38:58 -0500 diff --git a/waterfox-ublock-origin/debian/changelog b/waterfox-ublock-origin/debian/changelog new file mode 100644 index 0000000..ad35d72 --- /dev/null +++ b/waterfox-ublock-origin/debian/changelog @@ -0,0 +1,5 @@ +waterfox-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 diff --git a/waterfox-ublock-origin/debian/compat b/waterfox-ublock-origin/debian/compat new file mode 100644 index 0000000..48082f7 --- /dev/null +++ b/waterfox-ublock-origin/debian/compat @@ -0,0 +1 @@ +12 diff --git a/waterfox-ublock-origin/debian/control b/waterfox-ublock-origin/debian/control new file mode 100644 index 0000000..13a72ca --- /dev/null +++ b/waterfox-ublock-origin/debian/control @@ -0,0 +1,15 @@ +Source: waterfox-ublock-origin +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: waterfox-ublock-origin +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: An efficient blocker for Chromium and Firefox. Fast and lean. diff --git a/waterfox-ublock-origin/debian/copyright b/waterfox-ublock-origin/debian/copyright new file mode 100644 index 0000000..a3f3db0 --- /dev/null +++ b/waterfox-ublock-origin/debian/copyright @@ -0,0 +1,8 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: waterfox-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/waterfox-ublock-origin/debian/patches/series b/waterfox-ublock-origin/debian/patches/series new file mode 100644 index 0000000..4a97dfa --- /dev/null +++ b/waterfox-ublock-origin/debian/patches/series @@ -0,0 +1 @@ +# You must remove unused comment lines for the released package. diff --git a/waterfox-ublock-origin/debian/rules b/waterfox-ublock-origin/debian/rules new file mode 100755 index 0000000..55e8022 --- /dev/null +++ b/waterfox-ublock-origin/debian/rules @@ -0,0 +1,18 @@ +#!/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=waterfox-ublock-origin +export MOZ_EXTENSIONS=/usr/lib/waterfox/browser/extensions +export SOURCE0=uBlock0.firefox-legacy.xpi + +%: + 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/waterfox-ublock-origin/debian/source/format b/waterfox-ublock-origin/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/waterfox-ublock-origin/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/waterfox-ublock-origin/debian/source/local-options b/waterfox-ublock-origin/debian/source/local-options new file mode 100644 index 0000000..00131ee --- /dev/null +++ b/waterfox-ublock-origin/debian/source/local-options @@ -0,0 +1,2 @@ +#abort-on-upstream-changes +#unapply-patches diff --git a/waterfox-ublock-origin/debian/watch b/waterfox-ublock-origin/debian/watch new file mode 100644 index 0000000..23b0381 --- /dev/null +++ b/waterfox-ublock-origin/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/tags .*/firefox-legacy-v?([\d\.]+)\.tar\.gz diff --git a/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec index 0d05a2e..332a11c 100644 --- a/waterfox-ublock-origin/waterfox-ublock-origin.spec +++ b/waterfox-ublock-origin/waterfox-ublock-origin.spec @@ -4,7 +4,7 @@ %global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} Name: %{app_name}-ublock-origin -Version: 1.16.4.12 +Version: 1.16.4.14 Release: 1 Summary: uBlock Origin installed to system Waterfox extensions directory @@ -51,6 +51,9 @@ rm -rf %{buildroot} %{moz_extensions}/*/*.xpi %changelog +* 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 |