Merged upstream changes

2 files changed, 108 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b2de933..8b07664 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@ 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=20171215
-pkgrel=1.arcfour1
+pkgver=20171230
+pkgrel=3.arcfour1
 
 arch=('any')
 groups=('base' 'base-openrc')
 
 makedepends=(librelib)
 source=(blacklist.txt)
-sha512sums=('7275bd8e4797d66fe2714bdd89f1ce038649d5e5c982e364f9f4b964a1f860e58dba22d19da07edeadf28df44bc171e6ea6064431ebde535024cee86313b5851')
+sha512sums=('7026c219c39289f7ebbe33649a3f2c396144c998b60e2fd86a7aacbced070dedbaf98d9e95fa3ad6c393f31926d05f80b6cc24f1f0c57698db2f804375633ac2')
 
 package() {
 	cd "$srcdir"
diff --git a/blacklist.txt b/blacklist.txt
index 6cfa8ab..61d52f6 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -55,8 +55,8 @@ audex:audex:::[uses-nonfree] recommends nonfree faac optional installation
 audio-convert:audio-convert:::[uses-nonfree] recommends nonfree faac optional installation
 avidemux-cli:avidemux-cli:::[uses-nonfree] depends and recommends nonfree faac installation
 avidemux-qt:avidemux-qt:::[uses-nonfree] depends and recommends nonfree faac installation
-b43-firmware::fsf:b43-fwcutter:[nonfree] the nonfree firmware b43-fwcutter depends on (from Antergos)
-b43-fwcutter:b43-tools:fsf:b43-fwcutter:[uses-nonfree] only useful to install nonfree software
+b43-firmware:openfwwf:fsf:b43-fwcutter_.2F_b43-tools:[nonfree] Nonfree firmware for Broadcom 43XX series WLAN (from Antergos)
+b43-fwcutter::fsf:b43-fwcutter_.2F_b43-tools:[uses-nonfree] Only useful to obtain nonfree firmware
 bbswitch:bbswitch:::[technical] Recompile for linux-libre kernel instead of linux kernel
 bbswitch-dkms:bbswitch-dkms:::[technical] Recompile for linux-libre kernel instead of linux kernel
 bbswitch-lts:bbswitch-lts:::[technical] Recompile for linux-libre-lts kernel instead of linux-lts kernel
@@ -121,11 +121,106 @@ epiphany:epiphany:parabola:367:[uses-nonfree] has non-privacy search engines e.g
 faac::::[nonfree] [FIXME:description] is a GPL'ed package, but has non free code that can't be distributed under the GPL
 faenza-icon-theme:faenza-icon-theme:::[branding] has nonfree distros and application icons, also Archlinux logo and menu, rebranding
 faience-icon-theme:faience-icon-theme:::[branding] has nonfree distros and application icons, also Archlinux logo and menu, rebranding
-figlet:toilet:::[FIXME:description]
 file-roller:file-roller:::[uses-nonfree] recommends nonfree unrar and unace installation
 filesystem:filesystem:::[branding]
 firefox::fsf:firefox:[uses-nonfree] Has trademark issues, recommends nonfree software and by default has non-privacy search engines
 firefox-adblock-plus::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]
+firefox-developer-edition-i18n-af::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-an::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ar::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-as::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ast::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-az::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-be::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-bg::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-bn-bd::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-bn-in::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-br::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-bs::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ca::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-cak::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-cs::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-cy::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-da::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-de::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-dsb::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-el::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-en-gb::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-en-us::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-en-za::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-eo::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-es-ar::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-es-cl::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-es-es::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-es-mx::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-et::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-eu::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-fa::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ff::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-fi::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-fr::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-fy-nl::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ga-ie::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-gd::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-gl::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-gn::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-gu-in::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-he::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-hi-in::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-hr::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-hsb::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-hu::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-hy-am::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-id::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-is::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-it::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ja::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ka::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-kab::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-kk::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-km::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-kn::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ko::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-lij::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-lt::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-lv::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-mai::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-mk::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ml::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-mr::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ms::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-my::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-nb-no::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-nl::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-nn-no::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-or::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-pa-in::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-pl::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-pt-br::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-pt-pt::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-rm::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ro::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ru::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-si::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-sk::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-sl::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-son::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-sq::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-sr::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-sv-se::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ta::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-te::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-th::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-tr::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-uk::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-ur::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-uz::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-vi::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-xh::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-zh-cn::fsf:firefox:[semifree]
+firefox-developer-edition-i18n-zh-tw::fsf:firefox:[semifree]
 firefox-i18n-ach::fsf:firefox:[semifree]
 firefox-i18n-af::fsf:firefox:[semifree]
 firefox-i18n-an::fsf:firefox:[semifree]
@@ -288,7 +383,7 @@ jsampler::::[uses-nonfree] only useful with nonfree linuxsampler
 junit:junit:::[technical] Arch version was not built from source
 kdebase-runtime:kdebase-runtime:::[uses-nonfree] has non-privacy search engines by default
 kdelibs:kdelibs:::[FIXME:description] [[issue108]]
-kdenetwork-kopete:kdenetwork-kopete:fsf:kopete:[semifree] supports Skype
+kopete:kopete:fsf:kopete:[semifree] supports Skype
 khotkeys:khotkeys:parabola:1103:[uses-nonfree] has Google search engine URL into custom shortcuts
 kile:kile:::[uses-nonfree] recommends Adobe Reader
 kinfocenter:kinfocenter:parabola:1086:[branding]
@@ -315,13 +410,14 @@ libosinfo:libosinfo:parabola:517:[uses-nonfree] contains non-FSDG compliant dist
 libquicktime:libquicktime:::[uses-nonfree] depends on faac
 libreoffice-installer::::[nonfree] source code website unavailable (from Antergos)
 libretro-genesis-plus-gx::parabola:1011:[nonfree] noncommercial software https://github.com/libretro/Genesis-Plus-GX/blob/master/LICENSE.txt
+libretro-shaders-cg::parabola:1454:[uses-nonfree] depends on nonfree nvidia-cg-toolkit
 libretro-snes9x::parabola:1012:[nonfree] noncommercial software https://github.com/libretro/snes9x/blob/master/docs/snes9x-license.txt
 libsystemd:libsystemd:::[technical] Changing how the package gets split
 libunrar::::[nonfree] part of nonfree unrar, Issue442
 libview::::[uses-nonfree] only useful with vmware
 libxfce4ui:libxfce4ui:parabola:1117:[branding]
 libxnvctrl::parabola:763:[uses-nonfree] only useful for nonfree nvidia driver
-licenses:licenses:::[use-nonfree] contains non copyleft friendly licenses
+licenses:licenses:::[use-nonfree] Remove non-free CC -NC and -ND licenses (also add WTFPL)
 linux:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
 linux_logo::::[FIXME:description] [uses-nonfree] contains tux text-based logo for nonfree linux kernel
 linux-am33x:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
@@ -553,11 +649,14 @@ pyrit:pyrit:parabola:1142:[uses-nonfree] recommends nonfree cpyrit-cuda optional
 pysolfc-cardsets:pysolfc-cardsets:::[semifree] some copyrighted cardsets
 python2-antlr2:antlr2-python2:::[technical] repackage for boring reasons
 python2-pycuda::::[uses-nonfree] depends on nonfree cuda
+python2-pytorch-cuda::::[uses-nonfree] depends on nonfree cuda and cudnn
 python2-reportlab:python2-reportlab:::[semifree] setup.py downloads adobe t1 fonts without license
 python2-unrardll::::[uses-nonfree] depends on nonfree libunrar
 python-pycuda::::[uses-nonfree] depends on nonfree cuda
+python-pytorch-cuda::::[uses-nonfree] depends on nonfree cuda and cudnn
 python-reportlab:python-reportlab:::[semifree] setup.py downloads adobe t1 fonts without license
 python-tensorflow-cuda::::[uses-nonfree] depends on nonfree cuda and cudnn
+python-tensorflow-opt-cuda::::[uses-nonfree] depends on nonfree cuda and cudnn
 python-unrardll::::[uses-nonfree] depends on nonfree libunrar
 qsopcast::::[FIXME:description]
 r8168::::[nonfree] blobs
@@ -609,6 +708,7 @@ tarsnap::::[nonfree] self-admittedly non-free https://www.tarsnap.com/open-sourc
 teamspeak3::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 tensorflow::::[uses-nonfree] depends on nonfree cuda and cudnn
 tensorflow-cuda::::[uses-nonfree] depends on nonfree cuda and cudnn
+tensorflow-opt-cuda::::[uses-nonfree] depends on nonfree cuda and cudnn
 texlive-bin:texlive-bin:::[branding] [semifree] rebranding due to other TeXLive changes
 texlive-core:texlive-core:::[semifree] some nonfree packages
 texlive-fontsextra:texlive-fontsextra:::[semifree] some nonfree packages