Merged in upstream

2 files changed, 7 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 49f0a58..aab1a43 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=20170927
-pkgrel=2.arcfour1
+pkgver=20171008
+pkgrel=1.arcfour1
 
 arch=('any')
 groups=('base' 'base-openrc')
 
 makedepends=(librelib)
 source=(blacklist.txt)
-sha512sums=('9deac590acdd5f14f6ab01a97c02dcfc5f34931fce13d0bfc95070eebb4bd3d86b4863274e1545f5fcf71cd838068e5629953485ba308e2d7a7522621fdd0755')
+sha512sums=('d2038bcee3ad5583bd3a0c2c2b12037cf52c6cb3d2be02013a3c13947cc368cd85686e70703b7d7c05f2ca6f440479b0d639e2be15e1bffaf52aade455f39dbc')
 
 package() {
 	cd "$srcdir"
diff --git a/blacklist.txt b/blacklist.txt
index d2f7a55..463f28d 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -353,9 +353,9 @@ linux-cubox-headless:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubun
 linux-d3plug:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
 linux-docs:linux-libre-docs:::[semifree] docs comes from nonfree linux kernel
 linux-firmware:linux-libre-firmware:fsf:linux-firmware:[semifree] nonfree blobs and firmwares
-linux-hardened:linux-libre-grsec:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
-linux-hardened-headers:linux-libre-grsec-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
-linux-hardened-docs:linux-libre-grsec-docs:::[semifree] docs comes from nonfree linux-grsec kernel
+linux-hardened:linux-libre-hardened:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-hardened-headers:linux-libre-hardened-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-hardened-docs:linux-libre-hardened-docs:::[semifree] docs comes from nonfree linux-grsec kernel
 linux-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
 linux-headers-clearfog:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
 linux-headers-d3plug:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
@@ -719,7 +719,7 @@ unrar:unar:fsf:unrar:[nonfree]
 unzip:unzip:::[semifree] contains a source file that doesn't mention modification
 urbanterror::::[uses-nonfree] GPL2, but it can use together with proprietary data only
 urbanterror-data::::[nonfree] proprietary, it permits distribute together with the game only
-vapoursynth-plugin-fluxsmooth:::parabola:630:[nonfree] no license
+vapoursynth-plugin-fluxsmooth::parabola:630:[nonfree] no license
 veracrypt::parabola:1139:[nonfree] partially licensed under the terms of the TrueCrypt License 3.0 which is nonfree -> https://www.gnu.org/licenses/license-list.html#Truecrypt-3.0
 vhba-module:vhba-module:::[technical] adapted to nonfree linux kernel
 vhba-module-dkms:vhba-module-dkms:::[technical] Recompile for linux-libre kernel instead of linux kernel