Merged in upstream

2 files changed, 7 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9055867..d286cf8 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=20170710
-pkgrel=1
+pkgver=20170711
+pkgrel=2
 
 arch=('any')
 groups=('base' 'base-openrc')
 
 makedepends=(librelib)
 source=(blacklist.txt)
-sha512sums=('0c8b8f7b5e8ad54e13167a1f78fb3513722ed32d9e77e5f8e42cc30e1de4e10940560b1316168659ab878eaabec55412daec3948ea97e10a611bd3256bf029a2')
+sha512sums=('f81c009452f67b968515ef93c2e63ac85fbd156b6f375835b7ca2fecbd3fceab5fc3705d9bb2e8bc1916be19a3a20114a97dde681fd91be21395c323b1628963')
 validpgpkeys=(
               '081E4760E5FCD76098A304E43A85CAFF5C61486A' # jc_gargma
 )
diff --git a/blacklist.txt b/blacklist.txt
index 2e100f1..61b5528 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -26,6 +26,7 @@ arch-wiki-lite:parabola-wiki-lite:parabola:1025:[branding] [FIXME:package]
 archboot::::[technical] [FIXME:package] requires isdn4k-utils (for which there is a free replacement that is unpackaged)
 archey3:paraboley:::[branding] [FIXME:package] TODO: package archey3 with https://github.com/lclarkmichalek/archey3/pull/40
 archiso:parabolaiso:::[branding]
+archlinux-appstream-data::parabola:813:[uses-nonfree][FIXME:package] promotes nonfree packages and Arch repositories
 archlinux-menus::::[branding] [FIXME:package]
 archlinux-themes-kdm::::[branding] [FIXME:package]
 archlinux-themes-slim:parabola-themes-slim:::[branding]
@@ -100,6 +101,7 @@ dangerdeep-data::::[nonfree] non commercial license
 debootstrap:debootstrap:::[uses-nonfree] bootstrap a basic Debian system
 deepin-game::parabola:849:[uses-nonfree] depends on nonfree flashplugin
 dina-font::::[nonfree] using it for "for anything illegal" not allowed
+discover::::[uses-nonfree][FIXME:package] depends on nonfree archlinux-appstream-data
 ditaa:ditaa:::[technical] Arch version was not built from source
 dosemu::fsf:dosemu:[uses-nonfree] contains free software that can only be built using nonfree software
 doublecmd-gtk2:doublecmd-gtk2:::[uses-nonfree] recommends nonfree libunrar optional installation
@@ -235,14 +237,14 @@ fop:fop:sv:34579:[FIXME:description] (the linked bug is about batik, not fop...)
 frogatto::::[uses-nonfree] needs -data
 frogatto-data::::[nonfree] nonfree data
 gemrb::parabola:658:[uses-nonfree] requires nonfree content to play
-geogebra::::[nonfree] non commercial license -> https://geogebra.org/license
+geogebra::::[nonfree][technical][FIXME:package] Arch version is packaged from installers under noncommercial license, but free sources could be repackaged in principle -> https://lists.parabola.nu/pipermail/assist/2015-December/000586.html
 gfxboot::::[technical][FIXME:package] package wasn't built from source (from Antergos)
 gigedit::::[uses-nonfree] only useful with nonfree linuxsampler
 gloobus-preview:gloobus-preview:::[uses-nonfree] recommends nonfree unrar optional installation
 glsof:glsof:parabola:277:[technical] Arch version was not built from source
 gnome-boxes:gnome-boxes:parabola:517:[uses-nonfree] contains artwork for non-FSDG compliant distros and operating systems
 gnome-do-plugins::::[uses-nonfree] recommends nonfree software
-gnome-software::::[uses-nonfree] recommends nonfree software, shows wrong licenses for programs
+gnome-software::parabola:1413:[uses-nonfree][FIXME:package] depends on nonfree archlinux-appstream-data
 gnormalize:gnormalize:::[uses-nonfree] recommends nonfree faac and mac optional installation
 grub:grub:::[branding]
 gsopcast::::[FIXME:description]