diff options
43 files changed, 189 insertions, 473 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 diff --git a/palemoon-ublock-origin/README.md b/palemoon-ublock-origin/README.md deleted file mode 100644 index 92ca8ba..0000000 --- a/palemoon-ublock-origin/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# 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 in a few flavors, mostly for the installation directory. - -# Reverse dependency matrix -Distro | uBlock Origin version ----------- | --------------- -All | 1.16.4.11 - -# Differences from upstream -None diff --git a/palemoon-ublock-origin/debian/control b/palemoon-ublock-origin/debian/control deleted file mode 100644 index 3972948..0000000 --- a/palemoon-ublock-origin/debian/control +++ /dev/null @@ -1,20 +0,0 @@ -Source: palemoon-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: palemoon-ublock-origin -Architecture: all -Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: An 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/palemoon-ublock-origin/debian/rules b/palemoon-ublock-origin/debian/rules deleted file mode 100755 index cc4c963..0000000 --- a/palemoon-ublock-origin/debian/rules +++ /dev/null @@ -1,18 +0,0 @@ -#!/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=palemoon-ublock-origin -export MOZ_EXTENSIONS=/usr/lib/palemoon/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/palemoon-ublock-origin/palemoon-ublock-origin.spec b/palemoon-ublock-origin/palemoon-ublock-origin.spec deleted file mode 100644 index 420954e..0000000 --- a/palemoon-ublock-origin/palemoon-ublock-origin.spec +++ /dev/null @@ -1,105 +0,0 @@ -# palemoon globals -%global app_name palemoon -%global moz_extensions %{_libdir}/%{app_name}/browser/extensions -#%%global app_id - -Name: %{app_name}-ublock-origin -Version: 1.16.4.25 -Release: 1 -Summary: uBlock Origin installed to the system Pale Moon extensions directory - -Group: Applications/Internet -License: GPLv3 -URL: https://github.com/gorhill/uBlock -Source0: https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0_%{version}.firefox-legacy.xpi -BuildRequires: unzip -BuildRequires: coreutils -BuildArch: noarch - -#Requires: mozilla-filesystem -#Requires: %%{app_name}-filesystem - -%description -The "legacy" release of uBlock Origin (NPAPI) for tradional Mozilla-style -web browsers. This is packaged for %{app_name}. - -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 %{SOURCE0} 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 %{SOURCE0} )" - -mkdir -p %{buildroot}%{moz_extensions} -install -Dp -m0644 %{SOURCE0} %{buildroot}%{moz_extensions}/${newfilename} - -rm -rf install.rdf - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%{moz_extensions}/*.xpi - -%changelog -* 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 diff --git a/palemoon/bgstack15-palemoon.patch b/palemoon/bgstack15-palemoon.patch index f0bd4fa..191781b 100644 --- a/palemoon/bgstack15-palemoon.patch +++ b/palemoon/bgstack15-palemoon.patch @@ -1,9 +1,7 @@ diff -Naur 28.4.1-0/application/palemoon/branding/shared/locales/browserconfig.properties 28.4.1-1/application/palemoon/branding/shared/locales/browserconfig.properties ---- 28.4.1-0/palemoon/branding/shared/locales/browserconfig.properties 2019-03-26 13:33:15.000000000 -0400 -+++ 28.4.1-1/palemoon/branding/shared/locales/browserconfig.properties 2019-03-27 10:44:23.578435642 -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/ diff --git a/palemoon/debian/changelog b/palemoon/debian/changelog index 925924e..e79c5e6 100644 --- a/palemoon/debian/changelog +++ b/palemoon/debian/changelog @@ -1,3 +1,16 @@ +palemoon (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. + + -- Ben Stack <bgstack15@gmail.com> Tue, 27 Oct 2020 20:05:31 -0400 + palemoon (28.14.2-1+devuan) obs; urgency=low * Fixed some additional crashes caused by the ResizeObserver API. This should take care of all crashes that have been attributed to this new code. diff --git a/palemoon/debian/palemoon+devuan.dsc b/palemoon/debian/palemoon+devuan.dsc index 9324f3e..dcd6601 100644 --- a/palemoon/debian/palemoon+devuan.dsc +++ b/palemoon/debian/palemoon+devuan.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: palemoon Binary: palemoon 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 diff --git a/palemoon/debian/patches/bgstack15-palemoon.patch b/palemoon/debian/patches/bgstack15-palemoon.patch index f0bd4fa..191781b 100644 --- a/palemoon/debian/patches/bgstack15-palemoon.patch +++ b/palemoon/debian/patches/bgstack15-palemoon.patch @@ -1,9 +1,7 @@ diff -Naur 28.4.1-0/application/palemoon/branding/shared/locales/browserconfig.properties 28.4.1-1/application/palemoon/branding/shared/locales/browserconfig.properties ---- 28.4.1-0/palemoon/branding/shared/locales/browserconfig.properties 2019-03-26 13:33:15.000000000 -0400 -+++ 28.4.1-1/palemoon/branding/shared/locales/browserconfig.properties 2019-03-27 10:44:23.578435642 -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/ diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 9ff45fb..eb0e036 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -1,11 +1,11 @@ -%global tarballdir Pale-Moon-%{version}_Release +%global tarballdir pale-moon %global dummy_package 0 %global appname palemoon %global prettyname Pale Moon Web Browser %global stackrpms_custom 1 # derive from inside the full source tree or from notes at https://github.com/MoonchildProductions/Pale-Moon/releases # git submodule | awk -v "name=platform" '$2 == name {gsub("-","",$1); print $1}' -%global submodule_platform_tag RELBASE_20200929 +%global submodule_platform_tag RELBASE_20201024 # additional repos to get python27 and devtoolset-7 # for el6 and el7: Software Collection;, for x86_64 only @@ -42,14 +42,14 @@ Name: palemoon-stackrpms Name: palemoon %endif Summary: Pale Moon web browser -Version: 28.14.2 +Version: 28.15.0 Release: 1 Group: Networking/Web License: MPLv2.0 URL: http://linux.palemoon.org/ -Source0: https://github.com/MoonchildProductions/Pale-Moon/archive/%{version}_Release.tar.gz -Source1: https://github.com/MoonchildProductions/UXP/archive/%{submodule_platform_tag}.tar.gz +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 Source2: palemoon-mozconfig Source3: palemoon.desktop Source4: palemoon-mimeinfo.xml @@ -285,6 +285,10 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %doc AUTHORS LICENSE %changelog +* Tue Oct 27 2020 B Stack <bgstack15@gmail.com> - 28.15.0-1 +- update version +- change sources to upstream new location, repos.palemoon.org + * Sat Oct 03 2020 B Stack <bgstack15@gmail.com> - 28.14.2-1 - update version diff --git a/palemoon-stackrpms-ublock-origin/README.md b/ublock-origin-combined/README.md index 1dd6af9..1382bec 100644 --- a/palemoon-stackrpms-ublock-origin/README.md +++ b/ublock-origin-combined/README.md @@ -1,16 +1,23 @@ -# uBlock Origin upstream +# 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 +## 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 in a few flavors, mostly for the installation directory. +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 +## Reverse dependency matrix Distro | uBlock Origin version ---------- | --------------- -All | 1.16.4.12 +All | 1.16.4.25 -# Differences from upstream -None +## Differences from upstream +N/A diff --git a/palemoon-ublock-origin/debian/Makefile b/ublock-origin-combined/debian/Makefile index 3531a3e..fca5b8a 100644 --- a/palemoon-ublock-origin/debian/Makefile +++ b/ublock-origin-combined/debian/Makefile @@ -1,17 +1,19 @@ # Makefile for palemoon-ublock-origin for devuan SOURCE0=uBlock0.firefox-legacy.xpi -MOZ_EXTENSIONS=/usr/lib/palemoon/browser/extensions +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)${MOZ_EXTENSIONS} + 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)${MOZ_EXTENSIONS}/$${newfilename} + install -Dp -m0644 ${SOURCE0} $(DESTDIR)${extdir1}/$${newfilename} rm -f install.rdf || : uninstall: - rm -f $(DESTDIR)${MOZ_EXTENSIONS}/uBlock0@raymondhill.net.xpi + rm -f $(DESTDIR)${extdir1}/uBlock0@raymondhill.net.xpi diff --git a/palemoon-ublock-origin/debian/README.Debian b/ublock-origin-combined/debian/README.Debian index 3d345f5..3d345f5 100644 --- a/palemoon-ublock-origin/debian/README.Debian +++ b/ublock-origin-combined/debian/README.Debian diff --git a/palemoon-ublock-origin/debian/changelog b/ublock-origin-combined/debian/changelog index 2ecbe1a..483fcf9 100644 --- a/palemoon-ublock-origin/debian/changelog +++ b/ublock-origin-combined/debian/changelog @@ -1,3 +1,9 @@ +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 diff --git a/palemoon-ublock-origin/debian/compat b/ublock-origin-combined/debian/compat index 48082f7..48082f7 100644 --- a/palemoon-ublock-origin/debian/compat +++ b/ublock-origin-combined/debian/compat diff --git a/waterfox-ublock-origin/debian/control b/ublock-origin-combined/debian/control index 1380e7a..d491357 100644 --- a/waterfox-ublock-origin/debian/control +++ b/ublock-origin-combined/debian/control @@ -1,4 +1,4 @@ -Source: waterfox-ublock-origin +Source: ublock-origin-combined Section: web Priority: optional Maintainer: B Stack <bgstack15@gmail.com> @@ -8,11 +8,14 @@ Build-Depends: debhelper (>=12~), Standards-Version: 4.1.4 Homepage: https://github.com/gorhill/uBlock/releases -Package: waterfox-ublock-origin +Package: ublock-origin-combined Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends} -Description: An efficient blocker for Chromium and Firefox. Fast and lean. +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 diff --git a/palemoon-ublock-origin/debian/copyright b/ublock-origin-combined/debian/copyright index bb755b9..bb755b9 100644 --- a/palemoon-ublock-origin/debian/copyright +++ b/ublock-origin-combined/debian/copyright diff --git a/palemoon-ublock-origin/debian/patches/series b/ublock-origin-combined/debian/patches/series index 4a97dfa..4a97dfa 100644 --- a/palemoon-ublock-origin/debian/patches/series +++ b/ublock-origin-combined/debian/patches/series diff --git a/waterfox-ublock-origin/debian/rules b/ublock-origin-combined/debian/rules index 55e8022..f6069f7 100755 --- a/waterfox-ublock-origin/debian/rules +++ b/ublock-origin-combined/debian/rules @@ -4,9 +4,7 @@ #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 +export NAME=ublock-origin-combined %: dh $@ diff --git a/palemoon-ublock-origin/debian/source/format b/ublock-origin-combined/debian/source/format index 163aaf8..163aaf8 100644 --- a/palemoon-ublock-origin/debian/source/format +++ b/ublock-origin-combined/debian/source/format 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/palemoon-ublock-origin/debian/source/local-options b/ublock-origin-combined/debian/source/local-options index 00131ee..00131ee 100644 --- a/palemoon-ublock-origin/debian/source/local-options +++ b/ublock-origin-combined/debian/source/local-options 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/palemoon-ublock-origin/debian/watch b/ublock-origin-combined/debian/watch index e7e7f09..e7e7f09 100644 --- a/palemoon-ublock-origin/debian/watch +++ b/ublock-origin-combined/debian/watch diff --git a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec b/ublock-origin-combined/ublock-origin-combined.spec index f58571e..5b8eca6 100644 --- a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec +++ b/ublock-origin-combined/ublock-origin-combined.spec @@ -1,27 +1,37 @@ -# palemoon globals -%global app_name palemoon-stackrpms -%global moz_extensions %{_libdir}/%{app_name}/browser/extensions -#%%global app_id +# palemoon +%global extdir1 %{_libdir}/palemoon/browser/extensions +%global extdir2 %{_libdir}/palemoon-stackrpms/browser/extensions +# waterfox +%global extdir3 %{_datadir}/waterfox/extensions/%{app_id} -Name: %{app_name}-ublock-origin +%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 Pale Moon extensions directory +Summary: uBlock Origin installed to the system Mozilla-based extensions directories Group: Applications/Internet License: GPLv3 URL: https://github.com/gorhill/uBlock -Source0: https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0_%{version}.firefox-legacy.xpi +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 -#Requires: mozilla-filesystem -#Requires: %%{app_name}-filesystem +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 is packaged for %{app_name}. +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, @@ -34,23 +44,33 @@ EasyPrivacy, and Peter Lowe's ad/tracking/malware servers. %install # learn extension id to name the file -%{__unzip} -o %{SOURCE0} install.rdf +%{__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 %{SOURCE0} )" +test -z "${newfilename}" && newfilename="$( basename %{SOURCE1} )" +rm -rf install.rdf -mkdir -p %{buildroot}%{moz_extensions} -install -Dp -m0644 %{SOURCE0} %{buildroot}%{moz_extensions}/${newfilename} +# palemoon +mkdir -p %{buildroot}%{extdir1} %{buildroot}%{extdir2} %{buildroot}%{extdir3} +install -Dp -m0644 %{SOURCE1} %{buildroot}%{extdir1}/${newfilename} +ln -s %{extdir1}/${newfilename} %{buildroot}%{extdir2} -rm -rf install.rdf +# waterfox +ln -sf %{extdir1}/${newfilename} %{buildroot}%{extdir3} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%{moz_extensions}/*.xpi +%{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 diff --git a/waterfox-ublock-origin/README.md b/waterfox-ublock-origin/README.md deleted file mode 100644 index 92ca8ba..0000000 --- a/waterfox-ublock-origin/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# 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 in a few flavors, mostly for the installation directory. - -# Reverse dependency matrix -Distro | uBlock Origin version ----------- | --------------- -All | 1.16.4.11 - -# Differences from upstream -None diff --git a/waterfox-ublock-origin/debian/Makefile b/waterfox-ublock-origin/debian/Makefile deleted file mode 100644 index 4717e98..0000000 --- a/waterfox-ublock-origin/debian/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# 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 deleted file mode 100644 index e2b7e3c..0000000 --- a/waterfox-ublock-origin/debian/README.Debian +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 60a2b1b..0000000 --- a/waterfox-ublock-origin/debian/changelog +++ /dev/null @@ -1,60 +0,0 @@ -waterfox-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 - -waterfox-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 - -waterfox-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 - -waterfox-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 - -waterfox-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 - -waterfox-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 - -waterfox-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 - -waterfox-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 - -waterfox-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 - -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 deleted file mode 100644 index 48082f7..0000000 --- a/waterfox-ublock-origin/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/waterfox-ublock-origin/debian/copyright b/waterfox-ublock-origin/debian/copyright deleted file mode 100644 index a3f3db0..0000000 --- a/waterfox-ublock-origin/debian/copyright +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 4a97dfa..0000000 --- a/waterfox-ublock-origin/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -# You must remove unused comment lines for the released package. diff --git a/waterfox-ublock-origin/debian/source/format b/waterfox-ublock-origin/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/waterfox-ublock-origin/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/waterfox-ublock-origin/debian/source/local-options b/waterfox-ublock-origin/debian/source/local-options deleted file mode 100644 index 00131ee..0000000 --- a/waterfox-ublock-origin/debian/source/local-options +++ /dev/null @@ -1,2 +0,0 @@ -#abort-on-upstream-changes -#unapply-patches diff --git a/waterfox-ublock-origin/debian/watch b/waterfox-ublock-origin/debian/watch deleted file mode 100644 index e7e7f09..0000000 --- a/waterfox-ublock-origin/debian/watch +++ /dev/null @@ -1,5 +0,0 @@ -# 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/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec deleted file mode 100644 index 5c8a2b4..0000000 --- a/waterfox-ublock-origin/waterfox-ublock-origin.spec +++ /dev/null @@ -1,99 +0,0 @@ -# waterfox globals -%global app_name waterfox -%global moz_extensions %{_datadir}/%{app_name}/extensions -%global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} - -Name: %{app_name}-ublock-origin -Version: 1.16.4.25 -Release: 1 -Summary: uBlock Origin installed to system Waterfox extensions directory - -Group: Applications/Internet -License: GPLv3+ and LGPLv3 and MIT and OFL -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 - -Requires: mozilla-filesystem -Requires: %{app_name}-filesystem - -%description -The "legacy" release of uBlock Origin (NPAPI) for tradional Mozilla-style -web browsers. This is packaged for %{app_name}. - -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} )" - -mkdir -p %{buildroot}%{moz_extensions}/%{app_id} -install -Dp -m0644 %{SOURCE1} %{buildroot}%{moz_extensions}/%{app_id}/${newfilename} - -rm -rf install.rdf - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%{moz_extensions}/*/*.xpi - -%changelog -* 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 - -* Fri Jul 20 2018 Phantom X <megaphantomx at bol dot com dot br> - 1.16.4.4-1 -- 1.16.4.4 - -* Wed Jun 13 2018 Phantom X <megaphantomx at bol dot com dot br> - 1.16.4.1-1 -- Initial spec |