Added 7kaa-music | ttf-hannom reasoning | Synced with upstream

3 files changed, 16 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 29bb03a..22f493f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,14 @@
 # Maintainer: jc_gargma <jc_gargma@iserlohn-fortress.net>
 # Maintainer (Parabola): Parabola Project <dev@lists.parabola.nu>
 
+# # I maintain this because:
+# Parabola has some dubious blacklisting decisions
+
 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=20180911
+pkgver=20181002
 pkgrel=1
 
 arch=('any')
@@ -13,7 +16,7 @@ groups=('base' 'base-openrc')
 
 makedepends=(librelib)
 source=(blacklist.txt)
-sha512sums=('b2b67f207c0305a08317c7219067640c5a51c956d93e93eb76e150368d48a95e3911eb56181801a03db550558ef1492dba4689101f962cd8f94003423be47f30')
+sha512sums=('47a8685f538fe2a1e71f82c09f6ccf20a877bfaae27bf83a47c204cda923375518787bac0df73183cb446119e4faf903134ac9abfb4e24e097e400e527c38f6a')
 
 package() {
 	cd "$srcdir"
diff --git a/blacklist-orig.txt b/blacklist-orig.txt
index ac36218..954a4da 100644
--- a/blacklist-orig.txt
+++ b/blacklist-orig.txt
@@ -14,6 +14,8 @@ archboot::::[technical] [FIXME:package] requires isdn4k-utils (for which there i
 archey3:paraboley:::[branding] [FIXME:package] TODO: package archey3 with https://github.com/lclarkmichalek/archey3/pull/40
 arch-firefox-search::::[branding][FIXME:description]
 archiso:parabolaiso:::[branding][FIXME:description]
+archlinux32-keyring:archlinux32-keyring:::[technical] Blacklisted to avoid import by db-import-pkg; import separately with db-import-keyring
+archlinuxarm-keyring:archlinuxarm-keyring:::[technical] Blacklisted to avoid import by db-import-pkg; import separately with db-import-keyring
 archlinux-appstream-data::parabola:813:[uses-nonfree][FIXME:package] promotes nonfree packages and Arch repositories
 archlinux-menus::::[branding] [FIXME:package][FIXME:description]
 archlinux-themes-slim:parabola-themes-slim:::[branding][FIXME:description]
@@ -561,7 +563,7 @@ playonlinux::parabola:278:[nonfree] has a collection of scripts to download and
 ponysay:ponysay:parabola:206:[semifree] contains nonfree pony graphics
 povray:povray:::[semifree] contains nonfree documentation (CC by-nc-sa) see: https://github.com/POV-Ray/povray/blob/master/README.md (POV-Ray below 3.7 version are nonfree software)
 primus::::[uses-nonfree] only useful with bumblebee
-profont::::[FIXME:description]
+psensor:psensor:parabola:1914:[uses-nonfree] depends on nonfree libxnvctrl
 psutils:psutils:fsf:psutils:[semifree] has nonfree files
 pycuda-headers::::[uses-nonfree] depends on nonfree cuda
 pyqt5-common:pyqt5-common:::[uses-nonfree] depends on nonfree qt5-webengine
@@ -693,7 +695,7 @@ tmon:linux-libre-tools-tmon:::                                    [semifree] (li
 tp_smapi-lts:tp_smapi-lts:::[technical] adapted to nonfree linux-lts kernel
 tp_smapi:tp_smapi:::[technical] adapted to nonfree linux kernel
 truecrypt::::[FIXME:description] license too complex to understand and consider free
-ttf-hannom::::[FIXME:description]
+ttf-hannom::::[nonfree] non-comercial license https://git.archlinux.org/svntogit/packages.git/commit/trunk/README?h=packages/ttf-hannom&id=bdd0a7d145c56836c27f126d090d2d22cc88713d
 ttf-ubuntu-font-family::parabola:1055:[nonfree] Ubuntu font license considered non-free by DFSG and Fedora
 turbostat:linux-libre-tools-turbostat:::                          [semifree] (linux-tools) Build from the Linux-libre kernel
 uboot-a10-olinuxino-lime:uboot-a10-olinuxino-lime:::[technical] adapted to nonfree linux kernel
diff --git a/blacklist.txt b/blacklist.txt
index 2931090..2a991bf 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -1,3 +1,4 @@
+7kaa-music:::[non-free] Does not allow modifications and only allows for usage with the 7kaa package
 aarch64-linux-gnu-linux-api-headers:aarch64-linux-gnu-linux-libre-api-headers:::[semifree] has source containing and recommending nonfree software, [[issue1571]]
 abiword:abiword:::[semifree] Hard-codes nonfree fonts, and has non-privacy search engines e.g. Google
 abuse:abuse:fsf:Free_Abuse_Extensions:[semifree] Contains a nonfree addon
@@ -68,8 +69,8 @@ foomatic-db-nonfree-ppds::::[nonfree] clearly non free :P
 fop:fop:sv:34579:[FIXME:description] (the linked bug is about batik, not fop...)
 frogatto-data::::[nonfree] nonfree data
 frogatto::::[uses-nonfree] needs -data
-fwupd::::[nonfree] Downloads non-free firmware and BIOS updates
-fwupdate::::[nonfree] Downloads non-free firmware and BIOS updates
+fwupd::::[uses-nonfree] Downloads non-free firmware and BIOS updates
+fwupdate::::[uses-nonfree] Downloads non-free firmware and BIOS updates
 gemrb::parabola:658:[uses-nonfree] requires nonfree content to play
 gigedit::::[uses-nonfree] only useful with nonfree linuxsampler
 gloobus-preview:gloobus-preview:::[uses-nonfree] recommends nonfree unrar optional installation
@@ -219,7 +220,7 @@ opencl-nvidia-390xx::::[nonfree] nonfree, nondistributable, built from binary in
 opencl-nvidia::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 opencv:opencv:parabola:735:[semifree] contains nonfree module and some nonfree data
 openexr:openexr:::[semifree] includes embedded nonfree fonts in the documentation
-openmw::parabola:612:[uses-nonfree] has wizard installation support to install nonfree assets from Morrowind to run Morrowind
+openmw:openmw:parabola:612:[uses-nonfree] has wizard installation support to install nonfree assets from Morrowind to run Morrowind
 openshot:openshot:::[uses-nonfree] recommends nonfree faac optional installation
 openttd-opensfx::parabola:693:[nonfree] license CC Sampling Plus 1.0 restricting modification
 openttd:openttd:parabola:716:[uses-nonfree] recommends nonfree openttd-opensfx optional installation
@@ -250,6 +251,7 @@ playonlinux::parabola:278:[nonfree] has a collection of scripts to download and
 ponysay:ponysay:parabola:206:[semifree] contains nonfree pony graphics
 povray:povray:::[semifree] contains nonfree documentation (CC by-nc-sa) see: https://github.com/POV-Ray/povray/blob/master/README.md (POV-Ray below 3.7 version are nonfree software)
 primus::::[uses-nonfree] only useful with bumblebee
+psensor:psensor:parabola:1914:[uses-nonfree] depends on nonfree libxnvctrl
 psutils:psutils:fsf:psutils:[semifree] has nonfree files
 pycuda-headers::::[uses-nonfree] depends on nonfree cuda
 pyrit:pyrit:parabola:1142:[uses-nonfree] recommends nonfree cpyrit-cuda optional installation
@@ -305,7 +307,7 @@ texlive-fontsextra:texlive-fontsextra:::[semifree] some nonfree packages
 texlive-latexextra:texlive-latexextra:::[semifree] some nonfree packages
 tmon:linux-libre-tools-tmon:::[semifree] (linux-tools) Build from the Linux-libre kernel
 truecrypt::::[nonfree] License forbids usage by users that do not understand the license. Forbits derivative works using the same name or logo except for fair use reasons. Forbids dual-licensing with licenses that allow payment for software. https://www.gnu.org/licenses/license-list.html#Truecrypt-3.0
-ttf-hannom::::[nonfree] "For non-commercial, non-profit, personal use only."
+ttf-hannom::::[nonfree] non-comercial license https://git.archlinux.org/svntogit/packages.git/commit/trunk/README?h=packages/ttf-hannom&id=bdd0a7d145c56836c27f126d090d2d22cc88713d
 ttf-ubuntu-font-family::parabola:1055:[nonfree] Ubuntu font license considered non-free by DFSG and Fedora
 turbostat:linux-libre-tools-turbostat:::                          [semifree] (linux-tools) Build from the Linux-libre kernel
 uboot-odroid-c1::::[uses-nonfree] adapted to nonfree linux kernel and ODROID devices that requires nonfree startup software -> https://www.fsf.org/resources/hw/single-board-computers
@@ -342,7 +344,7 @@ virtualbox-host-modules-arch::::[uses-nonfree] depends on virtualbox
 virtualbox::::[nonfree] contains BIOS which needs a nonfree compiler to build from source (OpenWatcom compiler), doesn't contains free distros presets for the virtual machine creation wizard, supports for nonfree Extension Pack, has nonfree user manual and adapted to nonfree linux kernel
 virtualbox-sdk::::[uses-nonfree] depends on virtualbox
 vivaldi::::[nonfree] proprietary EULA, missing sources, built from binary installers, etc (from Antergos)
-winetricks::parabola:366:[uses-nonfree] recommends and installs nonfree software
+winetricks:winetricks-libre:parabola:366:[uses-nonfree] recommends and installs nonfree software
 wings3d:wings3d:::[uses-nonfree] supports nonfree kerkythea renderer
 x86_energy_perf_policy:linux-libre-tools-x86_energy_perf_policy:::[semifree] (linux-tools) Build from the Linux-libre kernel
 xarchiver-gtk2:xarchiver-gtk2:::[uses-nonfree] recommends nonfree unrar