Merged in upstream

3 files changed, 15 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1c0b709..97c3dfb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=your-freedom
 pkgdesc="This package conflicts with every proven nonfree package to ensure your system is free."
 license=('GPL3')
 url="https://git.parabola.nu/blacklist.git"
-pkgver=20181217
+pkgver=20190206
 pkgrel=1
 
 arch=('any')
@@ -16,7 +16,7 @@ groups=('base' 'base-openrc')
 
 makedepends=(librelib)
 source=(blacklist.txt)
-sha512sums=('97a4f461ea413dab662f0aaa1729558a709646aedd764ece755dafeed4fe159fe19edbea382936bc59649f739e61089c0246f7c6eb287826bc18a2c8d1704d0a')
+sha512sums=('0ad88839cc49f9ec26442a05d8ddf57ed7e85eef8f6e27f5d12cf2921f6d65ece2563e292dd5dc4162ae70484e96dd252ad416cef13f2218686677ba1f46212b')
 
 package() {
 	cd "$srcdir"
diff --git a/blacklist-orig.txt b/blacklist-orig.txt
index 1aabaa0..bc3d2fa 100644
--- a/blacklist-orig.txt
+++ b/blacklist-orig.txt
@@ -95,6 +95,8 @@ fcitx-libpinyin::::[uses-nonfree] depends on nonfree qt5-webengine
 file-roller:file-roller:::[uses-nonfree] recommends nonfree unrar and unace installation
 filesystem:filesystem:::[branding][FIXME:description]
 firefox-adblock-plus::fsf:firefox:[uses-nonfree] adapted for Firefox
+firefox-dark-reader::fsf:firefox:[uses-nonfree] adapted for Firefox
+firefox-decentraleyes::fsf:firefox:[uses-nonfree] adapted for Firefox
 firefox-developer-edition::fsf:firefox:[uses-nonfree] Has trademark issues, recommends nonfree software and by default has non-privacy search engines
 firefox-developer-edition-i18n-ach::fsf:firefox:[semifree][FIXME:description]
 firefox-developer-edition-i18n-af::fsf:firefox:[semifree][FIXME:description]
@@ -194,6 +196,7 @@ firefox-developer-edition-i18n-xh::fsf:firefox:[semifree][FIXME:description]
 firefox-developer-edition-i18n-zh-cn::fsf:firefox:[semifree][FIXME:description]
 firefox-developer-edition-i18n-zh-tw::fsf:firefox:[semifree][FIXME:description]
 firefox-extension-https-everywhere::fsf:firefox:[uses-nonfree] adapted for Firefox
+firefox-extension-privacybadger::fsf:firefox:[uses-nonfree] adapted for Firefox
 firefox::fsf:firefox:[uses-nonfree] Has trademark issues, recommends nonfree software and by default has non-privacy search engines
 firefox-i18n-ach::fsf:firefox:[semifree][FIXME:description]
 firefox-i18n-af::fsf:firefox:[semifree][FIXME:description]
@@ -290,8 +293,14 @@ firefox-i18n-vi::fsf:firefox:[semifree][FIXME:description]
 firefox-i18n-xh::fsf:firefox:[semifree][FIXME:description]
 firefox-i18n-zh-cn::fsf:firefox:[semifree][FIXME:description]
 firefox-i18n-zh-tw::fsf:firefox:[semifree][FIXME:description]
-firefox-noscript::fsf:firefox:[uses-nonfree] adapted for Firefox
+firefox-noscript:iceweasel-noscript:fsf:firefox:[uses-nonfree] adapted for Firefox
+firefox-referer-control::fsf:firefox:[uses-nonfree] adapted for Firefox
 firefox-spell-ru::fsf:firefox:[uses-nonfree] adapted for Firefox
+firefox-stylus::fsf:firefox:[uses-nonfree] adapted for Firefox
+firefox-tree-style-tab::fsf:firefox:[uses-nonfree] adapted for Firefox
+firefox-tridactyl::fsf:firefox:[uses-nonfree] adapted for Firefox
+firefox-ublock-origin:iceweasel-ublock-origin:fsf:firefox:[uses-nonfree] adapted for Firefox
+firefox-umatrix::fsf:firefox:[uses-nonfree] adapted for Firefox
 flashplugin::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 font-bh-ttf::::[nonfree] license forbids modification
 font-mathematica::::[FIXME:description]
@@ -314,7 +323,6 @@ gst-plugins-bad:gst-plugins-bad:::[uses-nonfree] depends on nonfree package faac
 handbrake-cli:handbrake-cli:::[technical] Arch version uses network during building (also doesn't use system fdk-aac, x265, or libvpx)
 handbrake:handbrake:::[technical] Arch version uses network during building (also doesn't use system fdk-aac, x265, or libvpx)
 hardinfo:hardinfo:::[branding][FIXME:description]
-hashcat:hashcat:parabola:1050:[uses-nonfree] recommends nonfree libxnvctrl and opencl-nvidia optional installation
 hexchat:hexchat:::[uses-nonfree] Hard-codes the firefox command in some menus
 hplip:hplip:::[uses-nonfree] recommends binary blobs
 human-icon-theme::::[branding] Arch Linux logo rebranding
@@ -595,6 +603,7 @@ riot-desktop::parabola:1380:[uses-nonfree] depends on nonfree electron
 riscv64-linux-gnu-linux-api-headers:riscv64-linux-gnu-linux-libre-api-headers:::[semifree] has source containing and recommending nonfree software
 rp-pppoe:rp-pppoe:::[semifree] installs documentation about nonfree counterpart
 ruby2.3:ruby2.3:parabola:674:[semifree] json module has nonfree CVTUTF code; replace with pure Ruby implementation
+ruby2.5:ruby2.5:parabola:674:[semifree] json module has nonfree CVTUTF code; replace with pure Ruby implementation
 ruby-docs:ruby-docs:parabola:674:[semifree] Rebuilt as part of 'ruby' package
 ruby:ruby:parabola:674:[semifree] json module has nonfree CVTUTF code; replace with pure Ruby implementation
 sane-gt68xx-firmware::::[nonfree] Contains nonfree Software
@@ -617,6 +626,7 @@ soundkonverter:soundkonverter:::[uses-nonfree] recommends nonfree faac and mac o
 sqlite-doc::::[FIXME:description] portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library
 steam-native-runtime::::[uses-nonfree] only useful with nonfree steam
 steam::::[nonfree] binary package
+supercollider:supercollider:::[uses-nonfree] built with nonfree qt5-webengine
 syslinux:syslinux:::[branding][FIXME:description]
 systemd-resolvconf:systemd-resolvconf:::[technical] Because systemd and libsystemd are being repackaged anyway (same PKGBUILD)
 systemd:systemd:::[branding] Parabola, not Arch [technical] Use linux-libre [recommends-nonfree] Say GNU/Linux, use FSDG distros as examples
diff --git a/blacklist.txt b/blacklist.txt
index 9027bee..dd050ad 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -80,7 +80,6 @@ gnome-software-packagekit-plugin::::[uses-nonfree][FIXME:package] depends on non
 gnome-software::parabola:1413:[uses-nonfree][FIXME:package] depends on nonfree archlinux-appstream-data
 gsopcast::::[uses-nonfree] GTK Front-end for non-free sopcast package
 gst-plugins-bad:gst-plugins-bad:::[uses-nonfree] depends on nonfree package faac
-hashcat:hashcat:parabola:1050:[uses-nonfree] recommends nonfree libxnvctrl and opencl-nvidia optional installation
 hplip:hplip:::[uses-nonfree] recommends binary blobs
 hydrogen:hydrogen:parabola:288:[uses-nonfree] recommends nonfree drumkits
 intel-ucode::::[nonfree] no modification, use restrictions
@@ -278,6 +277,7 @@ riot-desktop::parabola:1380:[uses-nonfree] depends on nonfree electron
 riscv64-linux-gnu-linux-api-headers:riscv64-linux-gnu-linux-libre-api-headers:::[semifree] has source containing and recommending nonfree software
 rp-pppoe:rp-pppoe:::[semifree] installs documentation about nonfree counterpart
 ruby2.3:ruby2.3:parabola:674:[semifree] json module has nonfree CVTUTF code; replace with pure Ruby implementation
+ruby2.5:ruby2.5:parabola:674:[semifree] json module has nonfree CVTUTF code; replace with pure Ruby implementation
 ruby-docs:ruby-docs:parabola:674:[semifree] Rebuilt as part of 'ruby' package
 ruby:ruby:parabola:674:[semifree] json module has nonfree CVTUTF code; replace with pure Ruby implementation
 sane-gt68xx-firmware::::[nonfree] Contains nonfree Software