Merge branch 'master' of git://git.parabola.nu/abslibre/abslibre

224 files changed, 6657 insertions, 4993 deletions

diff --git a/kernels/linux-libre-lts-xtreme/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/kernels/linux-libre-lts-xtreme/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
index eabb7fb3d..a63d09020 100644
--- a/kernels/linux-libre-lts-xtreme/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/kernels/linux-libre-lts-xtreme/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,4 +1,4 @@
-From 81e89a314fb1e70274c2ec72013ba0a076de55dd Mon Sep 17 00:00:00 2001
+From 043141070b13388a29ce9f73d1378db6fee9ea00 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
 Subject: [PATCH 1/7] ARM: atags: add support for Marvell's u-boot
@@ -47,5 +47,5 @@ index 979ff4016404..d1d0c1950fa4 100644
  };
  
 -- 
-2.13.0
+2.14.2
 
diff --git a/kernels/linux-libre-lts-xtreme/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/kernels/linux-libre-lts-xtreme/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index 15d47e779..f7d3a9bc6 100644
--- a/kernels/linux-libre-lts-xtreme/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/kernels/linux-libre-lts-xtreme/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,4 +1,4 @@
-From e62b74b84f4b146e0b82d6acf1c043dc599ea884 Mon Sep 17 00:00:00 2001
+From 278772450de941a06782c07a43e7511b6bdbf430 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
 Subject: [PATCH 2/7] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
@@ -43,5 +43,5 @@ index 9448aa0c6686..ac7b6ae6c00f 100644
  	}
  
 -- 
-2.13.0
+2.14.2
 
diff --git a/kernels/linux-libre-lts-xtreme/0003-SMILE-Plug-device-tree-file.patch b/kernels/linux-libre-lts-xtreme/0003-SMILE-Plug-device-tree-file.patch
index 8573e2631..980a1fc2d 100644
--- a/kernels/linux-libre-lts-xtreme/0003-SMILE-Plug-device-tree-file.patch
+++ b/kernels/linux-libre-lts-xtreme/0003-SMILE-Plug-device-tree-file.patch
@@ -1,4 +1,4 @@
-From 8a920b8030a9a677dd6d38cf0305e7bf63617a61 Mon Sep 17 00:00:00 2001
+From db678c33357f6349df02b0f4979fc8c9ee365697 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
 Subject: [PATCH 3/7] SMILE Plug device tree file
@@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 9c5e1d944d1c..342ed08ab225 100644
+index faf46abaa4a2..aecdcfa7a67b 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -985,6 +985,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -1010,6 +1010,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
  	armada-370-db.dtb \
  	armada-370-dlink-dns327l.dtb \
  	armada-370-mirabox.dtb \
@@ -205,5 +205,5 @@ index 000000000000..d01308ab848b
 +	};
 +};
 -- 
-2.13.0
+2.14.2
 
diff --git a/kernels/linux-libre-lts-xtreme/0004-fix-mvsdio-eMMC-timing.patch b/kernels/linux-libre-lts-xtreme/0004-fix-mvsdio-eMMC-timing.patch
index f3afd34a8..41b592420 100644
--- a/kernels/linux-libre-lts-xtreme/0004-fix-mvsdio-eMMC-timing.patch
+++ b/kernels/linux-libre-lts-xtreme/0004-fix-mvsdio-eMMC-timing.patch
@@ -1,4 +1,4 @@
-From 9ef8feb3e1a701eacd6979653511e1b13b095697 Mon Sep 17 00:00:00 2001
+From 1b4696de4df2ebd2d2a0da05a284705e11427e06 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
 Subject: [PATCH 4/7] fix mvsdio eMMC timing
@@ -34,5 +34,5 @@ index 58d74b8d6c79..c9715530d676 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.13.0
+2.14.2
 
diff --git a/kernels/linux-libre-lts-xtreme/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-lts-xtreme/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index 195521268..788a14239 100644
--- a/kernels/linux-libre-lts-xtreme/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/kernels/linux-libre-lts-xtreme/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,4 +1,4 @@
-From d52a089f2564db419f6a9b4109ccda69e847793d Mon Sep 17 00:00:00 2001
+From ffd117b73c6a0185d3089ec9abee06122e88eecb Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
 Subject: [PATCH 5/7] net/smsc95xx: Allow mac address to be set as a parameter
@@ -8,7 +8,7 @@ Subject: [PATCH 5/7] net/smsc95xx: Allow mac address to be set as a parameter
  1 file changed, 56 insertions(+)
 
 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index 765400b62168..ee3212f887e3 100644
+index 309b88acd3d0..7bc9feb891a1 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -60,6 +60,7 @@
@@ -91,5 +91,5 @@ index 765400b62168..ee3212f887e3 100644
  
  	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
-2.13.0
+2.14.2
 
diff --git a/kernels/linux-libre-lts-xtreme/0006-set-default-cubietruck-led-triggers.patch b/kernels/linux-libre-lts-xtreme/0006-set-default-cubietruck-led-triggers.patch
index 30c7a8c20..4819bd700 100644
--- a/kernels/linux-libre-lts-xtreme/0006-set-default-cubietruck-led-triggers.patch
+++ b/kernels/linux-libre-lts-xtreme/0006-set-default-cubietruck-led-triggers.patch
@@ -1,4 +1,4 @@
-From 6a5a573951f166fdda2d2daa235207f32d9bec92 Mon Sep 17 00:00:00 2001
+From e2567ba6352c663819406b73d4aa3aa31ad4ca06 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
 Subject: [PATCH 6/7] set default cubietruck led triggers
@@ -9,7 +9,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-index 102903e83bd2..40ce78704e8f 100644
+index 852a0aa24dce..82c963629a55 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 @@ -69,6 +69,7 @@
@@ -29,5 +29,5 @@ index 102903e83bd2..40ce78704e8f 100644
  	};
  
 -- 
-2.13.0
+2.14.2
 
diff --git a/kernels/linux-libre-lts-xtreme/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/kernels/linux-libre-lts-xtreme/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
index 3c3795cd9..edc81ae30 100644
--- a/kernels/linux-libre-lts-xtreme/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ b/kernels/linux-libre-lts-xtreme/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@@ -1,4 +1,4 @@
-From 65265b8379903a8dd95489616fde0126d10bd4ef Mon Sep 17 00:00:00 2001
+From dc9e6fcc9675737091fb99550b361aea81a94b90 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
 Subject: [PATCH 7/7] exynos4412-odroid: set higher minimum buck2 regulator
@@ -13,7 +13,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-index 0f1ff792fe44..a6fc2a53522f 100644
+index 102acd78be15..5b65992e5667 100644
 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 @@ -423,7 +423,7 @@
@@ -26,5 +26,5 @@ index 0f1ff792fe44..a6fc2a53522f 100644
  				regulator-always-on;
  				regulator-boot-on;
 -- 
-2.13.0
+2.14.2
 
diff --git a/kernels/linux-libre-lts-xtreme/PKGBUILD b/kernels/linux-libre-lts-xtreme/PKGBUILD
index 0f1838914..2e0833eff 100644
--- a/kernels/linux-libre-lts-xtreme/PKGBUILD
+++ b/kernels/linux-libre-lts-xtreme/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: David P. <megver83@parabola.nu>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
-# Contributor: fauno <fauno@parabola.nu>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor: Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Contributor: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Luke R. <g4jc@openmailbox.org>
 
-# Based on linux package
+# Based on linux-lts package
 
-pkgbase=linux-libre-xtreme
-_pkgbasever=4.13-gnu
-_pkgver=4.13.13-gnu
-_hardenedver=a
+pkgbase=linux-libre-lts-xtreme
+_pkgbasever=4.9-gnu
+_pkgver=4.9.75-gnu
+_knockpatchver=4.9_1
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -22,16 +22,18 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
 pkgrel=1
-rcnrel=armv7-x2
+rcnrel=armv7-x6
 arch=('i686' 'x86_64' 'armv7h')
-url="https://linux-libre.fsfla.org/"
+url="https://wiki.parabola.nu/Xtreme"
 license=('GPL2')
-makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'libelf')
 makedepends_armv7h=('git')
 options=('!strip')
 source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"{,.sign}
         "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"{,.sign}
-        "https://github.com/copperhead/linux-hardened/releases/download/${_pkgver%-*}.${_hardenedver}/linux-hardened-${_pkgver%-*}.${_hardenedver}.patch"{,.sig}
+        #"https://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver}.diff"
+        #"tcp_stealth_${_knockpatchver}.diff.sig::https://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver%_1}.diff_1.sig"
+        "https://repo.parabola.nu/other/knock/patches/linux-libre/tcp_stealth_${_knockpatchver}.diff"{,.sig}
         "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm"{,.sig}
         "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"{,.sig}
         "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig}
@@ -41,25 +43,23 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '90-linux.hook'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
+        'change-default-console-loglevel.patch'
         '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
         '0002-fix-Atmel-maXTouch-touchscreen-support.patch'
         # armv7h patches
-       "https://repo.parabola.nu/other/rcn-libre-hardened/patches/${_pkgver%-*}/rcn-libre-hardened-${_pkgver%-*}-${rcnrel}.patch"{,.sig}
-       '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
-       '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
-       '0003-SMILE-Plug-device-tree-file.patch'
-       '0004-fix-mvsdio-eMMC-timing.patch'
-       '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
-       '0006-set-default-cubietruck-led-triggers.patch'
-       '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch'
-       '0008-disable-USB3-port-on-ODROID-XU.patch'
-       '0009-ARM-dove-enable-ethernet-on-D3Plug.patch'
-        )
-sha512sums=('9ad6866c68f29f7e4f8b53d0b857f9b3c7f6abd0054460675c76f3100db34a77c2777d7f4191831008b532cb2ab6f686d8c4f457a4d005226c73f90937963518'
+        "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"{,.sig}
+        '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
+        '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
+        '0003-SMILE-Plug-device-tree-file.patch'
+        '0004-fix-mvsdio-eMMC-timing.patch'
+        '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
+        '0006-set-default-cubietruck-led-triggers.patch'
+        '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch')
+sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca49452f9b1cc80b0826c7a4962dbe4937aecb697aa823b2543ba2cabc704816'
             'SKIP'
-            '9c4e753de1865778a5bdece95ed4487cedf55d23d383640ec3616db4b631e971bf1ac21d7019677dde2dbd9d7469ea20f58a7b11496f7e56d6c0162bcf2d657a'
+            'e3a18af2204b7f73985704ed78f21f05412868e320d9ede6c58229d5b14ff990c73cfb6c45f3311a19b63078c1838faad7bf3164da7351295421adb758b43261'
             'SKIP'
-            '979dfd464353980de9c2166bb0fca041fa5faef0a2365678632bae94693a1de1d0867239f08cdc76bb3672a1eeaec280511c24470092f77a265fe140864704ac'
+            'a00e9fc0b930021242b231dfdd15160eaefbfad4aaa0ba0426bb9a25dd14acc1825cbb1bc9c680a6d43baca797591dc219e232862f566457752ff378e03600a3'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -67,28 +67,27 @@ sha512sums=('9ad6866c68f29f7e4f8b53d0b857f9b3c7f6abd0054460675c76f3100db34a77c27
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            '488fbc2aea9115e87cd9fa7fe6c4e8c07a3ab51c6e110ed4fcfb16da62b485fa4e29489da38963dcb2d8bf3a2f4be6f76a6004b259f91cb86639185b17fd3b4c'
-            '99837ae7b471d5789bdbd38e7e378c74ec88348a0696dc05ccfa6993e79f2f59e8ac2932a9c34b383ac9eb7e8bab31c4c7a87d785a35fda27db90567584198f2'
-            '774e8c72452d29c97917b501499399cf4c6cabc3d06d42f101e7c64af62a8d35c33a92aa5f9f48cdd5d5575bf9d0d9aca49b2ab6182fc7ae83481f8695022aea'
+            '33da572427ccbd809bc06adb99483a0b56e7e420c651165fb9fe9f491b1891d695b952173c31dedfe06657e2bf81ea61591f08e2b6067baf132f8abc2392c82b'
+            '37e106b6f5af18047d1a1f0e045e3379d7b105878e15c1a5a6e18d93860af9793423a2ea8c2054d14cd7f87b8566060aac90642ccadc62bf6214e61c0d9e7da9'
+            '43cb3b8eddb3844db2adb72044dbc0520f1b8e31e1e34586834b7ec499a501d3404e68291f8296aa78657544848e725c12e9b722941e2d52625fce5e99cf4a47'
             'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
+            'd9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '32533b4e3c3c16db4794b9f0de56ce61ee27e40adea422732f596328c9a01f85dce5a3347f7a3b2326f0466cfd7667c3fde5adc90a14fb17ec652568ca8ce66b'
+            'd5548e5afac67bec1d7bf754179ccad30beb453b3a5562b8c1ce34fc20b4b421528f2c90381803c8fdb8dc7757d801ee54a03f2631bab98e22f66c7d64c82b1e'
             'SKIP'
-            '8da49af5cce12f0bf21f5985cf85d13624404bab76cc0fd7a04b3ee6c046b5dceb4ae0bb821e060405366310473042892e716f530f04d1dab9a21ca1f778dd6c'
-            '06f40e0f197b15dffc7c724aba9a41f2343c8528576700202f069d5cd00013e7e5e8d62153cf358d02c21e28d7cf2a66e3f5190677cb590ac07f36be58b43cab'
-            '9ebb57495958cfcd64f82c6dbfc823ea724d888ac6991bc983981b9a4791c0691a7aba3f7358ec8c853a4e06f098d674a7bd410beb653e0f3bb6c2cd9baad254'
-            '42e4c7235301c476c47e8fad82117773fe362fc7a037ab18f78cef808e6d7868aea4671e89ea95f7fe8ba84a42f7d5425c8f5cca1049327775a6a83db9ff7afb'
-            'b02a0886168ff3b17ff3963b518e95c94a8ecb17409381a6e4f6ee06e6f352667f0b6f8d78e39509c54bacf4c29224f67eaf514b261625a951d35fcdd809d1f6'
-            '47643f83377377e7b878a78b42cb5c4261390d70912fff3e41fed8f4ec750077e62291451bde098032e199d152efb89cbe9058ffa341838f411df03e5b2cb9cb'
-            'af61d42d03ae4624feee5b31e699f7f16596a2b5556a43a42e773d00ab35b72ed60777b17c75acfd690f590376fba4000efda310cb628e3788f30c970bcc7e10'
-            'ef47eb4cbe69d1eab683c6b4f9ea17cc2e193e14e58e4d93da3f082401aedd8a3218a30a680a077724fda698f37389fa1a216781779b59e6bd17f44dfa569d3d'
-            '880f625458fe7d3f5cb7d5701f2c3e094a62a1965af2c9a1520724d0142d3535211f52bdbe1318c230e6fdb3fdfbf511a83bd81ba7e117ecbc7dcb87193286c1')
+            '4fa96f6c40b34c2448be34e794cebbcbe3354c8376c5a305aae9b931bf52a818522ccc91e7c4683481e4d2ba411e928cf5f6c1481666b596993d6ae4ee28eb08'
+            '6764e186cd5ba27817bf341cc7350309e14772c9ace5f34b05f10f42785158dc53509c58ae5961d75aae1d814190e8040c7bb2d0c6beee473725d6cc8d32c44e'
+            'cd7548cd7978eff2449a58bbdca40b89a573d8d9faed6f6cf7b4a6d8b45a432d84a2ef8a041524ebb6d89cfc6e2ac1eab88c6e398c0c9b31d31b7f0e8bbee3ac'
+            'ab649ebff6148df15eb6325acd2ddd0c99cc087e4722326bca8d13e70dfa60dbc40da3cb640c1ef2b67ee98b33fda79ee175519e7cc40c2d22def3c347519fd9'
+            '95a5a508187ebd551a2931cf8b9848b34b340d8cf725861893c1db4e10e08d8b876a3024398db07be2d76b4c88acb719b60e3d3d52f7569f52d8a799944db742'
+            '527fcd12a37bad8113e0fc389e10f665c16a894fa1d2ae3ed0809fe21d18164fd7590b34570f5999d8c1c569f212908db53ef9d8b3783e94eeba75666c5547d9'
+            'd34d69b936266da6c4d80a042f7613d368d97539457f8428727942fc196f32c932dc8dc97c522aa4793711e73b15b963dad9d18d85f930532d9491b4a2b37b96')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
-              '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
               '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
+              '76298B5BB60EDAD21B362E667585399992435BA4' # Mathias Krause
 )
 
 _kernelname=${pkgbase#linux-libre}
@@ -102,19 +101,22 @@ case "${CARCH}" in
 esac
 
 prepare() {
-  cd ${_srcname}
+  cd "${srcdir}/${_srcname}"
 
   # add upstream patch
   if [ "${_pkgbasever}" != "${_pkgver}" ]; then
-    patch -p1 -i ../patch-${_pkgbasever}-${_pkgver}
+    patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}"
   fi
+  
+  # add Knock patch
+  patch -p1 -i "${srcdir}/tcp_stealth_${_knockpatchver}.diff"
 
   if [ "${CARCH}" = "armv7h" ]; then
-    # RCN patch (CM3 firmware deblobbed and AUFS removed)
-    # Note: For stability reasons, AUFS has been removed in the RCN patch.
-    # We are supporting AUFS in linux-libre-pck through PCK patch.
-    # See https://wiki.parabola.nu/PCK for further details.
-    git apply -v "${srcdir}/rcn-libre-hardened-${_pkgver%-*}-${rcnrel}.patch"
+    # RCN patch (CM3 firmware deblobbed, AUFS and RT removed)
+    # Note: For stability reasons, AUFS and RT have been removed in the RCN patch.
+    # We are supporting AUFS in linux-libre-pck through PCK patch and RT through its official
+    # patch in linux-libre-rt. See https://wiki.parabola.nu/PCK for further details about PCK.
+    git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
 
     # ALARM patches
     patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
@@ -124,13 +126,8 @@ prepare() {
     patch -p1 -i "${srcdir}/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch"
     patch -p1 -i "${srcdir}/0006-set-default-cubietruck-led-triggers.patch"
     patch -p1 -i "${srcdir}/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch"
-    patch -p1 -i "${srcdir}/0008-disable-USB3-port-on-ODROID-XU.patch"
-    patch -p1 -i "${srcdir}/0009-ARM-dove-enable-ethernet-on-D3Plug.patch"
   fi
 
-  # add hardened patches
-  patch -Np1 -i "${srcdir}/linux-hardened-${_pkgver%-*}.${_hardenedver}.patch"
-  
   # add freedo as boot logo
   install -m644 -t drivers/video/logo \
     "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}
@@ -138,6 +135,11 @@ prepare() {
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
+  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
+  # remove this when a Kconfig knob is made available by upstream
+  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
+  patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
+
   # maintain the TTY over USB disconnects
   # http://www.coreboot.org/EHCI_Gadget_Debug
   patch -p1 -i "${srcdir}/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch"
@@ -147,7 +149,7 @@ prepare() {
   # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
   patch -p1 -i "${srcdir}/0002-fix-Atmel-maXTouch-touchscreen-support.patch"
 
-  cp -Tf ../config.${CARCH} .config
+  cat "${srcdir}/config.${CARCH}" > ./.config
 
   # append pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile
@@ -171,7 +173,7 @@ prepare() {
 }
 
 build() {
-  cd ${_srcname}
+  cd "${srcdir}/${_srcname}"
 
   if [ "${CARCH}" = "armv7h" ]; then
     make ${MAKEFLAGS} LOCALVERSION= zImage modules dtbs
@@ -181,18 +183,19 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase^} kernel and modules with a handful of awesome security features [AppArmor, SMACK, TOMOYO, SELinux, YAMA, Linux-hardened]"
+  pkgdesc="The ${pkgbase^} kernel and modules - stable longtime supported kernel package suitable for servers with handful of awesome security features [AppArmor, SMACK, TOMOYO, SELinux, YAMA, Knock]"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc')
   depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country'
-              'apparmor: to configure and enable mandatory access control for programs')
+              'apparmor: to configure and enable mandatory access control for programs'
+              'openssh-knock: to use SSH with TCP Stealth support')
   provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}")
   conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=linux.install
 
-  cd ${_srcname}
+  cd "${srcdir}/${_srcname}"
 
   # get kernel version
   _kernver="$(make LOCALVERSION= kernelrelease)"
@@ -216,39 +219,37 @@ _package() {
   # install mkinitcpio preset file for kernel
   if [ "${CARCH}" = "armv7h" ]; then
     sed "s|/boot/vmlinuz-%PKGBASE%|${_kernver}|g
-         s|%PKGBASE%|${pkgbase}|g" ../linux.preset |
-      install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+         s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" |
+      install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
   elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
     sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" |
-      install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+      install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
   fi
 
   # install pacman hook for initramfs regeneration
-  sed "s|%PKGBASE%|${pkgbase}|g" ../90-linux.hook |
-    install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook"
+  sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" |
+    install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook"
 
   # remove build and source links
-  rm "${pkgdir}"/lib/modules/${_kernver}/{source,build}
-  
+  rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware
-  rm -r "${pkgdir}/lib/firmware"
-  
+  rm -rf "${pkgdir}/lib/firmware"
   # make room for external modules
   ln -s "../extramodules-${_basekernel}${_kernelname}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
-  
   # add real version for building modules and running depmod from post_install/upgrade
-  echo "${_kernver}" |
-    install -Dm644 /dev/stdin "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}/version"
 
   # Now we call depmod...
   depmod -b "${pkgdir}" -F System.map "${_kernver}"
 
   # move module tree /lib -> /usr/lib
-  mv -t "${pkgdir}/usr" "${pkgdir}/lib"
+  mkdir -p "${pkgdir}/usr"
+  mv "${pkgdir}/lib" "${pkgdir}/usr/"
 
   if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
     # add vmlinux
-    install -Dm644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux"
+    install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux"
   fi
 }
 
@@ -258,92 +259,139 @@ _package-headers() {
   conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
   replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
 
-  cd ${_srcname}
-  local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build"
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
-  install -Dt "${_builddir}" -m644 Makefile .config Module.symvers
-  install -Dt "${_builddir}/kernel" -m644 kernel/Makefile
+  cd "${srcdir}/${_srcname}"
+  install -D -m644 Makefile \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/Makefile"
+  install -D -m644 kernel/Makefile \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/kernel/Makefile"
+  install -D -m644 .config \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/.config"
 
-  mkdir "${_builddir}/.tmp_versions"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include"
 
-  cp -t "${_builddir}" -a include scripts
+  for i in acpi asm-generic config crypto drm generated keys linux math-emu \
+    media net pcmcia scsi soc sound trace uapi video xen; do
+    cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/"
+  done
 
-  install -Dt "${_builddir}/arch/${KARCH}" -m644 arch/${KARCH}/Makefile
-  install -Dt "${_builddir}/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s
+  # copy arch includes for external modules
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}"
+  cp -a arch/${KARCH}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+  if [ "${CARCH}" = "armv7h" ]; then
+    for i in dove exynos omap2; do
+      mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-${i}"
+      cp -a arch/${KARCH}/mach-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-${i}/"
+    done
+    for i in omap orion samsung versatile; do
+      mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-${i}"
+      cp -a arch/${KARCH}/plat-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-${i}/"
+    done
+  fi
+
+  # copy files necessary for later builds
+  cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build"
 
-  if [[ ${CARCH} = i686 ]]; then
-    install -t "${_builddir}/arch/${KARCH}" -m644 arch/${KARCH}/Makefile_32.cpu
+  # fix permissions on scripts dir
+  chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions"
+
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel"
+
+  cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+
+  if [ "${CARCH}" = "i686" ]; then
+    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
   fi
 
-  cp -t "${_builddir}/arch/${KARCH}" -a arch/${KARCH}/include
+  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/"
 
-  install -Dt "${_builddir}/drivers/md" -m644 drivers/md/*.h
-  install -Dt "${_builddir}/net/mac80211" -m644 net/mac80211/*.h
+  # add docbook makefile
+  install -D -m644 Documentation/DocBook/Makefile \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
 
-  # http://bugs.archlinux.org/task/9912
-  install -Dt "${_builddir}/drivers/media/dvb-core" -m644 drivers/media/dvb-core/*.h
+  # add dm headers
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
+  cp drivers/md/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
+
+  # add inotify.h
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux"
+  cp include/linux/inotify.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux/"
 
+  # add wireless headers
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
+  cp net/mac80211/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
+
+  # add dvb headers for external modules
+  # in reference to:
+  # http://bugs.archlinux.org/task/9912
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core"
+  cp drivers/media/dvb-core/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/"
+  # and...
+  # http://bugs.archlinux.org/task/11194
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
+  cp include/config/dvb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
+
+  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+  # in reference to:
   # http://bugs.archlinux.org/task/13146
-  install -Dt "${_builddir}/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/lgdt330x.h
-  install -Dt "${_builddir}/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
+  cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
 
+  # add dvb headers
+  # in reference to:
   # http://bugs.archlinux.org/task/20402
-  install -Dt "${_builddir}/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
-  install -Dt "${_builddir}/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
-  install -Dt "${_builddir}/drivers/media/tuners" -m644 drivers/media/tuners/*.h
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb"
+  cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends"
+  cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners"
+  cp drivers/media/tuners/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/"
 
   # add xfs and shmem for aufs building
-  mkdir -p "${_builddir}"/{fs/xfs,mm}
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm"
+  # removed in 3.17-gnu series
+  # cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h"
 
   # copy in Kconfig files
-  find . -name Kconfig\* -exec install -Dm644 {} "${_builddir}/{}" \;
-
-  # add objtool for external module building and enabled VALIDATION_STACK option
-  if [[ -e tools/objtool/objtool ]]; then
-    install -Dt "${_builddir}/tools/objtool" tools/objtool/objtool
-  fi
-
-  # remove unneeded architectures
-  local _arch
-  for _arch in "${_builddir}"/arch/*/; do
-    if [[ ${_arch} != */${KARCH}/ ]]; then
-      rm -r "${_arch}"
-    fi
+  for i in $(find . -name "Kconfig*"); do
+    mkdir -p "${pkgdir}"/usr/lib/modules/${_kernver}/build/`echo ${i} | sed 's|/Kconfig.*||'`
+    cp ${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/${i}"
   done
 
-  # remove files already in linux-docs package
-  rm -r "${_builddir}/Documentation"
-
-  # parabola changes
-  # 
-  # since we don't want to diverge too much from arch's pkgbuild, we'll
-  # start marking our changes as such
-  if [ "${CARCH}" = "armv7h" ]; then
-    for i in dove exynos omap2; do
-      mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-${i}"
-      cp -a arch/${KARCH}/mach-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-${i}/"
-    done
-    for i in omap orion samsung versatile; do
-      mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-${i}"
-      cp -a arch/${KARCH}/plat-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-${i}/"
-    done
+  # add objtool for external module building and enabled VALIDATION_STACK option
+  if [ -f tools/objtool/objtool ];  then
+      mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool"
+      cp -a tools/objtool/objtool ${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool/
   fi
-  # end of parabola changes
 
-  # Fix permissions
-  chmod -R u=rwX,go=rX "${_builddir}"
+  chown -R root.root "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  find "${pkgdir}/usr/lib/modules/${_kernver}/build" -type d -exec chmod 755 {} \;
 
   # strip scripts directory
-  local _binary _strip
-  while read -rd '' _binary; do
-    case "$(file -bi "${_binary}")" in
-      *application/x-sharedlib*)  _strip="${STRIP_SHARED}"   ;; # Libraries (.so)
-      *application/x-archive*)    _strip="${STRIP_STATIC}"   ;; # Libraries (.a)
-      *application/x-executable*) _strip="${STRIP_BINARIES}" ;; # Binaries
-      *) continue ;;
+  find "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+    case "$(file -bi "${binary}")" in
+      *application/x-sharedlib*) # Libraries (.so)
+        /usr/bin/strip ${STRIP_SHARED} "${binary}";;
+      *application/x-archive*) # Libraries (.a)
+        /usr/bin/strip ${STRIP_STATIC} "${binary}";;
+      *application/x-executable*) # Binaries
+        /usr/bin/strip ${STRIP_BINARIES} "${binary}";;
     esac
-    /usr/bin/strip ${_strip} "${_binary}"
-  done < <(find "${_builddir}/scripts" -type f -perm -u+w -print0 2>/dev/null)
+  done
+
+  # remove unneeded architectures
+  find "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch -mindepth 1 -maxdepth 1 -type d -not -name "$KARCH" -exec rm -rf {} +
+
+  # remove files already in docs package
+  rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-01"
+  rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-02"
+  rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.select-break"
 }
 
 _package-docs() {
@@ -352,17 +400,17 @@ _package-docs() {
   conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
   replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
 
-  cd ${_srcname}
-  local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build"
+  cd "${srcdir}/${_srcname}"
 
-  mkdir -p "${_builddir}"
-  cp -t "${_builddir}" -a Documentation
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  find "${pkgdir}" -type f -exec chmod 444 {} \;
+  find "${pkgdir}" -type d -exec chmod 755 {} \;
 
-  # Fix permissions
-  chmod -R u=rwX,go=rX "${_builddir}"
+  # remove a file already in kernel package
+  rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
 }
 
-# wtf is this for
 pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
 for _p in ${pkgname[@]}; do
   eval "package_${_p}() {
diff --git a/kernels/linux-libre-lts-xtreme/config.armv7h b/kernels/linux-libre-lts-xtreme/config.armv7h
index 7dc669f35..5c07906e5 100644
--- a/kernels/linux-libre-lts-xtreme/config.armv7h
+++ b/kernels/linux-libre-lts-xtreme/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.5-gnu-1-xtreme Kernel Configuration
+# Linux/arm 4.9.74-gnu-1-lts-xtreme Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -36,7 +36,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-xtreme"
+CONFIG_LOCALVERSION="-lts-xtreme"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -57,11 +57,8 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
 CONFIG_USELIB=y
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -93,7 +90,7 @@ CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
-# CONFIG_NO_HZ is not set
+CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 
 #
@@ -113,17 +110,23 @@ CONFIG_TASK_IO_ACCOUNTING=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
+CONFIG_RCU_EXPERT=y
 CONFIG_SRCU=y
 # CONFIG_TASKS_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_RCU_KTHREAD_PRIO=0
+# CONFIG_RCU_NOCB_CPU is not set
+# CONFIG_RCU_EXPEDITE_BOOT is not set
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_NMI_LOG_BUF_SHIFT=13
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
@@ -138,16 +141,13 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
+# CONFIG_CGROUP_PERF is not set
 # CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -166,7 +166,6 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
-CONFIG_INITRAMFS_COMPRESSION=".gz"
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -179,7 +178,6 @@ CONFIG_MULTIUSER=y
 # CONFIG_SGETMASK_SYSCALL is not set
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_SYSCTL_SYSCALL=y
-CONFIG_POSIX_TIMERS=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
@@ -198,13 +196,12 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
-CONFIG_USERFAULTFD=y
+# CONFIG_USERFAULTFD is not set
 CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
 CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
-# CONFIG_PC104 is not set
 
 #
 # Kernel Performance Events And Counters
@@ -213,16 +210,11 @@ CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLAB_HARDENED=y
-CONFIG_SLAB_CANARY=y
-CONFIG_SLAB_SANITIZE=y
-CONFIG_SLAB_SANITIZE_VERIFY=y
+# CONFIG_SLAB_FREELIST_RANDOM is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
 CONFIG_PROFILING=y
@@ -246,7 +238,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -282,12 +273,6 @@ CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
 # CONFIG_HAVE_ARCH_VMAP_STACK is not set
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
 
 #
 # GCOV-based kernel profiling
@@ -310,18 +295,11 @@ CONFIG_MODULE_COMPRESS_GZIP=y
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
-CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_CMDLINE_PARSER=y
-CONFIG_BLK_WBT=y
-CONFIG_BLK_WBT_SQ=y
-CONFIG_BLK_WBT_MQ=y
-CONFIG_BLK_DEBUG_FS=y
-CONFIG_BLK_SED_OPAL=y
 
 #
 # Partition Types
@@ -348,7 +326,6 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
 
 #
 # IO Schedulers
@@ -357,11 +334,10 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_PADATA=y
 CONFIG_ASN1=m
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@@ -403,7 +379,10 @@ CONFIG_ARCH_MULTIPLATFORM=y
 #
 # Multiple platform selection
 #
+
+#
 # CPU Core family selection
+#
 # CONFIG_ARCH_MULTI_V6 is not set
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
@@ -463,6 +442,8 @@ CONFIG_HAVE_IMX_SRC=y
 #
 # Device tree only
 #
+
+#
 # Cortex-A platforms
 #
 CONFIG_SOC_IMX5=y
@@ -490,11 +471,16 @@ CONFIG_ARCH_OMAP=y
 #
 # TI OMAP Common Features
 #
+
+#
 # OMAP Feature Selections
 #
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWER_AVS_OMAP_CLASS3=y
 CONFIG_OMAP_RESET_CLOCKS=y
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 CONFIG_OMAP_DM_TIMER=y
@@ -543,10 +529,14 @@ CONFIG_S5P_DEV_MFC=y
 # CONFIG_ARCH_EXYNOS3 is not set
 CONFIG_ARCH_EXYNOS4=y
 CONFIG_ARCH_EXYNOS5=y
+
+#
 # EXYNOS SoCs
+#
 CONFIG_CPU_EXYNOS4210=y
 CONFIG_SOC_EXYNOS4212=y
 CONFIG_SOC_EXYNOS4412=y
+CONFIG_SOC_EXYNOS4415=y
 CONFIG_SOC_EXYNOS5250=y
 CONFIG_SOC_EXYNOS5260=y
 CONFIG_SOC_EXYNOS5410=y
@@ -560,6 +550,8 @@ CONFIG_PLAT_SAMSUNG=y
 #
 # Samsung Common options
 #
+
+#
 # Boot options
 #
 # CONFIG_SAMSUNG_ATAGS is not set
@@ -605,7 +597,6 @@ CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_CPU_PJ4=y
 CONFIG_CPU_PJ4B=y
 CONFIG_CPU_V7=y
-CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
 CONFIG_CPU_ABRT_EV7=y
@@ -617,7 +608,10 @@ CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
+
+#
 # Processor Features
+#
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARM_THUMB=y
@@ -646,6 +640,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_HEAVY_MB=y
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
+CONFIG_DEBUG_RODATA=y
 CONFIG_DEBUG_ALIGN_RODATA=y
 CONFIG_IWMMXT=y
 CONFIG_MULTI_IRQ_HANDLER=y
@@ -681,7 +676,6 @@ CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
@@ -698,27 +692,22 @@ CONFIG_PCI_ECAM=y
 # CONFIG_HOTPLUG_PCI is not set
 
 #
-# DesignWare PCI Core Support
+# PCI host controller drivers
 #
-CONFIG_PCIE_DW=y
-CONFIG_PCIE_DW_HOST=y
 CONFIG_PCI_DRA7XX=y
+CONFIG_PCI_MVEBU=y
 CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW=y
 # CONFIG_PCI_EXYNOS is not set
 CONFIG_PCI_IMX6=y
-# CONFIG_PCI_KEYSTONE is not set
-# CONFIG_PCI_LAYERSCAPE is not set
-# CONFIG_PCIE_ARMADA_8K is not set
-
-#
-# PCI host controller drivers
-#
-CONFIG_PCI_MVEBU=y
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
+# CONFIG_PCI_KEYSTONE is not set
 CONFIG_PCIE_XILINX=y
+# CONFIG_PCI_LAYERSCAPE is not set
 # CONFIG_PCIE_ALTERA is not set
+# CONFIG_PCIE_ARMADA_8K is not set
 # CONFIG_PCIE_ROCKCHIP is not set
 # CONFIG_PCCARD is not set
 
@@ -745,17 +734,18 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_NR_CPUS=8
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
+CONFIG_ARCH_NR_GPIO=1024
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 CONFIG_HZ_FIXED=0
-# CONFIG_HZ_100 is not set
+CONFIG_HZ_100=y
 # CONFIG_HZ_200 is not set
-CONFIG_HZ_250=y
+# CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
+CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_ARM_PATCH_IDIV=y
@@ -812,6 +802,10 @@ CONFIG_IOMMU_HELPER=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_XEN is not set
+
+#
+# Boot options
+#
 CONFIG_USE_OF=y
 CONFIG_ATAGS=y
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
@@ -822,7 +816,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE=""
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_AUTO_ZRELADDR=y
@@ -831,12 +825,15 @@ CONFIG_AUTO_ZRELADDR=y
 #
 # CPU Power Management
 #
+
+#
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
@@ -889,6 +886,8 @@ CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 #
 # Floating point emulation
 #
+
+#
 # At least one emulation must be selected
 #
 CONFIG_VFP=y
@@ -917,7 +916,8 @@ CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SUSPEND_SKIP_SYNC is not set
 CONFIG_HIBERNATE_CALLBACKS=y
-# CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_AUTOSLEEP=y
@@ -960,8 +960,9 @@ CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_SMC is not set
 CONFIG_INET=y
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_FIB_TRIE_STATS=y
@@ -989,7 +990,6 @@ CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
@@ -999,8 +999,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
-CONFIG_INET_DIAG_DESTROY=y
+# CONFIG_INET_DIAG_DESTROY is not set
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -1022,13 +1021,13 @@ CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
+CONFIG_TCP_STEALTH=y
 CONFIG_IPV6=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_ILA=m
@@ -1038,7 +1037,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
 CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_VTI=m
+# CONFIG_IPV6_VTI is not set
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
@@ -1051,9 +1050,6 @@ CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_PIMSM_V2=y
-CONFIG_IPV6_SEG6_LWTUNNEL=y
-CONFIG_IPV6_SEG6_INLINE=y
-CONFIG_IPV6_SEG6_HMAC=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y
@@ -1073,7 +1069,6 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_LOG_NETDEV=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
@@ -1082,10 +1077,10 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -1103,9 +1098,9 @@ CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=y
-CONFIG_NF_NAT_PROTO_UDPLITE=y
-CONFIG_NF_NAT_PROTO_SCTP=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1118,27 +1113,22 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
-CONFIG_NFT_RT=m
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_SET_RBTREE=m
 CONFIG_NFT_SET_HASH=m
-CONFIG_NFT_SET_BITMAP=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
-CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1240,7 +1230,6 @@ CONFIG_IP_SET_HASH_IPMARK=m
 CONFIG_IP_SET_HASH_IPPORT=m
 CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
 CONFIG_IP_SET_HASH_MAC=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
@@ -1296,12 +1285,10 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TABLES_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1343,12 +1330,10 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TABLES_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
@@ -1454,6 +1439,8 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
+CONFIG_NET_DSA_HWMON=y
+CONFIG_NET_DSA_TAG_BRCM=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_TRAILER=y
@@ -1555,7 +1542,6 @@ CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
@@ -1566,11 +1552,8 @@ CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
 # CONFIG_NET_ACT_SKBMOD is not set
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_ACT_IFE is not set
+# CONFIG_NET_ACT_TUNNEL_KEY is not set
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
@@ -1587,9 +1570,7 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
 CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
+# CONFIG_VSOCKETS is not set
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
@@ -1603,6 +1584,7 @@ CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_HWBM=y
+CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
@@ -1624,7 +1606,10 @@ CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_NETROM=m
 CONFIG_ROSE=m
+
+#
 # AX.25 network device drivers
+#
 CONFIG_MKISS=m
 CONFIG_6PACK=m
 CONFIG_BPQETHER=m
@@ -1666,7 +1651,6 @@ CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_SOFTING=m
-# CONFIG_CAN_SOFTING_CS is not set
 
 #
 # CAN SPI interfaces
@@ -1703,6 +1687,8 @@ CONFIG_IRDA_DEBUG=y
 #
 # Infrared-port device drivers
 #
+
+#
 # SIR device drivers
 #
 CONFIG_IRTTY_SIR=m
@@ -1746,7 +1732,10 @@ CONFIG_BT_6LOWPAN=m
 # CONFIG_BT_LEDS is not set
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BT_DEBUGFS=y
+
+#
 # Bluetooth device drivers
+#
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
@@ -1775,7 +1764,7 @@ CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
 CONFIG_AF_RXRPC=m
-CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_IPV6 is not set
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=y
@@ -1797,7 +1786,6 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1821,6 +1809,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=m
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
@@ -1841,6 +1830,8 @@ CONFIG_NFC_SHDLC=y
 #
 # Near Field Communication (NFC) devices
 #
+CONFIG_NFC_WILINK=m
+CONFIG_NFC_TRF7970A=m
 CONFIG_NFC_SIM=m
 CONFIG_NFC_PORT100=m
 CONFIG_NFC_FDP=m
@@ -1867,14 +1858,10 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
-# CONFIG_PSAMPLE is not set
-CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_NET_DEVLINK=m
-CONFIG_MAY_USE_DEVLINK=m
+# CONFIG_NET_DEVLINK is not set
+CONFIG_MAY_USE_DEVLINK=y
 CONFIG_HAVE_CBPF_JIT=y
 
 #
@@ -1903,19 +1890,21 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
-CONFIG_REGMAP_AC97=m
 CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
+# CONFIG_FENCE_TRACE is not set
 CONFIG_DMA_CMA=y
+
+#
 # Default contiguous memory area size:
+#
 CONFIG_CMA_SIZE_MBYTES=48
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
@@ -1940,7 +1929,6 @@ CONFIG_OMAP_INTERCONNECT=y
 CONFIG_OMAP_OCP2SCP=y
 CONFIG_SIMPLE_PM_BUS=y
 CONFIG_SUNXI_RSB=y
-# CONFIG_TEGRA_GMI is not set
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
@@ -2005,7 +1993,6 @@ CONFIG_MTD_PHYSMAP=m
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
 CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set
-# CONFIG_MTD_PHYSMAP_OF_GEMINI is not set
 # CONFIG_MTD_IMPA7 is not set
 CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_PLATRAM=m
@@ -2023,7 +2010,10 @@ CONFIG_MTD_SST25L=y
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLOCK2MTD is not set
+
+#
 # Disk-On-Chip Device Drivers
+#
 # CONFIG_MTD_DOCG3 is not set
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_ECC_SMC=y
@@ -2110,6 +2100,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -2118,13 +2109,12 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_ATA_OVER_ETH=m
 # CONFIG_MG_DISK is not set
 CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_BLK_DEV_RBD=m
 # CONFIG_BLK_DEV_RSXX is not set
 CONFIG_NVME_CORE=m
 CONFIG_BLK_DEV_NVME=m
+# CONFIG_BLK_DEV_NVME_SCSI is not set
 # CONFIG_NVME_RDMA is not set
-# CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 
 #
@@ -2153,14 +2143,13 @@ CONFIG_DS1682=m
 CONFIG_TI_DAC7512=m
 CONFIG_ARM_CHARLCD=y
 # CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
-CONFIG_SRAM_EXEC=y
 CONFIG_VEXPRESS_SYSCFG=y
 CONFIG_BONE_CAPEMGR=y
 # CONFIG_DEV_OVERLAYMGR is not set
 CONFIG_TIEQEP=m
 CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
 
 #
 # EEPROM support
@@ -2171,7 +2160,6 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
-# CONFIG_EEPROM_IDT_89HPESX is not set
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2182,17 +2170,47 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LIS3_I2C=m
+
+#
 # Altera FPGA firmware download module
+#
 CONFIG_ALTERA_STAPL=m
+
+#
 # Intel MIC Bus Driver
+#
+
+#
 # SCIF Bus Driver
+#
+
+#
 # VOP Bus Driver
+#
+
+#
 # Intel MIC Host Driver
+#
+
+#
 # Intel MIC Card Driver
+#
+
+#
 # SCIF Driver
+#
+
+#
 # Intel MIC Coprocessor State Management (COSM) Drivers
+#
+
+#
 # VOP Driver
+#
+
+#
 # Argus cape driver for beaglebone black
+#
 CONFIG_CAPE_BONE_ARGUS=y
 CONFIG_BEAGLEBONE_PINMUX_HELPER=m
 # CONFIG_ECHO is not set
@@ -2200,7 +2218,10 @@ CONFIG_BEAGLEBONE_PINMUX_HELPER=m
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
+
+#
 # SCSI device support
+#
 CONFIG_SCSI_MOD=y
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
@@ -2208,7 +2229,10 @@ CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
 # CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_PROC_FS=y
+
+#
 # SCSI support type (disk, tape, CD-ROM)
+#
 CONFIG_BLK_DEV_SD=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CHR_DEV_OSST is not set
@@ -2220,7 +2244,10 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
 # SCSI Transports
+#
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=y
@@ -2247,6 +2274,7 @@ CONFIG_SCSI_ACARD=m
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_SCSI_AIC94XX is not set
 CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
 # CONFIG_SCSI_MVSAS_TASKLET is not set
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_ADVANSYS=m
@@ -2280,9 +2308,8 @@ CONFIG_SCSI_STEX=m
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
 # CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_QEDI is not set
-# CONFIG_QEDF is not set
-# CONFIG_SCSI_LPFC is not set
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
 # CONFIG_SCSI_DC395x is not set
 CONFIG_SCSI_AM53C974=m
 # CONFIG_SCSI_NSP32 is not set
@@ -2307,7 +2334,10 @@ CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
+
+#
 # Controllers with non-SFF native interface
+#
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_AHCI_IMX=y
@@ -2320,12 +2350,18 @@ CONFIG_AHCI_QORIQ=y
 CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_SIL24=m
 CONFIG_ATA_SFF=y
+
+#
 # SFF controllers with custom DMA interface
+#
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_QSTOR=m
 CONFIG_SATA_SX4=m
 CONFIG_ATA_BMDMA=y
+
+#
 # SATA SFF controllers with BMDMA
+#
 # CONFIG_ATA_PIIX is not set
 # CONFIG_SATA_DWC is not set
 CONFIG_SATA_MV=y
@@ -2337,7 +2373,10 @@ CONFIG_SATA_SVW=m
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
+
+#
 # PATA SFF controllers with BMDMA
+#
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 CONFIG_PATA_ARTOP=m
@@ -2372,7 +2411,10 @@ CONFIG_PATA_TOSHIBA=m
 # CONFIG_PATA_TRIFLEX is not set
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
+
+#
 # PIO-only SFF controllers
+#
 # CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_NS87410 is not set
@@ -2380,7 +2422,10 @@ CONFIG_PATA_TOSHIBA=m
 CONFIG_PATA_PLATFORM=y
 CONFIG_PATA_OF_PLATFORM=y
 # CONFIG_PATA_RZ1000 is not set
+
+#
 # Generic fallback / legacy drivers
+#
 CONFIG_ATA_GENERIC=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_MD=y
@@ -2400,7 +2445,7 @@ CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_MQ_DEFAULT is not set
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
 CONFIG_DM_CRYPT=m
@@ -2408,6 +2453,7 @@ CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_CACHE_CLEANER=m
 CONFIG_DM_ERA=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -2439,7 +2485,10 @@ CONFIG_FUSION_SAS=m
 CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_CTL=m
 # CONFIG_FUSION_LOGGING is not set
+
+#
 # IEEE 1394 (FireWire) support
+#
 # CONFIG_FIREWIRE is not set
 # CONFIG_FIREWIRE_NOSY is not set
 CONFIG_NETDEVICES=y
@@ -2459,17 +2508,15 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_IPVLAN=m
-CONFIG_IPVTAP=m
 CONFIG_VXLAN=m
 CONFIG_GENEVE=m
-CONFIG_GTP=m
-CONFIG_MACSEC=m
+# CONFIG_GTP is not set
+# CONFIG_MACSEC is not set
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=m
-CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
@@ -2493,8 +2540,16 @@ CONFIG_ATM_FORE200E_TX_RETRY=16
 CONFIG_ATM_FORE200E_DEBUG=0
 # CONFIG_ATM_HE is not set
 CONFIG_ATM_SOLOS=m
+
+#
 # CAIF transport drivers
+#
+
+#
 # Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_B53=m
 # CONFIG_B53_SPI_DRIVER is not set
 CONFIG_B53_MDIO_DRIVER=m
@@ -2511,8 +2566,6 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
-CONFIG_NET_VENDOR_ALACRITECH=y
-# CONFIG_SLICOSS is not set
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
 CONFIG_SUN8I_EMAC=m
@@ -2524,10 +2577,9 @@ CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 # CONFIG_AMD8111_ETH is not set
 CONFIG_PCNET32=m
-# CONFIG_AMD_XGBE_HAVE_ECC is not set
-CONFIG_NET_VENDOR_AQUANTIA=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_ARC_EMAC_CORE=m
+CONFIG_ARC_EMAC=m
 CONFIG_EMAC_ROCKCHIP=m
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
@@ -2538,7 +2590,6 @@ CONFIG_ALX=m
 # CONFIG_NET_VENDOR_AURORA is not set
 CONFIG_NET_CADENCE=y
 CONFIG_MACB=m
-# CONFIG_MACB_PCI is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_B44 is not set
 # CONFIG_BCMGENET is not set
@@ -2548,7 +2599,6 @@ CONFIG_TIGON3=m
 CONFIG_BNX2X=m
 # CONFIG_SYSTEMPORT is not set
 CONFIG_BNXT=m
-# CONFIG_BNXT_DCB is not set
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CAVIUM=y
@@ -2649,8 +2699,13 @@ CONFIG_MLX5_CORE_EN_DCB=y
 # CONFIG_MLXSW_CORE is not set
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
+CONFIG_KS8851=m
 # CONFIG_KS8851_MLL is not set
 # CONFIG_KSZ884X_PCI is not set
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
@@ -2658,7 +2713,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETRONOME=y
-# CONFIG_NFP is not set
+# CONFIG_NFP_NETVF is not set
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_AX88796 is not set
 CONFIG_NE2K_PCI=m
@@ -2702,12 +2757,10 @@ CONFIG_SC92031=m
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
 CONFIG_SIS190=m
-CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MCDI_LOGGING=y
-# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_EPIC100=m
@@ -2718,7 +2771,6 @@ CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PLATFORM=m
-# CONFIG_DWMAC_DWC_QOS_ETH is not set
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
@@ -2730,6 +2782,8 @@ CONFIG_NET_VENDOR_SUN=y
 # CONFIG_SUNGEM is not set
 CONFIG_CASSINI=m
 CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
@@ -2740,7 +2794,6 @@ CONFIG_TI_CPSW_PHY_SEL=y
 CONFIG_TI_CPSW_ALE=y
 CONFIG_TI_CPSW=y
 CONFIG_TI_CPTS=y
-CONFIG_TI_CPTS_MOD=y
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
@@ -2756,13 +2809,21 @@ CONFIG_DEFXX=m
 CONFIG_SKFP=m
 # CONFIG_HIPPI is not set
 CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+
+#
 # MDIO bus device drivers
+#
+CONFIG_MDIO_BCM_UNIMAC=m
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_SUN4I=m
+
+#
 # MII PHY device drivers
+#
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AT803X_PHY=m
@@ -2780,7 +2841,6 @@ CONFIG_ICPLUS_PHY=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=y
-# CONFIG_MESON_GXL_PHY is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROSEMI_PHY is not set
@@ -2792,6 +2852,7 @@ CONFIG_STE10XP=m
 CONFIG_TERANETICS_PHY=m
 CONFIG_VITESSE_PHY=y
 # CONFIG_XILINX_GMII2RGMII is not set
+# CONFIG_MICREL_KS8995MA is not set
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
@@ -2854,7 +2915,6 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
-# CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
@@ -2947,7 +3007,10 @@ CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_IWLEGACY=m
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
+
+#
 # iwl3945 / iwl4965 Debugging Options
+#
 # CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
@@ -2956,7 +3019,10 @@ CONFIG_IWLMVM=m
 CONFIG_IWLWIFI_OPMODE_MODULAR=y
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
 # CONFIG_IWLWIFI_PCIE_RTPM is not set
+
+#
 # Debugging Options
+#
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
@@ -2968,12 +3034,15 @@ CONFIG_HOSTAP_PCI=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
 CONFIG_P54_LEDS=y
 CONFIG_PRISM54=m
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
 CONFIG_LIBERTAS_THINFIRM=m
@@ -3032,6 +3101,7 @@ CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_PCI=m
 CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
@@ -3039,11 +3109,13 @@ CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
+# CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
 CONFIG_WLAN_VENDOR_ST=y
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
 CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
@@ -3060,13 +3132,18 @@ CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
+
+#
 # WiMAX Wireless Broadband devices
+#
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
 CONFIG_IEEE802154_MRF24J40=m
 CONFIG_IEEE802154_CC2520=m
 CONFIG_IEEE802154_ATUSB=m
@@ -3074,14 +3151,20 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_VMXNET3 is not set
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set
+
+#
 # Input device support
+#
 CONFIG_INPUT=y
 CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=y
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_MATRIXKMAP=y
+
+#
 # Userland interfaces
+#
 CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
@@ -3089,12 +3172,15 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
+
+#
 # Input Device Drivers
+#
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADC is not set
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=m
+CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 CONFIG_KEYBOARD_LKKBD=m
@@ -3119,7 +3205,6 @@ CONFIG_KEYBOARD_SUNKBD=m
 # CONFIG_KEYBOARD_STMPE is not set
 CONFIG_KEYBOARD_SUN4I_LRADC=m
 CONFIG_KEYBOARD_OMAP4=m
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
 CONFIG_KEYBOARD_TWL4030=m
 CONFIG_KEYBOARD_XTKBD=m
 CONFIG_KEYBOARD_CROS_EC=y
@@ -3191,7 +3276,7 @@ CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
 CONFIG_TOUCHSCREEN_AR1021_I2C=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=y
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
@@ -3202,6 +3287,7 @@ CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
 CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 CONFIG_TOUCHSCREEN_DA9052=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
@@ -3273,13 +3359,13 @@ CONFIG_TOUCHSCREEN_SUN4I=m
 # CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
 CONFIG_TOUCHSCREEN_SX8654=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
-# CONFIG_TOUCHSCREEN_ZET6223 is not set
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
 CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_E3X0_BUTTON=m
@@ -3287,6 +3373,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m
 CONFIG_INPUT_MAX8997_HAPTIC=m
 CONFIG_INPUT_MC13783_PWRBUTTON=m
 CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
@@ -3314,6 +3401,7 @@ CONFIG_INPUT_DA9055_ONKEY=m
 CONFIG_INPUT_DA9063_ONKEY=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
 CONFIG_INPUT_IMS_PCU=m
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
@@ -3323,17 +3411,16 @@ CONFIG_INPUT_DRV2665_HAPTICS=m
 CONFIG_INPUT_DRV2667_HAPTICS=m
 CONFIG_RMI4_CORE=m
 CONFIG_RMI4_I2C=m
-# CONFIG_RMI4_SMB is not set
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_SPI=m
 CONFIG_RMI4_2D_SENSOR=y
 CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
-# CONFIG_RMI4_F34 is not set
 # CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_F55 is not set
+
+#
 # Hardware I/O ports
+#
 CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=y
 CONFIG_SERIO_AMBAKMI=m
@@ -3351,7 +3438,10 @@ CONFIG_GAMEPORT=m
 # CONFIG_GAMEPORT_L4 is not set
 # CONFIG_GAMEPORT_EMU10K1 is not set
 # CONFIG_GAMEPORT_FM801 is not set
+
+#
 # Character devices
+#
 CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
@@ -3367,7 +3457,10 @@ CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVKMEM=y
+
+#
 # Serial drivers
+#
 CONFIG_SERIAL_EARLYCON=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
@@ -3375,7 +3468,6 @@ CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_DMA is not set
 CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
 CONFIG_SERIAL_8250_NR_UARTS=6
 CONFIG_SERIAL_8250_RUNTIME_UARTS=6
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -3387,7 +3479,10 @@ CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
 # CONFIG_SERIAL_8250_MOXA is not set
 CONFIG_SERIAL_OF_PLATFORM=y
+
+#
 # Non-8250 serial port support
+#
 CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
@@ -3401,6 +3496,8 @@ CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 CONFIG_SERIAL_SAMSUNG_UARTS=4
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_SERIAL_TEGRA=y
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 # CONFIG_SERIAL_UARTLITE is not set
@@ -3414,6 +3511,7 @@ CONFIG_CONSOLE_POLL=y
 # CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 # CONFIG_SERIAL_ARC is not set
@@ -3423,9 +3521,9 @@ CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
 # CONFIG_SERIAL_ST_ASC is not set
+# CONFIG_SERIAL_STM32 is not set
 # CONFIG_SERIAL_MVEBU_UART is not set
 CONFIG_SERIAL_MCTRL_GPIO=y
-# CONFIG_SERIAL_DEV_BUS is not set
 CONFIG_TTY_PRINTK=m
 CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
@@ -3445,21 +3543,28 @@ CONFIG_HW_RANDOM_MESON=m
 # CONFIG_APPLICOM is not set
 # CONFIG_RAW_DRIVER is not set
 CONFIG_TCG_TPM=m
-# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_TIS_SPI is not set
 CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
 # CONFIG_TCG_VTPM_PROXY is not set
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
+# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
+
+#
 # I2C support
+#
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
+
+#
 # Multiplexer I2C Chip support
+#
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 # CONFIG_I2C_MUX_GPIO is not set
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -3467,13 +3572,18 @@ CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_MUX_PINCTRL=y
 # CONFIG_I2C_MUX_REG is not set
 CONFIG_I2C_DEMUX_PINCTRL=y
-# CONFIG_I2C_MUX_MLXCPLD is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
+
+#
 # I2C Hardware Bus support
+#
+
+#
 # PC SMBus host controller drivers
+#
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
 # CONFIG_I2C_ALI15X3 is not set
@@ -3488,7 +3598,10 @@ CONFIG_I2C_ALGOPCA=m
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
+
+#
 # I2C system bus drivers (mostly embedded / system-on-chip)
+#
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_CADENCE=y
 # CONFIG_I2C_CBUS_GPIO is not set
@@ -3500,14 +3613,12 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_EXYNOS5=y
 CONFIG_I2C_GPIO=y
 CONFIG_I2C_IMX=y
-# CONFIG_I2C_IMX_LPI2C is not set
 CONFIG_I2C_MESON=y
 CONFIG_I2C_MV64XXX=y
 # CONFIG_I2C_NOMADIK is not set
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_OMAP=y
 CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA is not set
 # CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_RK3X=y
 CONFIG_HAVE_S3C2410_I2C=y
@@ -3517,7 +3628,10 @@ CONFIG_I2C_SUN6I_P2WI=y
 CONFIG_I2C_TEGRA=y
 CONFIG_I2C_VERSATILE=y
 CONFIG_I2C_XILINX=y
+
+#
 # External I2C/SMBus adapter drivers
+#
 CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_DLN2=m
 CONFIG_I2C_PARPORT_LIGHT=m
@@ -3525,16 +3639,25 @@ CONFIG_I2C_ROBOTFUZZ_OSIF=m
 CONFIG_I2C_TAOS_EVM=m
 CONFIG_I2C_TINY_USB=m
 CONFIG_I2C_VIPERBOARD=m
+
+#
 # Other I2C/SMBus bus drivers
+#
 CONFIG_I2C_CROS_EC_TUNNEL=y
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
 # SPI Master Controller Drivers
+#
 # CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_ARMADA_3700 is not set
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_BCM2835AUX=m
 # CONFIG_SPI_BCM_QSPI is not set
@@ -3543,7 +3666,7 @@ CONFIG_SPI_CADENCE=y
 CONFIG_SPI_DAVINCI=y
 # CONFIG_SPI_DESIGNWARE is not set
 CONFIG_SPI_DLN2=m
-CONFIG_SPI_FSL_LPSPI=m
+CONFIG_SPI_GPIO=m
 CONFIG_SPI_IMX=m
 CONFIG_SPI_FSL_LIB=m
 CONFIG_SPI_FSL_SPI=m
@@ -3558,41 +3681,71 @@ CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_ROCKCHIP=y
 CONFIG_SPI_S3C64XX=y
+CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
+CONFIG_SPI_XCOMM=m
 CONFIG_SPI_XILINX=y
 CONFIG_SPI_ZYNQMP_GQSPI=y
+
+#
 # SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_LOOPBACK_TEST is not set
+CONFIG_SPI_TLE62X0=m
 # CONFIG_SPMI is not set
 CONFIG_HSI=m
 CONFIG_HSI_BOARDINFO=y
+
+#
 # HSI controllers
+#
 CONFIG_OMAP_SSI=m
+
+#
 # HSI clients
+#
 CONFIG_NOKIA_MODEM=m
 CONFIG_CMT_SPEECH=m
 CONFIG_SSI_PROTOCOL=m
 # CONFIG_HSI_CHAR is not set
+
+#
 # PPS support
+#
 CONFIG_PPS=y
 # CONFIG_PPS_DEBUG is not set
+
+#
 # PPS clients support
+#
 CONFIG_PPS_CLIENT_KTIMER=m
 CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PPS_CLIENT_GPIO=m
+
+#
 # PPS generators support
+#
+
+#
 # PTP clock support
+#
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_GIANFAR=m
+
+#
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
 CONFIG_PINCTRL=y
+
+#
 # Pin controllers
-CONFIG_GENERIC_PINCTRL_GROUPS=y
+#
 CONFIG_PINMUX=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
@@ -3601,7 +3754,7 @@ CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_MESON=y
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
-CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_TI_IODELAY=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_PINCTRL_ZYNQ=y
 CONFIG_PINCTRL_BCM2835=y
@@ -3627,8 +3780,11 @@ CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS5440=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SUN4I_A10=y
-CONFIG_PINCTRL_SUN5I=y
+CONFIG_PINCTRL_SUN5I_A10S=y
+CONFIG_PINCTRL_SUN5I_A13=y
+CONFIG_PINCTRL_GR8=y
 CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31S=y
 CONFIG_PINCTRL_SUN6I_A31_R=y
 CONFIG_PINCTRL_SUN7I_A20=y
 CONFIG_PINCTRL_SUN8I_A23=y
@@ -3637,7 +3793,6 @@ CONFIG_PINCTRL_SUN8I_A83T=y
 CONFIG_PINCTRL_SUN8I_A23_R=y
 CONFIG_PINCTRL_SUN8I_H3=y
 CONFIG_PINCTRL_SUN8I_H3_R=y
-CONFIG_PINCTRL_SUN8I_V3S=y
 CONFIG_PINCTRL_SUN9I_A80=y
 CONFIG_PINCTRL_SUN9I_A80_R=y
 CONFIG_PINCTRL_TEGRA=y
@@ -3646,7 +3801,6 @@ CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_TEGRA114=y
 CONFIG_PINCTRL_TEGRA124=y
 CONFIG_PINCTRL_TEGRA_XUSB=y
-CONFIG_PINCTRL_TI_IODELAY=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
@@ -3656,12 +3810,16 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_OF_HELPER is not set
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MAX730X=m
+
+#
 # Memory mapped GPIO drivers
+#
 # CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_ALTERA is not set
+CONFIG_GPIO_AXP209=y
 CONFIG_GPIO_DAVINCI=y
 CONFIG_GPIO_DWAPB=y
-# CONFIG_GPIO_EXAR is not set
+# CONFIG_GPIO_EM is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_MOCKUP is not set
@@ -3674,10 +3832,15 @@ CONFIG_GPIO_SYSCON=y
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TS4800 is not set
 CONFIG_GPIO_VF610=y
+# CONFIG_GPIO_VX855 is not set
 CONFIG_GPIO_XILINX=y
 # CONFIG_GPIO_ZEVIO is not set
 CONFIG_GPIO_ZYNQ=y
+# CONFIG_GPIO_ZX is not set
+
+#
 # I2C GPIO expanders
+#
 CONFIG_GPIO_ADP5588=m
 CONFIG_GPIO_ADNP=m
 CONFIG_GPIO_MAX7300=m
@@ -3688,7 +3851,10 @@ CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_SX150X=y
 CONFIG_GPIO_TPIC2810=m
 # CONFIG_GPIO_TS4900 is not set
+
+#
 # MFD GPIO expanders
+#
 CONFIG_GPIO_DA9052=y
 CONFIG_GPIO_DA9055=y
 CONFIG_GPIO_DLN2=m
@@ -3702,21 +3868,37 @@ CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TWL4030=y
 CONFIG_GPIO_TWL6040=y
 # CONFIG_GPIO_WM8994 is not set
+
+#
 # PCI GPIO expanders
-# CONFIG_GPIO_PCI_IDIO_16 is not set
+#
+# CONFIG_GPIO_AMD8111 is not set
+# CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_RDC321X is not set
+
+#
 # SPI GPIO expanders
+#
 CONFIG_GPIO_74X164=m
 CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
+
+#
 # SPI or I2C GPIO expanders
+#
 CONFIG_GPIO_MCP23S08=m
+
+#
 # USB GPIO expanders
+#
 # CONFIG_GPIO_VIPERBOARD is not set
 CONFIG_W1=m
 CONFIG_W1_CON=y
+
+#
 # 1-wire Bus Masters
+#
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
@@ -3724,10 +3906,12 @@ CONFIG_W1_MASTER_MXC=m
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
 CONFIG_HDQ_MASTER_OMAP=m
+
+#
 # 1-wire Slaves
+#
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2405=m
 CONFIG_W1_SLAVE_DS2408=m
 CONFIG_W1_SLAVE_DS2408_READBACK=y
 CONFIG_W1_SLAVE_DS2413=m
@@ -3770,11 +3954,12 @@ CONFIG_BATTERY_ACT8945A=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_SBS=m
-CONFIG_CHARGER_SBS=m
 CONFIG_BATTERY_BQ27XXX=m
 CONFIG_BATTERY_BQ27XXX_I2C=m
 CONFIG_BATTERY_DA9052=m
 CONFIG_AXP288_FUEL_GAUGE=m
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
 CONFIG_BATTERY_TWL4030_MADC=m
 CONFIG_BATTERY_RX51=m
 CONFIG_CHARGER_ISP1704=m
@@ -3784,20 +3969,25 @@ CONFIG_CHARGER_TWL4030=m
 CONFIG_CHARGER_GPIO=m
 # CONFIG_CHARGER_MANAGER is not set
 CONFIG_CHARGER_MAX14577=m
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 CONFIG_CHARGER_MAX77693=m
 CONFIG_CHARGER_MAX8997=m
 CONFIG_CHARGER_MAX8998=m
 CONFIG_CHARGER_BQ2415X=m
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
+CONFIG_CHARGER_BQ24735=m
 # CONFIG_CHARGER_BQ25890 is not set
 # CONFIG_CHARGER_SMB347 is not set
 CONFIG_CHARGER_TPS65090=m
 CONFIG_CHARGER_TPS65217=m
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
+CONFIG_AXP20X_POWER=y
 CONFIG_POWER_SEQUENCE=y
+
+#
+# Power Sequence Support
+#
 CONFIG_PWRSEQ_GENERIC=y
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
@@ -3806,6 +3996,7 @@ CONFIG_HWMON_VID=m
 #
 # Native drivers
 #
+CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
 CONFIG_SENSORS_ADM1021=m
@@ -3815,6 +4006,7 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
 CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
@@ -3851,18 +4043,21 @@ CONFIG_SENSORS_LTC4222=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4260=m
 CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_LM73=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -3916,11 +4111,11 @@ CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
-# CONFIG_SENSORS_STTS751 is not set
 CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_ADC128D818=m
 CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
 CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
@@ -3929,7 +4124,6 @@ CONFIG_SENSORS_TC74=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP108=m
 CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TMP421=m
 CONFIG_SENSORS_TWL4030_MADC=m
@@ -3969,24 +4163,39 @@ CONFIG_IMX_THERMAL=y
 CONFIG_ROCKCHIP_THERMAL=y
 CONFIG_DOVE_THERMAL=y
 CONFIG_ARMADA_THERMAL=y
+
+#
 # ACPI INT340X thermal drivers
+#
+
+#
 # Texas Instruments thermal drivers
+#
 CONFIG_TI_SOC_THERMAL=y
 CONFIG_TI_THERMAL=y
 CONFIG_OMAP3_THERMAL=y
 CONFIG_OMAP4_THERMAL=y
 CONFIG_OMAP5_THERMAL=y
 CONFIG_DRA752_THERMAL=y
+
+#
 # Samsung thermal drivers
+#
 CONFIG_EXYNOS_THERMAL=y
+
+#
 # NVIDIA Tegra thermal drivers
+#
 CONFIG_TEGRA_SOCTHERM=y
 CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 # CONFIG_WATCHDOG_SYSFS is not set
+
+#
 # Watchdog Device Drivers
+#
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_DA9052_WATCHDOG=m
 # CONFIG_DA9055_WATCHDOG is not set
@@ -4014,15 +4223,27 @@ CONFIG_MESON_WATCHDOG=m
 # CONFIG_I6300ESB_WDT is not set
 CONFIG_BCM2835_WDT=m
 # CONFIG_MEN_A21_WDT is not set
+
+#
 # PCI-based Watchdog Cards
+#
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_WDTPCI is not set
+
+#
 # USB-based Watchdog Cards
+#
 CONFIG_USBPCWATCHDOG=m
+
+#
 # Watchdog Pretimeout Governors
+#
 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
+
+#
 # Sonics Silicon Backplane
+#
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
 CONFIG_SSB_BLOCKIO=y
@@ -4037,7 +4258,10 @@ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
 # CONFIG_SSB_DRIVER_GPIO is not set
 CONFIG_BCMA_POSSIBLE=y
+
+#
 # Broadcom specific AMBA
+#
 CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
@@ -4047,11 +4271,13 @@ CONFIG_BCMA_DRIVER_PCI=y
 # CONFIG_BCMA_DRIVER_GMAC_CMN is not set
 # CONFIG_BCMA_DRIVER_GPIO is not set
 # CONFIG_BCMA_DEBUG is not set
+
+#
 # Multifunction device drivers
+#
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_ALTERA_A10SR is not set
 CONFIG_MFD_ACT8945A=y
-CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_AS3711 is not set
 CONFIG_MFD_AS3722=y
 # CONFIG_PMIC_ADP5520 is not set
@@ -4059,6 +4285,7 @@ CONFIG_MFD_AS3722=y
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
 CONFIG_MFD_BCM590XX=y
+# CONFIG_MFD_AC100 is not set
 CONFIG_MFD_AXP20X=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_AXP20X_RSB=y
@@ -4101,12 +4328,12 @@ CONFIG_MFD_MAX8997=y
 CONFIG_MFD_MAX8998=y
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_CPCAP is not set
+# CONFIG_EZX_PCAP is not set
 CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_UCB1400_CORE is not set
-# CONFIG_MFD_PM8XXX is not set
+# CONFIG_MFD_PM8921_CORE is not set
 # CONFIG_MFD_RDC321X is not set
 CONFIG_MFD_RTSX_PCI=m
 # CONFIG_MFD_RT5033 is not set
@@ -4121,7 +4348,10 @@ CONFIG_MFD_SEC_CORE=y
 # CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
 CONFIG_MFD_STMPE=y
+
+#
 # STMicroelectronics STMPE Interface Drivers
+#
 CONFIG_STMPE_I2C=y
 # CONFIG_STMPE_SPI is not set
 CONFIG_MFD_SUN6I_PRCM=y
@@ -4142,6 +4372,7 @@ CONFIG_MFD_TPS65218=y
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
 # CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_MFD_TPS80031 is not set
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_POWER=y
@@ -4156,8 +4387,10 @@ CONFIG_MFD_WL1273_CORE=m
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_VX855 is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_WM8350_I2C is not set
 CONFIG_MFD_WM8994=y
 CONFIG_MFD_VEXPRESS_SYSREG=y
@@ -4231,15 +4464,17 @@ CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_VEXPRESS=y
 CONFIG_REGULATOR_WM8994=y
 CONFIG_MEDIA_SUPPORT=y
+
+#
 # Multimedia core support
+#
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CEC_SUPPORT=y
-# CONFIG_MEDIA_CEC_DEBUG is not set
+CONFIG_MEDIA_CEC_EDID=y
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
 CONFIG_VIDEO_DEV=y
@@ -4264,9 +4499,12 @@ CONFIG_VIDEOBUF2_DVB=m
 CONFIG_DVB_CORE=y
 CONFIG_DVB_NET=y
 CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+
+#
 # Media drivers
+#
 CONFIG_RC_CORE=y
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
@@ -4292,14 +4530,15 @@ CONFIG_IR_STREAMZAP=m
 CONFIG_IR_IGORPLUGUSB=m
 CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
-CONFIG_IR_RX51=m
+# CONFIG_IR_RX51 is not set
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_IR_SUNXI=m
-CONFIG_IR_SERIAL=m
-CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_MEDIA_USB_SUPPORT=y
+
+#
 # Webcam devices
+#
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
@@ -4360,7 +4599,10 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_VIDEO_USBTV=m
+
+#
 # Analog TV USB devices
+#
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
@@ -4368,12 +4610,16 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160=m
 CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
 CONFIG_VIDEO_GO7007_LOADER=m
 CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
 # Analog/digital TV USB devices
+#
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_V4L2=y
 CONFIG_VIDEO_AU0828_RC=y
@@ -4384,7 +4630,10 @@ CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
+
+#
 # Digital TV USB devices
+#
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_DIB3000MC=m
@@ -4426,40 +4675,52 @@ CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_ZD1301=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_USB_DRV=m
 CONFIG_DVB_B2C2_FLEXCOP_USB=m
 # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
 CONFIG_DVB_AS102=m
+
+#
 # Webcam, TV (analog/digital) USB devices
+#
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_V4L2=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_EM28XX_RC=m
+
+#
 # Software defined radio USB devices
+#
 CONFIG_USB_AIRSPY=m
 CONFIG_USB_HACKRF=m
-# USB HDMI CEC adapters
-CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_MSI2500=m
 CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
 # Media capture support
+#
 CONFIG_VIDEO_SOLO6X10=m
 # CONFIG_VIDEO_TW5864 is not set
 CONFIG_VIDEO_TW68=m
 # CONFIG_VIDEO_TW686X is not set
+
+#
 # Media capture/analog TV support
+#
 CONFIG_VIDEO_IVTV=m
-# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV_ALSA=m
 CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_DT3155=m
+
+#
 # Media capture/analog/hybrid TV support
+#
 CONFIG_VIDEO_CX18=m
 CONFIG_VIDEO_CX18_ALSA=m
 CONFIG_VIDEO_CX23885=m
@@ -4481,7 +4742,10 @@ CONFIG_VIDEO_SAA7134_RC=y
 CONFIG_VIDEO_SAA7134_DVB=m
 # CONFIG_VIDEO_SAA7134_GO7007 is not set
 CONFIG_VIDEO_SAA7164=m
+
+#
 # Media digital TV PCI Adapters
+#
 CONFIG_DVB_AV7110_IR=y
 CONFIG_DVB_AV7110=m
 CONFIG_DVB_AV7110_OSD=y
@@ -4502,6 +4766,7 @@ CONFIG_DVB_HOPPER=m
 CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
 CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_VIDEO_OMAP3=m
@@ -4522,26 +4787,24 @@ CONFIG_VIDEO_XILINX_VTC=m
 # CONFIG_VIDEO_TI_CAL is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_CODA=m
-CONFIG_VIDEO_IMX_VDOA=m
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 # CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
 # CONFIG_VIDEO_SH_VEU is not set
 CONFIG_VIDEO_TI_VPE=m
 # CONFIG_VIDEO_TI_VPE_DEBUG is not set
-CONFIG_VIDEO_TI_VPDMA=m
-CONFIG_VIDEO_TI_SC=m
-CONFIG_VIDEO_TI_CSC=m
 CONFIG_V4L_TEST_DRIVERS=y
 CONFIG_VIDEO_VIVID=m
-# CONFIG_VIDEO_VIVID_CEC is not set
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
 # CONFIG_VIDEO_VIM2M is not set
 CONFIG_DVB_PLATFORM_DRIVERS=y
 CONFIG_DVB_C8SECTPFE=m
+
+#
 # Supported MMC/SDIO adapters
+#
 CONFIG_SMS_SDIO_DRV=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_TEA575X=m
@@ -4564,10 +4827,16 @@ CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
 CONFIG_RADIO_WL1273=m
+
+#
 # Texas Instruments WL128x FM driver (ST based)
+#
 CONFIG_RADIO_WL128X=m
 CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
 # common driver options
+#
 CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_CYPRESS_FIRMWARE=m
@@ -4578,11 +4847,17 @@ CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
 # CONFIG_SMS_SIANO_DEBUGFS is not set
 CONFIG_VIDEO_V4L2_TPG=m
+
+#
 # Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
+#
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=y
+
+#
 # Audio decoders, processors and mixers
+#
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
@@ -4597,34 +4872,67 @@ CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
 CONFIG_VIDEO_VP27SMPX=m
 CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
 # RDS decoders
+#
 CONFIG_VIDEO_SAA6588=m
+
+#
 # Video decoders
+#
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_TVP5150=m
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
+
+#
 # Video and audio decoders
+#
 CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_CX25840=m
+
+#
 # Video encoders
+#
 CONFIG_VIDEO_SAA7127=m
+
+#
 # Camera sensor devices
+#
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9V011=m
+
+#
 # Flash devices
+#
+
+#
 # Video improvement chips
+#
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
+
+#
 # Audio/Video compression chips
+#
 CONFIG_VIDEO_SAA6752HS=m
+
+#
 # Miscellaneous helper chips
+#
 CONFIG_VIDEO_M52790=m
+
+#
 # Sensors used on soc_camera driver
+#
+
+#
 # soc_camera sensor drivers
+#
 CONFIG_SOC_CAMERA_IMX074=m
 CONFIG_SOC_CAMERA_MT9M001=m
 CONFIG_SOC_CAMERA_MT9M111=m
@@ -4647,6 +4955,7 @@ CONFIG_MEDIA_TUNER_TDA18271=y
 CONFIG_MEDIA_TUNER_TDA9887=y
 CONFIG_MEDIA_TUNER_TEA5761=y
 CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MSI001=m
 CONFIG_MEDIA_TUNER_MT20XX=y
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -4674,19 +4983,28 @@ CONFIG_MEDIA_TUNER_IT913X=m
 CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
+
+#
 # Multistandard (satellite) frontends
+#
 CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 CONFIG_DVB_M88DS3103=m
+
+#
 # Multistandard (cable + terrestrial) frontends
+#
 CONFIG_DVB_DRXK=m
 CONFIG_DVB_TDA18271C2DD=m
 CONFIG_DVB_SI2165=m
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
+
+#
 # DVB-S (satellite) frontends
+#
 CONFIG_DVB_CX24110=m
 CONFIG_DVB_CX24123=m
 CONFIG_DVB_MT312=m
@@ -4743,7 +5061,6 @@ CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
 
 #
@@ -4794,6 +5111,7 @@ CONFIG_DVB_TUNER_DIB0090=m
 # SEC control devices for DVB-S
 #
 CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
@@ -4807,6 +5125,9 @@ CONFIG_DVB_TDA665x=m
 CONFIG_DVB_IX2505V=m
 CONFIG_DVB_M88RS2000=m
 CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
 
 #
 # Tools to develop new frontends
@@ -4824,8 +5145,6 @@ CONFIG_IMX_IPUV3_CORE=m
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
@@ -4833,7 +5152,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_TTM=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_VM=y
 
 #
 # I2C encoder or helper chips
@@ -4884,12 +5202,12 @@ CONFIG_DRM_EXYNOS_HDMI=y
 CONFIG_DRM_EXYNOS_IPP=y
 CONFIG_DRM_EXYNOS_FIMC=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
+# CONFIG_DRM_EXYNOS_GSC is not set
 CONFIG_DRM_ROCKCHIP=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=y
-# CONFIG_ROCKCHIP_CDN_DP is not set
-CONFIG_ROCKCHIP_DW_HDMI=y
-CONFIG_ROCKCHIP_DW_MIPI_DSI=y
-CONFIG_ROCKCHIP_INNO_HDMI=y
+CONFIG_ROCKCHIP_ANALOGIX_DP=m
+CONFIG_ROCKCHIP_DW_HDMI=m
+CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_INNO_HDMI=m
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_MGAG200 is not set
@@ -4926,6 +5244,7 @@ CONFIG_DRM_OMAP_PANEL_DPI=m
 CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m
 # CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02 is not set
 # CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01 is not set
+# CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1 is not set
 CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
 # CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 is not set
 CONFIG_DRM_TILCDC=m
@@ -4955,19 +5274,16 @@ CONFIG_DRM_BRIDGE=y
 #
 # Display Interface Bridges
 #
-CONFIG_DRM_DUMB_VGA_DAC=m
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+# CONFIG_DRM_DUMB_VGA_DAC is not set
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
-CONFIG_DRM_NXP_PTN3460=m
-CONFIG_DRM_PARADE_PS8622=m
-CONFIG_DRM_SIL_SII8620=m
-CONFIG_DRM_SII902X=m
-CONFIG_DRM_TOSHIBA_TC358767=m
-CONFIG_DRM_TI_TFP410=m
+CONFIG_DRM_NXP_PTN3460=y
+CONFIG_DRM_PARADE_PS8622=y
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
 CONFIG_DRM_ANALOGIX_DP=m
 CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7533=y
 # CONFIG_DRM_STI is not set
 CONFIG_DRM_IMX=m
@@ -4980,13 +5296,7 @@ CONFIG_DRM_VC4=m
 CONFIG_DRM_ETNAVIV=m
 # CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
 # CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_HISI_HIBMC is not set
-CONFIG_DRM_MXS=y
-CONFIG_DRM_MXSFB=m
-# CONFIG_DRM_MESON is not set
-# CONFIG_DRM_TINYDRM is not set
 # CONFIG_DRM_LEGACY is not set
-# CONFIG_DRM_LIB_RANDOM is not set
 
 #
 # Frame buffer Devices
@@ -5004,7 +5314,6 @@ CONFIG_FB_CFB_REV_PIXELS_IN_BYTE=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
@@ -5070,7 +5379,19 @@ CONFIG_FB_SSD1307=y
 # CONFIG_FB_SM712 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
 CONFIG_LCD_PLATFORM=y
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PWM=y
@@ -5089,7 +5410,10 @@ CONFIG_BACKLIGHT_GPIO=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
+
+#
 # Console display driver support
+#
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
@@ -5111,12 +5435,16 @@ CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
@@ -5125,6 +5453,10 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_MPU401_UART=m
 CONFIG_SND_OPL3_LIB=m
@@ -5217,8 +5549,10 @@ CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
+CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_UA101=m
@@ -5237,6 +5571,7 @@ CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_ADI is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_EDMA_SOC=m
 CONFIG_SND_DAVINCI_SOC_I2S=m
@@ -5249,6 +5584,8 @@ CONFIG_SND_DESIGNWARE_I2S=m
 #
 # SoC Audio for Freescale CPUs
 #
+
+#
 # Common SoC Audio options for Freescale CPUs:
 #
 CONFIG_SND_SOC_FSL_ASRC=m
@@ -5283,12 +5620,12 @@ CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
 CONFIG_SND_KIRKWOOD_SOC=m
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
+# CONFIG_SND_SOC_IMG is not set
 CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP_I2S=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
 CONFIG_SND_SOC_ROCKCHIP_RT5645=m
-CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
 # CONFIG_SND_SOC_RK3399_GRU_SOUND is not set
 CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_SND_SAMSUNG_PCM=m
@@ -5304,8 +5641,6 @@ CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 # Allwinner SoC Audio support
 #
 CONFIG_SND_SUN4I_CODEC=m
-CONFIG_SND_SUN8I_CODEC=m
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
 CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SOC_TEGRA=m
@@ -5324,6 +5659,7 @@ CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_TEGRA_MAX98090=m
 CONFIG_SND_SOC_TEGRA_RT5677=m
 CONFIG_SND_SOC_TEGRA_SGTL5000=m
+# CONFIG_SND_SOC_XTFPGA_I2S is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
@@ -5331,42 +5667,107 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 #
 CONFIG_SND_SOC_WM_HUBS=m
 # CONFIG_SND_SOC_AC97_CODEC is not set
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_ADAU7002 is not set
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_ALC5632=m
 # CONFIG_SND_SOC_BT_SCO is not set
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS42L51=m
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_CS53L30 is not set
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+# CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
+# CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
 CONFIG_SND_SOC_RL6231=m
+# CONFIG_SND_SOC_RT5616 is not set
 CONFIG_SND_SOC_RT5631=m
 CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SGTL5000=m
+# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
 # CONFIG_SND_SOC_SSM4567 is not set
-# CONFIG_SND_SOC_TDM is not set
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TAS5720 is not set
+CONFIG_SND_SOC_TDM=m
+# CONFIG_SND_SOC_TFA9879 is not set
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
 CONFIG_SND_SOC_TLV320AIC31XX=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731 is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
 CONFIG_SND_SOC_WM8753=m
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
 CONFIG_SND_SOC_WM8903=m
+# CONFIG_SND_SOC_WM8960 is not set
 CONFIG_SND_SOC_WM8962=m
+# CONFIG_SND_SOC_WM8974 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+# CONFIG_SND_SOC_WM8985 is not set
 CONFIG_SND_SOC_WM8994=m
 CONFIG_SND_SOC_WM9712=m
 CONFIG_SND_SOC_MC13783=m
-# CONFIG_SND_SOC_NAU8540 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SND_SIMPLE_SCU_CARD is not set
+# CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 
 #
@@ -5427,7 +5828,6 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MAYFLASH=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
@@ -5463,7 +5863,6 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_UDRAW_PS3=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -5546,7 +5945,10 @@ CONFIG_USB_HWA_HCD=m
 # CONFIG_USB_HCD_BCMA is not set
 # CONFIG_USB_HCD_SSB is not set
 # CONFIG_USB_HCD_TEST_MODE is not set
+
+#
 # USB Device Class drivers
+#
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_WDM=m
@@ -5554,6 +5956,9 @@ CONFIG_USB_TMC=m
 
 #
 # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
 # also be needed; see USB_STORAGE Help for more info
 #
 CONFIG_USB_STORAGE=y
@@ -5619,6 +6024,7 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 #
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_EXYNOS=y
+CONFIG_USB_DWC3_PCI=y
 CONFIG_USB_DWC3_KEYSTONE=y
 CONFIG_USB_DWC3_OF_SIMPLE=y
 CONFIG_USB_DWC2=y
@@ -5637,14 +6043,16 @@ CONFIG_USB_CHIPIDEA_OF=y
 CONFIG_USB_CHIPIDEA_PCI=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 CONFIG_USB_ISP1760=y
 CONFIG_USB_ISP1760_HCD=y
 CONFIG_USB_ISP1761_UDC=y
 # CONFIG_USB_ISP1760_HOST_ROLE is not set
 # CONFIG_USB_ISP1760_GADGET_ROLE is not set
 CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
 # USB port drivers
+#
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_SIMPLE=m
@@ -5664,7 +6072,6 @@ CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_F8153X=m
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
@@ -5710,9 +6117,11 @@ CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_UPD78F0730=m
 CONFIG_USB_SERIAL_DEBUG=m
+
+#
 # USB Miscellaneous drivers
+#
 CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 CONFIG_USB_ADUTUX=m
@@ -5735,7 +6144,6 @@ CONFIG_USB_EHSET_TEST_FIXTURE=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
-# CONFIG_USB_HUB_USB251XB is not set
 CONFIG_USB_HSIC_USB3503=y
 CONFIG_USB_HSIC_USB4604=y
 # CONFIG_USB_LINK_LAYER_TEST is not set
@@ -5745,7 +6153,10 @@ CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
+
+#
 # USB Physical Layer drivers
+#
 CONFIG_USB_PHY=y
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_NOP_USB_XCEIV=y
@@ -5763,8 +6174,11 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_U_SERIAL_CONSOLE=y
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
 # USB Peripheral Controller
+#
 # CONFIG_USB_FSL_USB2 is not set
 # CONFIG_USB_FUSB300 is not set
 # CONFIG_USB_FOTG210_UDC is not set
@@ -5784,7 +6198,6 @@ CONFIG_USB_GADGET_XILINX=y
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
-CONFIG_USB_F_SS_LB=m
 CONFIG_USB_U_SERIAL=m
 CONFIG_USB_U_ETHER=m
 CONFIG_USB_F_SERIAL=m
@@ -5792,41 +6205,17 @@ CONFIG_USB_F_OBEX=m
 CONFIG_USB_F_NCM=m
 CONFIG_USB_F_ECM=m
 CONFIG_USB_F_PHONET=m
-CONFIG_USB_F_EEM=m
 CONFIG_USB_F_SUBSET=m
 CONFIG_USB_F_RNDIS=m
 CONFIG_USB_F_MASS_STORAGE=m
-CONFIG_USB_F_FS=m
-CONFIG_USB_F_UAC1=m
-CONFIG_USB_F_UAC2=m
 CONFIG_USB_F_UVC=m
 CONFIG_USB_F_MIDI=m
 CONFIG_USB_F_HID=m
 CONFIG_USB_F_PRINTER=m
 CONFIG_USB_F_TCM=m
-CONFIG_USB_CONFIGFS=m
-CONFIG_USB_CONFIGFS_SERIAL=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_OBEX=y
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_USB_CONFIGFS_ECM=y
-CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-CONFIG_USB_CONFIGFS_RNDIS=y
-CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_PHONET=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS_F_LB_SS=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_CONFIGFS_F_UAC1=y
-CONFIG_USB_CONFIGFS_F_UAC2=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_CONFIGFS_F_HID=y
-CONFIG_USB_CONFIGFS_F_UVC=y
-CONFIG_USB_CONFIGFS_F_PRINTER=y
-CONFIG_USB_CONFIGFS_F_TCM=y
+# CONFIG_USB_CONFIGFS is not set
 # CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-# CONFIG_GADGET_UAC1 is not set
+# CONFIG_USB_AUDIO is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_ETH_EEM is not set
@@ -5841,9 +6230,7 @@ CONFIG_USB_G_PRINTER=m
 CONFIG_USB_CDC_COMPOSITE=m
 CONFIG_USB_G_NOKIA=m
 CONFIG_USB_G_ACM_MS=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_RNDIS=y
-CONFIG_USB_G_MULTI_CDC=y
+# CONFIG_USB_G_MULTI is not set
 CONFIG_USB_G_HID=m
 CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
@@ -5858,13 +6245,20 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_PWRSEQ_EMMC=y
-CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=y
+
+#
+# MMC/SD/SDIO Card Drivers
+#
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=16
+CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
+
+#
 # MMC/SD/SDIO Host Controller Drivers
+#
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
@@ -5874,7 +6268,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
 CONFIG_MMC_SDHCI_OF_AT91=y
 CONFIG_MMC_SDHCI_OF_ESDHC=y
-CONFIG_MMC_SDHCI_CADENCE=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_DOVE=y
 CONFIG_MMC_SDHCI_TEGRA=y
@@ -5883,7 +6276,6 @@ CONFIG_MMC_SDHCI_PXAV3=y
 CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_MMC_SDHCI_F_SDH30=y
 CONFIG_MMC_SDHCI_IPROC=y
-CONFIG_MMC_MESON_GX=y
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_MXC=y
@@ -5907,11 +6299,17 @@ CONFIG_MMC_TOSHIBA_PCI=m
 # CONFIG_MMC_MTK is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
+
+#
 # MemoryStick drivers
+#
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 CONFIG_MSPRO_BLOCK=m
 # CONFIG_MS_BLOCK is not set
+
+#
 # MemoryStick Host Controller Drivers
+#
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK_R592=m
@@ -5920,8 +6318,10 @@ CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
 # LED drivers
+#
 # CONFIG_LEDS_AAT1290 is not set
 CONFIG_LEDS_BCM6328=m
 CONFIG_LEDS_BCM6358=m
@@ -5940,12 +6340,13 @@ CONFIG_LEDS_LP8860=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA963X=m
 CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_NS2=m
+CONFIG_LEDS_NS2=y
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
 CONFIG_LEDS_MAX77693=m
@@ -5954,11 +6355,16 @@ CONFIG_LEDS_LM355x=m
 # CONFIG_LEDS_KTD2692 is not set
 CONFIG_LEDS_IS31FL319X=m
 CONFIG_LEDS_IS31FL32XX=m
+
+#
 # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
 CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_USER=m
+
+#
 # LED Triggers
+#
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
@@ -5969,7 +6375,10 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
+#
 # iptables trigger is under Netfilter config (LED target)
+#
 CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
@@ -6001,7 +6410,6 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_ISERT=m
 # CONFIG_RDMA_RXE is not set
-# CONFIG_INFINIBAND_BNXT_RE is not set
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC=y
@@ -6018,32 +6426,62 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 # CONFIG_RTC_DEBUG is not set
+
+#
 # RTC interfaces
+#
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 # CONFIG_RTC_DRV_TEST is not set
+
+#
 # I2C RTC drivers
+#
 CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AS3722=y
 CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_DS1307_HWMON=y
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
 CONFIG_RTC_DRV_HYM8563=m
+CONFIG_RTC_DRV_MAX6900=m
 CONFIG_RTC_DRV_MAX8907=m
 CONFIG_RTC_DRV_MAX8998=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX77686=y
 CONFIG_RTC_DRV_RK808=y
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8523=y
+CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8563=y
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_TPS6586X=m
 CONFIG_RTC_DRV_TPS65910=m
 CONFIG_RTC_DRV_S35390A=y
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=y
+
+#
 # SPI RTC drivers
+#
 CONFIG_RTC_DRV_M41T93=m
 CONFIG_RTC_DRV_M41T94=m
 CONFIG_RTC_DRV_DS1302=m
@@ -6051,6 +6489,7 @@ CONFIG_RTC_DRV_DS1305=m
 CONFIG_RTC_DRV_DS1343=m
 CONFIG_RTC_DRV_DS1347=m
 CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RX4581=m
 CONFIG_RTC_DRV_RX6110=m
@@ -6059,15 +6498,48 @@ CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_MCP795=m
 CONFIG_RTC_I2C_AND_SPI=y
+
+#
 # SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+
+#
 # Platform RTC drivers
+#
 CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+# CONFIG_RTC_DS1685_PROC_REGS is not set
 # CONFIG_RTC_DS1685_SYSFS_REGS is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
 CONFIG_RTC_DRV_DA9052=y
 CONFIG_RTC_DRV_DA9055=m
 CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_ZYNQMP=m
+
+#
 # on-CPU RTC drivers
+#
 CONFIG_RTC_DRV_IMXDI=y
 CONFIG_RTC_DRV_OMAP=y
 CONFIG_HAVE_S3C_RTC=y
@@ -6082,12 +6554,17 @@ CONFIG_RTC_DRV_MC13XXX=y
 CONFIG_RTC_DRV_TEGRA=y
 CONFIG_RTC_DRV_MXC=y
 CONFIG_RTC_DRV_SNVS=y
-CONFIG_RTC_DRV_R7301=y
+
+#
 # HID Sensor RTC drivers
+#
 CONFIG_RTC_DRV_HID_SENSOR_TIME=m
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
+
+#
 # DMA Devices
+#
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
@@ -6119,13 +6596,18 @@ CONFIG_XILINX_ZYNQMP_DMA=y
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 # CONFIG_DW_DMAC_PCI is not set
+
+#
 # DMA Clients
+#
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
 CONFIG_DMA_ENGINE_RAID=y
+
+#
 # DMABUF options
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
+#
+# CONFIG_SYNC_FILE is not set
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
@@ -6140,14 +6622,20 @@ CONFIG_UIO_MF624=m
 # CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO=y
+
+#
 # Virtio drivers
+#
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+
+#
 # Microsoft Hyper-V guest support
+#
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 # CONFIG_COMEDI is not set
@@ -6163,13 +6651,23 @@ CONFIG_88EU_AP_MODE=y
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
+
+#
 # IIO staging drivers
+#
+
+#
 # Accelerometers
+#
 CONFIG_ADIS16201=m
 CONFIG_ADIS16203=m
 CONFIG_ADIS16209=m
 CONFIG_ADIS16240=m
+CONFIG_SCA3000=m
+
+#
 # Analog to digital converters
+#
 CONFIG_AD7606=m
 CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
@@ -6177,24 +6675,48 @@ CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+
+#
 # Analog digital bi-direction converters
+#
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+
+#
 # Capacitance to digital converters
+#
 CONFIG_AD7150=m
 CONFIG_AD7152=m
 CONFIG_AD7746=m
+
+#
 # Direct Digital Synthesis
+#
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+
+#
 # Digital gyroscope sensors
+#
 CONFIG_ADIS16060=m
+
+#
 # Network Analyzer, Impedance Converters
+#
 CONFIG_AD5933=m
+
+#
 # Light sensors
-CONFIG_TSL2x7x=m
+#
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_TSL2583=m
+# CONFIG_TSL2x7x is not set
+
+#
 # Active energy metering IC
+#
 CONFIG_ADE7753=m
 CONFIG_ADE7754=m
 CONFIG_ADE7758=m
@@ -6202,14 +6724,23 @@ CONFIG_ADE7759=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+
+#
 # Resolver to digital converters
+#
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
 CONFIG_AD2S1210=m
+
+#
 # Triggers - standalone
+#
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_XGI is not set
+
+#
 # Speakup console speech
+#
 # CONFIG_SPEAKUP is not set
 CONFIG_MFD_NVEC=m
 CONFIG_KEYBOARD_NVEC=m
@@ -6218,13 +6749,21 @@ CONFIG_NVEC_POWER=m
 CONFIG_NVEC_PAZ00=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
+# CONFIG_MEDIA_CEC is not set
 CONFIG_DVB_CXD2099=m
 CONFIG_VIDEO_OMAP4=m
-# CONFIG_VIDEO_BCM2835 is not set
-CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
 CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m
+
+#
 # Android
+#
 CONFIG_ASHMEM=y
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 # CONFIG_ION is not set
@@ -6282,8 +6821,6 @@ CONFIG_WILC1000_SPI=m
 # CONFIG_MOST is not set
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
-CONFIG_BCM2835_VCHIQ=y
-CONFIG_SND_BCM2835=m
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CROS_EC_CHARDEV=y
@@ -6291,13 +6828,16 @@ CONFIG_CROS_EC_PROTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
+
+#
 # Common Clock Framework
+#
 CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_VEXPRESS_OSC=y
 CONFIG_COMMON_CLK_MAX77686=y
 CONFIG_COMMON_CLK_RK808=y
-CONFIG_COMMON_CLK_SI5351=y
+# CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_CDCE706 is not set
@@ -6313,7 +6853,6 @@ CONFIG_COMMON_CLK_PALMAS=y
 CONFIG_COMMON_CLK_PWM=y
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_COMMON_CLK_VC5 is not set
 CONFIG_COMMON_CLK_AMLOGIC=y
 CONFIG_COMMON_CLK_MESON8B=y
 CONFIG_MVEBU_CLK_COMMON=y
@@ -6339,16 +6878,13 @@ CONFIG_SUNXI_CCU_NKM=y
 CONFIG_SUNXI_CCU_NKMP=y
 CONFIG_SUNXI_CCU_NM=y
 CONFIG_SUNXI_CCU_MP=y
-# CONFIG_SUN50I_A64_CCU is not set
-CONFIG_SUN5I_CCU=y
 CONFIG_SUN6I_A31_CCU=y
 CONFIG_SUN8I_A23_CCU=y
 CONFIG_SUN8I_A33_CCU=y
 CONFIG_SUN8I_H3_CCU=y
-CONFIG_SUN8I_V3S_CCU=y
-CONFIG_SUN9I_A80_CCU=y
 CONFIG_TEGRA_CLK_EMC=y
 CONFIG_COMMON_CLK_TI_ADPLL=y
+CONFIG_HWSPINLOCK=y
 
 #
 # Hardware Spinlock drivers
@@ -6424,24 +6960,24 @@ CONFIG_ARM_SMMU=y
 #
 CONFIG_REMOTEPROC=y
 CONFIG_OMAP_REMOTEPROC=m
+# CONFIG_STE_MODEM_RPROC is not set
 CONFIG_WKUP_M3_RPROC=y
 
 #
 # Rpmsg drivers
 #
 CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
 CONFIG_RPMSG_VIRTIO=m
 
 #
 # SOC (System On Chip) specific Drivers
 #
+
+#
 # Broadcom SoC drivers
 #
 CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_SOC_BRCMSTB is not set
-CONFIG_FSL_GUTS=y
-CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
 CONFIG_EXYNOS_PMU=y
@@ -6469,7 +7005,7 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y
 #
 # DEVFREQ Drivers
 #
-CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y
+# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
 CONFIG_ARM_TEGRA_DEVFREQ=y
 # CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
 CONFIG_PM_DEVFREQ_EVENT=y
@@ -6481,12 +7017,18 @@ CONFIG_EXTCON=y
 #
 # Extcon Device Drivers
 #
+# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_AXP288 is not set
 CONFIG_EXTCON_GPIO=y
 CONFIG_EXTCON_MAX14577=y
+CONFIG_EXTCON_MAX3355=y
 CONFIG_EXTCON_MAX77693=y
 CONFIG_EXTCON_MAX8997=y
 CONFIG_EXTCON_PALMAS=y
+# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
+# CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
+CONFIG_EXTCON_USB_GPIO=y
 CONFIG_MEMORY=y
 # CONFIG_ARM_PL172_MPMC is not set
 CONFIG_TI_AEMIF=y
@@ -6510,19 +7052,21 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 CONFIG_IIO_SW_DEVICE=m
 CONFIG_IIO_SW_TRIGGER=m
 CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
 CONFIG_BMA180=m
 CONFIG_BMA220=m
 CONFIG_BMC150_ACCEL=m
 CONFIG_BMC150_ACCEL_I2C=m
 CONFIG_BMC150_ACCEL_SPI=m
-CONFIG_DA280=m
-CONFIG_DA311=m
 CONFIG_DMARD06=m
 CONFIG_DMARD09=m
-CONFIG_DMARD10=m
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 CONFIG_KXSD9=m
 CONFIG_KXSD9_SPI=m
 CONFIG_KXSD9_I2C=m
@@ -6538,15 +7082,17 @@ CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
 CONFIG_MXC6255=m
-CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+
+#
+# Analog to digital converters
+#
 CONFIG_AD_SIGMA_DELTA=m
 CONFIG_AD7266=m
 CONFIG_AD7291=m
 CONFIG_AD7298=m
 CONFIG_AD7476=m
-CONFIG_AD7766=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -6554,19 +7100,15 @@ CONFIG_AD7923=m
 CONFIG_AD799X=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
-CONFIG_ENVELOPE_DETECTOR=m
 CONFIG_EXYNOS_ADC=m
 CONFIG_HI8435=m
-CONFIG_HX711=m
 CONFIG_INA2XX_ADC=m
 CONFIG_IMX7D_ADC=m
 CONFIG_LTC2485=m
 CONFIG_MAX1027=m
-CONFIG_MAX11100=m
 CONFIG_MAX1363=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
-CONFIG_MESON_SARADC=m
 CONFIG_NAU7802=m
 CONFIG_PALMAS_GPADC=m
 CONFIG_ROCKCHIP_SARADC=m
@@ -6576,34 +7118,45 @@ CONFIG_TI_ADC12138=m
 CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
-CONFIG_TI_ADS7950=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_AM335X_ADC=m
-CONFIG_TI_TLC4541=m
 CONFIG_TWL4030_MADC=m
 CONFIG_TWL6030_GPADC=m
 CONFIG_VF610_ADC=m
 CONFIG_VIPERBOARD_ADC=m
 CONFIG_XILINX_XADC=m
+
+#
 # Amplifiers
+#
 CONFIG_AD8366=m
+
+#
 # Chemical Sensors
+#
 CONFIG_ATLAS_PH_SENSOR=m
 CONFIG_IAQCORE=m
 CONFIG_VZ89X=m
-CONFIG_IIO_CROS_EC_SENSORS_CORE=m
-CONFIG_IIO_CROS_EC_SENSORS=m
+
+#
 # Hid Sensor IIO Common
+#
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
 CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
 # SSP Sensor Common
+#
 CONFIG_IIO_SSP_SENSORS_COMMONS=m
 CONFIG_IIO_SSP_SENSORHUB=m
 CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
-# Counters
+
+#
 # Digital to analog converters
+#
 CONFIG_AD5064=m
 CONFIG_AD5360=m
 CONFIG_AD5380=m
@@ -6622,20 +7175,35 @@ CONFIG_AD5764=m
 CONFIG_AD5791=m
 CONFIG_AD7303=m
 CONFIG_AD8801=m
-CONFIG_DPOT_DAC=m
 CONFIG_M62332=m
 CONFIG_MAX517=m
 CONFIG_MAX5821=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
 CONFIG_VF610_DAC=m
+
+#
 # IIO dummy driver
+#
 # CONFIG_IIO_SIMPLE_DUMMY is not set
+
+#
 # Frequency Synthesizers DDS/PLL
+#
+
+#
 # Clock Generator/Distribution
+#
 CONFIG_AD9523=m
+
+#
 # Phase-Locked Loop (PLL) frequency synthesizers
+#
 CONFIG_ADF4350=m
+
+#
+# Digital gyroscope sensors
+#
 CONFIG_ADIS16080=m
 CONFIG_ADIS16130=m
 CONFIG_ADIS16136=m
@@ -6645,24 +7213,35 @@ CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_MPU3050=m
-CONFIG_MPU3050_I2C=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+
+#
 # Health Sensors
+#
+
+#
 # Heart Rate Monitors
+#
 CONFIG_AFE4403=m
 CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+
+#
 # Humidity sensors
+#
 CONFIG_AM2315=m
 CONFIG_DHT11=m
 CONFIG_HDC100X=m
-CONFIG_HTS221=m
-CONFIG_HTS221_I2C=m
-CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+
+#
 # Inertial measurement units
+#
 CONFIG_ADIS16400=m
 CONFIG_ADIS16480=m
 CONFIG_BMI160=m
@@ -6672,38 +7251,45 @@ CONFIG_KMX61=m
 CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
 CONFIG_INV_MPU6050_SPI=m
-CONFIG_IIO_ST_LSM6DSX=m
-CONFIG_IIO_ST_LSM6DSX_I2C=m
-CONFIG_IIO_ST_LSM6DSX_SPI=m
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
 CONFIG_ADJD_S311=m
 CONFIG_AL3320A=m
 CONFIG_APDS9300=m
 CONFIG_APDS9960=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
 CONFIG_CM32181=m
 CONFIG_CM3232=m
 CONFIG_CM3323=m
-CONFIG_CM3605=m
 CONFIG_CM36651=m
 CONFIG_GP2AP020A00F=m
-CONFIG_SENSORS_ISL29018=m
 CONFIG_ISL29125=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_PROX=m
 CONFIG_JSA1212=m
+CONFIG_RPR0521=m
 CONFIG_LTR501=m
 CONFIG_MAX44000=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
 CONFIG_SI1145=m
+CONFIG_STK3310=m
 CONFIG_TCS3414=m
 CONFIG_TCS3472=m
 CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL2583=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
 CONFIG_VEML6070=m
+
+#
 # Magnetometer sensors
+#
 CONFIG_AK8974=m
 CONFIG_AK8975=m
 CONFIG_AK09911=m
@@ -6713,28 +7299,42 @@ CONFIG_BMC150_MAGN_SPI=m
 CONFIG_MAG3110=m
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
+
+#
 # Inclinometer sensors
+#
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+
+#
+# Triggers - standalone
+#
 CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+
+#
 # Digital potentiometers
+#
 CONFIG_DS1803=m
-CONFIG_MAX5481=m
 CONFIG_MAX5487=m
 CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_TPL0102=m
-# Digital potentiostats
-CONFIG_LMP91000=m
+
+#
 # Pressure sensors
-CONFIG_ABP060MG=m
+#
 CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
-CONFIG_IIO_CROS_EC_BARO=m
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -6753,17 +7353,24 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+
+#
 # Lightning sensors
+#
 CONFIG_AS3935=m
-# Proximity and distance sensors
+
+#
+# Proximity sensors
+#
 CONFIG_LIDAR_LITE_V2=m
 CONFIG_SX9500=m
-CONFIG_SRF08=m
+
+#
 # Temperature sensors
+#
 CONFIG_MAXIM_THERMOCOUPLE=m
 CONFIG_MLX90614=m
 CONFIG_TMP006=m
-CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
 # CONFIG_NTB is not set
@@ -6778,7 +7385,7 @@ CONFIG_PWM_MESON=m
 CONFIG_PWM_OMAP_DMTIMER=m
 CONFIG_PWM_PCA9685=m
 CONFIG_PWM_ROCKCHIP=m
-CONFIG_PWM_SAMSUNG=y
+CONFIG_PWM_SAMSUNG=m
 # CONFIG_PWM_STMPE is not set
 CONFIG_PWM_SUN4I=m
 CONFIG_PWM_TEGRA=m
@@ -6798,6 +7405,7 @@ CONFIG_ORION_IRQCHIP=y
 CONFIG_IRQ_CROSSBAR=y
 # CONFIG_KEYSTONE_IRQ is not set
 CONFIG_LS_SCFG_MSI=y
+CONFIG_IPACK_BUS=y
 # CONFIG_BOARD_TPCI200 is not set
 # CONFIG_SERIAL_IPOCTAL is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
@@ -6812,9 +7420,11 @@ CONFIG_RESET_SOCFPGA=y
 CONFIG_RESET_SUNXI=y
 CONFIG_TI_SYSCON_RESET=y
 CONFIG_RESET_ZYNQ=y
-# CONFIG_RESET_TEGRA_BPMP is not set
 # CONFIG_FMC is not set
+
+#
 # PHY Subsystem
+#
 CONFIG_GENERIC_PHY=y
 CONFIG_ARMADA375_USBCLUSTER_PHY=y
 # CONFIG_PHY_DM816X_USB is not set
@@ -6827,6 +7437,7 @@ CONFIG_OMAP_USB2=y
 CONFIG_TI_PIPE3=y
 CONFIG_TWL4030_USB=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=y
+# CONFIG_BCM_KONA_USB2_PHY is not set
 CONFIG_PHY_EXYNOS5250_SATA=y
 CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_SUN9I_USB=y
@@ -6835,18 +7446,14 @@ CONFIG_PHY_EXYNOS4210_USB2=y
 CONFIG_PHY_EXYNOS4X12_USB2=y
 CONFIG_PHY_EXYNOS5250_USB2=y
 CONFIG_PHY_EXYNOS5_USBDRD=y
-# CONFIG_PHY_EXYNOS_PCIE is not set
 CONFIG_PHY_ROCKCHIP_USB=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 CONFIG_PHY_ROCKCHIP_EMMC=y
 CONFIG_PHY_ROCKCHIP_DP=y
 CONFIG_PHY_ROCKCHIP_PCIE=y
 CONFIG_PHY_ROCKCHIP_TYPEC=y
-# CONFIG_PHY_QCOM_USB_HS is not set
-# CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_TUSB1210 is not set
 CONFIG_PHY_TEGRA_XUSB=y
-CONFIG_PHY_MESON8B_USB2=y
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
 
@@ -6855,9 +7462,13 @@ CONFIG_PHY_MESON8B_USB2=y
 #
 CONFIG_ARM_PMU=y
 CONFIG_RAS=y
+# CONFIG_THUNDERBOLT is not set
+
+#
+# Android
+#
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDER_DEVICES="binder"
 CONFIG_ANDROID_BINDER_IPC_32BIT=y
 CONFIG_NVMEM=y
 CONFIG_NVMEM_IMX_OCOTP=y
@@ -6871,35 +7482,19 @@ CONFIG_NVMEM_VF610_OCOTP=y
 # FPGA Configuration Support
 #
 CONFIG_FPGA=m
-CONFIG_FPGA_REGION=m
 CONFIG_FPGA_MGR_SOCFPGA=m
-CONFIG_FPGA_MGR_SOCFPGA_A10=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
-CONFIG_FPGA_BRIDGE=m
-CONFIG_SOCFPGA_FPGA_BRIDGE=m
-CONFIG_ALTERA_FREEZE_BRIDGE=m
-
-#
-# FSI support
-#
-# CONFIG_FSI is not set
 
 #
 # Firmware Drivers
 #
 CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_HAVE_ARM_SMCCC=y
 
 #
-# Tegra firmware driver
-#
-# CONFIG_TEGRA_IVC is not set
-
-#
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
@@ -6972,7 +7567,6 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=y
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 
 #
 # Caches
@@ -6985,13 +7579,19 @@ CONFIG_FSCACHE_STATS=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
 # CD-ROM/DVD Filesystems
+#
 CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
+
+#
 # DOS/FAT/NT Filesystems
+#
 CONFIG_FAT_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
@@ -6999,7 +7599,10 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_FAT_DEFAULT_UTF8=y
 # CONFIG_NTFS_FS is not set
+
+#
 # Pseudo filesystems
+#
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
@@ -7030,7 +7633,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
-# CONFIG_UBIFS_FS_ENCRYPTION is not set
+CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FILE_CACHE=y
@@ -7077,6 +7680,7 @@ CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=y
 CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
 CONFIG_NFS_V4_1_MIGRATION=y
@@ -7121,6 +7725,7 @@ CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
 # CONFIG_CIFS_SMB311 is not set
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_NCP_FS is not set
@@ -7179,14 +7784,22 @@ CONFIG_NLS_MAC_ROMANIAN=m
 CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 # CONFIG_DLM is not set
+
+#
 # Kernel hacking
+#
+
+#
 # printk and dmesg options
+#
 CONFIG_PRINTK_TIME=y
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_DYNAMIC_DEBUG is not set
+
+#
 # Compile-time checks and compiler options
+#
 # CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
@@ -7202,27 +7815,27 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
-CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+
+#
 # Memory Debugging
-CONFIG_PAGE_EXTENSION=y
-CONFIG_PAGE_POISONING=y
-CONFIG_PAGE_POISONING_NO_SANITY=y
-# CONFIG_PAGE_POISONING_ZERO is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_SHIRQ is not set
+
+#
 # Debug Lockups and Hangs
+#
 CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
@@ -7231,15 +7844,19 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_WQ_WATCHDOG=y
-CONFIG_PANIC_ON_OOPS=y
-CONFIG_PANIC_ON_OOPS_VALUE=1
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_STACK_END_CHECK=y
 # CONFIG_DEBUG_TIMEKEEPING is not set
+CONFIG_TIMER_STATS=y
+
+#
 # Lock Debugging (spinlocks, mutexes, etc...)
+#
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
@@ -7250,17 +7867,20 @@ CONFIG_SCHED_STACK_END_CHECK=y
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_PI_LIST is not set
 # CONFIG_DEBUG_SG is not set
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_DEBUG_CREDENTIALS=y
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
 # RCU Debugging
+#
 # CONFIG_PROVE_RCU is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_TORTURE_TEST is not set
 # CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
@@ -7284,10 +7904,12 @@ CONFIG_RING_BUFFER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
+
+#
 # Runtime Testing
+#
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_SORT is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
@@ -7311,7 +7933,6 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_TEST_STATIC_KEYS is not set
-CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_KGDB=y
@@ -7337,30 +7958,33 @@ CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 # CONFIG_ARM_KPROBES_TEST is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_CORESIGHT is not set
 
 #
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 # CONFIG_TRUSTED_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_KEY_DH_OPERATIONS is not set
 CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SECURITY_TIOCSTI_RESTRICT=y
 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
+CONFIG_SECURITY_TIOCSTI_RESTRICT=y
 CONFIG_SECURITY=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+# CONFIG_SECURITY_WRITABLE_HOOKS is not set
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
 # CONFIG_HARDENED_USERCOPY is not set
-CONFIG_FORTIFY_SOURCE=y
 CONFIG_PAGE_SANITIZE=y
 CONFIG_PAGE_SANITIZE_VERIFY=y
 # CONFIG_STATIC_USERMODEHELPER is not set
@@ -7380,14 +8004,14 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
 CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/bin/init"
 CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_DEBUG=y
-CONFIG_SECURITY_APPARMOR_DEBUG_ASSERTS=y
-CONFIG_SECURITY_APPARMOR_DEBUG_MESSAGES=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_SECURITY_APPARMOR_DEBUG=y
+CONFIG_SECURITY_APPARMOR_DEBUG_ASSERTS=y
+CONFIG_SECURITY_APPARMOR_DEBUG_MESSAGES=y
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_YAMA=y
 CONFIG_INTEGRITY=y
@@ -7426,8 +8050,9 @@ CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=m
 CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_KPP=m
 CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_DH=m
 CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
@@ -7442,15 +8067,21 @@ CONFIG_CRYPTO_CRYPTD=m
 # CONFIG_CRYPTO_MCRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_ABLK_HELPER=m
 CONFIG_CRYPTO_ENGINE=m
+
+#
 # Authenticated Encryption with Associated Data
+#
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=m
+
+#
 # Block modes
+#
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
@@ -7459,12 +8090,18 @@ CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_KEYWRAP=m
+
+#
 # Hash modes
+#
 CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
+
+#
 # Digest
+#
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRCT10DIF=y
@@ -7483,9 +8120,11 @@ CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
+
+#
 # Ciphers
+#
 CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -7504,13 +8143,19 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
 # Compression
+#
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
+
+#
 # Random Number Generation
+#
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_DRBG_HMAC=y
@@ -7538,7 +8183,6 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_IMX=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
@@ -7549,12 +8193,14 @@ CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 # CONFIG_CRYPTO_DEV_CHELSIO is not set
-CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 CONFIG_X509_CERTIFICATE_PARSER=m
 CONFIG_PKCS7_MESSAGE_PARSER=m
+
+#
 # Certificates for signature checking
+#
 # CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM=y
@@ -7567,11 +8213,11 @@ CONFIG_CRYPTO_AES_ARM=y
 CONFIG_CRYPTO_AES_ARM_BS=m
 # CONFIG_CRYPTO_AES_ARM_CE is not set
 # CONFIG_CRYPTO_GHASH_ARM_CE is not set
-# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
-# CONFIG_CRYPTO_CRC32_ARM_CE is not set
-CONFIG_CRYPTO_CHACHA20_NEON=m
 # CONFIG_BINARY_PRINTF is not set
+
+#
 # Library routines
+#
 CONFIG_RAID6_PQ=y
 CONFIG_BITREVERSE=y
 CONFIG_HAVE_ARCH_BITREVERSE=y
@@ -7596,7 +8242,6 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 # CONFIG_CRC8 is not set
-CONFIG_AUDIT_GENERIC=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
@@ -7628,11 +8273,10 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
-# CONFIG_DMA_NOOP_OPS is not set
-# CONFIG_DMA_VIRT_OPS is not set
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
@@ -7658,501 +8302,4 @@ CONFIG_SBITMAP=y
 CONFIG_VIRTUALIZATION=y
 # CONFIG_VHOST_NET is not set
 # CONFIG_VHOST_SCSI is not set
-# CONFIG_VHOST_VSOCK is not set
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-CONFIG_TLS=m
-CONFIG_NET_DSA_TAG_LAN9303=y
-CONFIG_NET_DSA_TAG_MTK=y
-CONFIG_NET_SCH_DEFAULT=y
-CONFIG_DEFAULT_FQ=y
-# CONFIG_DEFAULT_CODEL is not set
-# CONFIG_DEFAULT_FQ_CODEL is not set
-# CONFIG_DEFAULT_SFQ is not set
-# CONFIG_DEFAULT_PFIFO_FAST is not set
-CONFIG_DEFAULT_NET_SCH="fq"
-CONFIG_CAN_VXCAN=m
-CONFIG_CAN_PEAK_PCIEFD=m
-CONFIG_CAN_PEAK_PCMCIA=m
-CONFIG_CAN_MCBA_USB=m
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIUART_NOKIA=m
-CONFIG_NET_9P_XEN=m
-CONFIG_PNP_DEBUG_MESSAGES=y
-CONFIG_PCI_ENDPOINT_TEST=m
-# CONFIG_CXL_LIB is not set
-CONFIG_AIC7XXX_DEBUG_ENABLE=y
-CONFIG_AIC79XX_DEBUG_ENABLE=y
-CONFIG_AIC94XX_DEBUG=y
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_ZONED=m
-CONFIG_VSOCKMON=m
-# CONFIG_NET_DSA_LOOP is not set
-CONFIG_NET_DSA_MT7530=m
-CONFIG_NET_DSA_MV88E6060=m
-# CONFIG_MICROCHIP_KSZ is not set
-CONFIG_NET_DSA_SMSC_LAN9303=m
-CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
-CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
-CONFIG_MACB_USE_HWSTAMP=y
-CONFIG_TIGON3_HWMON=y
-CONFIG_MLX5_ACCEL=y
-CONFIG_MLX5_FPGA=y
-CONFIG_MLX5_CORE_IPOIB=y
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLXFW=m
-CONFIG_NFP_APP_FLOWER=y
-CONFIG_NET_VENDOR_SYNOPSYS=y
-CONFIG_DWC_XLGMAC=m
-CONFIG_DWC_XLGMAC_PCI=m
-CONFIG_MDIO_DEVICE=m
-CONFIG_MDIO_BUS=m
-CONFIG_SWPHY=y
-CONFIG_LED_TRIGGER_PHY=y
-CONFIG_CORTINA_PHY=m
-CONFIG_MARVELL_10G_PHY=m
-CONFIG_WIL6210_TRACING=y
-CONFIG_ATH10K_SDIO=m
-CONFIG_RTLWIFI_DEBUG=y
-CONFIG_RSI_DEBUGFS=y
-CONFIG_WLAN_VENDOR_QUANTENNA=y
-CONFIG_QTNFMAC=m
-CONFIG_QTNFMAC_PEARL_PCIE=m
-CONFIG_KEYBOARD_DLINK_DIR685=m
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
-CONFIG_MOUSE_PS2_SMBUS=y
-CONFIG_TOUCHSCREEN_TSC2007_IIO=y
-CONFIG_TOUCHSCREEN_STMFTS=m
-CONFIG_IPMI_DMI_DECODE=y
-CONFIG_I2C_MUX_LTC4306=m
-# CONFIG_I2C_DESIGNWARE_SLAVE is not set
-# CONFIG_SPI is not set
-# CONFIG_PINCTRL_MCP23S08 is not set
-CONFIG_PINCTRL_CHERRYVIEW=m
-CONFIG_PINCTRL_INTEL=m
-CONFIG_PINCTRL_BROXTON=m
-CONFIG_PINCTRL_CANNONLAKE=m
-CONFIG_PINCTRL_GEMINILAKE=m
-CONFIG_PINCTRL_SUNRISEPOINT=m
-CONFIG_GPIO_AXP209=m
-CONFIG_GPIO_WHISKEY_COVE=m
-CONFIG_CHARGER_AXP20X=m
-CONFIG_BATTERY_AXP20X=m
-CONFIG_AXP20X_POWER=m
-CONFIG_AXP288_CHARGER=m
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_LTC3651=m
-# CONFIG_CHARGER_BQ24735 is not set
-CONFIG_SENSORS_ASPEED=m
-CONFIG_SENSORS_IR35221=m
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
-CONFIG_INTEL_SOC_PMIC_BXTWC=m
-CONFIG_INTEL_SOC_PMIC_CHTWC=m
-CONFIG_MFD_TI_LMU=m
-CONFIG_CEC_CORE=m
-CONFIG_MEDIA_CEC_RC=y
-CONFIG_V4L2_FWNODE=m
-CONFIG_DVB_MAX_ADAPTERS=16
-CONFIG_IR_SIR=m
-CONFIG_USB_RAINSHADOW_CEC=m
-# CONFIG_VIDEO_VIA_CAMERA is not set
-CONFIG_VIDEO_VIMC=m
-CONFIG_CEC_PLATFORM_DRIVERS=y
-CONFIG_SDR_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_OV2640=m
-CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_I915_ALPHA_SUPPORT=y
-CONFIG_DRM_PANEL_BRIDGE=y
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-CONFIG_SND_SEQ_DEVICE=m
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_SEQUENCER_OSS=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=m
-CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_MIDI_EMUL=m
-CONFIG_SND_SEQ_VIRMIDI=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREFACE=m
-CONFIG_SND_ATMEL_SOC=m
-CONFIG_SND_I2S_HI6210_I2S=m
-CONFIG_SND_SOC_IMG=y
-CONFIG_SND_SOC_IMG_I2S_IN=m
-CONFIG_SND_SOC_IMG_I2S_OUT=m
-CONFIG_SND_SOC_IMG_PARALLEL_OUT=m
-CONFIG_SND_SOC_IMG_SPDIF_IN=m
-CONFIG_SND_SOC_IMG_SPDIF_OUT=m
-CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
-CONFIG_SND_SOC_XTFPGA_I2S=m
-CONFIG_ZX_TDM=m
-CONFIG_SND_SOC_ADAU_UTILS=m
-CONFIG_SND_SOC_ADAU1701=m
-CONFIG_SND_SOC_ADAU17X1=m
-CONFIG_SND_SOC_ADAU1761=m
-CONFIG_SND_SOC_ADAU1761_I2C=m
-CONFIG_SND_SOC_ADAU7002=m
-CONFIG_SND_SOC_AK4554=m
-CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SOC_AK4642=m
-CONFIG_SND_SOC_AK5386=m
-CONFIG_SND_SOC_ALC5623=m
-CONFIG_SND_SOC_CS35L32=m
-CONFIG_SND_SOC_CS35L33=m
-CONFIG_SND_SOC_CS35L34=m
-CONFIG_SND_SOC_CS35L35=m
-CONFIG_SND_SOC_CS42L42=m
-CONFIG_SND_SOC_CS42L51_I2C=m
-CONFIG_SND_SOC_CS42L52=m
-CONFIG_SND_SOC_CS42L56=m
-CONFIG_SND_SOC_CS42L73=m
-CONFIG_SND_SOC_CS4265=m
-CONFIG_SND_SOC_CS4270=m
-CONFIG_SND_SOC_CS4271=m
-CONFIG_SND_SOC_CS4271_I2C=m
-CONFIG_SND_SOC_CS42XX8=m
-CONFIG_SND_SOC_CS42XX8_I2C=m
-CONFIG_SND_SOC_CS4349=m
-CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_DA7213=m
-CONFIG_SND_SOC_DIO2125=m
-CONFIG_SND_SOC_ES7134=m
-CONFIG_SND_SOC_ES8316=m
-CONFIG_SND_SOC_GTM601=m
-CONFIG_SND_SOC_INNO_RK3036=m
-CONFIG_SND_SOC_MAX98504=m
-CONFIG_SND_SOC_MAX98927=m
-CONFIG_SND_SOC_MAX9860=m
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
-CONFIG_SND_SOC_PCM1681=m
-CONFIG_SND_SOC_PCM179X=m
-CONFIG_SND_SOC_PCM179X_I2C=m
-CONFIG_SND_SOC_PCM3168A=m
-CONFIG_SND_SOC_PCM3168A_I2C=m
-CONFIG_SND_SOC_PCM512x=m
-CONFIG_SND_SOC_PCM512x_I2C=m
-CONFIG_SND_SOC_RT5514=m
-CONFIG_SND_SOC_RT5616=m
-CONFIG_SND_SOC_RT5663=m
-# CONFIG_SND_SOC_RT5677_SPI is not set
-CONFIG_SND_SOC_SIGMADSP=m
-CONFIG_SND_SOC_SIGMADSP_I2C=m
-CONFIG_SND_SOC_SIGMADSP_REGMAP=m
-CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
-CONFIG_SND_SOC_SSM2602=m
-CONFIG_SND_SOC_SSM2602_I2C=m
-CONFIG_SND_SOC_STA32X=m
-CONFIG_SND_SOC_STA350=m
-CONFIG_SND_SOC_STI_SAS=m
-CONFIG_SND_SOC_TAS2552=m
-CONFIG_SND_SOC_TAS5086=m
-CONFIG_SND_SOC_TAS571X=m
-CONFIG_SND_SOC_TAS5720=m
-CONFIG_SND_SOC_TFA9879=m
-CONFIG_SND_SOC_WM8510=m
-CONFIG_SND_SOC_WM8523=m
-CONFIG_SND_SOC_WM8580=m
-CONFIG_SND_SOC_WM8711=m
-CONFIG_SND_SOC_WM8728=m
-CONFIG_SND_SOC_WM8731=m
-CONFIG_SND_SOC_WM8737=m
-CONFIG_SND_SOC_WM8741=m
-CONFIG_SND_SOC_WM8750=m
-CONFIG_SND_SOC_WM8776=m
-CONFIG_SND_SOC_WM8804=m
-CONFIG_SND_SOC_WM8804_I2C=m
-CONFIG_SND_SOC_WM8960=m
-CONFIG_SND_SOC_WM8974=m
-CONFIG_SND_SOC_WM8978=m
-CONFIG_SND_SOC_WM8985=m
-CONFIG_SND_SOC_ZX_AUD96P22=m
-CONFIG_SND_SOC_NAU8810=m
-CONFIG_SND_SOC_NAU8824=m
-CONFIG_SND_SYNTH_EMUX=m
-CONFIG_HID_ACCUTOUCH=m
-CONFIG_HID_ITE=m
-CONFIG_HID_NTI=m
-CONFIG_HID_RETRODE=m
-CONFIG_USB_PCI=y
-CONFIG_TYPEC=m
-CONFIG_TYPEC_WCOVE=m
-CONFIG_TYPEC_UCSI=m
-CONFIG_UCSI_ACPI=m
-CONFIG_MMC_SDHCI_XENON=m
-CONFIG_INFINIBAND_QIB_DCA=y
-CONFIG_INFINIBAND_OPA_VNIC=m
-CONFIG_EDAC_GHES=y
-CONFIG_RTC_NVMEM=y
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_PCF50633 is not set
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_HD44780 is not set
-# CONFIG_PANEL is not set
-CONFIG_HYPERV_TSCPAGE=y
-CONFIG_RTL8723BS=m
-CONFIG_INTEL_ATOMISP=y
-CONFIG_VIDEO_ATOMISP=m
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_IMX=m
-CONFIG_VIDEO_OV2722=m
-CONFIG_VIDEO_GC2235=m
-CONFIG_VIDEO_OV8858=m
-CONFIG_VIDEO_MSRLIST_HELPER=m
-CONFIG_VIDEO_MT9M114=m
-CONFIG_VIDEO_AP1302=m
-CONFIG_VIDEO_GC0310=m
-CONFIG_VIDEO_OV2680=m
-CONFIG_VIDEO_LM3554=m
-CONFIG_LNET_XPRT_IB=m
-CONFIG_TYPEC_TCPM=m
-CONFIG_TYPEC_TCPCI=m
-CONFIG_TYPEC_FUSB302=m
-CONFIG_DRM_VBOXVIDEO=m
-CONFIG_DELL_WMI_LED=m
-CONFIG_WMI_BMOF=m
-CONFIG_PEAQ_WMI=m
-CONFIG_INTEL_CHT_INT33FE=m
-CONFIG_INTEL_INT0002_VGPIO=m
-# CONFIG_CROS_EC_LPC_MEC is not set
-CONFIG_HWSPINLOCK=m
-CONFIG_INTEL_IOMMU_DEFAULT_ON=y
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_ARIZONA=m
-CONFIG_EXTCON_AXP288=m
-CONFIG_EXTCON_INTEL_CHT_WC=m
-CONFIG_EXTCON_MAX3355=m
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_USB_GPIO=m
-CONFIG_AXP20X_ADC=m
-# CONFIG_LTC2497 is not set
-# CONFIG_MAX9611 is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX30102 is not set
-CONFIG_HID_SENSOR_HUMIDITY=m
-# CONFIG_BH1750 is not set
-# CONFIG_BH1780 is not set
-# CONFIG_IIO_CROS_EC_LIGHT_PROX is not set
-# CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_RPR0521 is not set
-# CONFIG_OPT3001 is not set
-# CONFIG_PA12203001 is not set
-# CONFIG_STK3310 is not set
-# CONFIG_VL6180 is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SRF04 is not set
-CONFIG_HID_SENSOR_TEMP=m
-# CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_GEMINI is not set
-# CONFIG_RESET_IMX7 is not set
-# CONFIG_RESET_TI_SYSCON is not set
-CONFIG_BCM_KONA_USB2_PHY=m
-# CONFIG_PHY_CPCAP_USB is not set
-CONFIG_RAS_CEC=y
-CONFIG_DAX=m
-CONFIG_FSI_MASTER_GPIO=m
-CONFIG_FSI_MASTER_HUB=m
-CONFIG_FSI_SCOM=m
-CONFIG_OVERLAY_FS_INDEX=y
-CONFIG_UBIFS_FS_SECURITY=y
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_SOFTLOCKUP_DETECTOR=y
-CONFIG_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
-# CONFIG_TEST_SYSCTL is not set
-# CONFIG_TEST_KMOD is not set
-# CONFIG_EARLY_PRINTK_USB_XDBC is not set
-CONFIG_OPTIMIZE_INLINING=y
-CONFIG_KEYS_COMPAT=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_DEV_NITROX=m
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
-CONFIG_SYSTEM_BLACKLIST_KEYRING=y
-CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
-CONFIG_CRC4=m
-CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_THIN_ARCHIVES=y
-# CONFIG_REFCOUNT_FULL is not set
-CONFIG_IOSCHED_BFQ=y
-CONFIG_BFQ_GROUP_IOSCHED=y
-# CONFIG_ARCH_ACTIONS is not set
-CONFIG_PCI_DRA7XX_HOST=y
-# CONFIG_PCI_FTPCI100 is not set
-# CONFIG_PCI_ENDPOINT is not set
-# CONFIG_PCI_SW_SWITCHTEC is not set
-CONFIG_ARCH_NR_GPIO=2048
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_ARM_DB8500_CPUFREQ is not set
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_CAN_HI311X=m
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
-# CONFIG_AHCI_DM816 is not set
-CONFIG_NET_DSA_BCM_SF2=m
-# CONFIG_QCA7000_SPI is not set
-CONFIG_DWMAC_SUN8I=m
-CONFIG_JOYSTICK_PSXPAD_SPI=m
-CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-CONFIG_SPI_MESON_SPICC=m
-# CONFIG_SPI_SLAVE is not set
-CONFIG_PINCTRL_EXYNOS_ARM=y
-CONFIG_PINCTRL_SUN8I_A83T_R=y
-# CONFIG_PINCTRL_SUN50I_A64 is not set
-# CONFIG_PINCTRL_SUN50I_A64_R is not set
-# CONFIG_PINCTRL_SUN50I_H5 is not set
-# CONFIG_GPIO_XRA1403 is not set
-CONFIG_W1_SLAVE_DS2438=m
-CONFIG_REBOOT_MODE=y
-# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
-CONFIG_BCM2835_THERMAL=y
-CONFIG_MFD_AC100=y
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_REGULATOR_TPS65132 is not set
-# CONFIG_REGULATOR_VCTRL is not set
-CONFIG_CEC_NOTIFIER=y
-CONFIG_VIDEO_MUX=m
-CONFIG_DRM_SUN4I_HDMI=m
-CONFIG_DRM_SUN4I_BACKEND=m
-CONFIG_DRM_SUN8I_MIXER=m
-CONFIG_OMAP_DSS_BASE=m
-CONFIG_DRM_STM=y
-# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PL111 is not set
-CONFIG_SND_HDA_PREALLOC_SIZE=2048
-CONFIG_SND_SOC_ROCKCHIP_PDM=m
-CONFIG_SND_SOC_ODROID=m
-# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
-# CONFIG_USB_SNP_UDC_PLAT is not set
-CONFIG_USB_U_AUDIO=m
-# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
-CONFIG_MMC_BCM2835=y
-# CONFIG_LEDS_LP3952 is not set
-# CONFIG_RTC_DRV_AC100 is not set
-CONFIG_RTC_DRV_DS3232_HWMON=y
-CONFIG_VIDEO_IMX_MEDIA=m
-CONFIG_VIDEO_IMX_CSI=m
-CONFIG_FB_TFT_SH1106=m
-CONFIG_BCM_VIDEOCORE=y
-# CONFIG_BCM2835_VCHIQ_SUPPORT_MEMDUMP is not set
-CONFIG_SUN8I_A83T_CCU=y
-CONFIG_SUN8I_DE2_CCU=y
-CONFIG_SUN8I_R_CCU=y
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_IOMMU_IOVA=m
-# CONFIG_KEYSTONE_REMOTEPROC is not set
-CONFIG_IMX7_PM_DOMAINS=y
-CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
-CONFIG_SOC_TEGRA_FLOWCTRL=y
-CONFIG_SOC_TEGRA_PMC=y
-CONFIG_MAX1118=m
-CONFIG_SUN4I_GPADC=m
-CONFIG_TI_ADC084S021=m
-CONFIG_TI_ADC108S102=m
-CONFIG_LTC2632=m
-CONFIG_IIO_MUX=m
-CONFIG_IMX_GPCV2=y
-CONFIG_PHY_MESON_GXL_USB2=y
-CONFIG_NVMEM_IMX_IIM=y
-CONFIG_FPGA_MGR_ICE40_SPI=m
-CONFIG_FPGA_MGR_XILINX_SPI=m
-CONFIG_ALTERA_PR_IP_CORE=m
-CONFIG_ALTERA_PR_IP_CORE_PLAT=m
-CONFIG_XILINX_PR_DECOUPLER=m
-# CONFIG_TEE is not set
-CONFIG_MULTIPLEXER=m
-# CONFIG_MUX_ADG792A is not set
-# CONFIG_MUX_GPIO is not set
-# CONFIG_MUX_MMIO is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_AUFS_FS is not set
-# CONFIG_SECURITY_INFINIBAND is not set
-CONFIG_CRYPTO_DEV_OMAP=m
-CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
-CONFIG_I2C_MUX_GPMUX=m
-# CONFIG_GPIO_FTGPIO010 is not set
-CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_MQ_IOSCHED_KYBER=y
-CONFIG_MDIO_BCM_UNIMAC=m
-# CONFIG_BATTERY_LEGO_EV3 is not set
-# CONFIG_REGULATOR_LM363X is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-CONFIG_RTC_DRV_DS1307_HWMON=y
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
-# CONFIG_CRYPTO_DEV_CCREE is not set
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/kernels/linux-libre-lts-xtreme/config.i686 b/kernels/linux-libre-lts-xtreme/config.i686
index ec502cf28..7cc1cd539 100644
--- a/kernels/linux-libre-lts-xtreme/config.i686
+++ b/kernels/linux-libre-lts-xtreme/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.9.13-gnu-1-lts-knock Kernel Configuration
+# Linux/x86 4.9.74-gnu-1-lts-knock Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -51,7 +51,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-lts-knock"
+CONFIG_LOCALVERSION="-lts-xtreme"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -7869,6 +7869,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
 CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_BIG_KEYS is not set
 CONFIG_TRUSTED_KEYS=m
@@ -7878,6 +7879,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY_TIOCSTI_RESTRICT=y
 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY=y
+CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
diff --git a/kernels/linux-libre-lts-xtreme/config.x86_64 b/kernels/linux-libre-lts-xtreme/config.x86_64
index b08e2ef99..d198ed106 100644
--- a/kernels/linux-libre-lts-xtreme/config.x86_64
+++ b/kernels/linux-libre-lts-xtreme/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.9.13-gnu-1-lts-knock Kernel Configuration
+# Linux/x86 4.9.74-gnu-1-lts-xtreme Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -54,7 +54,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-lts-knock"
+CONFIG_LOCALVERSION="-lts-xtreme"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -837,7 +837,6 @@ CONFIG_IA32_EMULATION=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
-CONFIG_KEYS_COMPAT=y
 CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_PMC_ATOM=y
 CONFIG_NET=y
@@ -7624,6 +7623,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY_TIOCSTI_RESTRICT=y
 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY=y
+CONFIG_PAGE_TABLE_ISOLATION=y
 # CONFIG_SECURITY_WRITABLE_HOOKS is not set
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index b464d7f76..2a0c570fd 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -9,8 +9,8 @@
 _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.13
-  _archrel=75
+  _basekernel=4.14
+  _archrel=90
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
@@ -18,36 +18,31 @@ elif [[ ${_kernelname} == -lts ]]; then
   _parabolarel=1
 fi
 
-_pkgname=acpi_call
-pkgname=${_pkgname}${_kernelname}
+pkgbase=acpi_call
 pkgver=1.1.0
 pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel}
 _extramodules=extramodules-${_basekernel}${_kernelname}
 pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre${_kernelname} kernel package)"
 arch=('i686' 'x86_64' 'armv7h')
-url="http://github.com/mkottman/${_pkgname}"
+url="http://github.com/mkottman/${pkgbase}"
 license=('GPL')
 
 # Generic (you shouldn't have to modify any of these variables)
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
-makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
+makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}" "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends+=('libelf')
 
-replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
-[[ -n ${_kernelname} ]] && replaces+=("${_pkgname}${_kernelname}-parabola")
-conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
-[[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola")
 if [[ ${_kernelname} != "" ]]; then
-  provides=("${_pkgname}")
+  provides=("${pkgbase}")
 fi
 
-install='kmod.install'
-source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0')
+source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+        'dkms.conf')
+sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0'
+            '32e6ea6523b13132c6c7838bba7fbf3d040ba2d35a892c2c356245612720df8a')
 
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${pkgbase}-${pkgver}"
 
   if [[ ${_basekernel} > 3.16 ]]; then
     # Fix build with Linux-libre 3.17-gnu
@@ -61,29 +56,56 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
-  make KVERSION="${_kernver}"
+  cd "${pkgbase}-${pkgver}"
+  make KVERSION="$(cat /usr/lib/modules/$_extramodules/version)"
 }
 
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+_package() {
+  depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
+  replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
+  [[ -n ${_kernelname} ]] && replaces+=("${_pkgname}${_kernelname}-parabola")
+  conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
+  [[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola")
 
-  # Set the correct extramodules directory for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
-  true && install=${install}.pkg
-  sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
+  cd $pkgbase-$pkgver
 
   # Actually install
-  install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d}
-  install -m 644 ${_pkgname}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}
-  gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${_pkgname}.ko
-  echo ${_pkgname} > "${pkgdir}"/usr/lib/modules-load.d/${_pkgname}${_kernelname}.conf
+  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 acpi_call.ko
+  find "$pkgdir" -name '*.ko' -exec gzip -n {} +
+
+  echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call${_kernelname}.conf"
 
-  install -dm 755 "${pkgdir}"/usr/share/${_pkgname}${_kernelname}
-  cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${_pkgname}${_kernelname}/
+  mkdir -p "$pkgdir/usr/share/acpi_call${_kernelname}"
+  cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support
 }
 
-# vim: ts=2 sw=2 et:
+if [[ ${_kernelname} == "" ]]; then
+  _package-dkms() {
+    depends=(dkms)
+    provides=("acpi_call=$pkgver-$pkgrel")
+    conflicts=(acpi_call)
+
+    cd $pkgbase-$pkgver
+
+    # Actually install
+    install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile acpi_call.c ../dkms.conf
+
+    echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call.conf"
+
+    mkdir -p "$pkgdir/usr/share/acpi_call"
+    cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support
+  }
+
+  pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms")
+else
+  pkgname=("${pkgbase}${_kernelname}")
+fi
+
+for _p in ${pkgname[@]}; do
+  eval "package_${_p}() {
+    $(declare -f "_package${_p#${pkgbase}${_kernelname}}")
+    _package${_p#${pkgbase}${_kernelname}}
+  }"
+done
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/acpi_call/dkms.conf b/libre/acpi_call/dkms.conf
new file mode 100644
index 000000000..edc5c2482
--- /dev/null
+++ b/libre/acpi_call/dkms.conf
@@ -0,0 +1,9 @@
+PACKAGE_NAME="acpi_call"
+PACKAGE_VERSION="#MODULE_VERSION#"
+AUTOINSTALL="yes"
+
+MAKE[0]="make KVERSION=$kernelver"
+CLEAN="make clean"
+
+BUILT_MODULE_NAME[0]="acpi_call"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi"
diff --git a/libre/acpi_call/kmod.install b/libre/acpi_call/kmod.install
deleted file mode 100644
index 40caa464f..000000000
--- a/libre/acpi_call/kmod.install
+++ /dev/null
@@ -1,14 +0,0 @@
-_EXTRAMODULES=
-
-post_install() {
-	echo ">>> Updating module dependencies. Please wait ..."
-	depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/arrayfire/PKGBUILD b/libre/arrayfire/PKGBUILD
index 353f270e4..3868d0a16 100644
--- a/libre/arrayfire/PKGBUILD
+++ b/libre/arrayfire/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=arrayfire
 pkgdesc="High performance software library for parallel computing with an easy-to-use API, without nonfree cuda and nvidia-utils support and nonfree SIFT algorithm"
 url='http://arrayfire.com'
 pkgver=3.5.1
-arch=('i686' 'x86_64' 'armv7h')
+arch=('i686' 'x86_64')
 pkgrel=1.parabola1
 license=('BSD3')
 makedepends=('cmake' 'graphviz' 'doxygen' 'opencl-headers' 'glfw' 'glew' 'boost' 'git' 'python' 'gcc')
diff --git a/libre/b43-tools/PKGBUILD b/libre/b43-tools/PKGBUILD
index f3c022578..39423778a 100644
--- a/libre/b43-tools/PKGBUILD
+++ b/libre/b43-tools/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=b43-tools
 pkgver=019
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Tools for the Broadcom 43xx series WLAN chip"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/mbuesch/b43-tools"
@@ -12,8 +12,9 @@ depends=('python2')
 makedepends=('bison' 'flex' 'python2')
 provides=("b43-fwcutter=$pkgver")
 conflicts=('b43-fwcutter')
+replaces=('b43-fwcutter')
 source=("https://github.com/mbuesch/b43-tools/archive/b43-fwcutter-019.tar.gz")
-md5sums=('d8387ec57b8bced796b0f9231077501a')
+sha256sums=('6fe82827655cf978a649c2c3f8221bc22bded28e4ec2f4ab0a7df487ea1ea4aa')
 
 build() {
   cd "$srcdir/b43-tools-b43-fwcutter-$pkgver"
diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD
index 1555321f6..809d97224 100644
--- a/libre/bbswitch/PKGBUILD
+++ b/libre/bbswitch/PKGBUILD
@@ -9,8 +9,8 @@
 _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.13
-  _archrel=81
+  _basekernel=4.14
+  _archrel=96
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
@@ -40,10 +40,8 @@ source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswi
 sha256sums=('76cabd3f734fb4fe6ebfe3ec9814138d0d6f47d47238521ecbd6a986b60d1477')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
+  cd "${pkgbase}-${pkgver}"
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
   make KDIR=/lib/modules/${_kernver}/build
 }
 
@@ -51,18 +49,10 @@ _package() {
   depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
   replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
   conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
-  install='kmod.install'
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  # Set the correct extramodules directory for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
-  true && install=${install}.pkg
-  sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
-
-  # Actually install
-  install -Dm644 ${pkgbase}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/${pkgbase}.ko
-  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/${pkgbase}.ko"
+  cd "${pkgbase}-${pkgver}"
+  install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 bbswitch.ko
+  find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
 }
 
 if [[ ${_kernelname} == "" ]]; then
@@ -71,11 +61,8 @@ if [[ ${_kernelname} == "" ]]; then
     conflicts=('bbswitch')
     provides=('bbswitch')
 
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-
-    install -dm755 "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
-
-    install -Dm644 Makefile bbswitch.c dkms/dkms.conf "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
+    cd "${pkgbase}-${pkgver}"
+    install -Dt "${pkgdir}/usr/src/${pkgbase}-${pkgver}" -m644 Makefile bbswitch.c dkms/dkms.conf
   }
 
   pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms")
diff --git a/libre/bbswitch/kmod.install b/libre/bbswitch/kmod.install
deleted file mode 100644
index 40caa464f..000000000
--- a/libre/bbswitch/kmod.install
+++ /dev/null
@@ -1,14 +0,0 @@
-_EXTRAMODULES=
-
-post_install() {
-	echo ">>> Updating module dependencies. Please wait ..."
-	depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/bitlbee/PKGBUILD b/libre/bitlbee/PKGBUILD
deleted file mode 100644
index a0a2111e6..000000000
--- a/libre/bitlbee/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 287876 2017-02-01 15:04:41Z bpiotrowski $
-# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
-# Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>
-# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor (Arch): Jeff 'codemac' Mickey <jeff@archlinux.org>
-# Contributor (Arch): simo <simo@archlinux.org>
-# Contributor (Arch): FUBAR <mrfubar@gmail.com>
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
-
-pkgname=bitlbee
-pkgver=3.5.1
-pkgrel=1.parabola1
-pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support'
-url='http://www.bitlbee.org/'
-license=('GPL')
-arch=('i686' 'x86_64' 'armv7h')
-depends=('gnutls' 'glib2')
-makedepends=('python' 'libotr')
-optdepends=('libotr: for OTR encryption support')
-replaces=("${pkgname}-libre" "${pkgname}-parabola")
-conflicts=("${pkgname}-libre" "${pkgname}-parabola")
-source=("http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz"
-        'bitlbee.tmpfiles')
-sha1sums=('de0767facdb7729253ae4d6ef6e3637ebd54939a'
-          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
-backup=('etc/bitlbee/bitlbee.conf'
-        'etc/bitlbee/motd.txt')
-install=bitlbee.install
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --etcdir=/etc/bitlbee \
-    --sbindir=/usr/bin \
-    --pidfile=/run/bitlbee/bitlbee.pid \
-    --ipcsocket=/run/bitlbee/bitlbee.sock \
-    --systemdsystemunitdir=/usr/lib/systemd/system \
-    --ssl=gnutls \
-    --strip=0 \
-    --otr=plugin \
-    --skype=0
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd}
-
-  install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
-  install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
-}
diff --git a/libre/bitlbee/bitlbee.install b/libre/bitlbee/bitlbee.install
deleted file mode 100644
index 2db5f795c..000000000
--- a/libre/bitlbee/bitlbee.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  if ! getent group bitlbee &>/dev/null; then
-    groupadd -r -g 65 bitlbee >/dev/null
-  fi
-  if ! getent passwd bitlbee &>/dev/null; then
-    useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/libre/bitlbee/bitlbee.tmpfiles b/libre/bitlbee/bitlbee.tmpfiles
deleted file mode 100644
index da72a0a79..000000000
--- a/libre/bitlbee/bitlbee.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 2b40070d6..1793f2952 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -19,7 +19,7 @@ pkgbase='blender'
 pkgname=("${pkgbase}" "${pkgbase}-addon-gimp" "${pkgbase}-addon-povray")
 pkgver=2.79rc2
 #[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel='5.parabola1'
+pkgrel='5.parabola2'
 epoch='17'
 
 pkgdesc='A fully integrated 3D graphics creation suite, without nonfree CUDA support'
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 79b2ccf98..b1d5f819b 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -11,7 +11,7 @@
 # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 
 pkgname=calibre
-pkgver=3.13.0
+pkgver=3.15.0
 pkgrel=1.parabola1
 arch=(x86_64 i686 armv7h)
 
@@ -27,9 +27,9 @@ depends=(python2-six python2-dateutil python2-cssutils python2-dukpy
          python2-netifaces python2-cssselect python2-apsw qt5-webkit
          qt5-svg python2-regex python2-pygments mtdev
          desktop-file-utils gtk-update-icon-cache optipng udisks2)
-depends_x86_64=(icu=60.1)
-depends_i686=(icu=60.1)
-depends_armv7h=(icu=60.1)
+depends_x86_64=("icu>=60" "icu<61")
+depends_i686=("icu>=60" "icu<61")
+depends_armv7h=("icu>=60" "icu<61")
 makedepends=(qt5-x11extras xdg-utils)
 optdepends=('ipython2: to use calibre-debug'
             'poppler: required for converting pdf to html')
@@ -37,13 +37,13 @@ replaces=($pkgname-libre)
 conflicts=($pkgname-libre)
 
 # for updated libre.patch commit id see: https://gitlab.com/libreforks/calibre/tags
-_commit='ce5c919653b60aa8aea611b3ee19dba8'
+_commit='11f261b5db0b2f0d23e5067368ce73d6'
 source=("https://download.calibre-ebook.com/$pkgver/calibre-$pkgver.tar.xz"
         "https://calibre-ebook.com/signatures/$pkgname-$pkgver.tar.xz.sig"
         "https://gitlab.com/libreforks/calibre/uploads/$_commit/libre.patch")
-sha256sums=('84c980e80b61d12797c91bfa0b6ba81926e2fef49ca3082c3e5ea80d161e13a9'
+sha256sums=('8746f52315561d606fd7120fec8284c2e4433f6ead14639c40b4b5f1522273ff'
             'SKIP'
-            '87b55892d8ba896dd1b29949769001fa5521f85f664b675eb118bba66a42dc5e')
+            'b218de451ac29081071b6ba965c543bfeb6fb9c5a1bdcedfa02b27811c986dd6')
 validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
 
 prepare() {
diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD
index 96d174567..dee544aa6 100644
--- a/libre/clementine/PKGBUILD
+++ b/libre/clementine/PKGBUILD
@@ -11,7 +11,7 @@
 pkgname=clementine
 _pkgname=$pkgname-libre
 pkgver=1.3.1
-pkgrel=10.parabola1
+pkgrel=11.parabola1
 pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support'
 url="http://www.$pkgname-player.org/"
 license=('GPL')
@@ -20,7 +20,7 @@ replaces=("$_pkgname")
 conflicts=("$_pkgname")
 depends=('chromaprint' 'crypto++' 'fftw' 'gcc-libs' 'glew' 'glib2' 'glibc'
          'gst-plugins-base-libs' 'gstreamer' 'libcdio' 'libechonest' 'libgl'
-         'libgpod' 'liblastfm' 'libmtp' 'libpulse' 'libx11' 'protobuf' 'qjson'
+         'libgpod' 'liblastfm' 'libmtp' 'libpulse' 'libx11' 'protobuf<3.6' 'qjson'
          'qt4' 'sqlite' 'taglib' 'zlib')
 makedepends=('boost' 'cmake' 'mesa' 'sparsehash')
 optdepends=('gst-plugins-base: "Base" plugin libraries'
diff --git a/libre/cool-retro-term/PKGBUILD b/libre/cool-retro-term/PKGBUILD
index b7adba51e..4f53a3b3c 100644
--- a/libre/cool-retro-term/PKGBUILD
+++ b/libre/cool-retro-term/PKGBUILD
@@ -5,22 +5,22 @@
 # Maintainer: André Silva <emulatorman@hyperbola.info>
 
 pkgname=cool-retro-term
-pkgver=1.0.0
-pkgrel=4.parabola1
+pkgver=1.0.1
+pkgrel=1.parabola1
 pkgdesc='A good looking terminal emulator which mimics the old cathode display, without nonfree fonts'
 arch=('i686' 'x86_64' 'armv7h')
 url='https://github.com/Swordfish90/cool-retro-term'
 license=('GPL3')
 depends=('qmltermwidget' 'qt5-quickcontrols' 'qt5-graphicaleffects' 'hicolor-icon-theme')
-mksource=("https://github.com/Swordfish90/cool-retro-term/archive/v$pkgver.tar.gz")
+mksource=("https://github.com/Swordfish90/cool-retro-term/archive/$pkgver.tar.gz")
 source=("https://repo.parabola.nu/other/cool-retro-term-libre/cool-retro-term-libre-$pkgver.tar.gz")
-mksha256sums=('db799084680545b6961e1b3d1bb7ff0cb8105e82279fe734c2c07c32525350d9')
-sha256sums=('a59fb6ead92d02873dc0d423c5a60c43bcc48a732b7616f8aef76f1f5f2bd357')
+mksha256sums=('45cd756c61bb6ee3ae7796f221da8d2b137e47f00c3d24839d0ac01ed19a6b42')
+sha256sums=('9bc8e23ac33dea077e84247e067548bfb78db29ab0fc361de65c4df780bd16dc')
 
 mksource() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  rm -rv app/qml/fonts/{1977-{apple2,commodore-pet},1982-commodore64,modern-envy-code-r}
+  rm -rv app/qml/fonts/{1977-{apple2,commodore-pet},1982-commodore64}
 }
 
 prepare() {
diff --git a/libre/faenza-icon-theme/PKGBUILD b/libre/faenza-icon-theme/PKGBUILD
index da9e41c80..df26df8e2 100644
--- a/libre/faenza-icon-theme/PKGBUILD
+++ b/libre/faenza-icon-theme/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgname=faenza-icon-theme
 pkgver=1.3.1
-pkgrel=4.parabola1
+pkgrel=4.parabola2
 pkgdesc='Icon theme designed for Equinox GTK theme, without nonfree distros and application icons (Parabola rebranded)'
 url='http://gnome-look.org/content/show.php/Faenza?content=128143'
 license=('GPL3')
diff --git a/libre/faience-icon-theme/PKGBUILD b/libre/faience-icon-theme/PKGBUILD
index 1cbce9e12..963413e51 100644
--- a/libre/faience-icon-theme/PKGBUILD
+++ b/libre/faience-icon-theme/PKGBUILD
@@ -2,13 +2,14 @@
 # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
 # Contributor (Arch): Ner0 <darkelfdarkelf666@yahoo.co.uk>
 # Contributor (Arch): Sander Deryckere  <sanderd17@gmail.com>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Jorge Araya Navarro <elcorreo@deshackra.com>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
 
 pkgname=faience-icon-theme
 pkgver=0.5.1
-pkgrel=3.parabola1
+pkgrel=3.parabola2
 pkgdesc='An icon theme based on Faenza, without nonfree distros and application icons (Parabola rebranded)'
 url='http://tiheum.deviantart.com/art/Faience-icon-theme-255099649'
 license=('GPL3')
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 344d32877..264690b2d 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -6,12 +6,12 @@
 
 pkgname=filesystem
 pkgver=2017.10
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc='Base Parabola GNU/Linux-libre files'
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
 url='https://www.parabola.nu'
-groups=('base' 'base-openrc')
+groups=('base')
 depends=('iana-etc')
 replaces=(filesystem-parabola)
 conflicts=(filesystem-parabola)
diff --git a/libre/glib2-static/0001-docs-Fix-building-with-meson.patch b/libre/glib2-static/0001-docs-Fix-building-with-meson.patch
new file mode 100644
index 000000000..02f69b700
--- /dev/null
+++ b/libre/glib2-static/0001-docs-Fix-building-with-meson.patch
@@ -0,0 +1,85 @@
+From a7cbd565aad04f92cbd9ac36696a9d033ae6bcc0 Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi@email.com>
+Date: Fri, 25 Aug 2017 13:36:23 +0200
+Subject: [PATCH] docs: Fix building with meson
+
+This fixes {gio,gobject}-doc ninja targets as well as
+install process when gtk-doc is enabled
+---
+ docs/reference/gio/meson.build     | 15 ++++++++++++++-
+ docs/reference/gobject/meson.build | 13 ++++++++++++-
+ 2 files changed, 26 insertions(+), 2 deletions(-)
+
+diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
+index 7f0467726..8f8dc7ce5 100644
+--- a/docs/reference/gio/meson.build
++++ b/docs/reference/gio/meson.build
+@@ -52,9 +52,12 @@ if get_option('with-docs') != 'no'
+     'gnetworkmonitorbase.h',
+     'gnetworkmonitornetlink.h',
+     'gnetworkmonitornm.h',
++    'gnetworkmonitorportal.h',
+     'gnotificationbackend.h',
+     'gnotification-private.h',
++    'gosxappinfo.h',
+     'gpollfilemonitor.h',
++    'gproxyresolverportal.h',
+     'gregistrysettingsbackend.h',
+     'gresourcefile.h',
+     'gsettingsbackendinternal.h',
+@@ -95,12 +98,22 @@ if get_option('with-docs') != 'no'
+     configuration: version_conf
+   )
+ 
++  # Meson uses paths relative to meson.source_root() in dependencies,
++  # which is invalid relative to current_source_dir(), so the compile
++  # process fails to find glib headers
++  top_build_dir = meson.build_root()
++  top_source_dir = meson.source_root()
++  glib_top_build_dir = join_paths(top_build_dir, 'glib')
++  glib_top_source_dir = join_paths(top_source_dir, 'glib')
++
++  scan_dep = declare_dependency(include_directories : [ top_source_dir, glib_top_build_dir, glib_top_source_dir ])
++
+   gnome.gtkdoc('gio',
+     main_xml : 'gio-docs.xml',
+     namespace : 'g',
+     gobject_typesfile : 'gio.types',
+     mode : 'none',
+-    dependencies : [libgio_dep, libgobject_dep, libglib_dep],
++    dependencies : [libgio_dep, libgobject_dep, libglib_dep, scan_dep],
+     src_dir : 'gio',
+     scan_args : [
+       '--rebuild-types',
+diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build
+index 1025e174f..9ec1f9123 100644
+--- a/docs/reference/gobject/meson.build
++++ b/docs/reference/gobject/meson.build
+@@ -17,12 +17,23 @@ if get_option('with-docs') != 'no'
+     configuration: version_conf
+   )
+ 
++  # Meson uses paths relative to meson.source_root() in dependencies,
++  # which is invalid relative to current_source_dir(), so the compile
++  # process fails to find glib headers
++  doc_source_dir = meson.current_source_dir()
++  top_build_dir = meson.build_root()
++  top_source_dir = meson.source_root()
++  glib_top_build_dir = join_paths(top_build_dir, 'glib')
++  glib_top_source_dir = join_paths(top_source_dir, 'glib')
++
++  scan_dep = declare_dependency(include_directories : [ doc_source_dir, top_source_dir, glib_top_build_dir, glib_top_source_dir ])
++
+   gnome.gtkdoc('gobject',
+     main_xml : 'gobject-docs.xml',
+     namespace : 'g',
+     gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'),
+     mode : 'none',
+-    dependencies : [libgobject_dep, libglib_dep],
++    dependencies : [libgobject_dep, libglib_dep, scan_dep],
+     src_dir : 'gobject',
+     scan_args : [
+       '--deprecated-guards=G_DISABLE_DEPRECATED',
+-- 
+2.14.1
+
diff --git a/libre/glib2-static/0001-meson-Build-with-static-linkage.patch b/libre/glib2-static/0001-meson-Build-with-static-linkage.patch
new file mode 100644
index 000000000..d7fa59bfa
--- /dev/null
+++ b/libre/glib2-static/0001-meson-Build-with-static-linkage.patch
@@ -0,0 +1,126 @@
+From 241041b0b38e5851bb1a166cbd9393bbdd6eea06 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@lukeshu.com>
+Date: Sun, 24 Dec 2017 03:42:06 -0500
+Subject: [PATCH] meson: Build with static linkage.
+
+This switches all libraries from using shared_library() to
+static_library().  For some reason, switching them to just library() (which
+should obey default_library) doesn't allow -Ddefault_library=static to set
+most of them to static.  I suspect it's a bug in meson 0.44.0-1.
+
+This also amends libglib_dep to include the pkg-config's Libs.private.
+---
+ gio/meson.build                                    | 2 +-
+ gio/tests/gdbus-object-manager-example/meson.build | 2 +-
+ gio/tests/modules/meson.build                      | 4 ++--
+ glib/meson.build                                   | 3 ++-
+ gmodule/meson.build                                | 2 +-
+ gobject/meson.build                                | 2 +-
+ gthread/meson.build                                | 2 +-
+ 7 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/gio/meson.build b/gio/meson.build
+index d7030aa29..b904841b2 100644
+--- a/gio/meson.build
++++ b/gio/meson.build
+@@ -711,7 +711,7 @@ else
+   gio_dtrace_hdr = []
+ endif
+ 
+-libgio = shared_library('gio-2.0',
++libgio = static_library('gio-2.0',
+   gioenumtypes_h, gioenumtypes_c, gnetworking_h, gio_sources,
+   gio_dtrace_hdr, gio_dtrace_obj,
+   version : library_version,
+diff --git a/gio/tests/gdbus-object-manager-example/meson.build b/gio/tests/gdbus-object-manager-example/meson.build
+index 630357378..b92d6ea9d 100644
+--- a/gio/tests/gdbus-object-manager-example/meson.build
++++ b/gio/tests/gdbus-object-manager-example/meson.build
+@@ -14,7 +14,7 @@ gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanag
+              '--generate-docbook', 'gdbus-example-objectmanager-generated',
+              '@INPUT@'])
+ 
+-libgdbus_example_objectmanager = shared_library('libgdbus-example-objectmanager',
++libgdbus_example_objectmanager = static_library('libgdbus-example-objectmanager',
+     gdbus_example_objectmanager_generated,
+     c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
+     dependencies : [libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep],
+diff --git a/gio/tests/modules/meson.build b/gio/tests/modules/meson.build
+index c219015d3..21a43c5ee 100644
+--- a/gio/tests/modules/meson.build
++++ b/gio/tests/modules/meson.build
+@@ -1,10 +1,10 @@
+-libtestmodulea = shared_library('testmodulea', 'test-module-a.c',
++libtestmodulea = static_library('testmodulea', 'test-module-a.c',
+   install : false,
+   dependencies : [libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep],
+   c_args : [ ]
+ )
+ 
+-libtestmoduleb = shared_library('testmoduleb', 'test-module-b.c',
++libtestmoduleb = static_library('testmoduleb', 'test-module-b.c',
+   install : false,
+   dependencies : [libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep],
+   c_args : [ ]
+diff --git a/glib/meson.build b/glib/meson.build
+index e46d2deb6..371e5bfbf 100644
+--- a/glib/meson.build
++++ b/glib/meson.build
+@@ -220,7 +220,7 @@ if use_pcre_static_flag
+   pcre_static_args = ['-DPCRE_STATIC']
+ endif
+ 
+-libglib = shared_library('glib-2.0',
++libglib = static_library('glib-2.0',
+   glib_dtrace_obj, glib_dtrace_hdr,
+   sources : [deprecated_sources, glib_sources, thread_src, plat_src],
+   version : library_version,
+@@ -235,6 +235,7 @@ libglib = shared_library('glib-2.0',
+ )
+ 
+ libglib_dep = declare_dependency(link_with : libglib,
++  dependencies : [pcre, thread_dep, libintl, librt] + libiconv + platform_deps,
+   # We sadly need to export configinc here because everyone includes <glib/*.h>
+   include_directories : [configinc, glibinc])
+ 
+diff --git a/gmodule/meson.build b/gmodule/meson.build
+index fd0219d92..841fc1e91 100644
+--- a/gmodule/meson.build
++++ b/gmodule/meson.build
+@@ -87,7 +87,7 @@ gmoduleconf_h = configure_file(input : 'gmoduleconf.h.in',
+ 
+ install_headers(['gmodule.h'], subdir : 'glib-2.0')
+ 
+-libgmodule = shared_library('gmodule-2.0',
++libgmodule = static_library('gmodule-2.0',
+   sources : ['gmodule.c'],
+   version : library_version,
+   soversion : soversion,
+diff --git a/gobject/meson.build b/gobject/meson.build
+index 9c722ce30..feac8fa92 100644
+--- a/gobject/meson.build
++++ b/gobject/meson.build
+@@ -53,7 +53,7 @@ else
+   gobject_dtrace_hdr = []
+ endif
+ 
+-libgobject = shared_library('gobject-2.0',
++libgobject = static_library('gobject-2.0',
+   gobject_dtrace_obj, gobject_dtrace_hdr,
+   sources : [gobject_c_sources],
+   version : library_version,
+diff --git a/gthread/meson.build b/gthread/meson.build
+index 2d5913a91..63e6dd86b 100644
+--- a/gthread/meson.build
++++ b/gthread/meson.build
+@@ -1,6 +1,6 @@
+ # Just a skeleton lib for backwards compatibility since all the functionaliy
+ # has been moved into glib now
+-libgthread = shared_library('gthread-2.0',
++libgthread = static_library('gthread-2.0',
+   sources : [ 'gthread-impl.c' ],
+   version : library_version,
+   soversion : soversion,
+-- 
+2.15.1
+
diff --git a/libre/glib2-static/0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch b/libre/glib2-static/0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
new file mode 100644
index 000000000..10c85a3f4
--- /dev/null
+++ b/libre/glib2-static/0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
@@ -0,0 +1,50 @@
+From b454a60bf154332bd5961880700b7d08aec98995 Mon Sep 17 00:00:00 2001
+Message-Id: <b454a60bf154332bd5961880700b7d08aec98995.1508856243.git.jan.steffens@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 24 Oct 2017 16:29:49 +0200
+Subject: [PATCH] meson: Fix GDB scripts install_dir for *nix
+
+Disable installation on Windows for now as this would use a colon in the
+directory name.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788772
+---
+ glib/meson.build    | 5 +++--
+ gobject/meson.build | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/glib/meson.build b/glib/meson.build
+index 1da0bcd3cc601b9e..33ece2d0221c1850 100644
+--- a/glib/meson.build
++++ b/glib/meson.build
+@@ -283,8 +283,9 @@ configure_file(
+   input: 'libglib-gdb.py.in',
+   output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version),
+   configuration: gdb_conf,
+-  install: true,
+-  install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + get_option('libdir'))
++  # FIXME: Figure out how to install this on Windows
++  install: host_system != 'windows',
++  install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
+ )
+ 
+ if enable_systemtap
+diff --git a/gobject/meson.build b/gobject/meson.build
+index 5a8289e6f054818e..0c8c0cb26f053d1c 100644
+--- a/gobject/meson.build
++++ b/gobject/meson.build
+@@ -100,8 +100,9 @@ configure_file(
+   input: 'libgobject-gdb.py.in',
+   output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version),
+   configuration: gdb_conf,
+-  install: true,
+-  install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + get_option('libdir'))
++  # FIXME: Figure out how to install this on Windows
++  install: host_system != 'windows',
++  install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
+ )
+ 
+ if enable_systemtap
+-- 
+2.14.2
+
diff --git a/libre/glib2-static/0001-meson-Fix-libmount-support.patch b/libre/glib2-static/0001-meson-Fix-libmount-support.patch
new file mode 100644
index 000000000..c85f047c0
--- /dev/null
+++ b/libre/glib2-static/0001-meson-Fix-libmount-support.patch
@@ -0,0 +1,41 @@
+From c93756c8f066a1e35fa2f46b231771d78e292600 Mon Sep 17 00:00:00 2001
+Message-Id: <c93756c8f066a1e35fa2f46b231771d78e292600.1509419562.git.jan.steffens@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 31 Oct 2017 04:11:42 +0100
+Subject: [PATCH] meson: Fix libmount support
+
+The define was still missing.
+---
+ config.h.meson | 3 +++
+ meson.build    | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/config.h.meson b/config.h.meson
+index c67e1792f4af1ada..3f310b3c960fcb29 100644
+--- a/config.h.meson
++++ b/config.h.meson
+@@ -247,6 +247,9 @@
+ /* Define if libelf is available */
+ #mesondefine HAVE_LIBELF
+ 
++/* Define if libmount is available */
++#mesondefine HAVE_LIBMOUNT
++
+ /* Define to 1 if you have the <linux/magic.h> header file. */
+ #mesondefine HAVE_LINUX_MAGIC_H
+ 
+diff --git a/meson.build b/meson.build
+index 208c23087627de1e..cd9cbf2ce10595c2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1535,6 +1535,7 @@ if use_system_pcre
+ endif
+ if libmount_dep.length() == 1 and libmount_dep[0].found()
+   glib_conf.set('LIBMOUNT_LIBS', '-lmount')
++  glib_conf.set('HAVE_LIBMOUNT', 1)
+ endif
+ glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
+ # FIXME: Missing:
+-- 
+2.15.0
+
diff --git a/libre/glib2-static/0001-meson-Fix-permissions-of-installed-scripts.patch b/libre/glib2-static/0001-meson-Fix-permissions-of-installed-scripts.patch
new file mode 100644
index 000000000..d89868acf
--- /dev/null
+++ b/libre/glib2-static/0001-meson-Fix-permissions-of-installed-scripts.patch
@@ -0,0 +1,50 @@
+From e36f79439be76f125b67081eb4605b377d738cca Mon Sep 17 00:00:00 2001
+Message-Id: <e36f79439be76f125b67081eb4605b377d738cca.1505389490.git.jan.steffens@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Thu, 14 Sep 2017 07:36:37 +0200
+Subject: [PATCH] meson: Fix permissions of installed scripts
+
+configure_file preserves the attributes, so the templates need to be
+executable for the (installed) outputs to be executable.
+---
+ gio/gdbus-2.0/codegen/gdbus-codegen.in | 0
+ gio/gdbus-2.0/codegen/meson.build      | 1 -
+ glib-gettextize.in                     | 0
+ gobject/meson.build                    | 1 -
+ 4 files changed, 2 deletions(-)
+ mode change 100644 => 100755 gio/gdbus-2.0/codegen/gdbus-codegen.in
+ mode change 100644 => 100755 glib-gettextize.in
+
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+old mode 100644
+new mode 100755
+diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
+index 0e9ffbdfade70779..93d9106adba17a89 100644
+--- a/gio/gdbus-2.0/codegen/meson.build
++++ b/gio/gdbus-2.0/codegen/meson.build
+@@ -13,7 +13,6 @@ gdbus_codegen_conf.set('VERSION', glib_version)
+ gdbus_codegen_conf.set('PYTHON', python.path())
+ 
+ # Install gdbus-codegen executable
+-# FIXME: Set permissions
+ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
+   output : 'gdbus-codegen',
+   install : true,
+diff --git a/glib-gettextize.in b/glib-gettextize.in
+old mode 100644
+new mode 100755
+diff --git a/gobject/meson.build b/gobject/meson.build
+index 0d39f2bbc36f816e..01f37a33a623f4b8 100644
+--- a/gobject/meson.build
++++ b/gobject/meson.build
+@@ -76,7 +76,6 @@ python_tools_conf.set('VERSION', glib_version)
+ python_tools_conf.set('PYTHON', python.path())
+ 
+ foreach tool: python_tools
+-  # FIXME: Ensure we set the appropriate permissions
+   tool_bin = configure_file(
+     input : tool + '.in',
+     output : tool,
+-- 
+2.14.1
+
diff --git a/libre/glib2-static/PKGBUILD b/libre/glib2-static/PKGBUILD
index 71e1fc1d3..585082103 100644
--- a/libre/glib2-static/PKGBUILD
+++ b/libre/glib2-static/PKGBUILD
@@ -1,19 +1,45 @@
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
-# based of glib2
+# Maintainer (Arch:glib2) Jan de Groot <jgc@archlinux.org>
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
+
+# glib 2.54 added meson as the preferred build system, and core/glib2
+# switched to that.  However, the meson build doesn't support static
+# linkage, so we're stuck with the old autotools build system.
 
-pkgbase=glib2
 pkgname=glib2-static
-pkgver=2.50.2
-pkgrel=1
-pkgdesc="Low level core library (static libraries only)"
-url="http://www.gtk.org/"
-arch=(i686 x86_64 armv7h)
-makedepends=(python git)
-_commit=224f8171dceca920cfd8a4b446726b7610cdafd9 # tags/2.50.2^0
-source=("git://git.gnome.org/glib#commit=$_commit"
-        revert-warn-glib-compile-schemas.patch)
+pkgver=2.54.2
+pkgrel=2.parabola2
+pkgdesc="Low level core library"
+url="https://wiki.gnome.org/Projects/GLib"
+license=(LGPL2.1)
+arch=(x86_64)
+arch+=(i686 armv7h)
+depends=(pcre libffi libutil-linux zlib)
+_depends=(pcre-static libffi-static libutil-linux-static zlib)
+makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux meson dbus)
+makedepends+=("${_depends[@]}")
+checkdepends=(desktop-file-utils)
+optdepends=('python: for gdbus-codegen and gtester-report'
+            'libelf: gresource inspection tool')
+options=(!emptydirs)
+_commit=52b3e434d849e2b0233d6d3d663b5dda82ab263e  # tags/2.54.2^0
+source=("git+https://git.gnome.org/browse/glib#commit=$_commit"
+        0001-docs-Fix-building-with-meson.patch
+        0001-meson-Fix-permissions-of-installed-scripts.patch
+        0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
+        0001-meson-Fix-libmount-support.patch
+        libs.diff
+        noisy-glib-compile-schemas.diff
+        glib-compile-schemas.hook gio-querymodules.hook)
 sha256sums=('SKIP'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+            '8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c'
+            '12b1a2f4e304e4c03e48ae9564d73ae38619bbb7711a013138939ff8e5cc2327'
+            'f53d5acfda4b7141a4813f1e49610e9176dc5bdf8e867d88290e34d91a40ebcb'
+            '14c0dcfb4efb690f7cb44673faf31f5eb40ac68c01974eddb53d5aa7ae366629'
+            '2fb828f51727bd9c8b48cfd9d6833c8b4ff82803331f6e2340b0ec8edfe57c52'
+            '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
+            'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
+            '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6')
 
 pkgver() {
   cd glib
@@ -21,34 +47,72 @@ pkgver() {
 }
 
 prepare() {
+  mkdir -p build glib2-docs/usr/share
   cd glib
-  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=786796
+  patch -Np1 -i ../0001-docs-Fix-building-with-meson.patch
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=787671
+  patch -Np1 -i ../0001-meson-Fix-permissions-of-installed-scripts.patch
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=788772
+  patch -Np1 -i ../0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=789681
+  patch -Np1 -i ../0001-meson-Fix-libmount-support.patch
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=788773
+  patch -Np1 -i ../libs.diff
+
+  # Suppress noise from glib-compile-schemas.hook
+  patch -Np1 -i ../noisy-glib-compile-schemas.diff
+
   NOCONFIGURE=1 ./autogen.sh
 }
-  
+
 build() {
-  cd glib
-  ./configure --prefix=/usr --libdir=/usr/lib \
-      --disable-fam --enable-static
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  cd build
+  ../glib/configure --prefix=/usr --libdir=/usr/lib \
+      --sysconfdir=/etc \
+      --with-pcre=system \
+      --disable-fam \
+      --disable-gtk-doc \
+      --disable-shared --enable-static \
+      $(check_option debug y && echo --enable-debug=yes)
   make
 }
 
-check() {
-  cd glib
-  # Takes an effing long time
-  #make -k check || :
+_check() {
+  cd build
+  rm -rf "$srcdir/test-home"
+  mkdir "$srcdir/test-home"
+  HOME="$srcdir/test-home" make -j1 check
 }
 
 package() {
+  pkgdesc+=" (static libraries)"
   depends=(glib2)
+  optdepends=()
   options=(staticlibs)
-  license=(LGPL)
 
-  cd glib
-  make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  rm -vr -- \
+     "$pkgdir"/usr/bin/ \
+     "$pkgdir"/usr/include/ \
+     "$pkgdir"/usr/lib/glib-*/ \
+     "$pkgdir"/usr/lib/pkgconfig/ \
+     "$pkgdir"/usr/share/
+}
+
+package_glib2-docs() {
+  pkgdesc="Documentation for GLib"
+  depends=()
+  optdepends=()
+  license+=(custom)
 
-  # remove conflicting files
-  rm -vr ${pkgdir}/usr/{bin,lib/{glib-*,pkgconfig},include,share}
-  rm -v ${pkgdir}/usr/lib/lib*.so*
+  mv glib2-docs/* "$pkgdir"
+  install -Dt "$pkgdir/usr/share/licenses/glib2-docs" -m644 glib/docs/reference/COPYING
 }
diff --git a/libre/glib2-static/gio-querymodules.hook b/libre/glib2-static/gio-querymodules.hook
new file mode 100644
index 000000000..193233398
--- /dev/null
+++ b/libre/glib2-static/gio-querymodules.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gio/modules/*.so
+
+[Action]
+Description = Updating GIO module cache...
+When = PostTransaction
+Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules
diff --git a/libre/glib2-static/glib-compile-schemas.hook b/libre/glib2-static/glib-compile-schemas.hook
new file mode 100644
index 000000000..04dc59b1a
--- /dev/null
+++ b/libre/glib2-static/glib-compile-schemas.hook
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/glib-2.0/schemas/*.gschema.xml
+Target = usr/share/glib-2.0/schemas/*.gschema.override
+
+[Action]
+Description = Compiling GSettings XML schema files...
+When = PostTransaction
+Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
diff --git a/libre/glib2-static/libs.diff b/libre/glib2-static/libs.diff
new file mode 100644
index 000000000..eef85b814
--- /dev/null
+++ b/libre/glib2-static/libs.diff
@@ -0,0 +1,110 @@
+diff --git i/gio/meson.build w/gio/meson.build
+index 4a10d49d7eb3229c..77537a77a26dcb5b 100644
+--- i/gio/meson.build
++++ w/gio/meson.build
+@@ -741,7 +741,7 @@ libgio = shared_library('gio-2.0',
+                   libgobject_dep, libgmodule_dep] + platform_deps + network_libs,
+   c_args : gio_c_args,
+   # intl.lib is not compatible with SAFESEH
+-  link_args : noseh_link_args,
++  link_args : noseh_link_args + library_link_args,
+ )
+ 
+ libgio_dep = declare_dependency(link_with : libgio,
+diff --git i/glib/meson.build w/glib/meson.build
+index f12a8b45bbbfec8f..2a505b3dd79ef163 100644
+--- i/glib/meson.build
++++ w/glib/meson.build
+@@ -227,7 +227,7 @@ libglib = shared_library('glib-2.0',
+   soversion : soversion,
+   install : true,
+   # intl.lib is not compatible with SAFESEH
+-  link_args : noseh_link_args,
++  link_args : noseh_link_args + library_link_args,
+   include_directories : configinc,
+   link_with : [charset_lib, gnulib_lib],
+   dependencies : [pcre, thread_dep, libintl, librt] + libiconv + platform_deps,
+diff --git i/gmodule/meson.build w/gmodule/meson.build
+index 191bca2446f9977e..fd0219d9225f2f3f 100644
+--- i/gmodule/meson.build
++++ w/gmodule/meson.build
+@@ -37,7 +37,7 @@ elif cc.has_function('NSLinkModule')
+ elif cc.links(dlopen_dlsym_test_code, args : '-ldl', name : 'dlopen() and dlsym() in libdl')
+   g_module_impl = 'G_MODULE_IMPL_DL'
+   libdl_dep = cc.find_library('dl')
+-  g_module_lib_args = '-ldl'
++  g_module_lib_args = ['-ldl']
+ endif
+ 
+ # additional checks for G_MODULE_IMPL_DL
+@@ -72,25 +72,29 @@ if g_module_impl == ''
+   message('WARNING: No suitable GModule implementation found!')
+ endif
+ 
++# For pc files
++glib_conf.set('G_MODULE_SUPPORTED', g_module_impl == '0' ? 'false' : 'true')
++glib_conf.set('G_MODULE_LIBS', ' '.join(g_module_lib_args))
++
+ gmoduleconf_conf.set('G_MODULE_IMPL', g_module_impl)
+-gmoduleconf_conf.set('G_MODULE_SUPPORTED', g_module_impl != '0')
+ gmoduleconf_conf.set('G_MODULE_HAVE_DLERROR', g_module_have_dlerror)
+ gmoduleconf_conf.set('G_MODULE_NEED_USCORE', g_module_need_uscore)
+ gmoduleconf_conf.set('G_MODULE_BROKEN_RTLD_GLOBAL', g_module_broken_rtld_global)
+ 
+ gmoduleconf_h = configure_file(input : 'gmoduleconf.h.in',
+                                output : 'gmoduleconf.h',
+                                configuration : gmoduleconf_conf)
+ 
+ install_headers(['gmodule.h'], subdir : 'glib-2.0')
+ 
+ libgmodule = shared_library('gmodule-2.0',
+   sources : ['gmodule.c'],
+   version : library_version,
+   soversion : soversion,
+   install : true,
+   include_directories : [configinc, gmoduleinc],
+   dependencies : [libdl_dep, libglib_dep],
++  link_args : library_link_args,
+   c_args : ['-DG_LOG_DOMAIN="GModule"', '-DG_DISABLE_DEPRECATED'] + glib_hidden_visibility_args)
+ 
+ libgmodule_dep = declare_dependency(link_with : libgmodule,
+diff --git i/gobject/meson.build w/gobject/meson.build
+index 65ffef0697b3bad4..32f6f91db12f29b6 100644
+--- i/gobject/meson.build
++++ w/gobject/meson.build
+@@ -61,6 +61,7 @@ libgobject = shared_library('gobject-2.0',
+   install : true,
+   include_directories : [configinc],
+   dependencies : [libintl, libffi_dep, libglib_dep],
++  link_args : library_link_args,
+   c_args : ['-DG_LOG_DOMAIN="GLib-GObject"', '-DGOBJECT_COMPILATION'] + glib_hidden_visibility_args)
+ 
+ libgobject_dep = declare_dependency(link_with : libgobject,
+diff --git i/gthread/meson.build w/gthread/meson.build
+index 8ccac3369894bda4..2d5913a91525460f 100644
+--- i/gthread/meson.build
++++ w/gthread/meson.build
+@@ -6,4 +6,5 @@ libgthread = shared_library('gthread-2.0',
+   soversion : soversion,
+   install : true,
+   dependencies : [libglib_dep],
++  link_args : library_link_args,
+   c_args : ['-DG_LOG_DOMAIN="GThread"' ] + glib_hidden_visibility_args)
+diff --git i/meson.build w/meson.build
+index 208c23087627de1e..dd860592b26c9973 100644
+--- i/meson.build
++++ w/meson.build
+@@ -1541,6 +1541,13 @@ glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
+ # @G_MODULE_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @G_LIBS_EXTRA@
+ # @PCRE_REQUIRES@ @GLIB_EXTRA_CFLAGS@ @G_THREAD_CFLAGS@
+ 
++# HACK
++glib_conf.set('G_THREAD_LIBS', '-pthread')
++glib_conf.set('G_THREAD_CFLAGS', '-pthread')
++glib_conf.set('G_MODULE_LDFLAGS', '-Wl,--export-dynamic')
++glib_conf.set('PCRE_REQUIRES', 'libpcre')
++library_link_args = [ '-Wl,-z,nodelete' ]
++
+ # Tracing: dtrace
+ want_dtrace = get_option('enable-dtrace')
+ enable_dtrace = false
diff --git a/libre/glib2-static/noisy-glib-compile-schemas.diff b/libre/glib2-static/noisy-glib-compile-schemas.diff
new file mode 100644
index 000000000..f5f2d9482
--- /dev/null
+++ b/libre/glib2-static/noisy-glib-compile-schemas.diff
@@ -0,0 +1,24 @@
+diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c
+index b8de0907248f6860..130f89b1728f7932 100644
+--- i/gio/glib-compile-schemas.c
++++ w/gio/glib-compile-schemas.c
+@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState  *state,
+       return;
+     }
+ 
+-  if (path && (g_str_has_prefix (path, "/apps/") ||
+-               g_str_has_prefix (path, "/desktop/") ||
+-               g_str_has_prefix (path, "/system/")))
+-    {
+-      gchar *message = NULL;
+-      message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”.  "
+-                                   "Paths starting with "
+-                                   "“/apps/”, “/desktop/” or “/system/” are deprecated."),
+-                                 id, path);
+-      g_printerr ("%s\n", message);
+-      g_free (message);
+-    }
+-
+   state->schema_state = schema_state_new (path, gettext_domain,
+                                           extends, extends_name, list_of);
+ 
diff --git a/libre/glib2-static/revert-warn-glib-compile-schemas.patch b/libre/glib2-static/revert-warn-glib-compile-schemas.patch
deleted file mode 100644
index 75b05103c..000000000
--- a/libre/glib2-static/revert-warn-glib-compile-schemas.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Thu, 12 Apr 2012 23:55:34 +0000
-Subject: glib-compile-schemas: warn about bad dconf paths
-
-For quite some time the recommended usage of GSettings and dconf has
-been to use paths like /org/gnome/example/.  Use of /apps/ has spilled
-over from GConf and is continuing to make its way into a number of
-applications as they port.
-
-glib-compile-schemas will now warn about these types of paths being
-used.  This generates a lot of noise, but hopefully it will reduce the
-number of ported applications making this mistake.
----
-diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
-index cf02389..27d0181 100644
---- a/gio/glib-compile-schemas.c
-+++ b/gio/glib-compile-schemas.c
-@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState  *state,
-       return;
-     }
- 
-+  if (path && (g_str_has_prefix (path, "/apps/") ||
-+               g_str_has_prefix (path, "/desktop/") ||
-+               g_str_has_prefix (path, "/system/")))
-+    g_printerr ("warning: Schema '%s' has path '%s'.  Paths starting with "
-+                "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
-+
-   state->schema_state = schema_state_new (path, gettext_domain,
-                                           extends, extends_name, list_of);
- 
---
-cgit v0.9.0.2
diff --git a/libre/gnormalize/PKGBUILD b/libre/gnormalize/PKGBUILD
index 7b0005f04..4a2930da4 100644
--- a/libre/gnormalize/PKGBUILD
+++ b/libre/gnormalize/PKGBUILD
@@ -2,18 +2,19 @@
 # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
 # Contributor (Arch): Chris Brannon <cmbrannon79@gmail.com>
 # Contributor (Arch): Corrado Primier <bardo@aur.archlinux.org>
-# Contributor (Arch):JZsolt Varadi (karmaxxl) 
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Contributor (Arch): JZsolt Varadi (karmaxxl) 
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=gnormalize
 pkgver=0.63
-pkgrel=6.parabola1
+pkgrel=7.parabola1
 pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation'
 arch=('any')
-url='http://gnormalize.sourceforge.net/'
+url='https://gnormalize.sourceforge.net/'
 license=('GPL')
-depends=('perl' 'cddb_get' 'desktop-file-utils' 'gtk2-perl' 'hicolor-icon-theme')
-makedepends=('xz' 'gendesk')
+depends=('cddb_get' 'gtk2-perl')
+makedepends=('gendesk')
 optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer'
             'lame: MP3 encoding'
             'mpg321: MP3 playing'
@@ -27,15 +28,17 @@ optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer'
             'wavegain: sound normalization')
 replaces=("${pkgname}-libre" "${pkgname}-parabola")
 conflicts=("${pkgname}-libre" "${pkgname}-parabola")
-source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${pkgname}-${pkgver}.tar.gz")
+source=("https://downloads.sourceforge.net/sourceforge/gnormalize/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --mimetypes \
-  'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg'
   lzma -qd gnormalize.1.lzma
+  gendesk -f -n \
+    --pkgname "$pkgname" \
+    --pkgdesc "$pkgdesc" \
+    --mimetypes 'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg'
 } 
 
 package() {
@@ -46,14 +49,13 @@ package() {
   install -d "$pkgdir/usr/share/$pkgname/animations"
   install -m644 animations/*.gif "$pkgdir/usr/share/$pkgname/animations/"
   install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
-  install -Dm644 "icons/$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "icons/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
   for i in 16 32 48 ; do
     install -Dm644 "icons/gnormalize-$i.png" \
       "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$pkgname.png"
   done
-  install -Dm644 "$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:
diff --git a/libre/handbrake/PKGBUILD b/libre/handbrake/PKGBUILD
index 36168de10..d9ed392b8 100644
--- a/libre/handbrake/PKGBUILD
+++ b/libre/handbrake/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=('handbrake' 'handbrake-cli')
 pkgver=1.0.7
-pkgrel=2.parabola3
+pkgrel=2.parabola4
 arch=('i686' 'x86_64' 'armv7h')
 url="https://handbrake.fr/"
 license=('GPL')
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
index a63bae4ac..7fe36ad4e 100644
--- a/libre/hardinfo/PKGBUILD
+++ b/libre/hardinfo/PKGBUILD
@@ -1,10 +1,11 @@
 # $Id: PKGBUILD 115005 2014-07-05 03:31:29Z eric $
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
+# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=hardinfo
 pkgver=0.5.1
-pkgrel=6.parabola1
+pkgrel=6.parabola2
 pkgdesc="A system information and benchmark tool (Parabola rebranded)"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://sourceforge.net/projects/hardinfo.berlios/"
diff --git a/libre/hex-a-hop/PKGBUILD b/libre/hex-a-hop/PKGBUILD
index 418f33257..2380a0b70 100644
--- a/libre/hex-a-hop/PKGBUILD
+++ b/libre/hex-a-hop/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=hex-a-hop
 pkgver=1.1.0
-pkgrel=5.parabola1
+pkgrel=5.parabola2
 pkgdesc='Hex-a-hop is a puzzle game based on hexagonal tiles, without nonfree music data'
 arch=('i686' 'x86_64' 'armv7h')
 url='http://hexahop.sourceforge.net/'
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 55d93274c..8f0bbd3d0 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -7,10 +7,10 @@ pkgbase=$_pkgbase-l10n
 _calbase=iceowl
 
 epoch=1
-pkgver=52.5.0
+pkgver=52.5.2
 pkgrel=1
 # look here: https://developer.mozilla.org/en-US/docs/Mozilla/Calendar/Calendar_Versions
-_calver=5.4.4
+_calver=5.4.5.2
 
 arch=('any')
 
@@ -147,121 +147,121 @@ EOF
 sha256sums=('49b419449431d8d64e20427a2e7105e3ac1ffc41e677a5f9a8eb276f5b82df4a'
             'acc2cf95661be7cb8928fca89e08d0681685409ff2428e4e3d25baf1af427b38'
             'e6edcc7c478d73ca5a17e4889acd302d55201ec5c29de545d3f44165201923db'
-            '0e0b7f56a2423908bf8b955c79b2834be01b278c40370a76eb33bbb7c8d91288'
-            '2fef7722c98933a5312778f2d83f9a4f0827992d53bfb4659c96222c2adec2f5'
-            'e63212a8b45661609cdba50ce7c6546dd8c843fc8573cbfd3ffd99f6f63ee548'
-            'bf3b9fd262a39fbda4c5332d5a6c0ef4c62aff9697cc466f5450d526d838d390'
-            'ad60b7728a0f5e168e0fde4b15b3db15145577d78361855678591f1fc5d5e8f8'
-            'fe785892f2d325cbef207213574b1a6de439b05f6ccefcd795dc28460b75a184'
-            'b8a0c2c9510e5ed0db024fe4d3c93f9800ca3821e38f12ef955f909fed148dd5'
-            '999955eef1a3fcc26e7d3e821c7c442b718589ddcc18543ad9bd2df746900731'
-            '602742c53ca47490fcc7c6739e5ac55cd810507d64a7197869cfdcf0a3cf38c6'
-            '64aa1c1daa8e0f8393bafb01d939832d3beaeeec56bbb63b0bb7491860a68e05'
-            'ff3db99a4bbccf2260db06bdf1338f9fc5e7738ca425eb49f5bc0f2a81e09c96'
-            'c9e19643701feb3cb491411f5c2d664ce2f8bb40087e853ca0395b45a5cc16a0'
-            'e381077092de1febf51fc314a38eb18918ee7dbfc3d0dce25c6570d7f727289a'
-            'f1f0807475ada0ba5c51abe2e925cc0ea76402f6563821479f1dcacd024c00eb'
-            'f0121e767536ec5bfb180894026fc123e7517069883ad8ec64ae257253a75777'
-            'a1556c9f00713a36e4dc9d1668f5648d5b3ef1b585f300da5aefb516ed8363fa'
-            '0636a1dbd920490a5c79dc99bed9da4a878c3cc6b6f83ac59ed18b372407b5bb'
-            '10d7ed81fc96d8ee9c071d52bb321a5b21eb18df6b400da74203e824fc74db6b'
-            '89ab726735ded22e7b866882a8d6658285f7f5f5c271fce82e5a72826fc14eda'
-            '8524e2f25a6eecbb938e3a2a7053922b19c588f608f08e8d23983680c127be64'
-            'c5c5f6dc7b64470760252bac71cf7d237c52372761d672d355f13af78978c93c'
-            '6cb3b1abfe7d768bd11b34ff2d1e94b96f44e983f9eb431456b29a657cb975e6'
-            'f510b370b6c4b2bfa90002a3b66b747c4f3cc36b29502d4f6c18be1109d9cb88'
-            'c08d696739fcdea3fb90630e12402a5fb676f2921b68b3abef9f53d5b3bdd560'
-            'dac4b706f308c25d4a0b5d185ad045d0e1641e95856456e98f4e7c972b7b965a'
-            '4abdc6c9215599196e7709d133e9018420416fbf04f87a57c048441c190567b2'
-            '501f5497be3b9ced345e106d90fe6a0ff3f29151be988ea4fa00b099beb749e3'
-            '73489740fad937466e55dee110ce39c0044c03fa1de71322edab290d961b88a6'
-            'c6eaf83141cc92e50ea239af69470b87f389f13b398d659c99812c0725a2f52f'
-            'bb8cab599453f8737f1f5a6d93ed85af28b7f159ba221cec35622b5e6642f722'
-            '2cf8af9f69b43babc0434026f02f7b6323fc68e7f5ffa754ceca899f962217b8'
-            '5e7f676fa829b69e525f0ea79efb1b717942995b541759b8decedc02aed53252'
-            'aaa0a9c5c268160dad9def19b719f3b4017f60131a98e9b90401b9cf80c39dc8'
-            '3e908983fff54ad4c8e1986d455fc88f0920c775e560179e4a86085c825b0c08'
-            '7d7ce32e58ea15e2a3b350de7eb51c2ed53d2fe29c3f0b3c5ff6946c176d0f5b'
-            '598c5be6944b8dd958dc6570bec7b5815ab92272d8a076f167530738545a4d88'
-            '4fe34db7dee5602327e3b04c611e5864e11b2113834ac637e81ed462158f3d7a'
-            'e835338bac38ada1df429aaec855cb597d3ab6bc0defcb2c190a44b677573187'
-            '3d6c0c9dfe0e36bdcfb68ce4466ea4b57e075180b8444c3ce947bcf6bcac95bd'
-            '809fd7fee8e3bff560f41842ba0cee8bb7969569475ec84940098e3984ac0117'
-            '7ffeab82cbc745699e4ebc11b16e105232c4e3ba618e07917ea6700eaa926768'
-            '7d9ec24a64f3bca5b6202671b5de7b18219a80fd25c1c2cb4a91b149860069bd'
-            'c5337fbb7f30216815d4a841a62baec666be00ee102e775de8f5642ce63b589e'
-            'cf9d5778489a126131564bea4eba998bd1ad8b998b5ed1248cb5d4354ec7ce90'
-            '989642c287371550f1bba03db9d1cdb5314d7a7c0307e3158100fb9ebe565935'
-            '65c2aa6b47232e6c2f2190b7a830dfdaebe0db1a0c3209e2ea93a6ace42afc03'
-            'b9fc9d6b6a8a9bc2de9ffabb4c3242eba5537cdfa4d5120f90eb172820fd1dc8'
-            'a00c861d3e9a5059a163a2e024948e51b47f045120d6dbf3dd7966dc26ac896b'
-            'adb845ecba559ba24d4f83fa43a9c9958ac332660283b9b581dd15a0633bd172'
-            'daf6547b38739914c37d29e00db577117c49b6264622a2df0abb8a2aa3514ecd'
-            '21b1ab1a42ee71ac81abfa154148cb78130eccef749b0714dc6aff5ad29fe70b'
-            '28d5ac2757c37a237dbf3f2f89cdff3db580aab4612c4267ebedf54aae0e79b8'
-            '0c6d4698b3d5e8f891f2225c5ae624f5bee2726363c0130d56c4e9aada675705'
-            '1352edd2a53a0e387c8bb1b1b2118b5202c459226b85e61d4325973b59e2b273'
-            'd77cd8f59a3da93ff1f46da5cc3bb53073b349f7eb32f24132bb8164a8dfa717'
-            '7148321bb727a3fcb4c45805f8b4d3e105d5a15ce969e62d37af36e4dace28e8'
-            '903bc6e737d558dad64cb9fdbdeedd5a6d40eb2d707c9ba161bcac7d46b4f028'
-            '097e95ae272cbe5d8162543f0d73a08ac851e1ba47db49d710ba50e1d1e4517b'
-            '57d4088b77c0eef84432d362bb95cc3be60a5d7f20155aa3a35a8fc5d3e4a091'
-            'edd49644fff4781d6216ede9529fa9725a2b6d2bf316ca24f87ea2286f0558e8'
-            '034fc0bae38ac6e7086bde0be1ca38f9c3ddc0364049cd7ffb48665c0fb64dc3'
-            'fff11a2367a3f66d26c3811a6f31b7ad904ffc30d59bbdb1cd7df9c3d9f2a967'
-            '7ea938162cbcdf0013823ccbd34f91a9160d8a8343c734253d6b4d46a50126b7'
-            'd08695ac033775799dd51916b160379a9d4bc01b001f6fd6ad96b871784f9e88'
-            '5152521ee4b30c28caf7de657a66afda77560f852c134f3770c4645a0b374a8e'
-            '854f89c1950d4228e27a80e895db3a8eca76800c4585c9d38d6c35ea12c05ae5'
-            '0700b4cbf29b9c82f65818516c8fa9d714e2b7c0db19abb26fbaf23df8f98bc4'
-            'ca08e44966a954dbf254c756642d344af4741d74b44a1dfd440ec45d1e472826'
-            '56fe86d1ac35a0a4e1e8feb766de0f37b388db3281d4c1bf413d404d783aff62'
-            '9679cad040c80ae6af3be8df426c9b6a5385fa0b93b84107824134e8a30e96be'
-            '0d0d48e352527df52b3fa1cba94b88e7d73b73d1a255360ad7955a614475a21f'
-            '96692b96fa112a36adcbcacebff50aefc2c5b238f4cb62903f655612e710b15d'
-            '91e8fc3d74dcfafef6f25f6e7a0393e8f0294582ba45c73d2dfc98caa9a7f184'
-            '2187b796b2d00d9d5e5a110a1375f0aa8f024189775acf28843d582003458787'
-            'f590f9f3b05863791e76fd08f81ee550be495b05646d0d5fda07c38549621eaa'
-            '6b9a33ba3f9a6df7c7cab474135b455735c462d20346b686dcc541c2d36503d0'
-            '4aa321fbce68b67f8e4e0371821caab8eda99c4cd185d64f02e4c60f71dfadd3'
-            'bc067a57105dca990e4bd1caab8a97700ea4597386ad56f98cfa7ba3d46a9079'
-            '158b074340e5d1f4a90674ce353aeef6a0f4e2c9a3d0cec6cd9a5ece4e8811cb'
-            '0fc2952a7e4818e09db1f9a8fa4b9231a70e7fd4ca485450be070b8eb6bab89f'
-            'a40f4bdb4fbdb5382d0c07d194456de4b22b2248de3cf9783e2d5620769a6ac3'
-            '195fcb82fe47932b5c11abe794770d0b669bc14bb8c2b7ef5ea9359351cd5731'
-            'caaf3b31ef3d58c12c5f3d9131df440975cb3dcdf4c054103cc11fdbd97af26b'
-            '1b4190c8f40fe991f7763f47a845a78eb1ead50478e54b08a14931323eba313c'
-            'cb4d9c4bba6b48cc3a19aa70d4bfbe6488c625f8430516e18af00fcfbd666752'
-            'a75890f2b40bc4c00366714566bf7a70761d3ecbeba6e9a564edadda25f613d2'
-            '6746b18f1bcebee956e4534f3ce35e27463c8c5695857b4cfa3c6f7a94f200d5'
-            '2a1382528433d231e87429c03bd9cd9c5364cd262546364c304f345a06ab1748'
-            'bfc22f3fecc0276a61ff5a5caa8e2d8df6163b5b44274c253b76fa9f7620fd03'
-            'a38c0bb5c33dc136964137c5787431dc12fc73ad07417f9eadea83a087ecb6df'
-            '3f833b5ab550d78a1742f0ede383ef2f8b805fbcef932f418e68d8feeb041b01'
-            'cbb1aadb62806bca13e7e39e6c558437a68527ad3be1b318ef0688dfabdaab46'
-            'cd006b0f06a0f00637c53fd672f957ccc0ef83e3e0a6991c7bc6d2e57be558b5'
-            '655fcc55cafbe2c815c406492a6b1eaf8e383e024ec4f42a7572cda45cefbe1a'
-            'e186af9039fdeaa3ce67ef25f459d818c34c58774f1915198024ad2188b9088e'
-            '6287de67ad7f8bb7611d176aca686c41b2ffcd1e62915fac428bbb8870274ffe'
-            '603f4edaf71587f47325a069e81c36df3b87ac48d657f9ccdbe1ec284d2ef620'
-            '747cf2f2bd51dc75a578ac627c0400803851820025081ee19889324b11c65f44'
-            '33122aa1bff13fdf68a913a17a29d8b9d3ee7c775ddb6e4b1f67be6417079556'
-            'db26bc2144442a89d5787abe6b1626208ff20e09d1d03d9a87082ff8ab3df78c'
-            '918b0bdea1840eceb1042c8aaaaf7e87e2b3a703412bc38c76a34b86f66235da'
-            '3e919889ec0229f618ea0bdec5845f05142addd7944d19688395ddd4201f8e22'
-            '46d831ac2588bfc1619852330b9294270244405eb386b76856e32265063c49ab'
-            'fbe62ac01731d3f3a22ae011331ed4cdbe18b76b0e66c8762bdafe944516d43f'
-            '4fe46c39efe4bf2bbdb95b1c028d432a0a53845ae30ce09192107bbbe3217e50'
-            '05bbf2256b886db58ce87883f13e93b5a380b3ed37dd09c6e03378b476e88a3c'
-            '1b0fafc37ebcf2b0bc59b29bf1984bb551cec84ce8a73bfabf4b064a3f9065f9'
-            'da213cde7f941a27bb4ac47d079263b354bcc2a6696ff7e2634990b9ae6f9e91'
-            '1b35e8894ab8ebe4703ef98de95e797e9d3bf3b885de0872de2dff95b0095509'
-            '473cbf34c33c5def816af70c5248d6027432f12169b6e6bef60861524242e1aa'
-            'd9b35b7513fe1cc4f211369a6083ee31d9dd87d38fd9c5fc5342bf9c8b29b233'
-            '5d66bc651c073600841251fe61266eb0fff0327950e6989a422d0fcda89db7bc'
-            'dd96df8637761c752cc1bc0e607491eac084bad2070fd3b02b8128b251e442d0'
-            '50af75edc61a48bcfdc43f632918351dd451af856f85c56e446fa6cb608db9be'
-            '20fc3e0dde8642927d5bb0d5bcb3be1524312acf0b0556d141553479cfb66c02'
-            'd886d88262f2fce12a6854047870b7076a787f0fce678319e39b29d5dde258eb'
-            '3ed5551811b7ae39ac72d62e9ba8e37cd0d79a0a818aca2591274adcfa5969cc'
-            'da803c42313eed5edc06ef3976a1dc9dbc1c397e768b1db67babcc27b1111ef1')
+            'd7a8692d263db8627443b2d8c1ecd4d06364829d0e9f8a890e94f2a25d0a3421'
+            'e3b74cd07dd62ee3eedfb590ca213adce7f9143ca2a4862cafebf735622128bc'
+            'b70bf171595b5a3bb92ba490929fa5a6e476444cc3c245661e28f20ba39dc62a'
+            '7a900ef8aa8701fcb24f7bed71b852d1d359cfe5f7f4e8a9db509e1d62ea3c3d'
+            '48b69b2f1c5b17fde1843b8e53f55488fcac27baa0f6637db91ed3cc6c328508'
+            '773eb2acfe8d92f4b9cea7aef0873359737352553483714be07b63012ec8ba4d'
+            'f0219905296688e1ec94b8f96054764caf7c00562e7ac2eb5893c03b2e324aae'
+            '482fcce244877679d63fd1068acdfe9d366e7c3f498924fe59f0e928ea596952'
+            'cea442f2be7885835acac51de212777c5490e20df393b7e00d2757100bcfe45d'
+            'e128e9a350135337412841457c3b78c4854958bea828b5d7d5e42c3eea6c94d4'
+            'ff985a3332b7e2fdd4e725bd128cda9b1ee56d9c14fe5f7e8311c445564c42d2'
+            '0b6f1f21a5b69b1c2a0bc9fe1f32f45151f1bae9972f18917d75b7d09251355a'
+            'e7595d5a39c6da2b1ea5f6ce1942eaede35a7f6c5856db869be7f49bc41fe86d'
+            '43a67f8ca8e69dc06a9c69b1dc1eb5d4301f4508287c42b3f6d36a1dc71b75b9'
+            'ed5b96993d7fb83b6974d344df537ea59bd0cc82314182a6ae813dded45387fb'
+            '2e616795cf3fab562732eb05138d8382dc5d702990c9d92ad09b6b3a3f0c73fe'
+            '2dc7a0690039a04b08b07fc9330100b66854b68b2b4d1a85a72e3079e1fe61b8'
+            'cacd00e442583cb57a7a0ca248ee3c4fbd3bda507f67bfa10310c59eec4061a1'
+            '5846914c053b7ee356679505f5b62360993bfb15cf0da5ec128b1039f7af3edf'
+            'c1257f1b837efdea8c467b88081067cc3b8e356c8b3f44eee4f4db59380608ce'
+            '707393f05f86ea10041d31ff9d61760ce9369bcbf984999663483e451598ca0d'
+            '0f470c47ec52274b7d494ff92969af52a3974e49c7065376afc06f21cff39e77'
+            '660031e37fab05c0320aef1aa8a0695b7ad7ceb9618428f4b89074e76cd5b4cb'
+            '24fb9d5228673397ef95906e36cff233bde2ffa4d76c7ad595eb1f5e0b77cfb8'
+            '910a1d603b14190034342cefbba9f3033d1203fa4f676c4c3e29675fc6c249b7'
+            '97bdca96b8ec2dba4d8cd352efc72096a81d9af5b32abed7da99f2ea0ae679f4'
+            '10d5bbe2cf22e3946cc67a8b9255c328740d61f292942990ffcf7c113edf5b7d'
+            'f0e0400623dc851dbfab041b25046d8ba670709475a869d8afb8169c83ace57e'
+            '78510bacb950a5791ceeccaa41feb5c09053bf685fdaba8eb4c3e260b0c57ca1'
+            '8dc22d30716cb406e443d725ce826d47e5a917484f88a2dbdd6e0bb98a984bad'
+            'be1f111bc6d0589c89fea611b9a7b30393f564405e41d0403b628ee4204e72e6'
+            '7fc49a2ed9f7dd1b1c983219312bf571bcbc4b435d2965c61749ec63f96fbbc8'
+            'a32ed2c27a4e3eb559db3a95e4e7bae1f51598b37c5a14598dce46d8ca19fe9f'
+            '6a256f33a0b2efb1799227d70df8595dc34249693bee4f4bdd0c9da305c241a2'
+            'e5449c5269a5afb66b716f6d090fda62749ec7717d84bfbda0dfab5e7c1af7f7'
+            'f21feabf91cada47ae535564d232321281a10e0f41409586bcd75e50a71066ec'
+            'b37355ad80efd2efcc1841dba2622eda5d1394fee894a72490fd22511493decf'
+            'd36ef43362b6018f541fcb09b81675c8475338b044f1a498ba3c34250b30c682'
+            'd9a3575b7ece3402873cb08a715ea790ba2069de8e12b401cacdd311028ae1f0'
+            '6e4d03c494ab3d97905d56354e6c38365c8a881d4d96a8b3f2510f91c58cad2e'
+            '011474c4243c2329df60b8a6f48e1a8f31dcc835d09e9814a316cb13424b2b2d'
+            '1282e8bd498578a2e173f9050d943ab1b46e756cd383255613ed6c53c8174a3e'
+            '9b64fbfc1e7390934002b738ebc9b772617fc765732fc51718d6218b0ff07f43'
+            '697765a1ee4cd86e4ecab8ac9588bbe949e15be238f35f59af1eb87ec4bebf04'
+            'f8fc5945970e06506041e0b141ad375397c409d824b4cbf8821237e100bb9f0e'
+            '6bc9e3949da3e6f72a488adcb55be1396141894d22b28d2b8275b31ff8f552f1'
+            '2673fc5e4fc529f034fae08798f10a056d512256ba5c6f2ffdfcf6ea83bfb28d'
+            '99f2609c7104a79ea5cb115d204ebdccdd62d831b8402f05e6462d379d52f2da'
+            '27d4ab4e421a621f12692c4c2292898faa1dc4cd03de7f3b469fc870d0966bdf'
+            '19563fcf14343996feae7ba2306e3b81e6433e6d7132a568c2efbda517dc183e'
+            '0f59d39cd46814960b3f0cb8cf343d91589ceb4db9f107cdcd99d18a34f791bf'
+            'c4690c86853e9ae0872de07ed96a6b71e564ce5baa6d03f79524cd62226898ba'
+            'bd67efbe342167fdcbb4438591487c6dd1c9ca46e9ad3fda4bf238638dd48f3a'
+            '6368e1d090b810ed49b3ebe2634f7703c54798028b01c67da022069652ab657f'
+            'fc98e7d8d5f6c97efa2dc40133a70170a3df05aa497719ce8c3befa1fd6d68fc'
+            '51616ae863d2885f7ce669df80d1e388496935497d598308d26808446b9489d4'
+            '1878c3fe119d2007baea3a6759bc950fbaefe93fc372d3b92c6ed64b2a946859'
+            'dd7a1dfb847f59cb104c30365ed1b4d661145a6bbbb2beaa02b36cf36122bd12'
+            '678218c48d874d5e308301343d8bad97cf6827e0fc0ca34d5ea1b0ac58beaeeb'
+            '529ce11312a84c63e5906d4008d08327ef591fbcedd935ddf56f93ac1b1b20db'
+            '5515a58cd0b691a1d0dee964d931279b8729cd59f3ee45b23f594f5d1df04240'
+            '6f6eb33c9c031b73c194f4996c2bd5b9398da096289d2eefe628529299ca70ce'
+            '2cf40947dec980d24583eb5ef57f9461848fdcb7e5fd6d534d670735a7bb4120'
+            '67b63e5333f7ae7ea04ce6663c4ddcfd0e2ea220e7a584b3963d242cc7a8529f'
+            '8ebcd3cca7db1e7c7cc3f41551fc83f2f8a2b13099da6b25ee30f884d7151f18'
+            '1d058eed9225d995bb7ee6d9a3aa6218dcbda86fac340cb9fb2cfe45da895eaa'
+            'f8dff411870edda5723264b5036de51c3570b96c38a31f23b495b0eb74df25c0'
+            'c9908b06b105741c350c04c61d85cb14971826e2c6b58272386b7ba86bd5a63a'
+            '1fcbb01397b921033ea5a70395d67dd7e143d7911cd03890c7780a23be15347d'
+            'c98eabaf8ad597139f4ebedb99baa9d8197783ea0afbc069c91310f4d5524f6f'
+            '7628e4678c52354a052cc46737d99d404c0beaac9498209846b485e0c29cad52'
+            '464ec41a13bb5ddff649a9a4813fce151e1316f4c1c51986ad60235751e17d46'
+            '3e48f9ea89318840b0ebbaf6391463274b06a2d48f2294299a4359cec3be0a1b'
+            '34f36e0198c433a9fd54ee3e7b764bccf2d85b740e935e7bc6831277028c834b'
+            '0c7ec0d8f73f6068ddf9690f606bee09f0526d00f7c5bd228af01b761d53dda1'
+            'd4ed63ff20ac403335b03e5b54bf180bfdd977380822f8d26452a84da114585b'
+            '68d98489e93122e1c5594a940dd64008eba76b33db395318ded2817b34ca8012'
+            '6137cd4bf89307079e89e1013347b3d87f9f98a58ed4deab8547f0e996e771ec'
+            '7a665dd51bd4220e26c3595699da7a74f77616f95f42e2dfcc962801b64700bb'
+            '29eeb5eb7ac50d0fdbb650c03baab11c0d49554977e73ac6950ea07ac7f6e71c'
+            '463490cfb5c2318dcf86806b88f01fab3c2be50f6c31e6d92ccb629ce1d4919a'
+            '1c5ca321aae5b19e6e3ab65aaaa20f1299b70c945a0f1b0fee44469432a8ce6b'
+            '9f8aa33583cfb8eb0fc3098b96a5257a392d982b26643539782b7877922c843e'
+            '6585c958190e613a81665c0b43670e2ace1645250e7238cf0a58d470f6416a19'
+            '6d854e679ab9f9e0f080e94648f68366d32a021b77f630820ae164bd9e348380'
+            'a1f6c96ed3c3acc684bcc629121f428962b5e111a80d445479371ae6c85511a4'
+            '162ef60b8a2f7e7f348d8a559ded2a325ae8c81d58d6574885754e049ae5cb39'
+            'ae9cf45b3edd150110cefe9a4f043e6226b459f339c7c719576e16f00d677e6c'
+            '6dc69a5ab79f59aac8e5930fc4ba0e914e0e65ca35b7a192fe4d1635bd9e9f43'
+            'f29c6c77394b3fa7e6e28678873d6b6eca548ec608ff1cf5c6bbe9ebdb577f8d'
+            '137125c20dca51d5a54354237f0b79e88fe15fdf6dfd731422fd72556263dcd6'
+            '25fe4075b7b5280035f5304844e69189978d47b7b89e9d1ea7eeb26c452c1cc3'
+            'eecd8b8c525531fd8aefb45bd5ae5a1cc97dec025f23b2ba9d17f04d66da8173'
+            'a21ee4e5abda073457761c2b402967628ae12acbfe45fe3774ec9ab8524e0c60'
+            'e64bb7b3a59d21bcb3746611e9b8ea468aa8b2b15039a86275ee8b69cf05b285'
+            '0cff484e6bcfca7607d35a32eb56a7d098b39a78268b1c57384cbe79124ffe11'
+            '716bf7a0f9a12d088be1e4ddd07f2a3861eb7a646dbf0ad1fea1be3187aa5049'
+            'd2a6d2fc9408bc5b7fcbc52857c794147c67e82291ba551adfd94f3184bd03f9'
+            'f458ec4d93120dc015302c67ecf8a3fb70bedf42803637805a739a43d187cda8'
+            '9380589f63f01e660eecd035b1742f740b3b4b0e6394fae5e9b27c2909ef36c1'
+            'e7d418562df152cb220227432d87e5808675a859267a1238924af67acd073d9d'
+            '617db320c9f49e2f6f8d75f7dd9bec27c990cbffc2631192bc1c46c8dc3f77ee'
+            'd563fbb8db8bbe94e19ab2a24c28f4b272690454175b9955f8e0f84fc08f8ffd'
+            'fbf49d3894882e9472a8add1d2c34acb27158f7e56d54260f36092a6dadf5ecb'
+            '66e0ed6938917713280892a263b3158494f2d7a112ae9d742d94b47140091d9e'
+            'b9b980ff76af72bdae112232b3d8d6e0150b879c970ec3ab9ac321c03891198d'
+            'dfed225bdb5490b547ccd7f088342f32e5e2b28214c6a7490cba5c189bbf149b'
+            '5c25dd2777a874bf32523a3ab54e828dcfc7b244fb77f897a641ffb91d12b1b6'
+            '0289d22b1263c1138134f5b6d286a3a42bd450eefe297cbe0c62f76cfacaddd6'
+            '5ecee09e88112d5cdf53710b8dbd6c2f235f54030b7bd8df9c4344ba853730bc'
+            '0d2f1e4068a42f31f58b92fe273685225bdabbda121e57936e0c73c5c18a40e3'
+            '4a6161e32135462974add9714d0115711037af844b5a0bad35474d983392736f'
+            '240595758975b80c2a205ae4526055307e61f74e5ce1aa58cffaded88f41600a'
+            'cba84306d2f318605e644bd2a0e4896b53746b9143af79ebfbc91a665af4b43e'
+            '69c6202ceb23bf912e99d776203c7f1c22ff4604e87bb819f78f5e6f9a28e2a9'
+            'e4fa82d51fcf24bc83c325c2c520eece28267db26b8b701b46070362f9916400'
+            '861584c71533159d58936c40ab60b1fcfd071a4b568fa8a779374e1b7984e2dc'
+            '9ab05de50ba2458284ebedb4c85216a4f366c8aa40f39bfe6d47b24bb127ad51')
diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 6b34cd70f..3f7ba7576 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -8,8 +8,8 @@ _oldname=thunderbird
 pkgname=icedove
 
 epoch=1
-pkgver=52.5.0
-pkgrel=4
+pkgver=52.5.2
+pkgrel=1
 _brandingver=52.1
 _brandingrel=1
 arch=(i686 x86_64 armv7h)
@@ -46,7 +46,7 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname
         libre-searchengines.patch
         no-neon.patch
         no-crmf.patch)
-sha256sums=('7f169d1110db6d184a1be750a59734cbe639fb304bd76553aeaa1bde3bb7f779'
+sha256sums=('7772e1865cd4cbaac82ea05374d0ae51f754f47c6160c9b83919da483d620ee5'
             '246418976524fbead5b99e6227f97322f8d4c45e0edf9ce75561ae8eccdefc65'
             'SKIP'
             'cafd1cf384791e8e3284f52370b2913a8b05935ecfd10d2a19c6dd5a8c219b62'
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 810199d29..1d04c3918 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -10,7 +10,7 @@ _pkgbase=iceweasel
 pkgbase=$_pkgbase-l10n
 
 epoch=1
-pkgver=57.0.2
+pkgver=57.0.4
 pkgrel=1
 
 arch=(any)
@@ -168,98 +168,98 @@ _package() {
 sha256sums=('d319f07f17268240cdf0c5f996952f09fbfbdfb2905f9d7b1741a7a42b4d8085'
             '754ea5ea2fe184d3bc1b1bb60d4caf72cdaca5e4d8f16065b22b988b1ede9ad1'
             '81d1f98843f29a81c10a9a96655505c72ee34acee45225dcd307ae9a123e63d9'
-            'e4997e2ec4ac9b164d0f1a0e69c539fcd62f4f3ad8781b62bc91161d87244ca6'
-            '049dbcbddd71bc640a192f0412660b49b9635fb3c95c69bc6bc39921efc858b6'
-            'cd8551e2217b018ac4b77cf7ac556b0e3d337ada79faa05e8b433d82bfce2563'
-            '4ab6c8a349b84c80a60093dd24e12e32cd3674cefc95a7d7f4399b87c7e68f43'
-            'b9bcf4ef2bc5d55a5861de8efa8451174a420e4032cafe9fe463c78fa029963b'
-            'a812abe6c44bde6e39820bccc3c7448a658ef9d9d7d98639ad7fdf39229ce6ae'
-            'ed972e2fc9c7aad3196b5db6c82812acd37d08bb83c1b9f276cb73f99cb10e44'
-            '5ff30769b04e5953c33cc9f64c66d8bbdc0ce8b0b1929910ffd82071964e138d'
-            '11984db8c70e3bd49a96c3e893c3681108bb9e9f698167c91f221799c5b26c23'
-            '9140e4b831f42d17d738515a104613b1632c6c39cd7165514e99dfdd561fddc3'
-            '7d6c277c61341ecd01d154a0c63e1d6d6d30139b22efa4dc050297194ef6ee54'
-            'acda7accd57dd95b5a48ec7baf25b29cc6938027e5bfbe9dd4ce999a31e448c1'
-            '69accf3f165f7feabdc3d3d59ef19af4b01811a89dfc3cff89798f71bb1759cb'
-            'b409e3f6d3359fbe1885bed346d04f856910704258be6235ac4b8d677ac87e8b'
-            'fa9159287516e9c84f11fab742147c767c405a5ba51036cd8251af9f83dcc295'
-            'ceae997c6945d2bbcda249433c72299d42e7798c19b7f2c71deebe77afc0ef33'
-            '1fd06e46a5cc6d4ae771fbc148b71e9e53e2a53396a44097bc9068714e94a805'
-            'c8fe1d4d5fa996f43c4ee9206fcd0519725d55221ba53017c482f8dae8880b70'
-            '5bd6244175c8cd96a0938eec42aeb470bbe833d25c1f1745afbb9bb3e66eb814'
-            'c9be692a527ac9934ca28bcbb6be3a1c1a7a6d5471cfe75809100c3941d55a37'
-            '2e1ee6612d7ed621aa5e43843de253b5ae3b31185e3d9d2607bb5518e27e864b'
-            '64c001b0a31985485269c870adf37f0652898f22774a1042030faf8a9af5f362'
-            '7c830511020b3c3d941d6b699b569a3a7a0897affe70ae4f55229af657b4696b'
-            'd09067757c1d240253fd4a28c41955163677f2198b9ca8967120b876bb206109'
-            'b9f4311f6aabccb3abb87198a56e34ad6560fb2802e227a557603b7dfe811cd6'
-            'fc5fc1f2126c2c87757efcaaa90d4cd5e5d1ce05af4c0e74cca1d144589416e2'
-            '2138bc886d134a7a3c9511f25acf984e83f05b0940de4ccf1ed5c15b5388a2d1'
-            '880c74c8994f4353f7b5149b88795cb84b6b66f26ee3a5fe181bc3cffc48db9a'
-            '79cb2491f93e1e77710b7f946e46ad2dd1d2ea1d99353ac513159a5ea05edabf'
-            '321d33ef3bf6faffa2bc5f333ac247773742402a597017b07cc6ea02b6d0c564'
-            '55ebe6b49e65bd84c5d4a7dd54d98457979d9d58abfe7ebc861ed16bf1e23957'
-            '4adce2a2efc8d02fbeee08fcc4442ca9bacd2ee4efaac9ab5639cc39dd7e0441'
-            '527edbec7d942e34714f234509985738125cb751011ed781e17a8888a40e2b29'
-            'e51f8f137b63cbac65bc8d1a63e301f128b58a502d090bd05838320829d28eb5'
-            'e6c47c559b647b9e2e2ad7b7dadbd9c92680bfaa26a706181d7d15d6b3b80189'
-            '80c291b1e480765fdcf012c460c172297e25bb022290f72c3e742cf4a0113fb1'
-            '8f575e976a6b2580344957ae13809aaaff7f64f29722ff7e339c3535ca713346'
-            '5c78506787b4e207f2e5cfd9a387d566ee9d964b2e29d41c9c1500171b33d81e'
-            '24cc04f7de1401540069fe12231c69d53d72bf48b21ad0158a57a199e324a97c'
-            '0cb1ba780dbf7e71dad2182dadc3d157261e479d2eb9ac847a5eb93274af83b2'
-            'bbb0c993585759536559ce2cca98827a5915dbe3880507a8681bc09a54e44901'
-            'fafc4772fbb6b96857d3f42402da2a556c20a0f291b479ac66e0c53745d29abe'
-            '978e0c8cb2985aa8906f35bb49fb4e4e2bec3492bc9c7c5b0a66cdbd9acde794'
-            '2eb787c77113156ab23d0986c234c12142981f73486af8474d011f1d89d03e7e'
-            '6d5537e0b83586d2561030eb480c21f9560c764c5c9d53cff6a109ff0e4a0849'
-            '363848557e54c141f7aaa065ba9fc658217b85cac901e71877d912e176004d50'
-            'c36719ef55557538fec0d7a011adda063494428f07495fc7cc3a592ec3c28aaa'
-            'ecdd58c5c92133cc92e0c3cac9c2e3de06e4ab5520c031ad74a03813e3ed0fe4'
-            '900a1823028928d24247cf707f98cfa5226f04cf5045b7d50889f68a9c35f735'
-            '8723506b966f04413dd5b20ca7bbfdf82373637b9d791e4eecd36f6aa0028aac'
-            'ed1f6920353721d64167b93b85bd2119c370553ef914aef1f18e2f01739cb0b9'
-            'ebd1b1bbb217a1b93726b8fd720dd63680d28fa76b9fb55768e87f7b9565470f'
-            '47105e123349f68f071d748fb2a654fd2b8445dcb9bc1006a83401d759a5d71e'
-            '7504d2e8e224240aa1a2d0761fec7f36c6c6427a529021f5aa7f33f35185072d'
-            'c5b950cd3fc7b1b2dcfea70508da8f8fbe327ab4ec662bf4ab8e9796482bd109'
-            '114e741a4ff2c75863ff217b4df778f4c2f4c3307bbeab6eacadcb9b0b2821fc'
-            '8d0a46effa9d4dea17ec8f32538494ef903dd6f2908fd7e4d12cf89b9f514dcf'
-            'd6d97b8381806d315448eae8ac3071d57aae58a2f7ab89f419ae21430e71736e'
-            'c1de5e657eaf33e1336162c06e9a643de44cae2083c6d8f7dfc026852aa2c33f'
-            'a6720e6734307e659ca989b3131cbbc51ac3cee8f75b40da2748ee4b26ac8bb2'
-            '0548e9b8e574db76432a231fc9e6bb281328e22413bcaf73be79ac0d815cb4cc'
-            '9727349fce8a362e83acb24cf403dff55dbf788e77d367cb236db8453b3d1e7f'
-            'aed732d507da43096c2666c7082394382b57d8f5db57f9469819c1c461ba1eff'
-            'a6da2ad562c248b922e9329511d649a7ff30edafba512585ff9824a047fa9b5c'
-            '29278b6bb2f86c00b47bc1555bdf39901fbae933bfb8da332c6fb4d9bb98eb93'
-            '85b542b1df86fbaf5e72dcbdcdb1902cb4c9399bf9d8358864189748bc40be4f'
-            'fcbdaca8ade333dcc6a9907d25826c96a3bdd38b738d767e8dd0e4d136cd0a04'
-            'f11ebb89292b1f6ea4b23aa1ebc9d2cf06eca70f74e3716bdf212813fa27d1f8'
-            '62f6b27b921403b5eb66ed6cd756ae58158c576113fdab7e22c2e0d6addeee0d'
-            '51add79881216d6b0b6b6a0e542312077c90a2f4bfecde7cfab50c021922c255'
-            'c50223c03c0a988592f6ff6faf988b0decd20ffcbf86a4094095795aae1a191b'
-            '3363080d6e6f3f64f0f65fd5dfbae135afb9fa7ac581dc11eb1f6b1d729c3419'
-            '122a54c218fd4f0968815a4bf5211952225194c1cdae6c87d5236f14775cfd08'
-            'a287438f5494388161055e2cec97ed4656423431697a244cb35c77ef722655e9'
-            'a99b89dbc7cd74f212edc93435ec28f8ec07cc09b815a07cd247eb5f9db51eef'
-            '481f65471392779bc115b78e9b743092e807ba623cfdb7fe1a5f0c6ef140c790'
-            'b25dd55d5d046ef80f5dbabba18008a53074dfb5b10694c3a1ef0bfa2ed47768'
-            '0aa9b90d9ee33055fd45ce508906231efae349a7fe902dff42d8f52477d9d572'
-            '4e23b6888f767ce131b440679025cfa523cd29673985b32e4693233780ddc1fd'
-            '9a5bb0644c00fea4eaf1e0cc5491340769a011a64ad106b2fd0c6fbbffba73b6'
-            '94bdf395d5fc7650a2af468f011b937f8fdf60d5d3803985d557978af1f8310f'
-            '16f41d29b8afabb32e7e488c476fee2bc84bcf0e6fb348c1a4c6a8157f465cbd'
-            '333722711aa715f65cd79b98f9edc109d151706b71ccec052cad1c3f55530e0b'
-            'b1547d3a366944f2f2eb2efe5bb2140d5be98590983bc9a5375bf92516835df2'
-            'fb8ca50c06430e851aa7f27812e223f80ac46770ce243b8fbd0785b574d9f822'
-            '0cd211ae333511fb7047b0c9ff7643b1b34893cb6255139c8058ccb267c03a78'
-            'fefbf5da1b82dc13057c322d1896834a44663369d849468acb1338fe8d2c0009'
-            '3f42f3473a001ad4f04d5c0adbccc9a1eb467dd478d13577ac508dbf29da392c'
-            '30bafef9fc22b8079e2ab3546a2589ad6899e9b5e45a6141d85419dbde0e86e9'
-            '2d3cc8579a83f5992e3b53f0f4ba1bf941400f075aab154c85c889069970cef7'
-            'f72a755f23c77fbd7bde1f150d320ddf3516baf26131a795c3227f85a41d1b43'
-            '07718242af2d00df88cde15704e5af63149eafac507eaa903e9f094f7796be70'
-            'e996e2042c168ec26fe8310343cb1d32fdebceecd633cdb403118bf679062526'
-            'd66d88d278fc54ff0081f83c0b15a4b2f47308f2bcb340332f6cf13e85dba160'
-            '9b669d4dd297915657f2d8dca25aeb51d49e9138d6d6c542e82256dfc477d696')
+            '0db61e82a56775653e8863cf46e92d7791ad855b789c326ad58dfbbf996a3880'
+            '018e8ca7b2ac1ca55f53bded94cb979d0872986ee494864330b97457d9efd7e0'
+            '2a536acaa8efa972b4a74bd8a786607eee939f97ea6c5aa5773f7132f42638fa'
+            'cba589fa5e88446edf0d051e80c02f1a06224ad0b8d66a2de81cde615b78f01d'
+            '758d4830417c3fff4cef797c12afac34d915e8940061e907ac68083f1c46c592'
+            'fb8b1c0c67bacf1cadafb43ffc639038a32fc5318be0dd691f8929ee2bd2b01e'
+            '17f7ac16870d6ce48ca02d45ba9a35bc42b58e85f2e86767f211fb956d2a83c6'
+            'b55f05cbb024c897a1f648cbc111a1802ad60b83531ebe3f9f5453606bed471c'
+            'b715180f7c48239b8d3404f1cfc102c0142e22f2aa7ac19877177e7a7f08d46a'
+            'da35dcf4bad2ec7484a4c9f0ddcb1424190e564e69801fbf2bbd94ee1d0c2a56'
+            '9093099dbb01f46e6b1aac94f401d1417985233dba072cfdbefecf7031756e81'
+            '198aead2f677fe5185edfc2abf3c83735e5b7f1cd19a2aaf7362b57003974eb4'
+            '6ba5d0950dc28aa070f32b2d613ce0913420ce2022004b1c189f253b2b17847a'
+            '6ef787d51d1bcd2426d3426ea57d0cdab244fc49b93f19226291cb6b7c06b30e'
+            '099d5847c14fdf22dc81c1bb581d136d292b01714d99de2cdadeac3c2988e561'
+            'ec2f172874be86e1c3950998e26cc77535ca8121db63c96d34068c58c3179d99'
+            '71f431a351e93c74c10f569601bb32ec990ea2a16b6bfb5f724966d0d7520bc6'
+            '5a4a0a5aa93c19c4f5fb5aab3f83765ddfd2f993d1cb8278de1366f5626fc925'
+            '4370210b943ebbf8b814a6e04be9c7e99416c2ff4c54c31748f781f44309e36c'
+            '5170e4e0e160405dd3ed5515e35fe36dae70aec8f48102345619e5c75bd1488a'
+            '9d2e01e55e1fd7d39b8a0a923088334dc00dca0547fd5985aaeed6319cce5095'
+            'ae4e8350e6a36cdeb8bfb31341bef5bba1eb48b6915b99a34a6cde2fd838651e'
+            '3afb8de6b06406aa92c2b7c353286823c06cdb45218af798278c04ab67d85032'
+            '92c5c01f2b5513d49aca2c453721026ac006cda7b1ed260083b8f101197dd9ea'
+            'b71b76d3a61b243bcdb71e02ed3e1752adf35301d45a441c21faa770799ce196'
+            '0c9ffc8db2fba0359bf69b6bf82b3be15b939dc834bb021cfaef88646abc9e3e'
+            '3f3af7c94265797b7947a6ca5b3868eab036dc2562777ff9a9c65cfcda9a5648'
+            '04edd799bfeb4a7433a80320abafc7d0c1c7c24982e1d53976638e5f2ac243f9'
+            '7bfee1ac67c2a50fca910ecd21aa54592774aa49ce11f58ddc64de1ccbdcc5c6'
+            '37ac8824f08bfd6d931bb6d325226a970adcf4a8b3fb9ad651ef6d965f8784bd'
+            '7b6df791d0390b4cdbe92811c5bd5e374958ad242a3bbc7a49f1cbf963aa5b36'
+            '7be55f40579f970e2682472fbb66e8f182c14491f67127991684e45968fbf3ed'
+            'f3321f6ecaad8d0171741fe91420492d09515b25cc9f7be764dc258b06dc7db7'
+            '71f29805ebe1f46242d4e01846880f42f310a42fbba22872014d8d45ceee29ea'
+            'a959c6f196e6a26d0941a336cb6b1183a8e5af789380f249f7a2e75510bc2610'
+            'f4e9632af6d1850a8079b12e2652de3af69fdcc2c9db06f79c94b3ef5d1de0c2'
+            '665ce3c813e280e821a1311c8ad3a7744583fbed821bb23240354163bed13ff1'
+            '20388643eececf3e1687b7deec855ff5ae094bf852c0d22c9bb805f344a7404b'
+            'dc3bba2acaa91c3cbb9a137d4ba76ea321447f1a935de45c81e9a7ac9310e2c6'
+            '6138f2080bab839e83a709307f443b765daa8654a2bd40a8b93c1db9e94793bf'
+            '651fbcff0b9b94071695bcfc2517ef2a151235ebd609fe55cf7433771103e6de'
+            '004f5c836c007157851e70e27b9afe690b83ab6cc3358d5a406961fc504b62e7'
+            '2355ad6a0d3ed332068e619d2f159111b80327989c6a4ca7cb4eff87ff77f753'
+            'aa836c086e743f90807db62eb66c911a8ed2d48e52b99b649c446832d399cd96'
+            '49ec24fff47910b9249037f72e14252284c51cd0e171259128ea7365bbe68844'
+            '606bfacd3bc3ffceb3b431378f66c49db6b6a37c5eedc84128dd00b15a8fb3d2'
+            'de5d81269f2293eedb3146150e49a2b48a5729d1a09f092be4c66bf4712fe267'
+            '5c3af12deb175399c67878856850eb7a1794bb6836dd1f3b072489dd8b3a6e1d'
+            '7fcbefb0ef86f4416097042a20a9ff5ebb08cab09e8efeea1d446fc436bbeee8'
+            '6dae24cb5e0d562f6521d5ceea3f79beca5ad4f7800a6883cb32429ee02e4bec'
+            '8e861ab62866d82798722c433accbd94a7a20ca7701fa05ccc2458c7d2026f8e'
+            '162acea7cd9df51ff0481d90dc239682f8cf834ec37f51a714b9e38d4ffa338e'
+            '8c7f6ece7b746c37a407bbbb22c79961a9e0762e7aabc8f945390e1bec515ebc'
+            'f003d5f0db4c94c793b0327f3ca5040d9a420cbcd03d6c717558c936c6aaa4a3'
+            '438f20f6ff1f24066c91679dcbb570ed814ddd3090cbba06e1d975d542916931'
+            '21e92623823811b62852a14a61985151d2a4dfa1c2d97592b63338eb63b354c2'
+            '9e26a3960988d1c79a60dfe1cbd9221f754f3e9cc54984f28660ea729012cc4b'
+            '6bb35ffb667d942c548086c82717eb29b6a9c18933346d0f47278e44fe68ef76'
+            '63b12574a6bbb97619f1aa0e0d585dbd57df3a2582989eaacd7520c1cbd13adc'
+            'a15d7e0641a84b914257545ae422b24476bcc536378fe15626e750ebdbddfa95'
+            'e990c82a2b92081fc064813db8d73da71ed0f9bc611a79e767a0d3a88928e9c0'
+            '8f15d51c621e877314c68e4f11559b57556a22ea74e18b40bdbad2c906b2d110'
+            'ac1b73452a2818a80958de7122e9f653bc62de3408ac3207f60cf1ad6f033063'
+            'fdc5bbf4e8b4ce6bb2039c57bd28a2737765a97995794a338e123e31e64d763d'
+            '64dbc7ccca7adaceb6b960ddad0d03b3b5cd220c691c79dceef5f89c0f3e6ba4'
+            '9dc539ef7641fb881f66d7b98b6bc0a76972d8e8734499ba6309d904436dc684'
+            'efe347ea92a21c9e1f9acd34eb0e05f19ccafd62b10a21ffa09febcc7584e8ef'
+            '0d8ab0fdda99f63ab21b482b7351409715a2cd2f41cddf6bbe5b1b272da74bcd'
+            '223d3ef52c3820258b49df7f42d9d861ad56f756860778b0ffd01cb13c453f1b'
+            '0e72f2fcaacc58de0031c4f4410e5b5f2cc0eabe931a26f23e74407b63b27aaa'
+            '870ee04109bceda64f6097eb64d57dae741cae1b3f327515a6ecac6c87253974'
+            '0d91f5bdc4dfaa9fb6daa20f771148e38f2d9e4399bf30fe244030e276c9ac89'
+            '4b2d43c3b949a37cccf71b71b45080792e2885d834a4e276fa7df5cf6a74dcc6'
+            '2ef8b8664011c26508cb09b136c45d9c9a1900a2300e097a5f230ca814a79780'
+            '37e0a1fff509be32a6cc359eed53f56e06f207c8c2e85d4e1e6faede3bb3b4ac'
+            '9c5669d219007a5a09fc0b9f813edb63f152a85329698e534a18799dbc8e9b68'
+            '4a392e7dfa9cc7e28f3e9a0d4ce5de24f6531d12bca17254d86043c8172acc1a'
+            'd124a90746df53a94b6dfd0f74b7a0e365ce8a36d8b5ff6b5022d557be801651'
+            'beabdded23f975d25273b4179933d8bfe618cc49de46a356bbd8a8d8a0b632dc'
+            'd0c419d071c43f139c0467f643a7619a333bfc28733b2c5c4df3bba1e1aa94bc'
+            'f0b8b5450dcd145148ae5fa4f4c446a623014ddc0f8c8a69b7990db667d5c32d'
+            '2f08696a618b027f3b5b866abe42bba53c1f37d89b0b2948aa4c3f893795f537'
+            'd1418c1a1de6b9958917d3ae288eb794a463139c947d2af7d8f758f37b8865ff'
+            '452278c7f1e5ee9f23d126de8f3659750ad5a8f5c87235fc089ffacf19348e53'
+            '642a0c33076fa02ddb624c5aaaa7f4892151e902585d6b6f72460db5923f1548'
+            '8e2fd00f5eb274f8dd8fb51101ddeccce2c755d85cb4054d682ae2c5981a48c9'
+            'f50f501e4eecd612b4946d9db620009012b3ccef5bc7ba87b3bf47c92204068b'
+            '5706cc11ad164057b7122829d15d3fbed85a76fab1f6ac398191711084663e95'
+            '163417dd79a964730dfd1e5e673679d70d0537089934a8ef4c72ef305becb830'
+            '4782235ccb58b4910eb41d9e40e09e596cda1028cf250006d6baca96abc2231e'
+            'a07005793b45fa437374f28007d2e2cd38a87c3c143932f33c9e015450fa7b2d'
+            '5579932fc28c8032a48a5a0bf79dc0c53e73455037e8e1263f7bb0601522b18a'
+            'b311b001e941a9e4065037b77b846132482ad711de4f214a4bfe8e8619a77d49'
+            'eb826002503363424f93a516623382b887b1a5fcee96ef0e610d9aed53c744cf'
+            'e24b8dd7a5953bbbf0dcbadbd370d2153fb9050da02acd0709a6ea7b629dbd87')
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 9cf9339e9..a5ec282b6 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=iceweasel-noscript
 
-pkgver=10.1.6
+pkgver=10.1.6.2
 pkgrel=1
 arch=(any)
 
@@ -21,7 +21,7 @@ groups=(iceweasel-addons)
 
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
 noextract=("noscript-$pkgver.xpi")
-sha256sums=('16c34ea0ec3eee05d303ba4fa2744d5cbe0a948325e84d41e5e8568f27a17207')
+sha256sums=('657d8ebff32415adb1a2d72cd0f7db5dabe8a32900d7c2f911a840548d31d37b')
 
 prepare() {
   unzip -qqo "noscript-$pkgver.xpi" -d "noscript-$pkgver"
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 1ee04aebd..c96f61c0c 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -20,8 +20,8 @@ _oldname=firefox
 pkgname=iceweasel
 
 epoch=1
-pkgver=57.0.2
-pkgrel=2
+pkgver=57.0.4
+pkgrel=1
 _brandingver=57.0
 _brandingrel=1
 _parabolarepo=https://repo.parabola.nu/other/iceweasel
@@ -67,7 +67,7 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname
         mozilla-build-arm.patch
         wifi-disentangle.patch
         wifi-fix-interface.patch)
-sha256sums=('cad021a13daf8fd2c951fab763e784c82aabef45e68a34c941fb64d62f1a5707'
+sha256sums=('97cced69abfd5c57d968f0095631f86beff4f7b61883edd5a4f207e7f9c43b33'
             'e93f2363d7b414d207250eb1c63d955681f158c8d5678ef3d2e9232cdb0382c7'
             'SKIP'
             '71e20557568330c29553201a6009060feb65921b021fff8053ad9f7cb67670fa'
diff --git a/libre/non-working/isdnutils-dfsg/PKGBUILD b/libre/isdnutils-dfsg/PKGBUILD
index 1ff0b451a..1ff0b451a 100644
--- a/libre/non-working/isdnutils-dfsg/PKGBUILD
+++ b/libre/isdnutils-dfsg/PKGBUILD
diff --git a/libre/non-working/isdnutils-dfsg/modern-autoconf.patch b/libre/isdnutils-dfsg/modern-autoconf.patch
index f80f34f54..f80f34f54 100644
--- a/libre/non-working/isdnutils-dfsg/modern-autoconf.patch
+++ b/libre/isdnutils-dfsg/modern-autoconf.patch
diff --git a/libre/khotkeys/PKGBUILD b/libre/khotkeys/PKGBUILD
index 30820fcde..f286a4b78 100644
--- a/libre/khotkeys/PKGBUILD
+++ b/libre/khotkeys/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=khotkeys
 
-pkgver=5.11.4
+pkgver=5.11.5
 pkgrel=1.parabola1
 arch=(i686 x86_64 armv7h)
 
@@ -21,11 +21,12 @@ conflicts=(kdebase-workspace)
 groups=(plasma)
 
 source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('8601789ea3b796677c887e7c3c7a2f1d4053474797d8f4f6d7cf50f9d7a15f73'
+sha256sums=('70d73eba6182574060277ee7ae5cf32626fe1e057861f199f92faee226963e14'
             'SKIP')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
               '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon
-              'D07BD8662C56CB291B316EB2F5675605C74E02CF') # David Edmundson
+              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson
+              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>
 
 prepare() {
   mkdir -p build
diff --git a/libre/kinfocenter/PKGBUILD b/libre/kinfocenter/PKGBUILD
index 8e66c3a07..bd7550d2d 100644
--- a/libre/kinfocenter/PKGBUILD
+++ b/libre/kinfocenter/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=kinfocenter
 
-pkgver=5.11.4
+pkgver=5.11.5
 pkgrel=1.parabola1
 arch=(i686 x86_64 armv7h)
 
@@ -22,13 +22,14 @@ groups=(plasma)
 source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
         parabola-logo.svg::https://wiki.parabola.nu/images/a/af/Parabolagnu%2Blinuxlibre-dark-scalable.svg
         kcm-about-distrorc)
-sha256sums=('c4e1cc4fda2b7f7799c00cea1d4e5e03ad70e711776721167d0705e940dac339'
+sha256sums=('2e36ac5817ca8fbba264ae2ba0061b97ae740690525160296ba823328989a77a'
             'SKIP'
             '75136b90185242891cbeb993285f400bcc9c6c70fdccb0f5e50790acaf875b92'
             '9c874f9ee68dc1c46fab1255f28bdca892e664b35208220db77ab59e04617a96')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
               '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon
-              'D07BD8662C56CB291B316EB2F5675605C74E02CF') # David Edmundson
+              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson
+              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>
 
 prepare() {
   mkdir -p build
diff --git a/libre/libffi-static/PKGBUILD b/libre/libffi-static/PKGBUILD
new file mode 100644
index 000000000..14b5f5f6f
--- /dev/null
+++ b/libre/libffi-static/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer (Arch:libffi):  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor (Arch:libffi): Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor (Arch:libffi): Jan de Groot <jgc@archlinux.org>
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+
+_pkgname=libffi
+pkgname=libffi-static
+pkgver=3.2.1
+pkgrel=2.parabola1
+pkgdesc='Portable foreign function interface library'
+pkgdesc+=' (static libraries)'
+arch=('x86_64')
+arch+=('i686' 'armv7h')
+url='http://sourceware.org/libffi/'
+license=('MIT')
+depends=("libffi=$pkgver")
+options=('staticlibs')
+checkdepends=('dejagnu')
+source=(ftp://sourceware.org/pub/libffi/libffi-$pkgver.tar.gz)
+sha1sums=('280c265b789e041c02e5c97815793dfc283fb1e6')
+
+build() {
+  cd $_pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static \
+    --disable-shared --enable-static \
+    --enable-pax_emutramp
+  make
+}
+
+check() {
+  make -C $_pkgname-$pkgver check
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+  rm -vr -- \
+     "$pkgdir/usr/lib"/libffi-*/ \
+     "$pkgdir/usr/lib/pkgconfig/" \
+     "$pkgdir/usr/share/info/" \
+     "$pkgdir/usr/share/man/"
+}
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index e551f4abf..208e97a3e 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development"
 url="https://git.parabola.nu/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20170709.1
+pkgver=20180103
 source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
-sha256sums=('1d74e007a33e46db11ecb14d7e501eabb3f6f4feb18d223329de9ce68cd70c91'
+sha256sums=('802375c1549cacb51def8c3be8554d8381f9a6eac8f599fca886a670737fec0e'
             'SKIP')
 validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker
 
@@ -89,14 +89,14 @@ package_libretools() {
     make # `librefetch`
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
-    systemd # systemd-nspawn
+    'systemd-tools>=234' # systemd-nspawn
     tokyocabinet # `toru`
     #namcap # Namcap is currently dissabled in libremakepkg :-(
     #subversion # `diff-unfree` # ignore because of xbs
     wget # `aur`, optdepend for librelib:`blacklist`
   )
   optdepends=(
-    'binfmt-qemu-static: To build ARM packages from x86'
+    'qemu-user-static-binfmt: To build ARM packages from x86'
   )
 
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/libre/librsvg-stable/PKGBUILD b/libre/librsvg-stable/PKGBUILD
deleted file mode 100644
index 3649f6c91..000000000
--- a/libre/librsvg-stable/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 258835 2016-02-03 13:30:55Z jgc $
-# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
-
-_pkgname=librsvg
-pkgname=librsvg-stable
-pkgver=2.40.10
-pkgrel=1
-epoch=2
-pkgdesc="A SVG viewing library (stable version)"
-arch=(i686 x86_64 armv7h)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'pango' 'libcroco')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'python2')
-conflicts=($_pkgname)
-provides=($_pkgname)
-options=('!emptydirs')
-url="https://live.gnome.org/LibRsvg"
-install=librsvg.install
-source=(https://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479')
-
-build() {
-  cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static --enable-vala
-  make
-}
- 
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/libre/librsvg-stable/librsvg.install b/libre/librsvg-stable/librsvg.install
deleted file mode 100644
index 8852ebf28..000000000
--- a/libre/librsvg-stable/librsvg.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/libre/libutil-linux-static/60-rfkill.rules b/libre/libutil-linux-static/60-rfkill.rules
new file mode 100644
index 000000000..bc98a3bef
--- /dev/null
+++ b/libre/libutil-linux-static/60-rfkill.rules
@@ -0,0 +1 @@
+KERNEL=="rfkill", GROUP="rfkill", MODE="0664"
diff --git a/libre/libutil-linux-static/PKGBUILD b/libre/libutil-linux-static/PKGBUILD
new file mode 100644
index 000000000..7162597b9
--- /dev/null
+++ b/libre/libutil-linux-static/PKGBUILD
@@ -0,0 +1,115 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+_pkgbase=util-linux
+pkgname=libutil-linux-static
+_pkgmajor=2.31
+pkgver=${_pkgmajor}.1
+pkgrel=2.parabola1
+pkgdesc="Miscellaneous system utilities for Linux"
+url="https://www.kernel.org/pub/linux/utils/util-linux/"
+arch=('i686' 'x86_64')
+makedepends=('systemd' 'python' 'libcap-ng')
+license=('GPL2')
+options=('strip' 'debug')
+validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
+source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$_pkgbase-$pkgver.tar."{xz,sign}
+        pam-{login,common,su}
+        'util-linux.sysusers'
+        '60-rfkill.rules'
+        'rfkill-unblock_.service'
+        'rfkill-block_.service')
+sha256sums=('1a51b16fa9cd51d26ef9ab52d2f1de12403b810fc8252bf7d478df91b3cddf11'
+            'SKIP'
+            '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
+            'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
+            '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
+            '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
+            '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37'
+            '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
+            'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
+
+build() {
+  cd "$_pkgbase-$pkgver"
+
+  ./configure --prefix=/usr \
+              --libdir=/usr/lib \
+              --bindir=/usr/bin \
+              --localstatedir=/run \
+              --enable-fs-paths-extra=/usr/bin \
+              --enable-raw \
+              --enable-vipw \
+              --enable-newgrp \
+              --enable-chfn-chsh \
+              --enable-write \
+              --enable-mesg \
+              --disable-shared --enable-static \
+              --with-python=3
+
+  make
+}
+
+package_util-linux() {
+  conflicts=('eject' 'zramctl' 'rfkill')
+  provides=('eject' 'zramctl' 'rfkill')
+  replaces=('zramctl' 'rfkill')
+  depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libcap-ng' 'libutil-linux')
+  optdepends=('python: python bindings to libmount')
+  groups=('base' 'base-devel')
+  backup=(etc/pam.d/chfn
+          etc/pam.d/chsh
+          etc/pam.d/login
+          etc/pam.d/su
+          etc/pam.d/su-l)
+
+  cd "$_pkgbase-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # setuid chfn and chsh
+  chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
+
+  # install PAM files for login-utils
+  install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
+  install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
+  install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
+  install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
+  install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l"
+
+  # TODO(dreisner): offer this upstream?
+  sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket"
+
+  # adjust for usrmove
+  # TODO(dreisner): fix configure.ac upstream so that this isn't needed
+  cd "$pkgdir"
+  mv {,usr/}sbin/* usr/bin
+  rmdir sbin usr/sbin
+
+  ### runtime libs are shipped as part of libutil-linux
+  rm "$pkgdir"/usr/lib/lib*.{a,so}*
+
+  ### install systemd-sysusers
+  install -Dm644 "$srcdir/util-linux.sysusers" \
+    "$pkgdir/usr/lib/sysusers.d/util-linux.conf"
+
+  install -Dm644 "$srcdir/60-rfkill.rules" \
+    "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules"
+
+  install -Dm644 "$srcdir/rfkill-unblock_.service" \
+    "$pkgdir/usr/lib/systemd/system/rfkill-unblock@.service"
+  install -Dm644 "$srcdir/rfkill-block_.service" \
+    "$pkgdir/usr/lib/systemd/system/rfkill-block@.service"
+}
+
+package() {
+  pkgdesc="util-linux runtime libraries"
+  pkgdes+=" (static libraries)"
+  provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+  provides=()
+  depends=("libutil-linux=$pkgver")
+  options=('staticlibs')
+
+  make -C "$_pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
+}
diff --git a/libre/libutil-linux-static/pam-common b/libre/libutil-linux-static/pam-common
new file mode 100644
index 000000000..a7bf8a4a5
--- /dev/null
+++ b/libre/libutil-linux-static/pam-common
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth		sufficient	pam_rootok.so
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so
+password	required	pam_permit.so
diff --git a/libre/libutil-linux-static/pam-login b/libre/libutil-linux-static/pam-login
new file mode 100644
index 000000000..1960d9497
--- /dev/null
+++ b/libre/libutil-linux-static/pam-login
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth       required     pam_securetty.so
+auth       requisite    pam_nologin.so
+auth       include      system-local-login
+account    include      system-local-login
+session    include      system-local-login
diff --git a/libre/libutil-linux-static/pam-su b/libre/libutil-linux-static/pam-su
new file mode 100644
index 000000000..cf15f40f1
--- /dev/null
+++ b/libre/libutil-linux-static/pam-su
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth		sufficient	pam_rootok.so
+# Uncomment the following line to implicitly trust users in the "wheel" group.
+#auth		sufficient	pam_wheel.so trust use_uid
+# Uncomment the following line to require a user to be in the "wheel" group.
+#auth		required	pam_wheel.so use_uid
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so
diff --git a/libre/libutil-linux-static/rfkill-block_.service b/libre/libutil-linux-static/rfkill-block_.service
new file mode 100644
index 000000000..ede74d12d
--- /dev/null
+++ b/libre/libutil-linux-static/rfkill-block_.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=RFKill-Block %I
+After=rfkill-unblock@all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/rfkill block %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/libutil-linux-static/rfkill-unblock_.service b/libre/libutil-linux-static/rfkill-unblock_.service
new file mode 100644
index 000000000..94ebf35af
--- /dev/null
+++ b/libre/libutil-linux-static/rfkill-unblock_.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=RFKill-Unblock %I
+After=rfkill-block@all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/rfkill unblock %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/libutil-linux-static/util-linux.sysusers b/libre/libutil-linux-static/util-linux.sysusers
new file mode 100644
index 000000000..de04d9f05
--- /dev/null
+++ b/libre/libutil-linux-static/util-linux.sysusers
@@ -0,0 +1,2 @@
+u uuidd 68
+g rfkill - - -
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index fbe538cef..f396d625f 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgbase=linux-libre-lts
 _pkgbasever=4.9-gnu
-_pkgver=4.9.64-gnu
+_pkgver=4.9.70-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -20,7 +20,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
 pkgrel=1
-rcnrel=armv7-x5
+rcnrel=armv7-x6
 arch=('i686' 'x86_64' 'armv7h')
 url="https://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -52,7 +52,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch')
 sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca49452f9b1cc80b0826c7a4962dbe4937aecb697aa823b2543ba2cabc704816'
             'SKIP'
-            '9c06c47e76fd23bc6f79316d73b8440a64bcce97bb55431083ac5a8e71b7f70d2304921681212cfebef801d3f4b250a69251a123304123e4119fcc5aa5a637ae'
+            'c2a80712602688c9ecf9597e3e8542d778ba92fef9021e766016b7620e49b9e8f09ca6ce39d2034d65e82dd2731e2bd7ce3711e348f5f7801ba662a2c6183969'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -60,15 +60,15 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            'd28ce1294be54c930447c349f52bbc26ec0ee8c02cb6f3763ab23442f4830da60ea5a7863296742e87fa73a0013840b3a79543c18c54b8111d7ba69e92b639b4'
-            'd1c9b5e41018f680703f67b113ce9cf2994c39291749a992410b81ba32360349516e62ccd1e240cddd20f68b356fffd81f7979efc5d5ce86b6e3ad0803bd9550'
-            '5af2e761601663ccd8ae993ba8e5012278474c164e16c84556d4719cdaac349a0a099d039fdf567d5500422e119e1ca4deedfec5eb59a6de55a25bdcce32cb89'
+            'be3047b93f76cd299b807c51e8f691ff6f7424045a323c6e024f38b8bc69aa656ca149d2eaf7f9ef4a17cf0657fcbb36b9fbcdfde82aca9818dd49b94e34757a'
+            'f2ad80d9c562c3d2028db33eeedc0eedf33d699ef8ac70b5d0b25bd6701293f195d991982e9de5f7952d520a75497327d1d45f8e9661617443b6aee02aa0dbca'
+            '9d9536e709dfa852397b10d78f1adbb9f09ff3c40441ab023f6343433ab96f2b427141ab7b6f3e39ae8cc43e0602ebbbccd95972cfb81f3ed60f6b3945dc20aa'
             'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
             'd9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '411f883ddf8e7a2b0b1dc784cbca0ef4194a20d20f6b95ec795fa53deea95a0d9c8ec58db626a77a3fef1a1dee1f11412d47505162c7d3bcd9d3c5f3cc365419'
+            'a5c9a4ff44466407a0497e4f016512dafec774712526b54f128a246ff6cd251efbaf8cd999ac9b786a0ace6cd9d5f67104247039faaf26170ae67239dad39566'
             'SKIP'
             '844084ad68a6c41f940a2f98d987fa8a2cf99a2f9e8ebdf1d6dcd62b6039f9e6c0669606964e9e7e813b94fdd890c20cc73366ee296c1d79099ee8b84c918b0d'
             '590ce7a3283109a37740b565d13e54cbc8f526de082c4cc8727e71e02a26e844d1b012cceff9ea2b85231dd5b9d80f10db1e2ea678ad81f400bebc5ac4bc7531'
diff --git a/libre/linux-libre-lts/config.armv7h b/libre/linux-libre-lts/config.armv7h
index 902da5f14..da1c48af2 100644
--- a/libre/linux-libre-lts/config.armv7h
+++ b/libre/linux-libre-lts/config.armv7h
@@ -961,6 +961,8 @@ CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 307e5cfd8..af023e476 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -853,6 +853,8 @@ CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index 05d521d32..8e84e2a60 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -862,6 +862,8 @@ CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
new file mode 100644
index 000000000..64341b9b7
--- /dev/null
+++ b/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -0,0 +1,103 @@
+From fb89d912d5f7289d3a922c77b671e36e1c740f5e Mon Sep 17 00:00:00 2001
+Message-Id: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com>
+From: Serge Hallyn <serge.hallyn@canonical.com>
+Date: Fri, 31 May 2013 19:12:12 +0100
+Subject: [PATCH 1/7] add sysctl to disallow unprivileged CLONE_NEWUSER by
+ default
+
+Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+[bwh: Remove unneeded binary sysctl bits]
+Signed-off-by: Daniel Micay <danielmicay@gmail.com>
+---
+ kernel/fork.c           | 15 +++++++++++++++
+ kernel/sysctl.c         | 12 ++++++++++++
+ kernel/user_namespace.c |  3 +++
+ 3 files changed, 30 insertions(+)
+
+diff --git a/kernel/fork.c b/kernel/fork.c
+index 500ce64517d93e68..35f5860958b40e9b 100644
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -102,6 +102,11 @@
+ 
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/task.h>
++#ifdef CONFIG_USER_NS
++extern int unprivileged_userns_clone;
++#else
++#define unprivileged_userns_clone 0
++#endif
+ 
+ /*
+  * Minimum number of threads to boot the kernel
+@@ -1554,6 +1559,10 @@ static __latent_entropy struct task_struct *copy_process(
+ 	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
+ 		return ERR_PTR(-EINVAL);
+ 
++	if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone)
++		if (!capable(CAP_SYS_ADMIN))
++			return ERR_PTR(-EPERM);
++
+ 	/*
+ 	 * Thread groups must share signals as well, and detached threads
+ 	 * can only be started up within the thread group.
+@@ -2347,6 +2356,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
+ 	if (unshare_flags & CLONE_NEWNS)
+ 		unshare_flags |= CLONE_FS;
+ 
++	if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) {
++		err = -EPERM;
++		if (!capable(CAP_SYS_ADMIN))
++			goto bad_unshare_out;
++	}
++
+ 	err = check_unshare_flags(unshare_flags);
+ 	if (err)
+ 		goto bad_unshare_out;
+diff --git a/kernel/sysctl.c b/kernel/sysctl.c
+index 56aca862c4f584f5..e8402ba393c1915d 100644
+--- a/kernel/sysctl.c
++++ b/kernel/sysctl.c
+@@ -105,6 +105,9 @@ extern int core_uses_pid;
+ extern char core_pattern[];
+ extern unsigned int core_pipe_limit;
+ #endif
++#ifdef CONFIG_USER_NS
++extern int unprivileged_userns_clone;
++#endif
+ extern int pid_max;
+ extern int pid_max_min, pid_max_max;
+ extern int percpu_pagelist_fraction;
+@@ -513,6 +516,15 @@ static struct ctl_table kern_table[] = {
+ 		.proc_handler	= proc_dointvec,
+ 	},
+ #endif
++#ifdef CONFIG_USER_NS
++	{
++		.procname	= "unprivileged_userns_clone",
++		.data		= &unprivileged_userns_clone,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec,
++	},
++#endif
+ #ifdef CONFIG_PROC_SYSCTL
+ 	{
+ 		.procname	= "tainted",
+diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
+index c490f1e4313b998a..dd03bd39d7bf194d 100644
+--- a/kernel/user_namespace.c
++++ b/kernel/user_namespace.c
+@@ -24,6 +24,9 @@
+ #include <linux/projid.h>
+ #include <linux/fs_struct.h>
+ 
++/* sysctl */
++int unprivileged_userns_clone;
++
+ static struct kmem_cache *user_ns_cachep __read_mostly;
+ static DEFINE_MUTEX(userns_state_mutex);
+ 
+-- 
+2.15.1
+
diff --git a/libre/linux-libre/0002-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch b/libre/linux-libre/0002-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch
new file mode 100644
index 000000000..8c23c9a54
--- /dev/null
+++ b/libre/linux-libre/0002-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch
@@ -0,0 +1,75 @@
+From 8c6956686606b9c3661e74a410c8cb2fc276c5ee Mon Sep 17 00:00:00 2001
+Message-Id: <8c6956686606b9c3661e74a410c8cb2fc276c5ee.1514959852.git.jan.steffens@gmail.com>
+In-Reply-To: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com>
+References: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com>
+From: Benjamin Poirier <bpoirier@suse.com>
+Date: Mon, 11 Dec 2017 16:26:40 +0900
+Subject: [PATCH 2/7] e1000e: Fix e1000_check_for_copper_link_ich8lan return
+ value.
+
+e1000e_check_for_copper_link() and e1000_check_for_copper_link_ich8lan()
+are the two functions that may be assigned to mac.ops.check_for_link when
+phy.media_type == e1000_media_type_copper. Commit 19110cfbb34d ("e1000e:
+Separate signaling for link check/link up") changed the meaning of the
+return value of check_for_link for copper media but only adjusted the first
+function. This patch adjusts the second function likewise.
+
+Reported-by: Christian Hesse <list@eworm.de>
+Reported-by: Gabriel C <nix.or.die@gmail.com>
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=198047
+Fixes: 19110cfbb34d ("e1000e: Separate signaling for link check/link up")
+Tested-by: Christian Hesse <list@eworm.de>
+Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
+---
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+index d6d4ed7acf031172..31277d3bb7dc1241 100644
+--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
++++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+@@ -1367,22 +1367,25 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
+  *  Checks to see of the link status of the hardware has changed.  If a
+  *  change in link status has been detected, then we read the PHY registers
+  *  to get the current speed/duplex if link exists.
++ *
++ *  Returns a negative error code (-E1000_ERR_*) or 0 (link down) or 1 (link
++ *  up).
+  **/
+ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
+ {
+ 	struct e1000_mac_info *mac = &hw->mac;
+ 	s32 ret_val, tipg_reg = 0;
+ 	u16 emi_addr, emi_val = 0;
+ 	bool link;
+ 	u16 phy_reg;
+ 
+ 	/* We only want to go out to the PHY registers to see if Auto-Neg
+ 	 * has completed and/or if our link status has changed.  The
+ 	 * get_link_status flag is set upon receiving a Link Status
+ 	 * Change or Rx Sequence Error interrupt.
+ 	 */
+ 	if (!mac->get_link_status)
+-		return 0;
++		return 1;
+ 
+ 	/* First we want to see if the MII Status Register reports
+ 	 * link.  If so, then we want to get the current speed/duplex
+@@ -1613,10 +1616,12 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
+ 	 * different link partner.
+ 	 */
+ 	ret_val = e1000e_config_fc_after_link_up(hw);
+-	if (ret_val)
++	if (ret_val) {
+ 		e_dbg("Error configuring flow control\n");
++		return ret_val;
++	}
+ 
+-	return ret_val;
++	return 1;
+ }
+ 
+ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
+-- 
+2.15.1
+
diff --git a/libre/linux-libre/0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch b/libre/linux-libre/0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch
new file mode 100644
index 000000000..d7872e2a1
--- /dev/null
+++ b/libre/linux-libre/0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch
@@ -0,0 +1,57 @@
+From b81e273fb227373a2951c7256ab11a87d5333a9d Mon Sep 17 00:00:00 2001
+Message-Id: <b81e273fb227373a2951c7256ab11a87d5333a9d.1514959852.git.jan.steffens@gmail.com>
+In-Reply-To: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com>
+References: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com>
+From: Mohamed Ghannam <simo.ghannam@gmail.com>
+Date: Tue, 5 Dec 2017 20:58:35 +0000
+Subject: [PATCH 3/7] dccp: CVE-2017-8824: use-after-free in DCCP code
+
+Whenever the sock object is in DCCP_CLOSED state,
+dccp_disconnect() must free dccps_hc_tx_ccid and
+dccps_hc_rx_ccid and set to NULL.
+
+Signed-off-by: Mohamed Ghannam <simo.ghannam@gmail.com>
+Reviewed-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/dccp/proto.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/net/dccp/proto.c b/net/dccp/proto.c
+index b68168fcc06aa198..9d43c1f4027408f3 100644
+--- a/net/dccp/proto.c
++++ b/net/dccp/proto.c
+@@ -259,25 +259,30 @@ int dccp_disconnect(struct sock *sk, int flags)
+ {
+ 	struct inet_connection_sock *icsk = inet_csk(sk);
+ 	struct inet_sock *inet = inet_sk(sk);
++	struct dccp_sock *dp = dccp_sk(sk);
+ 	int err = 0;
+ 	const int old_state = sk->sk_state;
+ 
+ 	if (old_state != DCCP_CLOSED)
+ 		dccp_set_state(sk, DCCP_CLOSED);
+ 
+ 	/*
+ 	 * This corresponds to the ABORT function of RFC793, sec. 3.8
+ 	 * TCP uses a RST segment, DCCP a Reset packet with Code 2, "Aborted".
+ 	 */
+ 	if (old_state == DCCP_LISTEN) {
+ 		inet_csk_listen_stop(sk);
+ 	} else if (dccp_need_reset(old_state)) {
+ 		dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED);
+ 		sk->sk_err = ECONNRESET;
+ 	} else if (old_state == DCCP_REQUESTING)
+ 		sk->sk_err = ECONNRESET;
+ 
+ 	dccp_clear_xmit_timers(sk);
++	ccid_hc_rx_delete(dp->dccps_hc_rx_ccid, sk);
++	ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk);
++	dp->dccps_hc_rx_ccid = NULL;
++	dp->dccps_hc_tx_ccid = NULL;
+ 
+ 	__skb_queue_purge(&sk->sk_receive_queue);
+ 	__skb_queue_purge(&sk->sk_write_queue);
+-- 
+2.15.1
+
diff --git a/libre/linux-libre/0004-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch b/libre/linux-libre/0004-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch
new file mode 100644
index 000000000..edd7b24a3
--- /dev/null
+++ b/libre/linux-libre/0004-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch
@@ -0,0 +1,49 @@
+From 3721d64246982f91a5bf863fc17ac60ff722e0c4 Mon Sep 17 00:00:00 2001
+Message-Id: <3721d64246982f91a5bf863fc17ac60ff722e0c4.1514959852.git.jan.steffens@gmail.com>
+In-Reply-To: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com>
+References: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com>
+From: Steffen Klassert <steffen.klassert@secunet.com>
+Date: Fri, 22 Dec 2017 10:44:57 +0100
+Subject: [PATCH 5/7] xfrm: Fix stack-out-of-bounds read on socket policy
+ lookup.
+
+When we do tunnel or beet mode, we pass saddr and daddr from the
+template to xfrm_state_find(), this is ok. On transport mode,
+we pass the addresses from the flowi, assuming that the IP
+addresses (and address family) don't change during transformation.
+This assumption is wrong in the IPv4 mapped IPv6 case, packet
+is IPv4 and template is IPv6.
+
+Fix this by catching address family missmatches of the policy
+and the flow already before we do the lookup.
+
+Reported-by: syzbot <syzkaller@googlegroups.com>
+Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
+---
+ net/xfrm/xfrm_policy.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
+index 6bc16bb61b5533ef..50c5f46b5cca942e 100644
+--- a/net/xfrm/xfrm_policy.c
++++ b/net/xfrm/xfrm_policy.c
+@@ -1169,9 +1169,15 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir,
+  again:
+ 	pol = rcu_dereference(sk->sk_policy[dir]);
+ 	if (pol != NULL) {
+-		bool match = xfrm_selector_match(&pol->selector, fl, family);
++		bool match;
+ 		int err = 0;
+ 
++		if (pol->family != family) {
++			pol = NULL;
++			goto out;
++		}
++
++		match = xfrm_selector_match(&pol->selector, fl, family);
+ 		if (match) {
+ 			if ((sk->sk_mark & pol->mark.m) != pol->mark.v) {
+ 				pol = NULL;
+-- 
+2.15.1
+
diff --git a/libre/linux-libre/0005-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch b/libre/linux-libre/0005-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch
new file mode 100644
index 000000000..0a54ce129
--- /dev/null
+++ b/libre/linux-libre/0005-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch
@@ -0,0 +1,114 @@
+From a79cb4d4e540c72a601ca0494e914565c16e2893 Mon Sep 17 00:00:00 2001
+Message-Id: <a79cb4d4e540c72a601ca0494e914565c16e2893.1514959852.git.jan.steffens@gmail.com>
+In-Reply-To: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com>
+References: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com>
+From: Tejun Heo <tj@kernel.org>
+Date: Wed, 20 Dec 2017 07:09:19 -0800
+Subject: [PATCH 6/7] cgroup: fix css_task_iter crash on CSS_TASK_ITER_PROC
+
+While teaching css_task_iter to handle skipping over tasks which
+aren't group leaders, bc2fb7ed089f ("cgroup: add @flags to
+css_task_iter_start() and implement CSS_TASK_ITER_PROCS") introduced a
+silly bug.
+
+CSS_TASK_ITER_PROCS is implemented by repeating
+css_task_iter_advance() while the advanced cursor is pointing to a
+non-leader thread.  However, the cursor variable, @l, wasn't updated
+when the iteration has to advance to the next css_set and the
+following repetition would operate on the terminal @l from the
+previous iteration which isn't pointing to a valid task leading to
+oopses like the following or infinite looping.
+
+  BUG: unable to handle kernel NULL pointer dereference at 0000000000000254
+  IP: __task_pid_nr_ns+0xc7/0xf0
+  PGD 0 P4D 0
+  Oops: 0000 [#1] SMP
+  ...
+  CPU: 2 PID: 1 Comm: systemd Not tainted 4.14.4-200.fc26.x86_64 #1
+  Hardware name: System manufacturer System Product Name/PRIME B350M-A, BIOS 3203 11/09/2017
+  task: ffff88c4baee8000 task.stack: ffff96d5c3158000
+  RIP: 0010:__task_pid_nr_ns+0xc7/0xf0
+  RSP: 0018:ffff96d5c315bd50 EFLAGS: 00010206
+  RAX: 0000000000000000 RBX: ffff88c4b68c6000 RCX: 0000000000000250
+  RDX: ffffffffa5e47960 RSI: 0000000000000000 RDI: ffff88c490f6ab00
+  RBP: ffff96d5c315bd50 R08: 0000000000001000 R09: 0000000000000005
+  R10: ffff88c4be006b80 R11: ffff88c42f1b8004 R12: ffff96d5c315bf18
+  R13: ffff88c42d7dd200 R14: ffff88c490f6a510 R15: ffff88c4b68c6000
+  FS:  00007f9446f8ea00(0000) GS:ffff88c4be680000(0000) knlGS:0000000000000000
+  CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
+  CR2: 0000000000000254 CR3: 00000007f956f000 CR4: 00000000003406e0
+  Call Trace:
+   cgroup_procs_show+0x19/0x30
+   cgroup_seqfile_show+0x4c/0xb0
+   kernfs_seq_show+0x21/0x30
+   seq_read+0x2ec/0x3f0
+   kernfs_fop_read+0x134/0x180
+   __vfs_read+0x37/0x160
+   ? security_file_permission+0x9b/0xc0
+   vfs_read+0x8e/0x130
+   SyS_read+0x55/0xc0
+   entry_SYSCALL_64_fastpath+0x1a/0xa5
+  RIP: 0033:0x7f94455f942d
+  RSP: 002b:00007ffe81ba2d00 EFLAGS: 00000293 ORIG_RAX: 0000000000000000
+  RAX: ffffffffffffffda RBX: 00005574e2233f00 RCX: 00007f94455f942d
+  RDX: 0000000000001000 RSI: 00005574e2321a90 RDI: 000000000000002b
+  RBP: 0000000000000000 R08: 00005574e2321a90 R09: 00005574e231de60
+  R10: 00007f94458c8b38 R11: 0000000000000293 R12: 00007f94458c8ae0
+  R13: 00007ffe81ba3800 R14: 0000000000000000 R15: 00005574e2116560
+  Code: 04 74 0e 89 f6 48 8d 04 76 48 8d 04 c5 f0 05 00 00 48 8b bf b8 05 00 00 48 01 c7 31 c0 48 8b 0f 48 85 c9 74 18 8b b2 30 08 00 00 <3b> 71 04 77 0d 48 c1 e6 05 48 01 f1 48 3b 51 38 74 09 5d c3 8b
+  RIP: __task_pid_nr_ns+0xc7/0xf0 RSP: ffff96d5c315bd50
+
+Fix it by moving the initialization of the cursor below the repeat
+label.  While at it, rename it to @next for readability.
+
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Fixes: bc2fb7ed089f ("cgroup: add @flags to css_task_iter_start() and implement CSS_TASK_ITER_PROCS")
+Cc: stable@vger.kernel.org # v4.14+
+Reported-by: Laura Abbott <labbott@redhat.com>
+Reported-by: Bronek Kozicki <brok@incorrekt.com>
+Reported-by: George Amanakis <gamanakis@gmail.com>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+---
+ kernel/cgroup/cgroup.c | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
+index 44857278eb8aa6a2..030e4286f14c715e 100644
+--- a/kernel/cgroup/cgroup.c
++++ b/kernel/cgroup/cgroup.c
+@@ -4059,26 +4059,24 @@ static void css_task_iter_advance_css_set(struct css_task_iter *it)
+ 
+ static void css_task_iter_advance(struct css_task_iter *it)
+ {
+-	struct list_head *l = it->task_pos;
++	struct list_head *next;
+ 
+ 	lockdep_assert_held(&css_set_lock);
+-	WARN_ON_ONCE(!l);
+-
+ repeat:
+ 	/*
+ 	 * Advance iterator to find next entry.  cset->tasks is consumed
+ 	 * first and then ->mg_tasks.  After ->mg_tasks, we move onto the
+ 	 * next cset.
+ 	 */
+-	l = l->next;
++	next = it->task_pos->next;
+ 
+-	if (l == it->tasks_head)
+-		l = it->mg_tasks_head->next;
++	if (next == it->tasks_head)
++		next = it->mg_tasks_head->next;
+ 
+-	if (l == it->mg_tasks_head)
++	if (next == it->mg_tasks_head)
+ 		css_task_iter_advance_css_set(it);
+ 	else
+-		it->task_pos = l;
++		it->task_pos = next;
+ 
+ 	/* if PROCS, skip over tasks which aren't group leaders */
+ 	if ((it->flags & CSS_TASK_ITER_PROCS) && it->task_pos &&
+-- 
+2.15.1
+
diff --git a/libre/linux-libre/0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/libre/linux-libre/0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
new file mode 100644
index 000000000..5d36d15ac
--- /dev/null
+++ b/libre/linux-libre/0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
@@ -0,0 +1,42 @@
+From cf45be4971bdd769c09e2a11db483510cd0bcc5f Mon Sep 17 00:00:00 2001
+Message-Id: <cf45be4971bdd769c09e2a11db483510cd0bcc5f.1515173964.git.jan.steffens@gmail.com>
+In-Reply-To: <0b716bdb952b678d9bb5eb32198dbc82ec492df2.1515173964.git.jan.steffens@gmail.com>
+References: <0b716bdb952b678d9bb5eb32198dbc82ec492df2.1515173964.git.jan.steffens@gmail.com>
+From: Jim Bride <jim.bride@linux.intel.com>
+Date: Mon, 6 Nov 2017 13:38:57 -0800
+Subject: [PATCH 6/6] drm/i915/edp: Only use the alternate fixed mode if it's
+ asked for
+
+In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for
+eDP if available."), the patch allows for the use of an alternate fixed
+mode if it is available, but the patch was not ensuring that the only
+time the alternate mode is used is when it is specifically requested.
+This patch adds an additional comparison to intel_edp_compare_alt_mode
+to ensure that we only use the alternate mode if it is directly
+requested.
+
+Fixes: dc911f5bd8aac ("Allow alternate fixed mode for eDP if available.")
+Cc: David Weinehall <david.weinehall@linux.intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Jim Bride <jim.bride@linux.intel.com>
+---
+ drivers/gpu/drm/i915/intel_dp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
+index 09f274419eea1c74..838cee312e8e6978 100644
+--- a/drivers/gpu/drm/i915/intel_dp.c
++++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -1632,7 +1632,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
+ 			m1->vdisplay == m2->vdisplay &&
+ 			m1->vsync_start == m2->vsync_start &&
+ 			m1->vsync_end == m2->vsync_end &&
+-			m1->vtotal == m2->vtotal);
++			m1->vtotal == m2->vtotal &&
++			m1->vrefresh == m2->vrefresh);
+ 	return bres;
+ }
+ 
+-- 
+2.15.1
+
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 1004f2de9..65f997a8a 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@
 pkgbase=linux-libre         # Build stock kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _pkgbasever=4.14-gnu
-_pkgver=4.14.7-gnu
+_pkgver=4.14.12-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -23,7 +23,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
 pkgrel=1
-rcnrel=armv7-x2
+rcnrel=armv7-x4
 arch=('i686' 'x86_64' 'armv7h')
 url="https://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -38,13 +38,10 @@ source=(
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig}
   # the main kernel config files
   'config.i686' 'config.x86_64' 'config.armv7h'
-  # pacman hooks for initramfs regeneration
-  '60-linux.hook'
-  '90-linux.hook'
+  # pacman hooks for depmod and initramfs regeneration
+  '60-linux.hook' '90-linux.hook'
   # standard config files for mkinitcpio ramdisk
   'linux.preset'
-  '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
-  '0002-fix-Atmel-maXTouch-touchscreen-support.patch'
   # armv7h patches
   "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"{,.sig}
   '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
@@ -56,10 +53,19 @@ source=(
   '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch'
   '0008-disable-USB3-port-on-ODROID-XU.patch'
   '0009-ARM-dove-enable-ethernet-on-D3Plug.patch'
-)
+  # other patches
+  '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
+  '0002-fix-Atmel-maXTouch-touchscreen-support.patch'
+  '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch'
+  '0002-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch'
+  '0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch'
+  '0004-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch'
+  '0005-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch'
+  '0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch'
+  )
 sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e684147ebed91d1528d2685423dd784c5fca0f3650f874f2b93cfc6b7689b9a87f'
             'SKIP'
-            '5c62bbc5d3bc5aa67eed8c4952e86263cc86bd9406cfe30a87ee4ff891b8aeb23e78df82d7cfefcdbedce17520b7fe3d515d930905ee2ceaf6c7462399670fb7'
+            '2e8abb699328db2b156890b6ab966ba0c8cefbf64c909d13290c92ca99419b5fb06a53d3d93ed83ed6bd28edb6eeba73bd996f3cb2bc150c3b8709b2e2bbea17'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -67,15 +73,13 @@ sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e6841
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            '6dac1e8ab08eea83dfb70d31c698002fe1f63530e046ecf2a8a7f708cbe9ac116a8ff532b27a75c92b978b53621bf76f9361b42cfed8bcbfdcad2cad145e7e6b'
-            '61407e3f5f3db60fc37e03f184b81b8a275a9795d3943bdeefd1a55efffe2fd178e162c3d2b40c446e25742468a3e9049001326ce62b7da62ee683c7c06b8215'
-            '873eba395fb0540b21760e17dc8442b2c04a159dcd597cd2574536f20195c7c38f35cbbaa1e4d47ed0ee440215adfb2f03f9602180175bf2cacdbfbdb3ad1cfe'
+            '702101a78169ad81532f416b44b74bf7723055169027489a1e95eea9909ed693f20fe3a595152f284cc0837ff09202231a82285c55c25db35447d15492f21aed'
+            'c0cad633c02bfb3ac0dd3c3daaa044b808bf6f3cfbd1035c31d95dfca338d3ad0eae50f6d9c264f6e8eaa3b590d8b500401509f55f8198406c726f6727ce0b05'
+            '7ff4babbe27585e0576d0a66f03cf41bd7556f8047db36f5e1f8391f1c624466fb714a7cfd0d91ae608eb5a123dfb7ad315ee900d8a81c9a2b1b769f4eb356a4'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
-            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            'ee810f2a28e5e07be61a6f3593eb6e1829803aff51ed959caaca6c4f83b7dde477bacbbb0581bd2dbd5bed1591170cf94666efe04064b16cc1ce7adac0813be4'
+            '6a9a290f0fa71973f40a0335017b65bac0486fe719fa79d5cab9358d03c43613f796f5cfcf68bd89964fcb71e05dcead40516b28f78cd25ab9a841c05cbd5874'
             'SKIP'
             '29c709ee6892a668c77945142ed9749cb8a3135575a4316f4a3cc85fbda41c09fdd65e32507b654c96aa438bd2aed08c09919bb162daee969643aafd053321c4'
             '5b35ef2c675aed00ddf82b8a96a486230fad78f05b5a69c95a57632d6c7f428f026439f3ced72cf54156ffd4fd563e68d4285ba6f42428c00b966257951039c3'
@@ -85,7 +89,15 @@ sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e6841
             '23f21fb05188479fb2238229a88d1d45f30052e3d7dcbbf99c5b9a763493eac122795431cf6932e85bd6e091380179b62e986782fafe7e8c2bd53940199b925e'
             '45a21f9dfec613c8f4dba284aaf80e307612440893536295a32ec805e11439272a0949921a22f12f67600df8415870aa27101b7e3d3869aea88ad3e1cb614086'
             '6c93bc1e8d580af288921e10c456bdbda1dcb6d6f08c111cddaf9a32b43c2df41b50136bc09aaac1da9c3cae667bba6e075d590dcc465107ae6e2c3dcf7da657'
-            'f813d51834cedc23fabbb6060709a24f29969fea5aeb963fdeddb79723014ffc0c6d34be45eea8419d5087a5a9c561a42a113d667f03625283f2f2fc68196545')
+            'f813d51834cedc23fabbb6060709a24f29969fea5aeb963fdeddb79723014ffc0c6d34be45eea8419d5087a5a9c561a42a113d667f03625283f2f2fc68196545'
+            '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
+            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
+            '05f2c577450cfeae4b66a7d022a9dd0dab0dbf36e9738423efa8f45aaf0755b48a89f1f88b042946205e681458f76c5c5177c16869094839b7b234e0e2b27511'
+            'fd9bdc818326fa36c9f1813d0d1821de5e325b646e1c307c197ad38bada7f298d35b4bc1bbf1c2854689f3ba71144879e799a1123037caccd6e3f64edfc22d54'
+            '814517d08c35cc886fe3382619d41107d6139a703c27186d0ce58e187eaf4e84891572e58246750ac8602555794ed6f74d946565b98860787a0aa617fb946dda'
+            'e6605e923c967b5f8db619868b15ea5b0d4254c62cf12bb920f38659933d6ca25a643d3e044c4915a8309071461f5f14c55d0aa0329c113bce4780d4fa3afbb7'
+            '0dec1482efe6e5d762a3061f365e43191484f055b738112452b8ca39e162b935d99cf16b25c0b253d6b532fabc54bde2f5c09be91887156ed6ae06d1558f94b9'
+            'fcc40dc86dd432be76854e3c51889db488de0f1029ecc227b92c4f58c62ba928f7dc3b9515ac3ca0a08d6a0a72ca4a1a754d47c4fb274fe89f09a2a336088e7a')
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
   '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
@@ -108,6 +120,7 @@ prepare() {
   if [ "${_pkgbasever}" != "${_pkgver}" ]; then
     patch -p1 -i ../patch-${_pkgbasever}-${_pkgver}
   fi
+  chmod +x tools/objtool/sync-check.sh  # GNU patch doesn't support git-style file mode
 
   if [ "${CARCH}" = "armv7h" ]; then
     # RCN patch (CM3 firmware deblobbed and AUFS removed)
@@ -132,8 +145,28 @@ prepare() {
   install -m644 -t drivers/video/logo \
     "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}
 
+  # security patches
+    
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+  
+  # disable USER_NS for non-root users by default
+  patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+
+  # https://bugs.archlinux.org/task/56575
+  patch -Np1 -i ../0002-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch
+
+  # https://nvd.nist.gov/vuln/detail/CVE-2017-8824
+  patch -Np1 -i ../0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch
+
+  # https://bugs.archlinux.org/task/56605
+  patch -Np1 -i ../0004-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch
+
+  # https://bugs.archlinux.org/task/56846
+  patch -Np1 -i ../0005-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch
+
+  # https://bugs.archlinux.org/task/56711
+  patch -Np1 -i ../0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
 
   # maintain the TTY over USB disconnects
   # http://www.coreboot.org/EHCI_Gadget_Debug
@@ -147,12 +180,12 @@ prepare() {
   cp -Tf ../config.${CARCH} .config
 
   if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config.${CARCH}
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config.${CARCH}
+    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
+    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
   fi
   
-  # set extraversion to pkgrel
-  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+  # append pkgrel to extraversion
+  sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
@@ -210,7 +243,7 @@ _package() {
   fi
 
   # make room for external modules
-  local _extramodules="extramodules-${_basekernel}${_kernelname:--ARCH}"
+  local _extramodules="extramodules-${_basekernel}${_kernelname}"
   ln -s "../${_extramodules}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules"
   
   # add real version for building modules and running depmod from hook
@@ -229,11 +262,20 @@ _package() {
   fi
   
   # sed expression for following substitutions
+  if [ "${CARCH}" = "armv7h" ]; then
   local _subst="
+    s|/boot/vmlinuz-%PKGBASE%|${_kernver}|g
     s|%PKGBASE%|${pkgbase}|g
     s|%KERNVER%|${_kernver}|g
     s|%EXTRAMODULES%|${_extramodules}|g
   "
+  elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
+  local _subst="
+    s|%PKGBASE%|${pkgbase}|g
+    s|%KERNVER%|${_kernver}|g
+    s|%EXTRAMODULES%|${_extramodules}|g
+  "
+  fi
 
   # hack to allow specifying an initially nonexisting install file
   sed "${_subst}" "${startdir}/${install}" > "${startdir}/${install}.pkg"
diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/config.armv7h
index 36583bcee..7c369dcac 100644
--- a/libre/linux-libre/config.armv7h
+++ b/libre/linux-libre/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.4-gnu-1 Kernel Configuration
+# Linux/arm 4.14.12-gnu-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2174,6 +2174,7 @@ CONFIG_VEXPRESS_SYSCFG=y
 CONFIG_BONE_CAPEMGR=y
 # CONFIG_DEV_OVERLAYMGR is not set
 CONFIG_TIEQEP=m
+# CONFIG_UDOO_ARD is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -5524,7 +5525,7 @@ CONFIG_FB_PM3=m
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_S3C is not set
 CONFIG_FB_SMSCUFX=m
-CONFIG_FB_UDL=m
+# CONFIG_FB_UDL is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 CONFIG_FB_XILINX=y
 CONFIG_FB_DA8XX=y
@@ -8432,6 +8433,7 @@ CONFIG_SECURITY=y
 # CONFIG_SECURITY_WRITABLE_HOOKS is not set
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_PAGE_TABLE_ISOLATION=y
 # CONFIG_SECURITY_INFINIBAND is not set
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 6e99febd0..207de9398 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.4-gnu Kernel Configuration
+# Linux/x86 4.14.12-gnu Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -5441,7 +5441,7 @@ CONFIG_FB_VT8623=m
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_UDL=m
+# CONFIG_FB_UDL is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_METRONOME is not set
@@ -8290,6 +8290,7 @@ CONFIG_SECURITY=y
 # CONFIG_SECURITY_WRITABLE_HOOKS is not set
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_NETWORK is not set
+CONFIG_PAGE_TABLE_ISOLATION=y
 # CONFIG_SECURITY_INFINIBAND is not set
 CONFIG_SECURITY_PATH=y
 # CONFIG_INTEL_TXT is not set
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index d58751021..0cdd17a02 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.4-gnu-1 Kernel Configuration
+# Linux/x86 4.14.12-gnu-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -76,11 +76,8 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
 # CONFIG_USELIB is not set
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -1130,7 +1127,6 @@ CONFIG_NETFILTER_XT_SET=m
 #
 # Xtables targets
 #
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -5300,7 +5296,7 @@ CONFIG_FB_VT8623=m
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_UDL=m
+# CONFIG_FB_UDL is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 CONFIG_FB_VIRTUAL=m
 CONFIG_XEN_FBDEV_FRONTEND=m
@@ -8058,9 +8054,9 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 # CONFIG_X86_DEBUG_FPU is not set
 # CONFIG_PUNIT_ATOM_DEBUG is not set
-# CONFIG_FRAME_POINTER_UNWINDER is not set
-CONFIG_ORC_UNWINDER=y
-# CONFIG_GUESS_UNWINDER is not set
+CONFIG_UNWINDER_ORC=y
+# CONFIG_UNWINDER_FRAME_POINTER is not set
+# CONFIG_UNWINDER_GUESS is not set
 
 #
 # Security options
@@ -8077,6 +8073,7 @@ CONFIG_SECURITY=y
 # CONFIG_SECURITY_WRITABLE_HOOKS is not set
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_NETWORK is not set
+CONFIG_PAGE_TABLE_ISOLATION=y
 # CONFIG_SECURITY_INFINIBAND is not set
 # CONFIG_SECURITY_PATH is not set
 # CONFIG_INTEL_TXT is not set
@@ -8092,7 +8089,6 @@ CONFIG_HARDENED_USERCOPY=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD
index 838014786..b6e596889 100644
--- a/libre/mesa/PKGBUILD
+++ b/libre/mesa/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgbase=mesa
 pkgname=("${pkgbase}")
-pkgver=17.3.0
+pkgver=17.3.1
 pkgrel=2.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
@@ -18,7 +18,7 @@ source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         LICENSE
         drirc
         0002-glvnd-fix-gl-dot-pc.patch)
-sha256sums=('29a0a3a6c39990d491a1a58ed5c692e596b3bfc6c01d0b45e0b787116c50c6d9'
+sha256sums=('9ae607e0998a586fb2c866cfc8e45e6f52d1c56cb1b41288253ea83eada824c1'
             'SKIP'
             '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
             '2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2'
@@ -61,7 +61,6 @@ build() {
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-gallium-drivers=${GALLIUM} \
     --with-dri-drivers=${DRI} \
     --with-platforms=x11,drm,wayland \
@@ -116,9 +115,9 @@ package_mesa() {
   install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d
   cp -rv ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/
 
-  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  install -m755 -d ${pkgdir}/usr/lib/dri
   # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
-  cp -av ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri
+  cp -av ${srcdir}/fakeinstall/usr/lib/dri/*_dri.so ${pkgdir}/usr/lib/dri
 
   cp -rv ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
   cp -rv ${srcdir}/fakeinstall/usr/lib/d3d  ${pkgdir}/usr/lib
diff --git a/libre/midori-gtk2/PKGBUILD b/libre/midori-gtk2/PKGBUILD
deleted file mode 100644
index a491bcc16..000000000
--- a/libre/midori-gtk2/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 139371 2015-09-06 21:13:29Z arodseth $
-# Maintainer (Arch): Alexander F Rødseth <xyproto@archlinux.org>
-# Contributor (Arch): Andreas Radke <andyrtr@archlinux.org>
-# Contributor (Arch): rabyte <rabyte.at.gmail.dot.com>
-# Contributor (Arch): Johannes Krampf <wuischke.at.amule.dot.org>
-# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor (Arch): Andrew Gregory <andrew.gregory.8@gmail.com>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-
-pkgname=midori-gtk2
-pkgver=0.5.11
-pkgrel=5.parabola1
-pkgdesc='Lightweight web browser (GTK2), without non-privacy search engines'
-arch=('x86_64' 'i686' 'armv7h')
-url='http://www.midori-browser.org/'
-license=('LGPL2.1')
-conflicts=('midori')
-provides=('midori')
-depends=('webkitgtk2' 'libxss' 'gcr' 'zeitgeist')
-makedepends=('bzr' 'intltool' 'vala' 'cmake' 'ninja')
-optdepends=('gst-plugins-base: HTML5 OGG videos support'
-            'gst-plugins-good: HTML5 H264 and WebM videos support'
-            'gst-libav: HTML5 H264 videos support'
-            'aria2: download utility')
-options=('!emptydirs')
-# options=('!emptydirs' '!strip')  # useful for debbuging see: https://labs.parabola.nu/issues/515
-source=("http://www.midori-browser.org/downloads/${pkgname/-gtk2}_${pkgver}_all_.tar.bz2")
-sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
-
-prepare() {
-  cd "${pkgname/-gtk2}-$pkgver"
-  # remove non-privacy search engines
-  sed -i 's|Duck Duck Go|DuckDuckGo HTML|
-          s|duckduckgo[.]com|duckduckgo.com/html|
-          \|Yahoo|d
-          \|name=Yahoo|d
-          \|text=Yahoo Web Search|d
-          \|uri=http://search[.]yahoo[.]com/search?p=|d
-          \|token=y|d
-          \|Google|d
-          \|name=Google|d
-          \|text=Web Search|d
-          \|uri=http://www[.]google[.]com/search?q=%s|d
-          \|token=g|d
-          \|Localize text or URL|d
-          \|translate[.]google[.]com/?q=|d
-         ' config/search
-}
-
-build() {
-  cd "${pkgname/-gtk2}-$pkgver"
-
-  mkdir -p build
-  cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -G Ninja
-  ninja
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C "${pkgname/-gtk2}-$pkgver/build" install
-}
-
-# getver: -u 2 midori-browser.org/download/source
-# vim:set ts=2 sw=2 et:
diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
index 221542d5f..b1de0b31e 100644
--- a/libre/opencv/PKGBUILD
+++ b/libre/opencv/PKGBUILD
@@ -7,14 +7,14 @@
 
 pkgbase=opencv
 pkgname=opencv
-pkgver=3.3.1
-pkgrel=1.parabola1
+pkgver=3.4.0
+pkgrel=2.parabola1
 pkgdesc="Free Computer Vision Library, without nonfree SIFT and SURF algorithms, nonfree Milky icons and lena images"
 arch=('i686' 'x86_64' 'armv7h')
 license=('BSD')
 url="http://opencv.org/"
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext' 'cblas' 'lapack' 'libgphoto2')
+makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 'lapacke')
 optdepends=('opencv-samples'
             'hdf5: support for HDF5 format'
             'opencl-icd-loader: For coding with OpenCL'
@@ -23,9 +23,9 @@ optdepends=('opencv-samples'
 mksource=("$pkgbase-$pkgver.zip::https://github.com/opencv/opencv/archive/$pkgver.zip"
           "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz")
 source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.zip")
-mksha256sums=('e59412c7e0d398113b1e454d600fcdff54cd77100a84483ac0d82bbf52496932'
-              '6f3ce148dc6e147496f0dbec1c99e917e13bf138f5a8ccfc3765f5c2372bd331')
-sha256sums=('9bf24efc68c82d211fdaff7ed9b007b1a49353d7e092658b51285d4a1d7f3b56')
+mksha256sums=('ae8a9f468b7ee3822a62d20d356c69f2b32330a231e738ac2914f332766611b7'
+              '699ab3eee7922fbd3e8f98c68e6d16a1d453b20ef364e76172e56466dc9c16cd')
+sha256sums=('624ac197cff564c4cae1cfdcc3a6a08e3b35511e9733c2552a9abd8621685fcd')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
             '-D WITH_OPENGL=ON'
@@ -40,6 +40,7 @@ _cmakeopts=('-D WITH_OPENCL=ON'
             '-D INSTALL_PYTHON_EXAMPLES=ON'
             '-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
+            '-D CMAKE_INSTALL_LIBDIR=lib'
             '-D CMAKE_SKIP_RPATH=ON'
             '-D WITH_IPP=OFF'
             #'-D INSTALL_CREATE_DISTRIB=ON'
@@ -47,10 +48,8 @@ _cmakeopts=('-D WITH_OPENCL=ON'
 
 # SSE only available from Pentium 3 onwards (i686 is way older)
 # SSE only available x86 hardware and ARM uses NEON
-[[ "$CARCH" = 'i686' || "$CARCH" = 'armv7h' ]] && \
-  _cmakeopts+=('-D ENABLE_SSE=OFF'
-               '-D ENABLE_SSE2=OFF'
-               '-D ENABLE_SSE3=OFF')
+[[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE2')
+[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE3 -D CPU_BASELINE_REQUIRE=SSE2')
 
 mksource() {
   cd "$srcdir/opencv_contrib-$pkgver"
@@ -78,10 +77,13 @@ build() {
   mkdir -p build
 
   cd build
+  # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually
   cmake ${_cmakeopts[@]} \
     -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+    -DLAPACK_LIBRARIES="/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so" \
+    -DLAPACK_CBLAS_H="/usr/include/cblas.h" \
+    -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
     ../$pkgname-$pkgver
-
   make
 }
 
@@ -89,7 +91,6 @@ package_opencv() {
   options=('staticlibs')
 
   cd build
-
   make DESTDIR="$pkgdir" install
 
   # install license file
diff --git a/libre/openttd/PKGBUILD b/libre/openttd/PKGBUILD
index b68a4bc7c..cbb4d097d 100644
--- a/libre/openttd/PKGBUILD
+++ b/libre/openttd/PKGBUILD
@@ -1,9 +1,10 @@
 # $Id: PKGBUILD 184972 2016-08-03 10:06:19Z lcarlier $
 # Maintainer (Arch): Vesa Kaihlavirta <vegai@iki.fi>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=openttd
-pkgver=1.7.0
+pkgver=1.7.1
 pkgrel=2.parabola1
 pkgdesc='An engine for running Transport Tycoon Deluxe, without nonfree openttd-opensfx recommendation'
 arch=('i686' 'x86_64' 'armv7h')
@@ -12,7 +13,7 @@ license=('GPL')
 depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz')
 optdepends=('openttd-opengfx: free graphics') 
 source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-sha256sums=('df9307f42a45ac57dff23fe5cfb9bdb2a3d676456e7c771de173de060c2a99e0')
+sha256sums=('61190952a98d494d3fd62e395dd6c359609914d0ba8fe80eaeb585b7d62a1b36')
 
 build() {
   cd ${pkgname}-${pkgver} 
diff --git a/libre/pacman-mirrorlist/PKGBUILD b/libre/pacman-mirrorlist/PKGBUILD
index 6c40b2f77..59fa1d7a3 100644
--- a/libre/pacman-mirrorlist/PKGBUILD
+++ b/libre/pacman-mirrorlist/PKGBUILD
@@ -12,7 +12,7 @@ license=('GPL')
 groups=('base' 'base-openrc')
 backup=(etc/pacman.d/mirrorlist)
 source=(mirrorlist-${pkgver}.txt::${url})
-sha512sums=('d666c20a5f07faecdfca2a02825c05d48e4315a4e57a0cbfc5ce2387c8259214129698342409100ce464818614b62873520e5867fa66b0dd90ab148bd61b62d4')
+sha256sums=('09d331dac77621d587f67a97806d6f9fa341b11e5678ec76ce13cc29bcd0b566')
 conflicts=(pacman-mirrorlist-libre pacman-mirrorlist-parabola)
 replaces=(pacman-mirrorlist-libre pacman-mirrorlist-parabola)
 
diff --git a/libre/parabola-hackers/PKGBUILD b/libre/parabola-hackers/PKGBUILD
index be1c9d6f3..d54e639b1 100644
--- a/libre/parabola-hackers/PKGBUILD
+++ b/libre/parabola-hackers/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=parabola-hackers
 pkgname=(parabola-hackers parabola-hackers-nshd)
-pkgver=20170908
+pkgver=20171221
 pkgdesc='Programs for doing magic with hackers.git'
 url='https://git.parabola.nu/packages/parabola-hackers.git/'
 license=('GPL')
@@ -11,7 +11,7 @@ pkgrel=1
 arch=('x86_64' 'i686')
 makedepends=('go')
 source=("https://repo.parabola.nu/other/$pkgbase/$pkgbase-$pkgver.tar.gz"{,.sig})
-sha256sums=('3d074623fd570d0ee5cbe3662b9eb9d2095211314b5bc097a4d6855f0cddfa80'
+sha256sums=('65e0641fda2b19760396cf4ef93464245f586b800bedecf984922dbb31381f68'
             'SKIP')
 validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker
 
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 8e460ec68..ea5c67bed 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Parabola automatic package builder <autobuilder@parabola.nu>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=parabola-keyring
-pkgver=20171101
-_gitver=20fc3a89b540945552edb722a9f50c1add543a66
+pkgver=20180104
+_gitver=aa0809f06972a8370b5884e144b7d998455a3029
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
@@ -10,9 +11,10 @@ url='https://git.parabola.nu/hackers.git/'
 license=('GPL')
 install=$pkgname.install
 source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
-sha512sums=('e850e483486c7fcc261a203788a087d17f6908ae1a2ba723eaecdeed6d0b903acc04ef1904166e64b9d79eac84ae1a30229968f5726179581b9aa7f4c1e14f4a'
+sha512sums=('775655309757cf1887a76e3e6e7079d751f65d0110097cf80cc02a490caad62e92f173a75f706067ade03781e139abf2a10b6fc64b7a4f04805a47f0bb52380b'
             'SKIP')
-validpgpkeys=('D3EAD7F9D076EB9AF650149DA170D6A0B669E21A') # Parabola automatic package builder <dev@lists.parabolagnulinux.org>
+#validpgpkeys=('D3EAD7F9D076EB9AF650149DA170D6A0B669E21A') # Parabola automatic package builder <dev@lists.parabolagnulinux.org>
+validpgpkeys=('1B8C5E87702444D3D825CC8086ED62396D5DBA58') # Omar Vega Ramos <ovruni@gnu.org.pe>
 
 mkdepends=('parabola-hackers')
 mksource=("hackers-${_gitver}::git://git.parabola.nu/hackers.git#commit=${_gitver}")
diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD
index 0b00891e4..0dcdc85ad 100644
--- a/libre/parabola-themes-slim/PKGBUILD
+++ b/libre/parabola-themes-slim/PKGBUILD
@@ -1,23 +1,24 @@
-# Maintainer (Arch): Mark J.R.P. <l1mpm4rk@gmail.com>
-# Contributor (Arch): Mark J.R.P. <l1mpm4rk@gmail.com>
+# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
+# Contributor (Arch): Thayer Williams <thayer@archlinux.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-provides=("parabola-themes-slim=$pkgver")
-replaces=('archlinux-themes-slim')
-conflicts=('archlinux-themes-slim')
 pkgname=parabola-themes-slim
 pkgver=1.0
-pkgrel=1.1
-pkgdesc="a theme parabolero to the Slim login manager"
+pkgrel=1.2
+pkgdesc="Parabola GNU/Linux-libre branded themes to the SLiM login manager"
 arch=('any')
-url="https://parabolagnulinux.org/"
-license=('CCPL')
-optdepends=('slim: simple login manager'
+url="https://parabola.nu/"
+license=('CCPL:cc-by-sa')
+optdepends=('slim: login manager providing theme support'
 	    'ttf-liberation: to have a beautiful style of letter in the login')
-source=(https://repo.parabola.nu/other/${pkgname}-${pkgver}.tar)
-md5sums=(bf6bead07cbcca9aa562907230496ba1)
+provides=("parabola-themes-slim=$pkgver")
+replaces=('archlinux-themes-slim')
+conflicts=('archlinux-themes-slim')
+source=("https://repo.parabola.nu/other/multimedia/${pkgname}-${pkgver}.tar")
+sha256sums=('53db48f8bc24a4540ce325545dfb32596ca509a1fef46cff58fdb6809eb1f224')
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  mkdir -p $pkgdir/usr/share/slim/themes
-  cp -a Parabola-*/ $pkgdir/usr/share/slim/themes
+  cd "$pkgname-$pkgver"
+  install -d "$pkgdir"/usr/share/slim/themes
+  cp -a Parabola-*/ "$pkgdir"/usr/share/slim/themes
 }
diff --git a/libre/pcre-static/PKGBUILD b/libre/pcre-static/PKGBUILD
index a4ad3db15..34ca10f9a 100644
--- a/libre/pcre-static/PKGBUILD
+++ b/libre/pcre-static/PKGBUILD
@@ -1,19 +1,25 @@
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
-# based of pcre
+# Maintainer (Arch:pcre): Sébastien "Seblu" Luttringer
+# Contributor (Arch:pcre): Allan McRae <allan@archlinux.org>
+# Contributor (Arch:pcre): Eric Belanger <eric@archlinux.org>
+# Contributor (Arch:pcre): John Proctor <jproctor@prium.net>
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
 
 _pkgname=pcre
 pkgname=pcre-static
-pkgver=8.39
-pkgrel=2
-pkgdesc='A library that implements Perl 5-style regular expressions (static libraries only)'
-arch=('i686' 'x86_64' 'armv7h')
+pkgver=8.41
+pkgrel=1.parabola1
+pkgdesc='A library that implements Perl 5-style regular expressions'
+pkgdesc+=' (static libraries)'
+arch=('x86_64')
+arch+=('i686' 'armv7h')
 url='http://www.pcre.org/'
-license=('BSD')
-depends=('pcre')
+license=('BSD3')
+depends=("$_pkgname=$pkgver")
 options=('staticlibs')
 validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel
-source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$_pkgname-$pkgver.tar.bz2"{,.sig})
-md5sums=('e3fca7650a0556a2647821679d81f585'
+source=("https://ftp.pcre.org/pub/pcre/$_pkgname-$pkgver.tar.bz2"{,.sig})
+md5sums=('c160d22723b1670447341b08c58981c1'
          'SKIP')
 
 prepare() {
@@ -22,8 +28,8 @@ prepare() {
   local filename
   for filename in "${source[@]}"; do
     if [[ "$filename" =~ \.patch$ ]]; then
-      msg2 "Applying patch $filename"
-      patch -p1 -N -i "$srcdir/$filename"
+      msg2 "Applying patch ${filename##*/}"
+      patch -p1 -N -i "$srcdir/${filename##*/}"
     fi
   done
   :
@@ -45,6 +51,7 @@ build() {
 
 check() {
   cd $_pkgname-$pkgver
+  if [[ $CARCH == armv7h ]]; then return 0; fi # qemu: Unsupported syscall: 229
   make -j1 check
 }
 
@@ -52,9 +59,18 @@ package() {
   cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
+  install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
   # remove conflicting files
-  rm -vr ${pkgdir}/usr/{bin,include,lib/pkgconfig,share}
-  rm -v ${pkgdir}/usr/lib/lib*.so*
+  rm -vr -- \
+     "$pkgdir"/usr/bin/ \
+     "$pkgdir"/usr/include/ \
+     "$pkgdir"/usr/lib/pkgconfig/ \
+     "$pkgdir"/usr/share/doc/ \
+     "$pkgdir"/usr/share/man/
+  rm -v -- \
+     "${pkgdir}"/usr/lib/lib*.so \
+     "${pkgdir}"/usr/lib/lib*.so.*
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/pixman-static/PKGBUILD b/libre/pixman-static/PKGBUILD
index 68c47ae50..3a9fa8268 100644
--- a/libre/pixman-static/PKGBUILD
+++ b/libre/pixman-static/PKGBUILD
@@ -1,15 +1,20 @@
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
-# based of pixman
+# Maintainer (Arch:pixman): Jan de Groot <jgc@archlinux.org>
+# Maintainer (Arch:pixman): Andreas Radke <andyrtr@archlinux.org>
+# Contributor (Arch:pixman): Alexander Baldeck <alexander@archlinux.org>
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
 
 _pkgname=pixman
 pkgname=pixman-static
 pkgver=0.34.0
-pkgrel=1
-pkgdesc="The pixel-manipulation library for X and cairo (static libraries only)"
-arch=(i686 x86_64 armv7h)
+pkgrel=1.parabola1
+pkgdesc="The pixel-manipulation library for X and cairo"
+pkgdes+=" (static libraries)"
+arch=(x86_64)
+arch+=(i686 armv7h)
 url="http://xorg.freedesktop.org"
 license=('custom')
-depends=('pixman')
+depends=("pixman=$pkgver")
 options=('staticlibs')
 source=(http://xorg.freedesktop.org/releases/individual/lib/${_pkgname}-${pkgver}.tar.bz2)
 sha1sums=('367698744e74d6d4f363041482965b9ea7fbe4a5')
@@ -28,6 +33,8 @@ check() {
 package() {
   cd $_pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 
   # remove conflicting files
   rm -vr ${pkgdir}/usr/{include,lib/pkgconfig}
diff --git a/libre/qemu-static/PKGBUILD b/libre/qemu-static/PKGBUILD
deleted file mode 100644
index f281baa5f..000000000
--- a/libre/qemu-static/PKGBUILD
+++ /dev/null
@@ -1,136 +0,0 @@
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
-# based of qemu
-
-pkgbase=qemu
-pkgname=(qemu-static binfmt-qemu-static)
-pkgver=2.8.0
-pkgrel=1
-arch=(i686 x86_64 armv7h)
-license=(GPL2 LGPL2.1)
-url="http://wiki.qemu.org/"
-makedepends=(pixman-static glib2-static pcre-static python2)
-source=("$url/download/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
-        qemu-{extra,aarch64,arm,i386,mips,mips64,x86_64}-static.conf)
-sha256sums=('dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62'
-            'SKIP'
-            '2e87f745595f779df820b32dddbba6af634918134c311ae634b88453dc0b7861'
-            'e91ff2371250137cca405645c8a8d0647d5229f3c38e28c3c1ef0511747ab73d'
-            '40a6b6a330e7f624516232be85ac814a24464eeff1097e037f75ed4f16319e74'
-            'c7374b6c643971af382e873fbb7c6f5e549bfdfeaad5a22d4a21d99918e779aa'
-            'e36af2cc4238b953a0fabb5bf032dfbd584bbf8bb0836e71621006ec0fa170af'
-            '2f8eadb0adc7bcd67b21e898fbbc808300094a584e5e28f45024d8016110e066'
-            '6c69ddc9ce44827e55e54cf78a2632292a440b5c222e6e4e904d962a7af39ff2')
-validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
-
-prepare() {
-  mkdir build-static
-  mkdir -p extra-arch-static/usr/{bin,share/qemu}
-
-  cd ${pkgbase}-${pkgver}
-  sed -i 's/vte-2\.90/vte-2.91/g' configure
-}
-
-build() {
-  _build static \
-    --audio-drv-list= \
-    --disable-bluez \
-    --disable-sdl \
-    --disable-gtk \
-    --disable-vte \
-    --disable-opengl \
-    --disable-virglrenderer \
-    --disable-brlapi \
-    --disable-docs \
-    --disable-linux-aio \
-    --disable-seccomp \
-    --disable-spice \
-    --disable-{rbd,glusterfs,libiscsi,curl} \
-    --disable-system \
-    --static \
-    --disable-vnc \
-    --disable-attr \
-    --disable-blobs \
-    --disable-vhost-net \
-    --disable-bzip2 \
-    --disable-libssh2 \
-    --disable-gcrypt \
-    --disable-nettle \
-    --disable-curses \
-    --disable-kvm \
-    --disable-guest-agent
-}
-
-_build() {
-  cd build-$1
-
-  # qemu vs. make 4 == bad
-  export ARFLAGS=rv
-
-  # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
-  export CFLAGS+=" -fPIC"
-
-  ../${pkgbase}-${pkgver}/configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/qemu \
-    --python=/usr/bin/python2 \
-    --smbd=/usr/bin/smbd \
-    --disable-modules \
-    --disable-jemalloc \
-    "${@:2}"
-
-  make
-}
-
-_package() {
-  options=(!strip)
-
-  make -C build-$1 DESTDIR="$pkgdir" install "${@:2}"
-
-  cd "$pkgdir"/usr/bin
-  tidy_strip
-
-  # remove extra arch
-  for _bin in qemu-*; do
-    [[ -f $_bin ]] || continue
-
-    case ${_bin#qemu-} in
-      # tools
-      img|io|nbd) rm "$_bin"; continue ;;
-    esac
-
-    mv "$_bin"{,-static}
-  done
-
-  # remove conflicting files
-  rm -vr ../{lib,share}
-  rm -v ivshmem-{client,server}
-}
-
-package_qemu-static() {
-  pkgdesc="QEMU for foreign architectures (static binaries only)"
-  replaces=(qemu-{static-arch-extra,arch-extra-static})
-  conflicts=(qemu-{static-arch-extra,arch-extra-static})
-  options=(!strip)
-
-  _package static
-}
-
-package_binfmt-qemu-static() {
-  pkgdesc='Register qemu-static interpreters for various binary formats'
-  depends=(qemu-static)
-
-  install -dm755 "${pkgdir}"/usr/lib/binfmt.d
-
-  if [[ $CARCH = x86_64 ]]; then
-    install -m644 "${srcdir}"/qemu-x86_64-static.conf "${pkgdir}"/usr/lib/binfmt.d/qemu-static.conf
-  elif [[ $CARCH = i686 ]]; then
-    install -m644 "${srcdir}"/qemu-i386-static.conf "${pkgdir}"/usr/lib/binfmt.d/qemu-static.conf
-  elif [[ $CARCH = armv7h ]]; then
-    install -m644 "${srcdir}"/qemu-arm-static.conf "${pkgdir}"/usr/lib/binfmt.d/qemu-static.conf
-  elif [[ $CARCH = mips64el ]]; then
-    install -m644 "${srcdir}"/qemu-mips64-static.conf "${pkgdir}"/usr/lib/binfmt.d/qemu-static.conf
-  fi
-  install -m644 "${srcdir}"/qemu-extra-static.conf "${pkgdir}"/usr/lib/binfmt.d/qemu-extra-static.conf
-}
diff --git a/libre/qemu-static/qemu-aarch64-static.conf b/libre/qemu-static/qemu-aarch64-static.conf
deleted file mode 100644
index 3ddffa966..000000000
--- a/libre/qemu-static/qemu-aarch64-static.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# /etc/binfmt.d/qemu-static.conf
-:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C
-:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C
-:i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C
-:i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C
-#:i586:M::::/usr/bin/qemu-i386-static:C
-#:i686:M::::/usr/bin/qemu-i386-static:C
-:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C
-:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C
-:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C
-:mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-static:C
-:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C
-:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C
-:mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-static:C
-:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C
-:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C
-#:or32:M::::/usr/bin/qemu-or32-static:C
-:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C
-:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C
-:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C
-:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C
-:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C
-:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C
-:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C
-:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C
-:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C
-:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C
-#:tilegx:M::::/usr/bin/qemu-tilegx-static:C
-#:unicore32:M::::/usr/bin/qemu-unicore32-static:C
-#:x32:M::::/usr/bin/qemu-x86_64-static:C
-#:x86_64:M::::/usr/bin/qemu-x86_64-static:C
diff --git a/libre/qemu-static/qemu-arm-static.conf b/libre/qemu-static/qemu-arm-static.conf
deleted file mode 100644
index a76f7fe4c..000000000
--- a/libre/qemu-static/qemu-arm-static.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# /etc/binfmt.d/qemu-static.conf
-:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C
-:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C
-:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C
-:i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C
-:i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C
-#:i586:M::::/usr/bin/qemu-i386-static:C
-#:i686:M::::/usr/bin/qemu-i386-static:C
-:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C
-:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C
-:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C
-:mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-static:C
-:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C
-:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C
-:mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-static:C
-:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C
-:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C
-#:or32:M::::/usr/bin/qemu-or32-static:C
-:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C
-:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C
-:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C
-:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C
-:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C
-:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C
-:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C
-:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C
-:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C
-:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C
-#:tilegx:M::::/usr/bin/qemu-tilegx-static:C
-#:unicore32:M::::/usr/bin/qemu-unicore32-static:C
-#:x32:M::::/usr/bin/qemu-x86_64-static:C
-#:x86_64:M::::/usr/bin/qemu-x86_64-static:C
diff --git a/libre/qemu-static/qemu-extra-static.conf b/libre/qemu-static/qemu-extra-static.conf
deleted file mode 100644
index ee321493b..000000000
--- a/libre/qemu-static/qemu-extra-static.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# /etc/binfmt.d/qemu-static-extra.conf
-### obtained from qemu source code (git) ###
-#:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C
-#:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C
-#:arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:C
-#:armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:C
-#:i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C
-#:i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C
-#:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C
-#:mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-static:C
-#:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C
-#:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C
-#:mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-static:C
-#:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C
-#:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C
-#:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C
-#:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4-static:C
-#:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb-static:C
-#:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C
-
-### obtained from others sources         ###
-#:arm64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-aarch64-static:C
-#:i586:M::::/usr/bin/qemu-i386-static:C
-#:i686:M::::/usr/bin/qemu-i386-static:C
-#:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C
-#:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C
-#:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C
-#:or32:M::::/usr/bin/qemu-or32-static:C
-#:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C
-#:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C
-#:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C
-#:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C
-#:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C
-#:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C
-#:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C
-#:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C
-#:tilegx:M::::/usr/bin/qemu-tilegx-static:C
-#:unicore32:M::::/usr/bin/qemu-unicore32-static:C
-#:x32:M::::/usr/bin/qemu-x86_64-static:C
-#:x86_64:M::::/usr/bin/qemu-x86_64-static:C
diff --git a/libre/qemu-static/qemu-i386-static.conf b/libre/qemu-static/qemu-i386-static.conf
deleted file mode 100644
index 931cd83aa..000000000
--- a/libre/qemu-static/qemu-i386-static.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# /etc/binfmt.d/qemu-static.conf
-:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C
-:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C
-:arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:C
-:armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:C
-:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C
-:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C
-:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C
-:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C
-:mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-static:C
-:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C
-:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C
-:mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-static:C
-:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C
-:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C
-#:or32:M::::/usr/bin/qemu-or32-static:C
-:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C
-:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C
-:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C
-:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C
-:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C
-:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C
-:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C
-:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C
-:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C
-:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C
-#:tilegx:M::::/usr/bin/qemu-tilegx-static:C
-#:unicore32:M::::/usr/bin/qemu-unicore32-static:C
-#:x32:M::::/usr/bin/qemu-x86_64-static:C
-#:x86_64:M::::/usr/bin/qemu-x86_64-static:C
diff --git a/libre/qemu-static/qemu-mips-static.conf b/libre/qemu-static/qemu-mips-static.conf
deleted file mode 100644
index 47594b5eb..000000000
--- a/libre/qemu-static/qemu-mips-static.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# /etc/binfmt.d/qemu-static.conf
-:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C
-:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C
-:arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:C
-:armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:C
-:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C
-:i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C
-:i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C
-#:i586:M::::/usr/bin/qemu-i386-static:C
-#:i686:M::::/usr/bin/qemu-i386-static:C
-:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C
-:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C
-:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C
-:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C
-:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C
-:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C
-:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C
-#:or32:M::::/usr/bin/qemu-or32-static:C
-:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C
-:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C
-:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C
-:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C
-:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C
-:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C
-:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C
-:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C
-:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C
-:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C
-#:tilegx:M::::/usr/bin/qemu-tilegx-static:C
-#:unicore32:M::::/usr/bin/qemu-unicore32-static:C
-#:x32:M::::/usr/bin/qemu-x86_64-static:C
-#:x86_64:M::::/usr/bin/qemu-x86_64-static:C
diff --git a/libre/qemu-static/qemu-mips64-static.conf b/libre/qemu-static/qemu-mips64-static.conf
deleted file mode 100644
index 3b255ce19..000000000
--- a/libre/qemu-static/qemu-mips64-static.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# /etc/binfmt.d/qemu-static.conf
-:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C
-:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C
-:arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:C
-:armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:C
-:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C
-:i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C
-:i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C
-#:i586:M::::/usr/bin/qemu-i386-static:C
-#:i686:M::::/usr/bin/qemu-i386-static:C
-:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C
-:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C
-:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C
-#:or32:M::::/usr/bin/qemu-or32-static:C
-:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C
-:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C
-:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C
-:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C
-:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C
-:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C
-:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C
-:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C
-:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C
-:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C
-#:tilegx:M::::/usr/bin/qemu-tilegx-static:C
-#:unicore32:M::::/usr/bin/qemu-unicore32-static:C
-#:x32:M::::/usr/bin/qemu-x86_64-static:C
-#:x86_64:M::::/usr/bin/qemu-x86_64-static:C
diff --git a/libre/qemu-static/qemu-x86_64-static.conf b/libre/qemu-static/qemu-x86_64-static.conf
deleted file mode 100644
index 7b89e2246..000000000
--- a/libre/qemu-static/qemu-x86_64-static.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# /etc/binfmt.d/qemu-static.conf
-:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C
-:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C
-:arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:C
-:armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:C
-:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C
-:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C
-:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C
-:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C
-:mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-static:C
-:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C
-:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C
-:mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-static:C
-:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C
-:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C
-#:or32:M::::/usr/bin/qemu-or32-static:C
-:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C
-:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C
-:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C
-:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C
-:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C
-:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C
-:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C
-:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C
-:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C
-:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C
-#:tilegx:M::::/usr/bin/qemu-tilegx-static:C
-#:unicore32:M::::/usr/bin/qemu-unicore32-static:C
diff --git a/libre/qemu-user-static/0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch b/libre/qemu-user-static/0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch
new file mode 100644
index 000000000..bbc3840fe
--- /dev/null
+++ b/libre/qemu-user-static/0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch
@@ -0,0 +1,81 @@
+From 0c5afb7a15b6bb0e3fe276e377ad3702427e85d1 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Wed, 27 Dec 2017 03:33:21 -0500
+Subject: [PATCH 01/10] linux-user: Use #if to only call validate_guest_space
+ for 32-bit ARM target
+
+Instead of defining a bogus validate_guest_space that always returns 1 on
+targets other than 32-bit ARM, use #if blocks to only call it on 32-bit ARM
+targets.  This makes the "normal" flow control clearer.
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 21 +++++++++------------
+ 1 file changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index 20f3d8c2c3..cac991159c 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -354,7 +354,6 @@ enum {
+ 
+ /* The commpage only exists for 32 bit kernels */
+ 
+-#define TARGET_HAS_VALIDATE_GUEST_SPACE
+ /* Return 1 if the proposed guest space is suitable for the guest.
+  * Return 0 if the proposed guest space isn't suitable, but another
+  * address space should be tried.
+@@ -1823,15 +1822,6 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,
+     return sp;
+ }
+ 
+-#ifndef TARGET_HAS_VALIDATE_GUEST_SPACE
+-/* If the guest doesn't have a validation function just agree */
+-static int validate_guest_space(unsigned long guest_base,
+-                                unsigned long guest_size)
+-{
+-    return 1;
+-}
+-#endif
+-
+ unsigned long init_guest_space(unsigned long host_start,
+                                unsigned long host_size,
+                                unsigned long guest_start,
+@@ -1845,11 +1835,12 @@ unsigned long init_guest_space(unsigned long host_start,
+     /* If just a starting address is given, then just verify that
+      * address.  */
+     if (host_start && !host_size) {
++#if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
+         if (validate_guest_space(host_start, host_size) == 1) {
+-            return host_start;
+-        } else {
+             return (unsigned long)-1;
+         }
++#endif
++        return host_start;
+     }
+ 
+     /* Setup the initial flags and start address.  */
+@@ -1888,6 +1879,8 @@ unsigned long init_guest_space(unsigned long host_start,
+ 
+         /* Check to see if the address is valid.  */
+         if (!host_start || real_start == current_start) {
++#if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
++            /* On 32-bit ARM, we need to also be able to map the commpage.  */
+             int valid = validate_guest_space(real_start - guest_start,
+                                              real_size);
+             if (valid == 1) {
+@@ -1896,6 +1889,10 @@ unsigned long init_guest_space(unsigned long host_start,
+                 return (unsigned long)-1;
+             }
+             /* valid == 0, so try again. */
++#else
++            /* On other architectures, whatever we have here is fine.  */
++            break;
++#endif
+         }
+ 
+         /* That address didn't work.  Unmap and try a different one.
+-- 
+2.15.1
+
diff --git a/libre/qemu-user-static/0002-linux-user-Rename-validate_guest_space-init_guest_co.patch b/libre/qemu-user-static/0002-linux-user-Rename-validate_guest_space-init_guest_co.patch
new file mode 100644
index 000000000..06e508219
--- /dev/null
+++ b/libre/qemu-user-static/0002-linux-user-Rename-validate_guest_space-init_guest_co.patch
@@ -0,0 +1,54 @@
+From b5b929b0423e5db333c9d5dfc104bb3598ff4182 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Thu, 28 Dec 2017 08:03:26 -0500
+Subject: [PATCH 02/10] linux-user: Rename validate_guest_space =>
+ init_guest_commpage
+
+init_guest_commpage is a much more honest description of what the function
+does.  validate_guest_space not only suggests that the function has no
+side-effects, but also introduces confusion as to why it is only needed on
+32-bit ARM targets.
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index cac991159c..453394239c 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -362,8 +362,8 @@ enum {
+  * The guest code may leave a page mapped and populate it if the
+  * address is suitable.
+  */
+-static int validate_guest_space(unsigned long guest_base,
+-                                unsigned long guest_size)
++static int init_guest_commpage(unsigned long guest_base,
++                               unsigned long guest_size)
+ {
+     unsigned long real_start, test_page_addr;
+ 
+@@ -1836,7 +1836,7 @@ unsigned long init_guest_space(unsigned long host_start,
+      * address.  */
+     if (host_start && !host_size) {
+ #if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
+-        if (validate_guest_space(host_start, host_size) == 1) {
++        if (init_guest_commpage(host_start, host_size) != 1) {
+             return (unsigned long)-1;
+         }
+ #endif
+@@ -1881,8 +1881,8 @@ unsigned long init_guest_space(unsigned long host_start,
+         if (!host_start || real_start == current_start) {
+ #if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
+             /* On 32-bit ARM, we need to also be able to map the commpage.  */
+-            int valid = validate_guest_space(real_start - guest_start,
+-                                             real_size);
++            int valid = init_guest_commpage(real_start - guest_start,
++                                            real_size);
+             if (valid == 1) {
+                 break;
+             } else if (valid == -1) {
+-- 
+2.15.1
+
diff --git a/libre/qemu-user-static/0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch b/libre/qemu-user-static/0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch
new file mode 100644
index 000000000..ea9eff138
--- /dev/null
+++ b/libre/qemu-user-static/0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch
@@ -0,0 +1,29 @@
+From c03d2cc51c5fa496f894b641c035b12e49fd637b Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Wed, 27 Dec 2017 14:40:39 -0500
+Subject: [PATCH 03/10] linux-user: init_guest_space: Clean up if we can't
+ initialize the commpage
+
+We'll just exit with an error anyway, so it doesn't really matter, but it
+is cleaned up in all of the other places were we error out.
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index 453394239c..1a6b660b25 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -1886,6 +1886,7 @@ unsigned long init_guest_space(unsigned long host_start,
+             if (valid == 1) {
+                 break;
+             } else if (valid == -1) {
++                munmap((void *)real_start, host_size);
+                 return (unsigned long)-1;
+             }
+             /* valid == 0, so try again. */
+-- 
+2.15.1
+
diff --git a/libre/qemu-user-static/0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch b/libre/qemu-user-static/0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch
new file mode 100644
index 000000000..7f9cfc7a8
--- /dev/null
+++ b/libre/qemu-user-static/0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch
@@ -0,0 +1,47 @@
+From bc26025ccc64a2a63fc58776c93e2e4392445abe Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Wed, 27 Dec 2017 19:44:00 -0500
+Subject: [PATCH 04/10] linux-user: init_guest_space: Correctly handle
+ guest_start in commpage initialization
+
+init_guest_commpage  needs to check if the mapped space, which ends at
+real_start+real_size overlaps with where it needs to put the commpage,
+which is (assuming sane qemu_host_page_size) guest_base + 0xffff000, where
+guest_base is real_start - guest_start.
+
+    [guest_base][       0xffff0000      ][commpage]
+    [guest_base][guest_start][real_size] [commpage]
+    [       real_start      ][real_size] [commpage]
+                                        ^
+                                 fail if this gap < 0
+
+Since init_guest_commpage wants to do everything relative to guest_base
+(rather than real_start), it obviously needs to be comparing 0xffff0000
+against guest_start+real_size, not just real_size.
+
+This bug has been present since 806d102141b99d4f1e55a97d68b7ea8c8ba3129f in
+2012, but guest_start is usually 0, and prior to v2.11 real_size was
+usually much smaller than 0xffff0000, so it was uncommon for it to have
+made a difference.
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index 1a6b660b25..f41cecc3cb 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -1882,7 +1882,7 @@ unsigned long init_guest_space(unsigned long host_start,
+ #if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
+             /* On 32-bit ARM, we need to also be able to map the commpage.  */
+             int valid = init_guest_commpage(real_start - guest_start,
+-                                            real_size);
++                                            real_size + guest_start);
+             if (valid == 1) {
+                 break;
+             } else if (valid == -1) {
+-- 
+2.15.1
+
diff --git a/libre/qemu-user-static/0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch b/libre/qemu-user-static/0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch
new file mode 100644
index 000000000..1570774ee
--- /dev/null
+++ b/libre/qemu-user-static/0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch
@@ -0,0 +1,120 @@
+From b2432d1b415143a55083782712f11241f194c0ba Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Wed, 27 Dec 2017 20:05:52 -0500
+Subject: [PATCH 05/10] linux-user: init_guest_space: Clarify page alignment
+ logic
+
+There are 3 parts to this change:
+ - Add a comment showing the relative sizes and positions of the blocks of
+   memory
+ - introduce and use new aligned_{start,size} instead of adjusting
+   real_{start_size}
+ - When we clean up (on failure), munmap(real_start, real_size) instead of
+   munmap(aligned_start, aligned_size).  It *shouldn't* make any
+   difference, but I will admit that this does mean we are making the
+   syscall with different values, so this isn't quite a no-op patch.
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 43 +++++++++++++++++++++++++++++++++----------
+ 1 file changed, 33 insertions(+), 10 deletions(-)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index f41cecc3cb..22f2632dfa 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -1827,7 +1827,7 @@ unsigned long init_guest_space(unsigned long host_start,
+                                unsigned long guest_start,
+                                bool fixed)
+ {
+-    unsigned long current_start, real_start;
++    unsigned long current_start, aligned_start;
+     int flags;
+ 
+     assert(host_start || host_size);
+@@ -1853,7 +1853,8 @@ unsigned long init_guest_space(unsigned long host_start,
+     /* Otherwise, a non-zero size region of memory needs to be mapped
+      * and validated.  */
+     while (1) {
+-        unsigned long real_size = host_size;
++        unsigned long real_start, real_size, aligned_size;
++        aligned_size = real_size = host_size;
+ 
+         /* Do not use mmap_find_vma here because that is limited to the
+          * guest address space.  We are going to make the
+@@ -1867,26 +1868,48 @@ unsigned long init_guest_space(unsigned long host_start,
+ 
+         /* Ensure the address is properly aligned.  */
+         if (real_start & ~qemu_host_page_mask) {
++            /* Ideally, we adjust like
++             *
++             *    pages: [  ][  ][  ][  ][  ]
++             *      old:   [   real   ]
++             *             [ aligned  ]
++             *      new:   [     real     ]
++             *               [ aligned  ]
++             *
++             * But if there is something else mapped right after it,
++             * then obviously it won't have room to grow, and the
++             * kernel will put the new larger real someplace else with
++             * unknown alignment (if we made it to here, then
++             * fixed=false).  Which is why we grow real by a full page
++             * size, instead of by part of one; so that even if we get
++             * moved, we can still guarantee alignment.  But this does
++             * mean that there is a padding of < 1 page both before
++             * and after the aligned range; the "after" could could
++             * cause problems for ARM emulation where it could butt in
++             * to where we need to put the commpage.
++             */
+             munmap((void *)real_start, host_size);
+-            real_size = host_size + qemu_host_page_size;
++            real_size = aligned_size + qemu_host_page_size;
+             real_start = (unsigned long)
+                 mmap((void *)real_start, real_size, PROT_NONE, flags, -1, 0);
+             if (real_start == (unsigned long)-1) {
+                 return (unsigned long)-1;
+             }
+-            real_start = HOST_PAGE_ALIGN(real_start);
++            aligned_start = HOST_PAGE_ALIGN(real_start);
++        } else {
++            aligned_start = real_start;
+         }
+ 
+         /* Check to see if the address is valid.  */
+-        if (!host_start || real_start == current_start) {
++        if (!host_start || aligned_start == current_start) {
+ #if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
+             /* On 32-bit ARM, we need to also be able to map the commpage.  */
+-            int valid = init_guest_commpage(real_start - guest_start,
+-                                            real_size + guest_start);
++            int valid = init_guest_commpage(aligned_start - guest_start,
++                                            aligned_size + guest_start);
+             if (valid == 1) {
+                 break;
+             } else if (valid == -1) {
+-                munmap((void *)real_start, host_size);
++                munmap((void *)real_start, real_size);
+                 return (unsigned long)-1;
+             }
+             /* valid == 0, so try again. */
+@@ -1905,7 +1928,7 @@ unsigned long init_guest_space(unsigned long host_start,
+          * address space randomization put a shared library somewhere
+          * inconvenient.
+          */
+-        munmap((void *)real_start, host_size);
++        munmap((void *)real_start, real_size);
+         current_start += qemu_host_page_size;
+         if (host_start == current_start) {
+             /* Theoretically possible if host doesn't have any suitably
+@@ -1917,7 +1940,7 @@ unsigned long init_guest_space(unsigned long host_start,
+ 
+     qemu_log_mask(CPU_LOG_PAGE, "Reserved 0x%lx bytes of guest address space\n", host_size);
+ 
+-    return real_start;
++    return aligned_start;
+ }
+ 
+ static void probe_guest_base(const char *image_name,
+-- 
+2.15.1
+
diff --git a/libre/qemu-user-static/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch b/libre/qemu-user-static/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch
new file mode 100644
index 000000000..4436b7817
--- /dev/null
+++ b/libre/qemu-user-static/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch
@@ -0,0 +1,30 @@
+From ca873a81cc020df0ee0ec072a60678bb83dce9e2 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Wed, 27 Dec 2017 21:05:29 -0500
+Subject: [PATCH 06/10] linux-user: init_guest_commpage: Add a comment about
+ size check
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index 22f2632dfa..b560f5d6fe 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -374,6 +374,11 @@ static int init_guest_commpage(unsigned long guest_base,
+ 
+     /* If the commpage lies within the already allocated guest space,
+      * then there is no way we can allocate it.
++     *
++     * You may be thinking that that this check is redundant because
++     * we already validated the guest size against MAX_RESERVED_VA;
++     * but if qemu_host_page_mask is unusually large, then
++     * test_page_addr may be lower.
+      */
+     if (test_page_addr >= guest_base
+         && test_page_addr < (guest_base + guest_size)) {
+-- 
+2.15.1
+
diff --git a/libre/qemu-user-static/0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch b/libre/qemu-user-static/0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch
new file mode 100644
index 000000000..59be04cf9
--- /dev/null
+++ b/libre/qemu-user-static/0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch
@@ -0,0 +1,94 @@
+From dbbba45fa37da85ac213fbbe1f7eab3e1de74b41 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Wed, 27 Dec 2017 21:17:52 -0500
+Subject: [PATCH 07/10] linux-user: init_guest_space: Clean up control flow a
+ bit
+
+Instead of doing
+
+        if (check1) {
+            if (check2) {
+               success;
+            }
+        }
+
+        retry;
+
+Do a clearer
+
+        if (!check1) {
+           goto try_again;
+        }
+
+        if (!check2) {
+           goto try_again;
+        }
+
+        success;
+
+    try_again:
+        retry;
+
+Besides being clearer, this makes it easier to insert more checks that
+need to trigger a retry on check failure, or rearrange them, or anything
+like that.
+
+Because some indentation is changing, "ignore space change" may be useful
+for viewing this patch.
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 34 +++++++++++++++++++---------------
+ 1 file changed, 19 insertions(+), 15 deletions(-)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index b560f5d6fe..5c0ad65611 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -1906,24 +1906,28 @@ unsigned long init_guest_space(unsigned long host_start,
+         }
+ 
+         /* Check to see if the address is valid.  */
+-        if (!host_start || aligned_start == current_start) {
++        if (host_start && aligned_start != current_start) {
++            goto try_again;
++        }
++
+ #if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
+-            /* On 32-bit ARM, we need to also be able to map the commpage.  */
+-            int valid = init_guest_commpage(aligned_start - guest_start,
+-                                            aligned_size + guest_start);
+-            if (valid == 1) {
+-                break;
+-            } else if (valid == -1) {
+-                munmap((void *)real_start, real_size);
+-                return (unsigned long)-1;
+-            }
+-            /* valid == 0, so try again. */
+-#else
+-            /* On other architectures, whatever we have here is fine.  */
+-            break;
+-#endif
++        /* On 32-bit ARM, we need to also be able to map the commpage.  */
++        int valid = init_guest_commpage(aligned_start - guest_start,
++                                        aligned_size + guest_start);
++        if (valid == -1) {
++            munmap((void *)real_start, real_size);
++            return (unsigned long)-1;
++        } else if (valid == -1) {
++            goto try_again;
+         }
++#endif
++
++        /* If nothing has said `return -1` or `goto try_again` yet,
++         * then the address we have is good.
++         */
++        break;
+ 
++    try_again:
+         /* That address didn't work.  Unmap and try a different one.
+          * The address the host picked because is typically right at
+          * the top of the host address space and leaves the guest with
+-- 
+2.15.1
+
diff --git a/libre/qemu-user-static/0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch b/libre/qemu-user-static/0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch
new file mode 100644
index 000000000..9f434e116
--- /dev/null
+++ b/libre/qemu-user-static/0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch
@@ -0,0 +1,50 @@
+From 8f38106de8d023be8b3b28955df3615637c65dd9 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Thu, 28 Dec 2017 06:42:12 -0500
+Subject: [PATCH 08/10] linux-user: init_guest_space: Don't try to align if
+ we'll reject it
+
+If the ensure-alignment code gets triggered, then the
+"if (host_start && real_start != current_start)" check will always trigger,
+so save 2 syscalls and put that check first.
+
+Note that we can't just switch to using MAP_FIXED for that check, because
+then we couldn't differentiate between a failure because "there isn't
+enough space" and "there isn't enough space *here*".
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index 5c0ad65611..1b7583d659 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -1871,6 +1871,11 @@ unsigned long init_guest_space(unsigned long host_start,
+             return (unsigned long)-1;
+         }
+ 
++        /* Check to see if the address is valid.  */
++        if (host_start && real_start != current_start) {
++            goto try_again;
++        }
++
+         /* Ensure the address is properly aligned.  */
+         if (real_start & ~qemu_host_page_mask) {
+             /* Ideally, we adjust like
+@@ -1905,11 +1910,6 @@ unsigned long init_guest_space(unsigned long host_start,
+             aligned_start = real_start;
+         }
+ 
+-        /* Check to see if the address is valid.  */
+-        if (host_start && aligned_start != current_start) {
+-            goto try_again;
+-        }
+-
+ #if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
+         /* On 32-bit ARM, we need to also be able to map the commpage.  */
+         int valid = init_guest_commpage(aligned_start - guest_start,
+-- 
+2.15.1
+
diff --git a/libre/qemu-user-static/0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch b/libre/qemu-user-static/0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch
new file mode 100644
index 000000000..e91fdefd8
--- /dev/null
+++ b/libre/qemu-user-static/0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch
@@ -0,0 +1,29 @@
+From 81033c66738a2e3b713c414e8e07e6ef8e59d8d7 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Thu, 28 Dec 2017 07:22:29 -0500
+Subject: [PATCH 09/10] linux-user: init_guest_space: Add a comment about
+ search strategy
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index 1b7583d659..7736ea2c3a 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -1936,6 +1936,10 @@ unsigned long init_guest_space(unsigned long host_start,
+          * happen often.  Probably means we got unlucky and host
+          * address space randomization put a shared library somewhere
+          * inconvenient.
++         *
++         * This is probably a good strategy if host_start, but is
++         * probably a bad strategy if not, which means we got here
++         * because of trouble with ARM commpage setup.
+          */
+         munmap((void *)real_start, real_size);
+         current_start += qemu_host_page_size;
+-- 
+2.15.1
+
diff --git a/libre/qemu-user-static/0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch b/libre/qemu-user-static/0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch
new file mode 100644
index 000000000..587293564
--- /dev/null
+++ b/libre/qemu-user-static/0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch
@@ -0,0 +1,99 @@
+From f8ccd5e7353937e0a48ccd8bfbc07202dc85afac Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Thu, 28 Dec 2017 07:27:20 -0500
+Cc: paul@codesourcery.com
+Subject: [PATCH 10/10] linux-user: init_guest_space: Try to make ARM
+ space+commpage continuous
+
+At a fixed distance after the usable memory that init_guest_space maps, for
+32-bit ARM targets we also need to map a commpage.  The normal
+init_guest_space logic doesn't keep this in mind when searching for an
+address range.
+
+If !host_start, then try to find a big continuous segment where we can put
+both the usable memory and the commpage; we then munmap that segment and
+set current_start to that address; and let the normal code mmap the usable
+memory and the commpage separately.  That is: if we don't have hint of
+where to start looking for memory, come up with one that is better than
+NULL.  Depending on host_size and guest_start, there may or may not be a
+gap between the usable memory and the commpage, so this is slightly more
+restrictive than it needs to be; but it's only a hint, so that's OK.
+
+We only do that for !host start, because if host_start, then either:
+ - we got an address passed in with -B, in which case we don't want to
+   interfere with what the user said;
+ - or host_start is based off of the ELF image's loaddr.  The check "if
+   (host_start && real_start != current_start)" suggests that we really
+   want lowest available address that is >= loaddr.  I don't know why that
+   is, but I'm trusting that Paul Brook knew what he was doing when he
+   wrote the original version of that check in
+   c581deda322080e8beb88b2e468d4af54454e4b3 way back in 2010.
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 49 insertions(+)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index 7736ea2c3a..cd3a7d877d 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -1857,6 +1857,55 @@ unsigned long init_guest_space(unsigned long host_start,
+ 
+     /* Otherwise, a non-zero size region of memory needs to be mapped
+      * and validated.  */
++
++#if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
++    /* On 32-bit ARM, we need to map not just the usable memory, but
++     * also the commpage.  Try to find a suitable place by allocating
++     * a big chunk for all of it.  If host_start, then the naive
++     * strategy probably does good enough.
++     */
++    if (!host_start) {
++        unsigned long guest_full_size, host_full_size, real_start;
++
++        guest_full_size =
++            (0xffff0f00 & qemu_host_page_mask) + qemu_host_page_size;
++        host_full_size = guest_full_size - guest_start;
++        real_start = (unsigned long)
++            mmap(NULL, host_full_size, PROT_NONE, flags, -1, 0);
++        if (real_start == (unsigned long)-1) {
++            if (host_size < host_full_size - qemu_host_page_size) {
++                /* We failed to map a continous segment, but we're
++                 * allowed to have a gap between the usable memory and
++                 * the commpage where other things can be mapped.
++                 * This sparseness gives us more flexibility to find
++                 * an address range.
++                 */
++                goto naive;
++            }
++            return (unsigned long)-1;
++        }
++        munmap((void *)real_start, host_full_size);
++        if (real_start & ~qemu_host_page_mask) {
++            /* The same thing again, but with an extra qemu_host_page_size
++             * so that we can shift around alignment.
++             */
++            unsigned long real_size = host_full_size + qemu_host_page_size;
++            real_start = (unsigned long)
++                mmap(NULL, real_size, PROT_NONE, flags, -1, 0);
++            if (real_start == (unsigned long)-1) {
++                if (host_size < host_full_size - qemu_host_page_size) {
++                    goto naive;
++                }
++                return (unsigned long)-1;
++            }
++            munmap((void *)real_start, real_size);
++            real_start = HOST_PAGE_ALIGN(real_start);
++        }
++        current_start = real_start;
++    }
++ naive:
++#endif
++
+     while (1) {
+         unsigned long real_start, real_size, aligned_size;
+         aligned_size = real_size = host_size;
+-- 
+2.15.1
+
diff --git a/libre/qemu-user-static/PKGBUILD b/libre/qemu-user-static/PKGBUILD
new file mode 100644
index 000000000..a3030470b
--- /dev/null
+++ b/libre/qemu-user-static/PKGBUILD
@@ -0,0 +1,170 @@
+# Maintainer (Arch:qemu): Tobias Powalowski <tpowa@archlinux.org>
+# Contributor (Arch:qemu): Sébastien "Seblu" Luttringer <seblu@seblu.net>
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
+
+_pkgbase=qemu
+pkgname=(qemu-user-static qemu-user-static-binfmt)
+pkgdesc="A generic and open source machine emulator and virtualizer"
+pkgver=2.11.0
+pkgrel=3.parabola1
+arch=(x86_64)
+arch+=(i686 armv7h)
+license=(GPL2 LGPL2.1)
+url="http://wiki.qemu.org/"
+makedepends=(pixman-static glib2-static pcre-static python2)
+source=("$url/download/${_pkgbase}-${pkgver}.tar.bz2"{,.sig}
+        0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch
+        0002-linux-user-Rename-validate_guest_space-init_guest_co.patch
+        0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch
+        0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch
+        0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch
+        0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch
+        0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch
+        0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch
+        0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch
+        0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch
+        allow_elf64.patch)
+sha256sums=('c4f034c7665a84a1c3be72c8da37f3c31ec063475699df062ab646d8b2e17fcb'
+            'SKIP'
+            '9953a8debd9456adb4f5968817fa89da4d4542e44980a5533ccf86371d819845'
+            'a977e9295daa14a9c73258cf16399eb5af66382217f8a4e69951ec044131a7ce'
+            'dba2cfeb24841d45936091319957ee6f65e481da3c761791d410d3b8e6799998'
+            '75b3bda6752c4bf17488489f898767b6772b10ecc5d1f0a5bc1bd831e99a31e3'
+            '731895a8ed6f6d322bb60764b01cf09e0ea762d7d53fc01e91c2d2aecfdc8844'
+            '69b37040f52ef86b86c7c2952eb3f85f3c67d7adf289c43fdac8c71827c6e5b9'
+            '76f88850b0f52450eecb80029ffe16db6f418cec3b58231aca354cc20bbfb16a'
+            '76944d84990cc76e47c381849c683a346c5234bcebbe4c24334d0fd8368482db'
+            '7845867348fd380def28c7fe023e54cee8ff88cd6754aae3ab3472149cfbde51'
+            '1953e7cac58c23526d007d8559410e0042d4a7c1b8cbd5f4c0543f7f876436dd'
+            '13a6d9e678bdc9e1f051006cfd0555f5a80582368f54c8a1bb5a78ece3832ac4')
+validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
+
+case $CARCH in
+  i?86) _corearch=i386 ;;
+  x86_64) _corearch=x86_64 ;;
+esac
+
+prepare() {
+  mkdir build-static
+  mkdir -p extra-arch-static/usr/{bin,share/qemu}
+
+  cd ${_pkgbase}-${pkgver}
+  sed -i 's/vte-2\.90/vte-2.91/g' configure
+
+  # https://bugs.launchpad.net/qemu/+bug/1740219
+  # https://lists.nongnu.org/archive/html/qemu-devel/2017-12/msg05237.html
+  local patchfile
+  for patchfile in ../????-linux-user-*.patch; do
+    patch -p1 < "$patchfile"
+  done
+
+  patch -p1 < ../allow_elf64.patch
+}
+
+build() {
+  local flags=(
+    --static
+    --disable-system # disable building qemu-system-$CPU, we only want qemu-$CPU
+    --disable-guest-agent # disable building qemu-ga
+    --disable-tools # disable building the qemu-{io,nbd,img} tools
+    --disable-blobs # disable installing firmware files used by system
+    --disable-docs
+    --disable-modules # modules imply dynamic linking
+
+    # jemalloc-static isn't packaged
+    --disable-jemalloc
+
+    # These libraries are only used for system or tools, but even
+    # though that's disabled, libqemuutil.a still tries to link
+    # against them unless we specifically tell it not to (the linkage
+    # would be removed at the final linker's tree-shaking).
+    --disable-gcrypt
+    --disable-nettle
+  )
+  _build static "${flags[@]}" \
+    --audio-drv-list= \
+    --disable-bluez \
+    --disable-sdl \
+    --disable-gtk \
+    --disable-vte \
+    --disable-opengl \
+    --disable-virglrenderer
+}
+
+_build() (
+  cd build-$1
+
+  # qemu vs. make 4 == bad
+  export ARFLAGS=rv
+
+  # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
+  export CFLAGS+=" -fPIC"
+
+  ../${_pkgbase}-${pkgver}/configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/qemu \
+    --python=/usr/bin/python2 \
+    --smbd=/usr/bin/smbd \
+    --with-gtkabi=3.0 \
+    --with-sdlabi=2.0 \
+    --enable-modules \
+    --enable-jemalloc \
+    "${@:2}"
+
+  make
+)
+
+package_qemu-user-static() {
+  pkgdesc="QEMU user-mode emulation (static binaries)"
+
+  provides=("qemu-static=$pkgver")
+  replaces=(qemu-static)
+  conflicts=(qemu-static)
+
+  _package static
+
+  rm -vr -- \
+     "$pkgdir"/usr/lib/ \
+     "$pkgdir"/usr/share/
+
+  local prog
+  for prog in "$pkgdir"/usr/bin/*; do
+    mv -nT -- "$prog" "${prog%-static}-static"
+  done
+}
+
+_package() {
+  options=(!strip)
+
+  make -C build-$1 DESTDIR="$pkgdir" install "${@:2}"
+
+  cd "$pkgdir"/usr/bin
+  tidy_strip
+}
+
+package_qemu-user-static-binfmt() {
+  pkgdesc="binfmt registration for QEMU user-mode emulation"
+  depends=("qemu-user-static=$pkgver")
+
+  provides=("binfmt-qemu-static=$pkgver")
+  replaces=('binfmt-qemu-static')
+  conflicts=('binfmt-qemu-static')
+
+  cd ${_pkgbase}-${pkgver}
+
+  install -d "$pkgdir"/usr/lib/binfmt.d
+
+  < scripts/qemu-binfmt-conf.sh \
+    sed -e 's/^CHECK=.*/CHECK=qemu_check_systemd/' \
+        -e 's/^BINFMT_SET=.*/BINFMT_SET=qemu_generate_systemd/' \
+  | sh /dev/stdin \
+       --qemu-path /usr/bin \
+       --exportdir "$pkgdir"/usr/lib/binfmt.d \
+       --credential yes
+
+  # add the "-static" suffix
+  sed -i 's/:[^:]*$/-static&/' --  "$pkgdir"/usr/lib/binfmt.d/*.conf
+}
diff --git a/libre/qemu-user-static/allow_elf64.patch b/libre/qemu-user-static/allow_elf64.patch
new file mode 100644
index 000000000..07f27a038
--- /dev/null
+++ b/libre/qemu-user-static/allow_elf64.patch
@@ -0,0 +1,27 @@
+commit 3c72765ec760a51f0e879dc792be82c93141e318
+Author: Anatol Pomozov <anatol.pomozov@gmail.com>
+Date:   Tue Jun 6 20:07:03 2017 -0700
+
+    Remove restriction that prevents bootimg elf64 images
+    
+    It is possible to create a 64 bit elf image that has valid multiboot header.
+    qemu should be able to boot such images.
+    
+    Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
+
+diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
+index 663f35a658..cf1b4f5fb3 100644
+--- a/hw/i386/multiboot.c
++++ b/hw/i386/multiboot.c
+@@ -192,11 +192,6 @@ int load_multiboot(FWCfgState *fw_cfg,
+         int kernel_size;
+         fclose(f);
+ 
+-        if (((struct elf64_hdr*)header)->e_machine == EM_X86_64) {
+-            fprintf(stderr, "Cannot load x86-64 image, give a 32bit one.\n");
+-            exit(1);
+-        }
+-
+         kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry,
+                                &elf_low, &elf_high, 0, I386_ELF_MACHINE,
+                                0, 0);
diff --git a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
index 5ee14d118..ff71a4f85 100644
--- a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
+++ b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
@@ -1,4 +1,4 @@
-From d817ea1a39a1e5ae78d776708585878dc39f6ec6 Mon Sep 17 00:00:00 2001
+From 878ad05e921e204d05fb3005a7c0999265d20cb0 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:19:20 -0400
 Subject: [PATCH 1/7] FSDG: man/: Refer to the operating system as GNU/Linux
@@ -8,17 +8,26 @@ cases, "Linux" is (correctly) used to refer to just the kernel.  In others,
 it is in a string for which code must also be adjusted; these instances
 are not included in this commit.
 ---
- man/daemon.xml               | 4 ++--
- man/sd-bus-errors.xml        | 2 +-
- man/sd_bus_error_add_map.xml | 2 +-
- man/systemd.xml              | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
+ man/daemon.xml                   | 4 ++--
+ man/journald.conf.xml            | 2 +-
+ man/machinectl.xml               | 2 +-
+ man/sd-bus-errors.xml            | 2 +-
+ man/sd-login.xml                 | 2 +-
+ man/sd_bus_error_add_map.xml     | 2 +-
+ man/sd_uid_get_state.xml         | 2 +-
+ man/systemd-detect-virt.xml      | 4 ++--
+ man/systemd-machine-id-setup.xml | 2 +-
+ man/systemd-resolved.service.xml | 6 +++---
+ man/systemd.exec.xml             | 2 +-
+ man/systemd.socket.xml           | 2 +-
+ man/systemd.xml                  | 6 +++---
+ 13 files changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/man/daemon.xml b/man/daemon.xml
-index 485c66225..a64974968 100644
+index 18337daad8..ab65f6f4d9 100644
 --- a/man/daemon.xml
 +++ b/man/daemon.xml
-@@ -168,7 +168,7 @@
+@@ -170,7 +170,7 @@
      <refsect2>
        <title>New-Style Daemons</title>
  
@@ -27,7 +36,7 @@ index 485c66225..a64974968 100644
        new-style daemons. This makes it easier to supervise and control
        them at runtime and simplifies their implementation.</para>
  
-@@ -309,7 +309,7 @@
+@@ -311,7 +311,7 @@
        as detailed in the <ulink
        url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
        Linux Standard Base Core Specification</ulink>. This method of
@@ -36,11 +45,37 @@ index 485c66225..a64974968 100644
        old-style and new-style systems. Among other issues, SysV init
        scripts have the disadvantage of involving shell scripts in the
        boot process. New-style init systems generally employ updated
+diff --git a/man/journald.conf.xml b/man/journald.conf.xml
+index 844228e324..58b21d424b 100644
+--- a/man/journald.conf.xml
++++ b/man/journald.conf.xml
+@@ -132,7 +132,7 @@
+         <term><varname>SplitMode=</varname></term>
+ 
+         <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or
+-        <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access
++        <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access
+         control is managed per file, and the journal daemon will assign users read access to their journal files. If
+         <literal>uid</literal>, all regular users will each get their own journal files, and system users will log to
+         the system journal. If <literal>none</literal>, journal files are not split up by user and all messages are
+diff --git a/man/machinectl.xml b/man/machinectl.xml
+index 43f4d127b8..908ee5649c 100644
+--- a/man/machinectl.xml
++++ b/man/machinectl.xml
+@@ -899,7 +899,7 @@
+     <para>The <command>machinectl</command> tool operates on machines
+     and images whose names must be chosen following strict
+     rules. Machine names must be suitable for use as host names
+-    following a conservative subset of DNS and UNIX/Linux
++    following a conservative subset of DNS and GNU/Linux
+     semantics. Specifically, they must consist of one or more
+     non-empty label strings, separated by dots. No leading or trailing
+     dots are allowed. No sequences of multiple dots are allowed. The
 diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
-index 055af7a68..d2b81f4e4 100644
+index a655ab1d97..b1f24381dd 100644
 --- a/man/sd-bus-errors.xml
 +++ b/man/sd-bus-errors.xml
-@@ -126,7 +126,7 @@
+@@ -128,7 +128,7 @@
  
      <para>In addition to this list, in sd-bus, the special error
      namespace <literal>System.Error.</literal> is used to map
@@ -49,11 +84,24 @@ index 055af7a68..d2b81f4e4 100644
      project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
      to D-Bus errors and back. For example, the error
      <constant>EUCLEAN</constant> is mapped to
+diff --git a/man/sd-login.xml b/man/sd-login.xml
+index 148dd19cea..5b99d9e281 100644
+--- a/man/sd-login.xml
++++ b/man/sd-login.xml
+@@ -270,7 +270,7 @@
+ 
+     <para>
+       <ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink>
+-      for an introduction to multi-seat support on Linux and the background for this set of APIs.
++      for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs.
+     </para>
+   </refsect1>
+ 
 diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
-index a1eda21ed..55402dfc2 100644
+index b79381fefd..072b31c7d3 100644
 --- a/man/sd_bus_error_add_map.xml
 +++ b/man/sd_bus_error_add_map.xml
-@@ -82,7 +82,7 @@
+@@ -84,7 +84,7 @@
  
      <para>The <function>sd_bus_error_add_map()</function> call may be
      used to register additional mappings for converting D-Bus errors
@@ -62,11 +110,113 @@ index a1eda21ed..55402dfc2 100644
      defined with this call are consulted by calls such as
      <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>
      or
+diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
+index 1183d9079a..c8b62f7a43 100644
+--- a/man/sd_uid_get_state.xml
++++ b/man/sd_uid_get_state.xml
+@@ -199,7 +199,7 @@
+         <listitem><para>An input parameter was invalid (out of range,
+         or NULL, where that is not accepted). This is also returned if
+         the passed user ID is 0xFFFF or 0xFFFFFFFF, which are
+-        undefined on Linux.</para></listitem>
++        undefined on GNU/Linux.</para></listitem>
+       </varlistentry>
+ 
+       <varlistentry>
+diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
+index 4426827e57..b59570ad2c 100644
+--- a/man/systemd-detect-virt.xml
++++ b/man/systemd-detect-virt.xml
+@@ -156,12 +156,12 @@
+ 
+           <row>
+             <entry><varname>lxc</varname></entry>
+-            <entry>Linux container implementation by LXC</entry>
++            <entry>Container implementation by LXC</entry>
+           </row>
+ 
+           <row>
+             <entry><varname>lxc-libvirt</varname></entry>
+-            <entry>Linux container implementation by libvirt</entry>
++            <entry>Container implementation by libvirt</entry>
+           </row>
+ 
+           <row>
+diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
+index 527cb7bff5..8c4a62ccee 100644
+--- a/man/systemd-machine-id-setup.xml
++++ b/man/systemd-machine-id-setup.xml
+@@ -90,7 +90,7 @@
+       and is different for every booted instance of the
+       VM.</para></listitem>
+ 
+-      <listitem><para>Similarly, if run inside a Linux container
++      <listitem><para>Similarly, if run inside a container
+       environment and a UUID is configured for the container, this is
+       used to initialize the machine ID. For details, see the
+       documentation of the <ulink
+diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
+index da6e8c4441..3a629b09ec 100644
+--- a/man/systemd-resolved.service.xml
++++ b/man/systemd-resolved.service.xml
+@@ -73,7 +73,7 @@
+       <citerefentry project='man-pages'><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API as defined
+       by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related resolver functions,
+       including <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This
+-      API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC
++      API is widely supported, including beyond the GNU/Linux platform. In its current form it does not expose DNSSEC
+       validation status information however, and is synchronous only. This API is backed by the glibc Name Service
+       Switch (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>). Usage of the
+       glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+@@ -173,7 +173,7 @@
+ 
+     <itemizedlist>
+       <listitem><para><command>systemd-resolved</command> maintains the
+-      <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional Linux
++      <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional GNU/Linux
+       programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists the 127.0.0.53
+       DNS stub (see above) as the only DNS server. It also contains a list of search domains that are in use by
+       systemd-resolved. The list of search domains is always kept up-to-date. Note that
+@@ -189,7 +189,7 @@
+       <command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem>
+ 
+       <listitem><para><command>systemd-resolved</command> maintains the
+-      <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux
++      <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux
+       programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept up-to-date,
+       containing information about all known DNS servers. Note the file format's limitations: it does not know a
+       concept of per-interface DNS servers and hence only contains system-wide DNS server definitions. Note that
+diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
+index 3d81e45732..c4a6ca4a07 100644
+--- a/man/systemd.exec.xml
++++ b/man/systemd.exec.xml
+@@ -215,7 +215,7 @@
+         which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted
+         as first character). The user/group name must have at least one character, and at most 31. These restrictions
+         are enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among
+-        Linux systems.</para>
++        GNU/Linux systems.</para>
+ 
+         <para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is
+         dynamically allocated at the time the service is started, and released at the time the service is stopped —
+diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
+index a1943f65ab..a2b5ac0b59 100644
+--- a/man/systemd.socket.xml
++++ b/man/systemd.socket.xml
+@@ -302,7 +302,7 @@
+         <listitem><para>Specifies a POSIX message queue name to listen
+         on. This expects a valid message queue name (i.e. beginning
+         with /). Behavior otherwise is very similar to the
+-        <varname>ListenFIFO=</varname> directive above. On Linux
++        <varname>ListenFIFO=</varname> directive above. On GNU/Linux
+         message queue descriptors are actually file descriptors and
+         can be inherited between processes.</para></listitem>
+       </varlistentry>
 diff --git a/man/systemd.xml b/man/systemd.xml
-index e8178ca4b..ea7dad1ae 100644
+index 62ececb6e9..af464246ce 100644
 --- a/man/systemd.xml
 +++ b/man/systemd.xml
-@@ -64,7 +64,7 @@
+@@ -66,7 +66,7 @@
    <refsect1>
      <title>Description</title>
  
@@ -75,6 +225,19 @@ index e8178ca4b..ea7dad1ae 100644
      systems. When run as first process on boot (as PID 1), it acts as
      init system that brings up and maintains userspace
      services.</para>
+@@ -884,10 +884,10 @@
+     <title>Kernel Command Line</title>
+ 
+     <para>When run as system instance systemd parses a number of
+-    kernel command line arguments<footnote><para>If run inside a Linux
++    kernel command line arguments<footnote><para>If run inside a
+     container these arguments may be passed as command line arguments
+     to systemd itself, next to any of the command line options listed
+-    in the Options section above. If run outside of Linux containers,
++    in the Options section above. If run outside of a container,
+     these arguments are parsed from <filename>/proc/cmdline</filename>
+     instead.</para></footnote>:</para>
+ 
 -- 
-2.13.2
+2.15.1
 
diff --git a/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
index b9e94ee33..b44003e77 100644
--- a/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
+++ b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
@@ -1,7 +1,7 @@
-From 10ccaa5d0fb340e61abc158238f939f4f7744396 Mon Sep 17 00:00:00 2001
+From 515c6b9cfdc8508225b07f602feaf9680020acbd Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:23:40 -0400
-Subject: [PATCH 2/7] FSDG: os-release: Default to PRETTY_NAME "GNU/Linux"
+Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
  instead of "Linux"
 
 ---
@@ -14,10 +14,10 @@ Subject: [PATCH 2/7] FSDG: os-release: Default to PRETTY_NAME "GNU/Linux"
  6 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/man/kernel-install.xml b/man/kernel-install.xml
-index 94b6b1110..2f42d49d9 100644
+index fa86a3aaa0..cc5ca2a2a9 100644
 --- a/man/kernel-install.xml
 +++ b/man/kernel-install.xml
-@@ -110,7 +110,7 @@
+@@ -112,7 +112,7 @@
            <replaceable>PRETTY_NAME</replaceable> parameter specified
            in <filename>/etc/os-release</filename> or
            <filename>/usr/lib/os-release</filename> (if the former is
@@ -27,10 +27,10 @@ index 94b6b1110..2f42d49d9 100644
            the file <filename>initrd</filename> is found next to the
            <filename>linux</filename> file, the initrd will be added to
 diff --git a/man/os-release.xml b/man/os-release.xml
-index 99bbb6100..27d18749d 100644
+index b0468c16a0..80d0d39bb9 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -210,7 +210,7 @@
+@@ -212,7 +212,7 @@
          suitable for presentation to the user. May or may not contain
          a release code name or OS version of some kind, as suitable.
          If not set, defaults to
@@ -40,10 +40,10 @@ index 99bbb6100..27d18749d 100644
          Miracle)"</literal>.</para></listitem>
        </varlistentry>
 diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
-index ac0470b20..36b01500c 100644
+index d45c1dc496..686a951f09 100644
 --- a/src/analyze/analyze.c
 +++ b/src/analyze/analyze.c
-@@ -658,7 +658,7 @@ static int analyze_plot(sd_bus *bus) {
+@@ -693,7 +693,7 @@ static int analyze_plot(sd_bus *bus) {
          svg("<rect class=\"background\" width=\"100%%\" height=\"100%%\" />\n");
          svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
          svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",
@@ -53,10 +53,10 @@ index ac0470b20..36b01500c 100644
              strempty(host->kernel_name),
              strempty(host->kernel_release),
 diff --git a/src/core/main.c b/src/core/main.c
-index bcf9ea5f2..b66093827 100644
+index 2ad5073368..257ac31ca7 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
-@@ -1264,11 +1264,11 @@ static int status_welcome(void) {
+@@ -1355,11 +1355,11 @@ static int status_welcome(void) {
                  return status_printf(NULL, false, false,
                                       "\nWelcome to \x1B[%sm%s\x1B[0m!\n",
                                       isempty(ansi_color) ? "1" : ansi_color,
@@ -71,10 +71,10 @@ index bcf9ea5f2..b66093827 100644
  
  static int write_container_id(void) {
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index bc16290c7..f7574223a 100644
+index 207ddeb70f..46a20de469 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
-@@ -97,7 +97,7 @@ static void print_welcome(void) {
+@@ -101,7 +101,7 @@ static void print_welcome(void) {
                  log_warning_errno(r, "Failed to read os-release file: %m");
  
          printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",
@@ -84,10 +84,10 @@ index bc16290c7..f7574223a 100644
          press_any_key();
  
 diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
-index a0bca05c9..af9f0f9cc 100644
+index 305ea8f5c9..ae46dcc34d 100644
 --- a/src/kernel-install/90-loaderentry.install
 +++ b/src/kernel-install/90-loaderentry.install
-@@ -38,7 +38,7 @@ elif [[ -f /usr/lib/os-release ]]; then
+@@ -36,7 +36,7 @@ elif [[ -f /usr/lib/os-release ]]; then
  fi
  
  if ! [[ $PRETTY_NAME ]]; then
@@ -97,5 +97,5 @@ index a0bca05c9..af9f0f9cc 100644
  
  declare -a BOOT_OPTIONS
 -- 
-2.13.2
+2.15.1
 
diff --git a/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
index 40761d4ef..d9b3d9fe5 100644
--- a/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch
+++ b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
@@ -1,7 +1,7 @@
-From d13b518038bfcdeae9c58bce183751f835cb18d4 Mon Sep 17 00:00:00 2001
+From 46ba10771dec899315255bef0aa420b0479b3f30 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:24:56 -0400
-Subject: [PATCH 3/7] FSDG: os-release: Default to NAME "GNU/Linux" instead of
+Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of
  "Linux"
 
 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 3/7] FSDG: os-release: Default to NAME "GNU/Linux" instead of
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/man/os-release.xml b/man/os-release.xml
-index 27d18749d..a88d16b17 100644
+index 80d0d39bb9..ad3891e719 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -121,7 +121,7 @@
+@@ -123,7 +123,7 @@
          <listitem><para>A string identifying the operating system,
          without a version component, and suitable for presentation to
          the user. If not set, defaults to
@@ -23,10 +23,10 @@ index 27d18749d..a88d16b17 100644
          GNU/Linux"</literal>.</para></listitem>
        </varlistentry>
 diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index 9a1c5b76c..93e5f1ae7 100644
+index 82c70cfbe3..bd45b8e728 100644
 --- a/src/journal-remote/journal-gatewayd.c
 +++ b/src/journal-remote/journal-gatewayd.c
-@@ -805,7 +805,7 @@ static int request_handler_machine(
+@@ -806,7 +806,7 @@ static int request_handler_machine(
                       SD_ID128_FORMAT_VAL(mid),
                       SD_ID128_FORMAT_VAL(bid),
                       hostname_cleanup(hostname),
@@ -36,5 +36,5 @@ index 9a1c5b76c..93e5f1ae7 100644
                       usage,
                       cutoff_from,
 -- 
-2.13.2
+2.15.1
 
diff --git a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
index aadcc8a80..7e69a1c76 100644
--- a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
+++ b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
@@ -1,4 +1,4 @@
-From 97ace109bae3bd426f8578b7c606004be8234758 Mon Sep 17 00:00:00 2001
+From 2c010a68e43ce7d852d44940bdb5c291713f1751 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:28:30 -0400
 Subject: [PATCH 4/7] FSDG: os-release: Default ID to "gnu-linux" instead of
@@ -11,10 +11,10 @@ field, so this is just a man page change.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/man/os-release.xml b/man/os-release.xml
-index a88d16b17..caf60f41a 100644
+index ad3891e719..81f294c7e4 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -145,7 +145,7 @@
+@@ -147,7 +147,7 @@
          the operating system, excluding any version information and
          suitable for processing by scripts or usage in generated
          filenames. If not set, defaults to
@@ -24,5 +24,5 @@ index a88d16b17..caf60f41a 100644
          <literal>ID=debian</literal>.</para></listitem>
        </varlistentry>
 -- 
-2.13.2
+2.15.1
 
diff --git a/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch b/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
index 475a368be..9cbd40515 100644
--- a/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
+++ b/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
@@ -1,4 +1,4 @@
-From b98fdc685b819dca6f6b3fd9ef49ff4b0ec645af Mon Sep 17 00:00:00 2001
+From 025279cf5c4ff229cd191439d424295a0de69d65 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:31:20 -0400
 Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux"
@@ -9,10 +9,10 @@ Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux"
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
-index 9db8b8f61..bcfe3d381 100644
+index 2dbf432df9..696bf4679e 100644
 --- a/src/resolve/resolved-manager.c
 +++ b/src/resolve/resolved-manager.c
-@@ -383,10 +383,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char
+@@ -408,10 +408,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char
  static const char *fallback_hostname(void) {
  
          /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it to be
@@ -26,5 +26,5 @@ index 9db8b8f61..bcfe3d381 100644
          return FALLBACK_HOSTNAME;
  }
 -- 
-2.13.2
+2.15.1
 
diff --git a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
index 145e45d4b..d2bbda12c 100644
--- a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
+++ b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
@@ -1,18 +1,18 @@
-From 888c40a593c053c4af053fbe6ecd31c8c51f70c8 Mon Sep 17 00:00:00 2001
+From 6998da16c87712adea3e5b49a04aec180178d11a Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:32:21 -0400
 Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples
 
 ---
  man/os-release.xml     | 49 +++++++++++++++++++++++++------------------------
- man/systemd-nspawn.xml | 34 ++++++++++++++++++----------------
- 2 files changed, 43 insertions(+), 40 deletions(-)
+ man/systemd-nspawn.xml | 48 ++++++++++++++++++++++++++----------------------
+ 2 files changed, 51 insertions(+), 46 deletions(-)
 
 diff --git a/man/os-release.xml b/man/os-release.xml
-index caf60f41a..2811f434c 100644
+index 81f294c7e4..973e19747d 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,7 @@
          without a version component, and suitable for presentation to
          the user. If not set, defaults to
          <literal>NAME=GNU/Linux</literal>. Example:
@@ -21,7 +21,7 @@ index caf60f41a..2811f434c 100644
          GNU/Linux"</literal>.</para></listitem>
        </varlistentry>
  
-@@ -133,8 +133,8 @@
+@@ -135,8 +135,8 @@
          version, excluding any OS name information, possibly including
          a release code name, and suitable for presentation to the
          user. This field is optional. Example:
@@ -32,7 +32,7 @@ index caf60f41a..2811f434c 100644
        </varlistentry>
  
        <varlistentry>
-@@ -146,8 +146,8 @@
+@@ -148,8 +148,8 @@
          suitable for processing by scripts or usage in generated
          filenames. If not set, defaults to
          <literal>ID=gnu-linux</literal>. Example:
@@ -43,7 +43,7 @@ index caf60f41a..2811f434c 100644
        </varlistentry>
  
        <varlistentry>
-@@ -168,9 +168,9 @@
+@@ -170,9 +170,9 @@
          should be listed in order of how closely the local operating
          system relates to the listed ones, starting with the closest.
          This field is optional. Example: for an operating system with
@@ -55,7 +55,7 @@ index caf60f41a..2811f434c 100644
          assignment of <literal>ID_LIKE=debian</literal> is
          appropriate.</para></listitem>
        </varlistentry>
-@@ -199,8 +199,8 @@
+@@ -201,8 +201,8 @@
          identifying the operating system version, excluding any OS
          name information or release code name, and suitable for
          processing by scripts or usage in generated filenames. This
@@ -66,7 +66,7 @@ index caf60f41a..2811f434c 100644
        </varlistentry>
  
        <varlistentry>
-@@ -211,8 +211,8 @@
+@@ -213,8 +213,8 @@
          a release code name or OS version of some kind, as suitable.
          If not set, defaults to
          <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:
@@ -77,7 +77,7 @@ index caf60f41a..2811f434c 100644
        </varlistentry>
  
        <varlistentry>
-@@ -235,7 +235,7 @@
+@@ -237,7 +237,7 @@
          <ulink url="http://scap.nist.gov/specifications/cpe/">Common
          Platform Enumeration Specification</ulink> as proposed by the
          NIST. This field is optional. Example:
@@ -86,7 +86,7 @@ index caf60f41a..2811f434c 100644
          </para></listitem>
        </varlistentry>
  
-@@ -270,8 +270,8 @@
+@@ -272,8 +272,8 @@
          one URL shall be listed in each setting. If multiple resources
          need to be referenced, it is recommended to provide an online
          landing page linking all available resources. Examples:
@@ -97,7 +97,7 @@ index caf60f41a..2811f434c 100644
        </varlistentry>
  
        <varlistentry>
-@@ -346,21 +346,22 @@
+@@ -348,21 +348,22 @@
      recommended to prefix new fields with an OS specific
      name in order to avoid name clashes. Applications
      reading this file must ignore unknown fields. Example:
@@ -131,23 +131,24 @@ index caf60f41a..2811f434c 100644
  
    <refsect1>
 diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index ae7082776..ef80d90ba 100644
+index 3dbdf376d3..01e6ca403a 100644
 --- a/man/systemd-nspawn.xml
 +++ b/man/systemd-nspawn.xml
-@@ -1048,10 +1048,11 @@
+@@ -1082,11 +1082,12 @@
    <refsect1>
      <title>Examples</title>
  
 +<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use.
      <example>
-       <title>Download a Fedora image and start a shell in it</title>
+       <title>Download a
+       <ulink url="https://getfedora.org">Fedora</ulink> image and start a shell in it</title>
  
 -      <programlisting># machinectl pull-raw --verify=no \
 +      <programlisting># machinectl pull-raw -&2D;verify=no \
        https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.raw.xz
  # systemd-nspawn -M Fedora-Cloud-Base-25-1.3.x86_64.raw</programlisting>
  
-@@ -1059,39 +1060,40 @@
+@@ -1094,31 +1095,32 @@
        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
        and opens a shell in it.</para>
      </example>
@@ -157,18 +158,24 @@ index ae7082776..ef80d90ba 100644
 -      <title>Build and boot a minimal Fedora distribution in a container</title>
 +      <title>Build and boot a minimal BLAG distribution in a container</title>
  
--      <programlisting># dnf -y --releasever=25 --installroot=/srv/mycontainer \
+-      <programlisting># dnf -y --releasever=27 --installroot=/var/lib/machines/f27container \
 -      --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \
 -      systemd passwd dnf fedora-release vim-minimal
-+      <programlisting># dnf -y --releasever=210k --installroot=/srv/mycontainer \
+-# systemd-nspawn -bD /var/lib/machines/f27container</programlisting>
++      <programlisting># dnf -y --releasever=140k --installroot=/var/lib/machines/blag140container \
 +      --disablerepo='*' --enablerepo=blag --enablerepo=updates install \
 +      systemd passwd dnf blag-release vim-minimal
- # systemd-nspawn -bD /srv/mycontainer</programlisting>
++# systemd-nspawn -bD /var/lib/machines/blag140container</programlisting>
  
 -      <para>This installs a minimal Fedora distribution into the
+-      directory <filename noindex='true'>/var/lib/machines/f27container</filename>
 +      <para>This installs a minimal BLAG distribution into the
-       directory <filename noindex='true'>/srv/mycontainer/</filename>
-       and then boots an OS in a namespace container in it.</para>
++      directory <filename noindex='true'>/var/lib/machines/blag140container</filename>
+       and then boots an OS in a namespace container in it. Because the installation
+       is located underneath the standard <filename>/var/lib/machines/</filename>
+       directory, it is also possible to start the machine using
+-      <command>systemd-nspawn -M f27container</command>.</para>
++      <command>systemd-nspawn -M blag140container</command>.</para>
      </example>
  
      <example>
@@ -185,11 +192,14 @@ index ae7082776..ef80d90ba 100644
 +      <para>This installs a minimal gNewSense unstable distribution into
 +      the directory <filename>~/gnewsense-tree/</filename> and then
        spawns a shell in a namespace container in it.</para>
-     </example>
+ 
+       <para><command>debootstrap</command> supports
+@@ -1133,29 +1135,31 @@
  
      <example>
--      <title>Boot a minimal Arch Linux distribution in a container</title>
-+      <title>Boot a minimal Parabola distribution in a container</title>
+       <title>Boot a minimal
+-      <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title>
++      <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title>
  
 -      <programlisting># pacstrap -c -d ~/arch-tree/ base
 -# systemd-nspawn -bD ~/arch-tree/</programlisting>
@@ -203,6 +213,27 @@ index ae7082776..ef80d90ba 100644
        in a namespace container in it.</para>
      </example>
  
++<!-- TODO: This example needs switched to an FSDG OS
+     <example>
+       <title>Install the
+       <ulink url="https://software.opensuse.org/distributions/tumbleweed">OpenSUSE Tumbleweed</ulink>
+       rolling distribution</title>
+ 
+-      <programlisting># zypper --root=/var/lib/machines/tumbleweed ar -c \
++      <programlisting># zypper -&2Droot=/var/lib/machines/tumbleweed ar -c \
+       https://download.opensuse.org/tumbleweed/repo/oss tumbleweed
+-# zypper --root=/var/lib/machines/tumbleweed refresh
+-# zypper --root=/var/lib/machines/tumbleweed install --no-recommends \
++# zypper -&2Droot=/var/lib/machines/tumbleweed refresh
++# zypper -&2Droot=/var/lib/machines/tumbleweed install -&2Dno-recommends \
+       systemd shadow zypper openSUSE-release vim
+ # systemd-nspawn -M tumbleweed passwd root
+ # systemd-nspawn -M tumbleweed -b</programlisting>
+     </example>
++-->
+ 
+     <example>
+       <title>Boot into an ephemeral snapshot of the host system</title>
 -- 
-2.13.2
+2.15.1
 
diff --git a/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch b/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
index 2ca860d87..8810889d8 100644
--- a/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
+++ b/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
@@ -1,4 +1,4 @@
-From c2357a5265d49410d3aacef1ccacb9b0caf761a5 Mon Sep 17 00:00:00 2001
+From 502b6b516b9469307fd1ca9a1af2b6558a2ba0e6 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Sat, 17 Dec 2016 00:56:43 -0500
 Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of
@@ -9,10 +9,10 @@ Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
-index 155bf278b..297dcb535 100644
+index 59c1af73de..31b8b0fdab 100644
 --- a/src/boot/bootctl.c
 +++ b/src/boot/bootctl.c
-@@ -778,13 +778,13 @@ static int install_variables(const char *esp_path,
+@@ -682,13 +682,13 @@ static int install_variables(const char *esp_path,
                                         "Failed to determine current boot order: %m");
  
          if (first || r == 0) {
@@ -29,5 +29,5 @@ index 155bf278b..297dcb535 100644
  
          return insert_into_order(slot, first);
 -- 
-2.13.2
+2.15.1
 
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index eec3dbbd4..58371fdbf 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -10,14 +10,14 @@ pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 _libsystemd=('libsystemd-standalone' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
 pkgname+=("${_libsystemd[@]}")
 # latest commit on stable branch
-_commit='743b771c559c6101544f7358a42c8c519fe4b0db'
+_commit='a1b2c92d8290c76a29ccd0887a92ac064e1bb5a1'
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
-pkgver=235.38
-pkgrel=3
+pkgver=236.0
+pkgrel=2
 pkgrel+=.parabola1
-arch=('i686' 'x86_64')
-arch+=('armv7h')
+arch=('x86_64')
+arch+=('i686' 'armv7h')
 url="https://www.github.com/systemd/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
@@ -27,7 +27,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
 makedepends_i686=('gnu-efi-libs')
 makedepends_x86_64=('gnu-efi-libs')
 options=('strip')
-validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4') # Lennart Poettering <lennart@poettering.net>
+validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4')  # Lennart Poettering <lennart@poettering.net>
 source=('git://github.com/systemd/systemd-stable.git'
         'git://github.com/systemd/systemd.git' # pull in for tags, backports & reverts
         'initcpio-hook-udev'
@@ -42,8 +42,8 @@ source=('git://github.com/systemd/systemd-stable.git'
         'systemd-tmpfiles.hook'
         'systemd-update.hook'
         '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'
-        '0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch'
-        '0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch'
+        '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch'
+        '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch'
         '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch'
         '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch'
         '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch'
@@ -61,17 +61,17 @@ sha512sums=('SKIP'
             '7d49a948f5d58f662a7d81544254528257ef8c0a08ca560834f09a7cdf566161d2df4d419ebbc2983196cd45c9eeefcd0c4c2c554376916dce42e895262afc30'
             'e521d92674597f82d589b83c378c50c92c881fdb84c436c8b26f7a3436a4c91a20585824a5563933f6868a3023b9ee2fdc7bd58e04bb47c25a0a36e296308fd3'
             '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618'
-            'e85c5564348253e1bc49d943f0456c38ebef0c50a5a7782ea6ebb1f45bd624a69430d79693fe1223b0adace9f07c167b84133a003a09a8b61ae48d1b70610277'
-            '0ad718e9441798a4479600ffce364c2f0e582fd0ccf7762dde90f99755dee4569bcee8299ea2ccbf3a010966c8d48c59fcd0b1f93c9b8a479332c2c128fc2b2a'
-            '03ec8cfde36a0a7413993118707e32b0d8b693d366da8cb22a6e71e1c10178d1df05b2e2d1d5a2a298d49af005f3cdf80bfd8d40959d3e53310491b6ada39fed'
-            '9c13df718d4db2592c50c348c7b6340bbd7dd6ee6951da0f2bbd9c1878e0f034b975dfa9b28081b57e76f91c49f0bbcce314d0baaf1c5916dcff11e98d426372'
-            'b45c4e40f626a02951a852ea4cd2304f00a172dc64b5c38a97f5c68e4a89ceb4f4164cc9221533c4a5c52662e0b9629a82c521514bfcc21f0c11ce517643c2c1'
-            'f5c4cbeecac8f9d8f009deb4ac1d0b797210bcd1a91fcc6bf8ec110320ad6ceb8fd2a28b184ca037d73078d09a22f224ad3fc46f4bbf972432cce23263b2e1dc'
-            'e276fd1aedd7718333324fa9d99493fe99d951f446e3b590a99e2cc9562a0bd0e29693907997cb52096c39168c5be62ded3feedf93bacd3c9659d58775b6ca8d')
+            '107d2e36544aa8ef1c6e86339fbc811acb6e1d15eb0edca9f463bdd1b0e91fa8d85cf8c9e70eeaf4196e2f942e30310b672859191f3093c4806546ae30140fb9'
+            '7445f9802cc194e27238cc89954c1035b0bf0c32b2702a7cbf463f701c4f87a416d7f3f75cc3eb9abe276ac7e49d377451c3727523544568420e348d47c1ef4c'
+            '7b969dc665281eb43871cf399398ddc25a16f533919dfbf721e2a2eb922cde6936c42400083ef39d5cc873a0b2bf749897c9bb1aaa38624315b8e5810f82efca'
+            'fbcc54a62b6f3f7ec1dfad8317160c3057f145e542a423a2fd6b5c141012929aeb977491afe35b16c4903b5fd0d1469f3d87d1c8a036b4d6b623ac7dbe682ff5'
+            '4e86eac4132d5bd712061d09c14141d91e6bfd2f3879a1fc4a92a15fa77d01552de5c9ebae4a67be2b2a54223a53f2538ba03d4fa0c96ecd1e62a4e8cf341fd1'
+            'f443f25f788eb0bf3199a60f8765db1e60f596ec9939c14f7670ed51b97756ec6f0488a619e3f0f750111f3a82f9d5dbfac601138e7822d9e2a39219a57522a4'
+            '6a16666f18b7075a68733376f4b1fe34dd2aa29eaf43e693a98e303b9c5202317636816cb4a914d5141801026d1693dd4de2f79e0950aa777e8de6e4879cd9d0')
 
 _backports=(
-	# Fix typo in statx macro (#7180) (FS#56289)
-	'8e6a7a8b2be409d356bcaface00f6d44390c07ff'
+  # cryptsetup-generator: Don't mistake NULL input as OOM (#7688) 
+  'aff0b1fa7bf2ca60fd5ffdf7ea25184d576cf61d'
 )
 
 _reverts=(
@@ -214,6 +214,7 @@ package_systemd() {
   depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
            'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
            'util-linux' 'xz')
+  depends_i686=('cryptsetup=1.7.5')
   provides=("systemd-tools=$pkgver" "udev=$pkgver")
   replaces=('systemd-tools' 'udev')
   conflicts=('systemd-tools' 'udev')
@@ -257,7 +258,10 @@ package_systemd() {
   install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
   install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
 
-  # ensure proper permissions for /var/log/journal. This is only to placate
+  # ensure proper permissions for /var/log/journal
+  # The permissions are stored with named group by tar, so this works with
+  # users and groups populated by systemd-sysusers. This is only to prevent a
+  # warning from pacman as permissions are set by systemd-tmpfiles anyway.
   chown root:systemd-journal "$pkgdir/var/log/journal"
   chmod 2755 "$pkgdir/var/log/journal"
 
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index 16c0eb8b2..53c16eb28 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -14,8 +14,8 @@
 _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.13
-  _archrel=31
+  _basekernel=4.14
+  _archrel=45
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
@@ -46,7 +46,6 @@ if [[ ${_kernelname} != "" ]]; then
   provides=("${_pkgname}")
 fi
 
-install='kmod.install'
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/evgeni/${_pkgname}/archive/${__pkgname}/${pkgver}.tar.gz")
 sha256sums=('cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381')
 
@@ -71,9 +70,4 @@ package() {
   # load module on startup
   install -dm 755 "${pkgdir}/usr/lib/modules-load.d"
   echo ${_pkgname} > "${pkgdir}/usr/lib/modules-load.d/${_pkgname}${_kernelname}.conf"
-
-  # Set the correct extramodules directory for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
-  true && install=${install}.pkg
-  sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
 }
diff --git a/libre/tp_smapi/kmod.install b/libre/tp_smapi/kmod.install
deleted file mode 100644
index 40caa464f..000000000
--- a/libre/tp_smapi/kmod.install
+++ /dev/null
@@ -1,14 +0,0 @@
-_EXTRAMODULES=
-
-post_install() {
-	echo ">>> Updating module dependencies. Please wait ..."
-	depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/uboot-grub/PKGBUILD b/libre/uboot-grub/PKGBUILD
index d680f6f67..5965d13f6 100644
--- a/libre/uboot-grub/PKGBUILD
+++ b/libre/uboot-grub/PKGBUILD
@@ -5,6 +5,7 @@ pkgbase=uboot-grub
 pkgname=('uboot-grub-am335x_evm')
 pkgver=2015.07
 pkgrel=1
+arch=(armv7h)
 url='http://www.denx.de/wiki/U-Boot/'
 license=('GPL2')
 makedepends=('bc')
diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD
index 82c8038d6..4efe21005 100644
--- a/libre/vhba-module/PKGBUILD
+++ b/libre/vhba-module/PKGBUILD
@@ -9,8 +9,8 @@
 _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.13
-  _archrel=16
+  _basekernel=4.14
+  _archrel=31
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
@@ -52,13 +52,15 @@ _package() {
   depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
   replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
   conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
-  install='kmod.install'
 
   cd "${pkgbase}-${pkgver}"
 
   # Actually install
   install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 vhba.ko
   install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules
+  echo 'g cdemu - -' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/cdemu.conf"
+
+  find "$pkgdir" -name '*.ko' -exec gzip -n {} +
 }
 
 if [[ ${_kernelname} == "" ]]; then
@@ -70,6 +72,7 @@ if [[ ${_kernelname} == "" ]]; then
     cd $pkgbase-$pkgver
     install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile vhba.c ../dkms.conf
     install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules
+    echo 'g cdemu - -' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/cdemu.conf"
   }
 
   pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms")
diff --git a/libre/vhba-module/kmod.install b/libre/vhba-module/kmod.install
deleted file mode 100644
index 2c7652580..000000000
--- a/libre/vhba-module/kmod.install
+++ /dev/null
@@ -1,15 +0,0 @@
-
-post_install() {
-	post_upgrade $1 0
-	getent group cdemu &>/dev/null || groupadd -r cdemu
-}
-
-post_upgrade() {
-	_EXTRAMODULES=extramodules-4.11
-	depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
-}
-
-post_remove() {
-	post_upgrade $1 0
-	groupdel cdemu
-}
diff --git a/libre/vim-colorsamplerpack/PKGBUILD b/libre/vim-colorsamplerpack/PKGBUILD
index 490bc246e..41667e3d6 100644
--- a/libre/vim-colorsamplerpack/PKGBUILD
+++ b/libre/vim-colorsamplerpack/PKGBUILD
@@ -1,12 +1,13 @@
 # $Id: PKGBUILD 189356 2016-09-15 20:21:37Z svenstaro $
 # Contributor (Arch): Aaron Griffin <aaron@archlinux.org>
 # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 _pkgname=vim-colorsamplerpack-libre
 pkgname=vim-colorsamplerpack
 pkgver=2012.10.28
-pkgrel=4.parabola1
+pkgrel=4.parabola2
 _scriptid=18915
 pkgdesc="Different colorschemes for vim, without nonfree colorschemes"
 arch=('any')
diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index 175b164fc..3694d3d61 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -13,18 +13,19 @@
 
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
-pkgver=8.0.1176
+pkgver=8.0.1415
 _versiondir=80
 pkgrel=1.parabola1
 url='http://www.vim.org'
 arch=('i686' 'x86_64' 'armv7h')
 license=('custom:vim')
-makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'gtk3' 'lua' 'gawk' 'tcl')
+makedepends=('glibc' 'libgcrypt' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'gtk3' 'lua'
+             'gawk' 'tcl' 'pcre' 'zlib' 'libffi')
 source=(vim-${pkgver}.tar.gz::https://github.com/vim/vim/archive/v${pkgver}.tar.gz
         vimrc
         parabola.vim
         vimdoc.hook)
-sha256sums=('1485524d747b2046b9e1ea3bfcf80148e6a9a65e29d972d23cf88152ad9dcca2'
+sha256sums=('6db5d55c45f70db167a2c2be81c6e47833ea59c754f45839c9b4996934055610'
             '6c22ef5791004dc3a1151400a3ce6aec35f660237aed734bcde0a8a16882cbc0'
             '2d0cae071444b5b07015c4692c47661214788d47b3aade9ffccdf703784517d0'
             '7095cafac21df7aa42749d6864d1c0549fe65771d8edda3102c931c60782b6b9')
@@ -141,7 +142,8 @@ package_vim-runtime() {
 
 package_vim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl' 'glibc' 'libgcrypt' 'pcre'
+           'zlib' 'libffi')
   optdepends=('python2: Python 2 language support'
               'python: Python 3 language support'
               'ruby: Ruby language support'
@@ -179,7 +181,8 @@ package_vim() {
 
 package_gvim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk3')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk3' 'glibc' 'libgcrypt' 'pcre'
+           'zlib' 'libffi')
   optdepends=('python2: Python 2 language support'
               'python: Python 3 language support'
               'ruby: Ruby language support'
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 7879c61d0..fa1cfbef0 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -4,8 +4,8 @@ pkgname=your-freedom
 pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free."
 license=('GPL3')
 url="https://git.parabola.nu/blacklist.git"
-pkgver=20171219
-_gitver=86f06b9727d83b97993aa7862b5b6471b39ad933
+pkgver=20180104
+_gitver=d57698fc89599f7a115ed5f10c42aff1c363429f
 pkgrel=1
 
 arch=('any')
@@ -14,7 +14,7 @@ install=${pkgname}.install
 
 makedepends=(librelib)
 source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver})
-sha512sums=('0c3d77cf54515036f98e30e8c4f4f4e34bc40c9d32e1d7ebb89f468246e21ee141852f72f2a59260ddc257ec3daea4accfce9d4702454e941b8ef20db1c825b6')
+sha512sums=('7c88b2b977ac8d6637d6a4384bc267df4721aecd1eebc100c060a29181af7c4e022e51366711002a313040c35048eacc0d1a8699308fa734a90f178153ca77ce')
 
 package() {
 	cd "$srcdir"
diff --git a/nonprism/darktable/PKGBUILD b/nonprism/darktable/PKGBUILD
index 429c67064..8b334d121 100644
--- a/nonprism/darktable/PKGBUILD
+++ b/nonprism/darktable/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=darktable
 epoch=2
 pkgver=2.2.5
 pkgrel=2.nonprism1
-arch=(i686 x86_64 armv7h)
+arch=(i686 x86_64)
 
 pkgdesc="Utility to organize and develop raw images, without flickcurl support"
 url="http://darktable.sf.net/"
diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index b794bf2d4..d99655052 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -8,8 +8,8 @@ _oldname=thunderbird
 pkgname=icedove
 
 epoch=1
-pkgver=52.5.0
-pkgrel=2.nonprism1
+pkgver=52.5.2
+pkgrel=1.nonprism1
 _brandingver=52.1
 _brandingrel=1
 arch=(i686 x86_64 armv7h)
@@ -46,7 +46,7 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname
         libre-searchengines.patch
         no-neon.patch
         no-crmf.patch)
-sha256sums=('7f169d1110db6d184a1be750a59734cbe639fb304bd76553aeaa1bde3bb7f779'
+sha256sums=('7772e1865cd4cbaac82ea05374d0ae51f754f47c6160c9b83919da483d620ee5'
             '246418976524fbead5b99e6227f97322f8d4c45e0edf9ce75561ae8eccdefc65'
             'SKIP'
             'cafd1cf384791e8e3284f52370b2913a8b05935ecfd10d2a19c6dd5a8c219b62'
diff --git a/nonprism/kdenetwork-kopete/PKGBUILD b/nonprism/kdenetwork-kopete/PKGBUILD
deleted file mode 100644
index d83641bc7..000000000
--- a/nonprism/kdenetwork-kopete/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 290221 2017-03-09 16:12:45Z arojas $
-# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
-# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
-# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-
-pkgname=kdenetwork-kopete
-pkgver=16.12.3
-pkgrel=1.parabola1.nonprism1
-pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols'
-url='https://kde.org/applications/internet/kopete/'
-arch=('i686' 'x86_64' 'armv7h')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdenetwork')
-replaces=(${pkgname}-libre ${pkgname}-libre-nonprism)
-conflicts=(${pkgname}-libre ${pkgname}-libre-nonprism)
-depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'kdepimlibs4')
-makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'jsoncpp')
-optdepends=('mediastreamer: jingle support')
-source=("https://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig}
-        kopete-mediastreamer2.14.patch
-        'libre-nonprism.patch')
-sha1sums=('0331b1639457ffa64e69029f9a109dd344029c03'
-          'SKIP'
-          'b284ffb226cbcc0da6540ecd978d37287aa6eddb'
-          'f0d7b727da1b5160f05952eec4df1bfbefab99cf')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
-
-prepare() {
-  cd kopete-$pkgver
-# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
-  rm -rv protocols/skype
-# Remove unsafe/dangerous services
-  rm -rv protocols/oscar
-  rm -rv protocols/yahoo
-  rm -rv protocols/qq
-  rm -rv protocols/groupwise
-  rm -rv protocols/gadu
-  rm -rv protocols/wlm
-  rm -rv protocols/meanwhile
-  patch -p1 -i "${srcdir}"/libre-nonprism.patch
-  cd ..
-  mkdir -p build
-
-# Fix build with mediastreamer 2.14
-  cd kopete-$pkgver
-  patch -p1 -i ../kopete-mediastreamer2.14.patch
-}
-
-build() {
-  cd build
-  cmake ../kopete-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DWITH_Libmsn=OFF \
-    -DWITH_Libgadu=OFF \
-    -DWITH_skype=OFF \
-    -DWITH_oscar=OFF \
-    -DWITH_yahoo=OFF \
-    -DWITH_qq=OFF \
-    -DWITH_groupwise=OFF \
-    -DWITH_gadu=OFF \
-    -DWITH_GOOGLETALK=OFF \
-    -DWITH_wlm=OFF \
-    -DWITH_WLM_MEDIASTREAMER=OFF \
-    -DWITH_meanwhile=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}
diff --git a/nonprism/kopete/PKGBUILD b/nonprism/kopete/PKGBUILD
new file mode 100644
index 000000000..696781bb3
--- /dev/null
+++ b/nonprism/kopete/PKGBUILD
@@ -0,0 +1,95 @@
+# $Id: PKGBUILD 290221 2017-03-09 16:12:45Z arojas $
+# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
+# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: André Silva <emulatorman@hyperbola.info>
+
+pkgname=kopete
+
+pkgver=17.08.3
+pkgrel=1.parabola2.nonprism1
+arch=(i686 x86_64 armv7h)
+
+pkgdesc="Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols"
+url="https://kde.org/applications/internet/kopete/"
+license=(GPL LGPL FDL)
+
+makedepends=(cmake automoc4 boost mediastreamer libgadu jsoncpp openssl-1.0)
+depends=(kdebase-runtime libotr qimageblitz qca-qt4 qjson)
+optdepends=('mediastreamer: jingle support')
+conflicts=(kdenetwork-kopete)
+replaces=(kdenetwork-kopete)
+
+source=("https://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig}
+        kopete-mediastreamer2.14.patch
+        kopete-pthread-link.patch
+        kopete-no-kdepimlibs.patch
+        libre-nonprism.patch)
+sha256sums=('f86ccc1ca809c723d1baf2eed745f158337059263555f6fafa23ea200aacafec'
+            'SKIP'
+            'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0'
+            'a7ebdd8dd4336b7ec085ef254bf18040f473b73379a8cd84569b28441a6c71df'
+            'b9e7f0029dabe6a738114b11a093eb7d24aaf1e71b26d089901246e56cbeacf5'
+            'c1824f31afbe37089508a7bc3ac29e5a5835e0aac6fd53d8097085cde1e3cf23')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
+
+prepare() {
+  mkdir -p build
+
+  cd kopete-$pkgver
+
+  # based on https://devel.trisquel.info/trisquel/package-helpers/blob/belenos/helpers/make-kopete
+  sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/skype
+  sed 's/, Skype//' -i ./doc/index.docbook
+
+  # Remove unsafe/dangerous services
+  rm -rv protocols/oscar
+  rm -rv protocols/yahoo
+  rm -rv protocols/qq
+  rm -rv protocols/groupwise
+  rm -rv protocols/gadu
+  rm -rv protocols/wlm
+  rm -rv protocols/meanwhile
+  patch -p1 -i "${srcdir}"/libre-nonprism.patch
+
+  # Fix build with mediastreamer 2.14
+  patch -p1 -i ../kopete-mediastreamer2.14.patch
+  # Fix linking to pthread in libjingle-call
+  patch -p1 -i ../kopete-pthread-link.patch
+  # Remove kdepimlibs usage
+  patch -p1 -i ../kopete-no-kdepimlibs.patch
+}
+
+build() {
+  cd build
+
+  cmake ../kopete-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DWITH_Libmsn=OFF \
+    -DWITH_Libgadu=OFF \
+    -DWITH_skype=OFF \
+    -DWITH_oscar=OFF \
+    -DWITH_yahoo=OFF \
+    -DWITH_qq=OFF \
+    -DWITH_groupwise=OFF \
+    -DWITH_gadu=OFF \
+    -DWITH_GOOGLETALK=OFF \
+    -DWITH_wlm=OFF \
+    -DWITH_WLM_MEDIASTREAMER=OFF \
+    -DWITH_meanwhile=OFF \
+    -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 \
+    -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so \
+    -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so
+  make
+}
+
+package() {
+  cd build
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/nonprism/kdenetwork-kopete/kopete-mediastreamer2.14.patch b/nonprism/kopete/kopete-mediastreamer2.14.patch
index f4ee1a096..f4ee1a096 100644
--- a/nonprism/kdenetwork-kopete/kopete-mediastreamer2.14.patch
+++ b/nonprism/kopete/kopete-mediastreamer2.14.patch
diff --git a/nonprism/kopete/kopete-no-kdepimlibs.patch b/nonprism/kopete/kopete-no-kdepimlibs.patch
new file mode 100644
index 000000000..e4d3609f8
--- /dev/null
+++ b/nonprism/kopete/kopete-no-kdepimlibs.patch
@@ -0,0 +1,1280 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5216807ab..78c7ab500 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,6 @@ project(kopete)
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ include(MacroLibrary)
+-find_package(KdepimLibs REQUIRED)
+ find_package(QImageBlitz REQUIRED)
+ 
+ set(KOPETE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+diff --git a/kopete/contactlist/CMakeLists.txt b/kopete/contactlist/CMakeLists.txt
+index 2219addf9..ea5623a75 100644
+--- a/kopete/contactlist/CMakeLists.txt
++++ b/kopete/contactlist/CMakeLists.txt
+@@ -12,10 +12,8 @@ set(kopetecontactlist_SRCS
+ #kopetegroupviewitem.cpp
+ kopetecontactlistview.cpp
+ kopetelviprops.cpp
+-kopeteaddrbookexport.cpp
+ customnotificationprops.cpp
+ kopetegrouplistaction.cpp
+-kabcexport.cpp
+ contactlistmodel.cpp
+ contactlisttreemodel.cpp
+ contactlistplainmodel.cpp
+@@ -28,9 +26,6 @@ contactlistlayoutitemconfig.cpp
+ kde4_add_ui_files(kopetecontactlist_SRCS
+ kopetegvipropswidget.ui
+ kopetemetalvipropswidget.ui
+-kopeteaddrbookexportui.ui
+-kabcexport_page1.ui
+-kabcexport_page2.ui
+ )
+ 
+ kde4_add_library( kopetecontactlist SHARED ${kopetecontactlist_SRCS} )
+diff --git a/kopete/contactlist/contactlistproxymodel.cpp b/kopete/contactlist/contactlistproxymodel.cpp
+index d0ada7892..cb636dfca 100644
+--- a/kopete/contactlist/contactlistproxymodel.cpp
++++ b/kopete/contactlist/contactlistproxymodel.cpp
+@@ -27,7 +27,6 @@
+ #include "kopetecontact.h"
+ #include "kopeteappearancesettings.h"
+ #include "kopeteitembase.h"
+-#include <kabc/stdaddressbook.h>
+ 
+ namespace Kopete {
+ 
+@@ -272,15 +271,6 @@ bool ContactListProxyModel::searchContactInfo(Kopete::MetaContact *mc, QRegExp s
+ 		return true;
+ 
+ 	// Check the address book
+-	KABC::Addressee addressee = KABC::StdAddressBook::self()->findByUid( mc->kabcId() );
+-	if ( !addressee.isEmpty() )
+-	{
+-		QString emailAddr = addressee.fullEmail();
+-
+-		if ( emailAddr.contains( searchPattern ) )
+-			return true;
+-	}
+-
+ 	// Check alternative names
+ 	foreach( Kopete::Contact* c , mc->contacts() )
+ 	{
+diff --git a/kopete/contactlist/kopetecontactlistview.cpp b/kopete/contactlist/kopetecontactlistview.cpp
+index b32a500cf..9b403d123 100644
+--- a/kopete/contactlist/kopetecontactlistview.cpp
++++ b/kopete/contactlist/kopetecontactlistview.cpp
+@@ -39,7 +39,6 @@
+ #include <KMessageBox>
+ #include <KToolInvocation>
+ #include <kxmlguifactory.h>
+-#include <kabc/stdaddressbook.h>
+ 
+ #include "kopeteuiglobal.h"
+ #include "kopetecontactlistelement.h"
+@@ -529,24 +528,6 @@ void KopeteContactListView::sendMessage()
+ void KopeteContactListView::sendEmail()
+ {
+ 	Kopete::MetaContact* metaContact = metaContactFromIndex( currentIndex() );
+-	if ( metaContact )
+-	{
+-		KABC::Addressee addressee = KABC::StdAddressBook::self()->findByUid( metaContact->kabcId() );
+-		if ( !addressee.isEmpty() )
+-		{
+-			QString emailAddr = addressee.fullEmail();
+-			
+-			kDebug( 14000 ) << "Email: " << emailAddr << "!";
+-			if ( !emailAddr.isEmpty() )
+-				KToolInvocation::invokeMailer( emailAddr, QString() );
+-			else
+-				KMessageBox::queuedMessageBox( this, KMessageBox::Sorry, i18n( "There is no email address set for this contact in the KDE address book." ), i18n( "No Email Address in Address Book" ) );
+-		}
+-		else
+-		{
+-			KMessageBox::queuedMessageBox( this, KMessageBox::Sorry, i18n( "This contact was not found in the KDE address book. Check that a contact is selected in the properties dialog." ), i18n( "Not Found in Address Book" ) );
+-		}
+-	}
+ }
+ 
+ void KopeteContactListView::rename()
+diff --git a/kopete/contactlist/kopetelviprops.cpp b/kopete/contactlist/kopetelviprops.cpp
+index 04ff289a1..84a4c95f8 100644
+--- a/kopete/contactlist/kopetelviprops.cpp
++++ b/kopete/contactlist/kopetelviprops.cpp
+@@ -43,18 +43,12 @@
+ #include <klocale.h>
+ #include <kmessagebox.h>
+ #include <kurlrequester.h>
+-#include <kabc/addresseedialog.h>
+-#include <kabc/stdaddressbook.h>
+-#include <kabc/addressee.h>
+ #include <kstandarddirs.h>
+ 
+-#include "kabcpersistence.h"
+-#include "kopeteaddrbookexport.h"
+ #include "kopetecontact.h"
+ #include "kopetegroup.h"
+ #include "kopeteaccount.h"
+ #include "kopeteprotocol.h"
+-#include "addressbooklinkwidget.h"
+ #include "avatardialog.h"
+ 
+ #include "customnotificationprops.h"
+@@ -186,9 +180,6 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(Kopete::MetaContact *metaContact, QWidget
+ 	hb->setMargin( -1 );
+ 	hb->setObjectName( "soundFromKABClayout" );
+ 
+-	mFromKABC = new QPushButton( i18n( "Sync KABC..." ), mNotificationProps->widget() );
+-	mFromKABC->setObjectName( QLatin1String("getSoundFromKABC") );
+-	hb->addWidget( mFromKABC ); // [ [Button] <-xxxxx-> ]
+ 	hb->addStretch();
+ 	vb->addStretch(); // vert spacer keeps the rest snug
+ 
+@@ -199,10 +190,8 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(Kopete::MetaContact *metaContact, QWidget
+ 	ui_mainWidget->tabWidget->addTab( npMainWidget, i18n( "Custom &Notifications" ) );
+ 	setMainWidget( mainWidget );
+ 
+-	connect( ui_mainWidget->radioNameKABC, SIGNAL(toggled(bool)), SLOT(slotEnableAndDisableWidgets()));
+ 	connect( ui_mainWidget->radioNameContact, SIGNAL(toggled(bool)), SLOT(slotEnableAndDisableWidgets()));
+ 	connect( ui_mainWidget->radioNameCustom, SIGNAL(toggled(bool)), SLOT(slotEnableAndDisableWidgets()));
+-	connect( ui_mainWidget->radioPhotoKABC, SIGNAL(toggled(bool)), SLOT(slotEnableAndDisableWidgets()));
+ 	connect( ui_mainWidget->radioPhotoContact, SIGNAL(toggled(bool)), SLOT(slotEnableAndDisableWidgets()));
+ 	connect( ui_mainWidget->radioPhotoCustom, SIGNAL(toggled(bool)), SLOT(slotEnableAndDisableWidgets()));
+ 	connect( ui_mainWidget->cmbAccountPhoto, SIGNAL(activated(int)), SLOT(slotEnableAndDisableWidgets()));
+@@ -210,7 +199,6 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(Kopete::MetaContact *metaContact, QWidget
+ 
+ 	ui_mainWidget->btnClearPhoto->setIcon( KIcon( (QApplication::layoutDirection() == Qt::RightToLeft) ? "edit-clear-locationbar-ltr" : "edit-clear-locationbar-rtl" ) );
+ 	connect( ui_mainWidget->btnClearPhoto, SIGNAL(clicked()), this, SLOT(slotClearPhotoClicked()) );
+-	connect( ui_mainWidget->widAddresseeLink, SIGNAL(addresseeChanged(KABC::Addressee)), SLOT(slotAddresseeChanged(KABC::Addressee)) );
+ 	connect( ui_mainWidget->btnChoosePhoto, SIGNAL(clicked()), this, SLOT(slotSelectPhoto()));
+ 	ui_mainWidget->chkUseCustomIcons->setChecked( mMetaContact->useCustomIcon() );
+ 
+@@ -235,41 +223,14 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(Kopete::MetaContact *metaContact, QWidget
+ //	ui_mainWidget->icnbAway->setIcon( awayName );
+ //	ui_mainWidget->icnbUnknown->setIcon( unknownName );
+ 
+-	ui_mainWidget->widAddresseeLink->setMetaContact( mMetaContact );
+-
+-	mAddressBookUid = mMetaContact->kabcId();
+-
+ 	mExport = 0L;
+ 
+-	if ( !mAddressBookUid.isEmpty() )
+-	{
+-		KABC::AddressBook *ab = Kopete::KABCPersistence::self()->addressBook();
+-		KABC::Addressee a = ab->findByUid( mAddressBookUid );
+-		ui_mainWidget->widAddresseeLink->setAddressee( a );
+-
+-		if ( !a.isEmpty() )
+-		{
+-			ui_mainWidget->btnImportKABC->setEnabled( true );
+-			ui_mainWidget->btnExportKABC->setEnabled( true );
+-			mExport = new KopeteAddressBookExport( this, mMetaContact );
+-			
+-			mSound = a.sound();
+-			mFromKABC->setEnabled( !( mSound.isIntern() || mSound.url().isEmpty() ) );
+-		}
+-	}
+-	
+ 	slotLoadNameSources();
+ 	slotLoadPhotoSources();
+ 
+ 	connect( this, SIGNAL(okClicked()), this, SLOT(slotOkClicked()) );
+ 	connect( ui_mainWidget->chkUseCustomIcons, SIGNAL(toggled(bool)),
+ 		this, SLOT(slotUseCustomIconsToggled(bool)) );
+-	connect( ui_mainWidget->btnImportKABC, SIGNAL(clicked()),
+-		this, SLOT(slotImportClicked()) );
+-	connect( ui_mainWidget->btnExportKABC, SIGNAL(clicked()),
+-					 this, SLOT(slotExportClicked()) );
+-	connect( mFromKABC, SIGNAL(clicked()),
+-		this, SLOT(slotFromKABCClicked()) );
+ 
+ 	slotUseCustomIconsToggled( ui_mainWidget->chkUseCustomIcons->isChecked() );
+ 	slotEnableAndDisableWidgets();
+@@ -325,7 +286,6 @@ void KopeteMetaLVIProps::slotLoadNameSources()
+ 	Kopete::MetaContact::PropertySource nameSource = mMetaContact->displayNameSource();
+ 	
+ 	ui_mainWidget->radioNameContact->setChecked(nameSource == Kopete::MetaContact::SourceContact);
+-	ui_mainWidget->radioNameKABC->setChecked(nameSource == Kopete::MetaContact::SourceKABC);
+ 	ui_mainWidget->radioNameCustom->setChecked(nameSource == Kopete::MetaContact::SourceCustom);
+ 
+ }
+@@ -361,10 +321,7 @@ void KopeteMetaLVIProps::slotLoadPhotoSources()
+ 	Kopete::MetaContact::PropertySource photoSource = mMetaContact->photoSource();
+ 
+ 	ui_mainWidget->radioPhotoContact->setChecked(photoSource == Kopete::MetaContact::SourceContact);
+-	ui_mainWidget->radioPhotoKABC->setChecked(photoSource == Kopete::MetaContact::SourceKABC);
+ 	ui_mainWidget->radioPhotoCustom->setChecked(photoSource == Kopete::MetaContact::SourceCustom);
+-
+-	ui_mainWidget->chkSyncPhoto->setChecked(mMetaContact->isPhotoSyncedWithKABC());
+ }
+ 
+ void KopeteMetaLVIProps::slotSelectPhoto()
+@@ -379,24 +336,6 @@ void KopeteMetaLVIProps::slotSelectPhoto()
+ 
+ void KopeteMetaLVIProps::slotEnableAndDisableWidgets()
+ {
+-	KABC::AddressBook *ab = Kopete::KABCPersistence::self()->addressBook();
+-	KABC::Addressee a = ab->findByUid( mAddressBookUid );
+-	bool validLink = ! a.isEmpty();
+-	// kabc source requires a kabc link
+-	ui_mainWidget->radioNameKABC->setEnabled(validLink);
+-	// kabc source requires a kabc link
+-	ui_mainWidget->radioPhotoKABC->setEnabled(validLink);
+-	// sync with kabc has no sense if we use kabc as source (sync kabc with kabc? uh?)
+-	// it has also no sense if they are no kabc link
+-	if( selectedPhotoSource() == Kopete::MetaContact::SourceKABC || !validLink )
+-	{
+-		ui_mainWidget->chkSyncPhoto->setEnabled(false);
+-	}
+-	else
+-	{
+-		ui_mainWidget->chkSyncPhoto->setEnabled(true);
+-	}
+-
+ 	ui_mainWidget->radioNameContact->setEnabled(mMetaContact->contacts().count());
+ 	ui_mainWidget->radioPhotoContact->setEnabled(!m_withPhotoContacts.isEmpty());
+ 
+@@ -416,9 +355,6 @@ void KopeteMetaLVIProps::slotEnableAndDisableWidgets()
+ 	QImage photo;
+ 	switch ( selectedPhotoSource() )
+ 	{
+-		case Kopete::MetaContact::SourceKABC:
+-		photo = Kopete::photoFromKABC(mAddressBookUid);
+-		break;
+ 		case Kopete::MetaContact::SourceContact:
+ 		photo = Kopete::photoFromContact(selectedPhotoSourceContact());
+ 		break;
+@@ -434,8 +370,6 @@ void KopeteMetaLVIProps::slotEnableAndDisableWidgets()
+ 
+ Kopete::MetaContact::PropertySource KopeteMetaLVIProps::selectedNameSource() const
+ {
+-	if ( ui_mainWidget->radioNameKABC->isChecked() )
+-		return Kopete::MetaContact::SourceKABC;
+ 	if ( ui_mainWidget->radioNameContact->isChecked() )
+ 		return Kopete::MetaContact::SourceContact;
+ 	if ( ui_mainWidget->radioNameCustom->isChecked() )
+@@ -446,8 +380,6 @@ Kopete::MetaContact::PropertySource KopeteMetaLVIProps::selectedNameSource() con
+ 
+ Kopete::MetaContact::PropertySource KopeteMetaLVIProps::selectedPhotoSource() const
+ {
+-	if ( ui_mainWidget->radioPhotoKABC->isChecked() )
+-		return Kopete::MetaContact::SourceKABC;
+ 	if ( ui_mainWidget->radioPhotoContact->isChecked() )
+ 		return Kopete::MetaContact::SourceContact;
+ 	if ( ui_mainWidget->radioPhotoCustom->isChecked() )
+@@ -490,10 +422,6 @@ Kopete::Contact* KopeteMetaLVIProps::selectedPhotoSourceContact() const
+ 
+ void KopeteMetaLVIProps::slotOkClicked()
+ {
+-	// update meta contact's UID
+-	mMetaContact->setKabcId( mAddressBookUid );
+-	//this has to be done first, in the case something is synced with KABC   (see bug 109494)
+-	
+ 	// set custom display name
+ 	if( ui_mainWidget->edtDisplayName->text() != mMetaContact->customDisplayName() )
+ 		mMetaContact->setDisplayName( ui_mainWidget->edtDisplayName->text() );
+@@ -508,7 +436,6 @@ void KopeteMetaLVIProps::slotOkClicked()
+ 	mMetaContact->setPhotoSourceContact( selectedPhotoSourceContact() );
+ 	if ( !m_photoPath.isEmpty())
+ 		mMetaContact->setPhoto(KUrl(m_photoPath));
+-	mMetaContact->setPhotoSyncedWithKABC( ui_mainWidget->chkSyncPhoto->isChecked() );
+ 	
+ 	mMetaContact->setUseCustomIcon(
+ 		ui_mainWidget->chkUseCustomIcons->isChecked() );
+@@ -550,53 +477,6 @@ void KopeteMetaLVIProps::slotUseCustomIconsToggled(bool on)
+ 	ui_mainWidget->icnbUnknown->setEnabled( on );
+ }
+ 
+-void KopeteMetaLVIProps::slotAddresseeChanged( const KABC::Addressee & a )
+-{
+-	if ( !a.isEmpty() )
+-	{
+-		mSound = a.sound();
+-		mFromKABC->setEnabled( !( mSound.isIntern() || mSound.url().isEmpty() ) );
+-		ui_mainWidget->btnExportKABC->setEnabled( true );
+-		ui_mainWidget->btnImportKABC->setEnabled( true );
+-		// set/update the MC's addressee uin field
+-		mAddressBookUid = a.uid();
+-	}
+-	else
+-	{
+-		ui_mainWidget->btnExportKABC->setEnabled( false );
+-		ui_mainWidget->btnImportKABC->setEnabled( false );
+-		mAddressBookUid.clear();
+-		ui_mainWidget->radioNameContact->setChecked( true );
+-		ui_mainWidget->radioPhotoContact->setChecked( true );
+-	}
+-	slotEnableAndDisableWidgets();
+-}
+-
+-void KopeteMetaLVIProps::slotExportClicked()
+-{
+-	mMetaContact->setKabcId( mAddressBookUid );
+-	delete mExport;
+-	mExport = new KopeteAddressBookExport( this, mMetaContact );
+-	if ( mExport->showDialog() == QDialog::Accepted )
+-		mExport->exportData();
+-}
+-
+-void KopeteMetaLVIProps::slotImportClicked()
+-{
+-	mMetaContact->setKabcId( mAddressBookUid );
+-	if ( Kopete::KABCPersistence::self()->syncWithKABC( mMetaContact ) )
+-		KMessageBox::queuedMessageBox( this, KMessageBox::Information,
+-																	 i18n( "No contacts were imported from the address book." ),
+-																	 i18n( "No Change" ) );
+-}
+-
+-void KopeteMetaLVIProps::slotFromKABCClicked()
+-{
+-#if 0 
+-	mNotificationProps->widget()->customSound->setUrl( mSound.url() );
+-#endif
+-}
+-
+ void KopeteMetaLVIProps::slotOpenSoundDialog( KUrlRequester *requester )
+ {
+ 	// taken from kdelibs/kio/kfile/knotifydialog.cpp
+diff --git a/kopete/contactlist/kopetelviprops.h b/kopete/contactlist/kopetelviprops.h
+index c4c65747c..cae803993 100644
+--- a/kopete/contactlist/kopetelviprops.h
++++ b/kopete/contactlist/kopetelviprops.h
+@@ -21,19 +21,16 @@
+ #define KOPETELVIPROPS_H
+ 
+ #include <kdialog.h>
+-#include <kabc/sound.h>
+ 
+ #include "kopetemetacontact.h"
+ 
+ #include "ui_kopetemetalvipropswidget.h"
+ #include "ui_kopetegvipropswidget.h"
+ 
+-class AddressBookLinkWidget;
+ class CustomNotificationProps;
+ class KopeteAddressBookExport;
+ class KUrlRequester;
+ 
+-namespace KABC { class Addressee; }
+ namespace Kopete {
+ 	class Contact;
+ 	class Group;
+@@ -74,10 +71,8 @@ class KopeteMetaLVIProps: public KDialog
+ 		QPushButton *mFromKABC;
+ 		QWidget* mainWidget;
+ 		Ui::KopeteMetaLVIPropsWidget *ui_mainWidget;
+-		AddressBookLinkWidget *linkWidget;
+ 		Kopete::MetaContact *mMetaContact;
+ 		KopeteAddressBookExport *mExport;
+-		KABC::Sound mSound;
+ 		int m_countPhotoCapable;
+ 		QMap<int, Kopete::Contact *> m_withPhotoContacts;
+ 		QString mAddressBookUid; // the currently selected addressbook UID
+@@ -93,10 +88,6 @@ class KopeteMetaLVIProps: public KDialog
+ 		void slotOkClicked();
+ 		void slotUseCustomIconsToggled( bool on );
+ 		void slotClearPhotoClicked();
+-		void slotAddresseeChanged( const KABC::Addressee & );
+-		void slotExportClicked();
+-		void slotImportClicked();
+-		void slotFromKABCClicked();
+ 		void slotOpenSoundDialog( KUrlRequester *requester );
+ 		void slotLoadNameSources();
+ 		void slotLoadPhotoSources();
+diff --git a/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/contactlist/kopetemetalvipropswidget.ui
+index c2265367f..d882676f4 100644
+--- a/kopete/contactlist/kopetemetalvipropswidget.ui
++++ b/kopete/contactlist/kopetemetalvipropswidget.ui
+@@ -62,9 +62,6 @@
+           <property name="bottomMargin" >
+            <number>11</number>
+           </property>
+-          <item>
+-           <widget class="Kopete::UI::AddressBookLinkWidget" native="1" name="widAddresseeLink" />
+-          </item>
+           <item>
+            <layout class="QHBoxLayout" >
+             <property name="spacing" >
+@@ -82,19 +79,6 @@
+             <property name="bottomMargin" >
+              <number>0</number>
+             </property>
+-            <item>
+-             <widget class="QPushButton" name="btnExportKABC" >
+-              <property name="enabled" >
+-               <bool>false</bool>
+-              </property>
+-              <property name="toolTip" >
+-               <string>Export contact's details to the KDE Address Book</string>
+-              </property>
+-              <property name="text" >
+-               <string>E&amp;xport Details...</string>
+-              </property>
+-             </widget>
+-            </item>
+             <item>
+              <spacer>
+               <property name="orientation" >
+@@ -111,19 +95,6 @@
+               </property>
+              </spacer>
+             </item>
+-            <item>
+-             <widget class="QPushButton" name="btnImportKABC" >
+-              <property name="enabled" >
+-               <bool>false</bool>
+-              </property>
+-              <property name="toolTip" >
+-               <string>Import contacts from the KDE Address Book</string>
+-              </property>
+-              <property name="text" >
+-               <string>&amp;Import Contacts</string>
+-              </property>
+-             </widget>
+-            </item>
+            </layout>
+           </item>
+          </layout>
+@@ -135,13 +106,6 @@
+           <string>Display Name Source</string>
+          </property>
+          <layout class="QGridLayout" >
+-          <item row="0" column="0" colspan="4" >
+-           <widget class="QRadioButton" name="radioNameKABC" >
+-            <property name="text" >
+-             <string>Use address book &amp;name (needs address book link)</string>
+-            </property>
+-           </widget>
+-          </item>
+           <item row="1" column="0" colspan="2" >
+            <widget class="QRadioButton" name="radioNameContact" >
+             <property name="text" >
+@@ -213,13 +177,6 @@
+           <string>Photo Source</string>
+          </property>
+          <layout class="QGridLayout" >
+-          <item row="0" column="0" >
+-           <widget class="QRadioButton" name="radioPhotoKABC" >
+-            <property name="text" >
+-             <string>U&amp;se address book photo (needs address book link)</string>
+-            </property>
+-           </widget>
+-          </item>
+           <item rowspan="3" row="0" column="1" >
+            <widget class="QLabel" name="photoLabel" >
+             <property name="minimumSize" >
+@@ -513,14 +470,10 @@
+  </customwidgets>
+  <tabstops>
+   <tabstop>tabWidget</tabstop>
+-  <tabstop>btnExportKABC</tabstop>
+-  <tabstop>btnImportKABC</tabstop>
+-  <tabstop>radioNameKABC</tabstop>
+   <tabstop>radioNameContact</tabstop>
+   <tabstop>cmbAccountName</tabstop>
+   <tabstop>radioNameCustom</tabstop>
+   <tabstop>edtDisplayName</tabstop>
+-  <tabstop>radioPhotoKABC</tabstop>
+   <tabstop>radioPhotoContact</tabstop>
+   <tabstop>cmbAccountPhoto</tabstop>
+   <tabstop>radioPhotoCustom</tabstop>
+diff --git a/kopete/kopeteapplication.cpp b/kopete/kopeteapplication.cpp
+index 601b33ae2..0cf1f7952 100644
+--- a/kopete/kopeteapplication.cpp
++++ b/kopete/kopeteapplication.cpp
+@@ -32,7 +32,6 @@
+ #include <solid/networking.h>
+ 
+ #include "addaccountwizard.h"
+-#include "kabcpersistence.h"
+ #include "kopeteaccount.h"
+ #include "kopeteaccountmanager.h"
+ #include "kopetestatusmanager.h"
+@@ -131,11 +130,6 @@ KopeteApplication::~KopeteApplication()
+ 
+ void KopeteApplication::slotLoadPlugins()
+ {
+-	// we have to load the address book early, because calling this enters the Qt event loop when there are remote resources.
+-	// The plugin manager is written with the assumption that Kopete will not reenter the event loop during plugin load,
+-	// otherwise lots of things break as plugins are loaded, then contacts are added to incompletely initialised MCLVIs
+-	Kopete::KABCPersistence::self()->addressBook();
+-
+ 	//Create the command handler (looks silly)
+ 	Kopete::CommandHandler::commandHandler();
+ 
+diff --git a/kopete/kopetewindow.cpp b/kopete/kopetewindow.cpp
+index c6ca7ec4d..564e2a0f5 100644
+--- a/kopete/kopetewindow.cpp
++++ b/kopete/kopetewindow.cpp
+@@ -72,8 +72,6 @@
+ 
+ #include "addcontactpage.h"
+ #include "addressbooklinkwidget.h"
+-#include "ui_groupkabcselectorwidget.h"
+-#include "kabcexport.h"
+ #include "kopeteappearancesettings.h"
+ #include "kopeteapplication.h"
+ #include "kopeteaccount.h"
+@@ -397,11 +395,6 @@ void KopeteWindow::initActions()
+ 	connect ( d->actionDisconnect, SIGNAL (triggered(bool)), this, SLOT (slotDisconnectAll()) );
+ 	d->actionDisconnect->setEnabled ( false );
+ 
+-	d->actionExportContacts = new KAction ( i18n ( "&Export Contacts..." ), this );
+-	d->actionExportContacts->setIcon ( KIcon ( "document-export" ) );
+-	actionCollection()->addAction ( "ExportContacts", d->actionExportContacts );
+-	connect ( d->actionExportContacts, SIGNAL (triggered(bool)), this, SLOT (showExportDialog()) );
+-
+ 	d->actionSetAway = new KAction ( KIcon ( "user-identity", 0, QStringList() << QString() << "user-away" ), i18n ( "&Away" ), this );
+ 	actionCollection()->addAction ( "SetAwayAll", d->actionSetAway );
+ 	connect ( d->actionSetAway, SIGNAL (triggered(bool)), this, SLOT (slotGlobalAway()) );
+@@ -1291,13 +1284,6 @@ void KopeteWindow::slotTrayAboutToShowMenu ( KMenu * popup )
+ 	popup->addAction ( actionCollection->action ( KStandardAction::name ( KStandardAction::Quit ) ) );
+ }
+ 
+-void KopeteWindow::showExportDialog()
+-{
+-	KabcExportWizard* wizard = new KabcExportWizard ( this );
+-	wizard->setObjectName ( QLatin1String ( "export_contact_dialog" ) );
+-	wizard->show();
+-}
+-
+ void KopeteWindow::leaveEvent ( QEvent * )
+ {
+ 	startAutoHideTimer();
+@@ -1413,18 +1399,12 @@ void KopeteWindow::showAddContactDialog ( Kopete::Account * account )
+ 	AddContactPage *addContactPage =
+ 	    account->protocol()->createAddContactWidget ( mainWid, account );
+ 
+-	QWidget* groupKABC = new QWidget ( mainWid );
+-	groupKABC->setObjectName ( "groupkabcwidget" );
+-	Ui::GroupKABCSelectorWidget ui_groupKABC;
+-	ui_groupKABC.setupUi ( groupKABC );
+-
+ 	// Populate the groups list
+ 	Kopete::GroupList groups=Kopete::ContactList::self()->groups();
+ 	QHash<QString, Kopete::Group*> groupItems;
+ 
+ 	// Add top level group
+ 	groupItems.insert ( Kopete::Group::topLevel()->displayName(), Kopete::Group::topLevel() );
+-	ui_groupKABC.groupCombo->addItem ( Kopete::Group::topLevel()->displayName() );
+ 
+ 	foreach ( Kopete::Group *group, groups )
+ 	{
+@@ -1434,7 +1414,6 @@ void KopeteWindow::showAddContactDialog ( Kopete::Account * account )
+ 		if ( !groupname.isEmpty() )
+ 		{
+ 			groupItems.insert ( groupname, group );
+-			ui_groupKABC.groupCombo->addItem ( groupname );
+ 		}
+ 	}
+ 
+@@ -1451,8 +1430,6 @@ void KopeteWindow::showAddContactDialog ( Kopete::Account * account )
+ 			if ( addContactPage->validateData() )
+ 			{
+ 				Kopete::MetaContact * metacontact = new Kopete::MetaContact();
+-				metacontact->addToGroup ( groupItems[ ui_groupKABC.groupCombo->currentText() ] );
+-				metacontact->setKabcId ( ui_groupKABC.widAddresseeLink->uid() );
+ 				if ( addContactPage->apply ( account, metacontact ) )
+ 				{
+ 					Kopete::ContactList::self()->addMetaContact ( metacontact );
+diff --git a/kopete/kopetewindow.h b/kopete/kopetewindow.h
+index 974b27572..d4cedb3b8 100644
+--- a/kopete/kopetewindow.h
++++ b/kopete/kopetewindow.h
+@@ -171,11 +171,6 @@ private slots:
+ 	 */
+ 	void showAddContactDialog( Kopete::Account * );
+ 
+-	/**
+-	 * Show the Export Contacts wizards
+-	 */
+-	void showExportDialog();
+-
+ 	/**
+ 	 * Enable the Connect All and Disconnect All buttons here
+ 	 * along with connecting the accountRegistered and accountUnregistered
+diff --git a/libkopete/CMakeLists.txt b/libkopete/CMakeLists.txt
+index c1df84378..f899810c8 100644
+--- a/libkopete/CMakeLists.txt
++++ b/libkopete/CMakeLists.txt
+@@ -40,10 +40,6 @@ endif (Q_WS_WIN)
+ set(kopete_ui_SRCS
+   ui/accountselector.cpp
+   ui/addcontactpage.cpp
+-  ui/addressbooklinkwidget.cpp
+-  ui/addressbookselectordialog.cpp
+-  ui/addressbookselectorwidget.cpp
+-  ui/addresseeitem.cpp
+   ui/avatardialog.cpp
+   ui/avatarwebcamdialog.cpp
+   ui/avatarselectorwidget.cpp
+@@ -79,7 +75,6 @@ set(kopete_LIB_SRCS
+    ${kopete_ui_SRCS}
+    ${kopete_contactlist_SRCS}
+    ${kopete_tasks_SRCS}
+-   kabcpersistence.cpp
+    kopeteaccount.cpp
+    kopeteaccountmanager.cpp
+    kopeteavatarmanager.cpp
+diff --git a/libkopete/contactlist/xmlcontactstorage.cpp b/libkopete/contactlist/xmlcontactstorage.cpp
+index 5164b3b69..7830a5102 100644
+--- a/libkopete/contactlist/xmlcontactstorage.cpp
++++ b/libkopete/contactlist/xmlcontactstorage.cpp
+@@ -340,9 +340,6 @@ bool XmlContactStorage::parseMetaContact( Kopete::MetaContact *metaContact, cons
+             // custom photo, used for custom photo source
+             metaContact->setPhoto( KUrl(contactElement.text()) );
+ 
+-            bool photoSyncedWithKABC = (contactElement.attribute(QString::fromUtf8("syncWithKABC")) == QString::fromUtf8("1")) || (contactElement.attribute(QString::fromUtf8("syncWithKABC")) == QString::fromUtf8("true"));
+-            metaContact->setPhotoSyncedWithKABC( photoSyncedWithKABC );
+-
+             // retrieve deprecated data (now stored in property-sources)
+             // save temporarely, we will find a Contact* with this later
+             if ( contactElement.hasAttribute(PSCID_ELEM) && contactElement.hasAttribute(PSPID_ELEM) && contactElement.hasAttribute(PSAID_ELEM))
+@@ -450,7 +447,7 @@ bool XmlContactStorage::parseMetaContact( Kopete::MetaContact *metaContact, cons
+         {
+             // lets do the best conversion for the old name tracking
+             // if the custom display name is the same as kabc name, set the source to kabc
+-            if ( !metaContact->kabcId().isEmpty() && ( metaContact->customDisplayName() == nameFromKABC( metaContact->kabcId() )) )
++            if ( !metaContact->kabcId().isEmpty() )
+                 metaContact->setDisplayNameSource( Kopete::MetaContact::SourceKABC );
+             else
+                 metaContact->setDisplayNameSource( Kopete::MetaContact::SourceCustom );
+@@ -466,7 +463,7 @@ bool XmlContactStorage::parseMetaContact( Kopete::MetaContact *metaContact, cons
+         }
+         else
+         {
+-            if ( !metaContact->kabcId().isEmpty() && !photoFromKABC( metaContact->kabcId() ).isNull() )
++            if ( !metaContact->kabcId().isEmpty() )
+                 metaContact->setPhotoSource( Kopete::MetaContact::SourceKABC );
+             else
+                 metaContact->setPhotoSource( Kopete::MetaContact::SourceCustom );
+@@ -705,9 +702,6 @@ const QDomElement XmlContactStorage::storeMetaContact( Kopete::MetaContact *meta
+     // set the contact source for photo
+     _photoSource.setAttribute( QString::fromUtf8("source"), sourceToString( metaContact->photoSource() ) );
+ 
+-    if( !metaContact->kabcId().isEmpty()  )
+-        photo.setAttribute( QString::fromUtf8("syncWithKABC") , QString::fromUtf8( metaContact->isPhotoSyncedWithKABC() ? "true" : "false" ) );
+-
+     if( metaContact->photoSourceContact() )
+     {
+         //kDebug(14010) << "serializing photo source " << nameFromContact(photoSourceContact());
+diff --git a/libkopete/kopeteaccount.cpp b/libkopete/kopeteaccount.cpp
+index e6e7669a9..61f60d872 100644
+--- a/libkopete/kopeteaccount.cpp
++++ b/libkopete/kopeteaccount.cpp
+@@ -42,7 +42,6 @@
+ 
+ #include "kopeteidentity.h"
+ #include "kopeteidentitymanager.h"
+-#include "kabcpersistence.h"
+ #include "kopetecontactlist.h"
+ #include "kopeteaccountmanager.h"
+ #include "kopetecontact.h"
+@@ -392,11 +391,6 @@ Kopete::MetaContact* Account::addContact( const QString &contactId, const QStrin
+ 	if ( c )
+ 	{
+ 		c->setMetaContact( parentContact );
+-		if ( mode == ChangeKABC )
+-		{
+-			kDebug( 14010 ) << " changing KABC";
+-			KABCPersistence::self()->write( parentContact );
+-		}
+ 	}
+ 	else
+ 	{
+@@ -453,12 +447,6 @@ bool Account::addContact(const QString &contactId , MetaContact *parent, AddMode
+ 
+ 	const bool success = createContact(contactId, parent);
+ 
+-	if ( success && mode == ChangeKABC )
+-	{
+-		kDebug( 14010 ) << " changing KABC";
+-		KABCPersistence::self()->write( parent );
+-	}
+-
+ 	return success;
+ }
+ 
+diff --git a/libkopete/kopetecontact.cpp b/libkopete/kopetecontact.cpp
+index 670fba008..7bb5e182b 100644
+--- a/libkopete/kopetecontact.cpp
++++ b/libkopete/kopetecontact.cpp
+@@ -28,7 +28,6 @@
+ #include <kdeversion.h>
+ #include <kinputdialog.h>
+ 
+-#include <kabcpersistence.h>
+ #include <kdialog.h>
+ #include <klocale.h>
+ #include <kicon.h>
+@@ -448,10 +447,6 @@ void Contact::setMetaContact( MetaContact *m )
+ 	{
+ 		m->addContact( this );
+ 		connect( m, SIGNAL(destroyed(QObject*)), this, SLOT(slotMetaContactDestroyed(QObject*)) );
+-		// it is necessary to call this write here, because MetaContact::addContact() does not differentiate
+-		// between adding completely new contacts (which should be written to kabc) and restoring upon restart
+-		// (where no write is needed).
+-		KABCPersistence::self()->write( m );
+ 	}
+ 	sync();
+ }
+diff --git a/libkopete/kopetecontactlist.cpp b/libkopete/kopetecontactlist.cpp
+index fade2ea29..221d5ad56 100644
+--- a/libkopete/kopetecontactlist.cpp
++++ b/libkopete/kopetecontactlist.cpp
+@@ -27,7 +27,6 @@
+ #include <QtCore/QTextStream>
+ 
+ // KDE includes
+-#include <kabc/stdaddressbook.h>
+ #include <kapplication.h>
+ #include <kdebug.h>
+ #include <kglobal.h>
+@@ -434,16 +433,6 @@ void ContactList::slotSaveLater()
+ 	d->saveTimer->start( 17100 /* 17,1 seconds */ );
+ }
+ 
+-void ContactList::slotKABCChanged()
+-{
+-	// TODO: react to changes in KABC, replacing this function, post 3.4 (Will)
+-	// call syncWithKABC on each metacontact to check if its associated kabc entry has changed.
+-/*	for ( MetaContact * mc = d->contacts.first(); mc; mc = d->contacts.next() )
+-
+-		mc->syncWithKABC();*/
+-}
+-
+-
+ } //END namespace Kopete
+ 
+ #include "kopetecontactlist.moc"
+diff --git a/libkopete/kopetecontactlist.h b/libkopete/kopetecontactlist.h
+index abfb8a15f..8313757ea 100644
+--- a/libkopete/kopetecontactlist.h
++++ b/libkopete/kopetecontactlist.h
+@@ -266,10 +266,6 @@ private slots:
+ 	 * Called when the contact list changes. Flags the list dirty and schedules a save for a little while later.
+ 	 */
+ 	void slotSaveLater();
+-	/**
+-	 * Called on contact list load or when KABC has changed, to check if we need to update our contact list from there.
+-	 */
+-	void slotKABCChanged();
+ 
+ private:
+ 	/**
+diff --git a/libkopete/kopetemetacontact.cpp b/libkopete/kopetemetacontact.cpp
+index da9b92bf5..ef181a4ef 100644
+--- a/libkopete/kopetemetacontact.cpp
++++ b/libkopete/kopetemetacontact.cpp
+@@ -23,16 +23,12 @@
+ 
+ #include <QTextDocument>
+ 
+-#include <kabc/addressbook.h>
+-#include <kabc/addressee.h>
+-
+ #include <kdebug.h>
+ #include <klocale.h>
+ #include <kmessagebox.h>
+ #include <kdeversion.h>
+ #include <knotification.h>
+ 
+-#include "kabcpersistence.h"
+ #include "kopetecontactlist.h"
+ #include "kopetecontact.h"
+ #include "kopeteaccountmanager.h"
+@@ -62,10 +58,6 @@ MetaContact::MetaContact()
+ 	connect( this, SIGNAL(contactAdded(Kopete::Contact*)), SIGNAL(persistentDataChanged()) );
+ 	connect( this, SIGNAL(contactRemoved(Kopete::Contact*)), SIGNAL(persistentDataChanged()) );
+ 
+-	// TODO: speed up: this slot is called when any kabc contact is changed and is called in *every* metacontact instance. also slot is slow because it finding kabc id
+-	// Update the KABC picture when the KDE Address book change.
+-	connect(KABCPersistence::self()->addressBook(), SIGNAL(addressBookChanged(AddressBook*)), this, SLOT(slotUpdateAddressBookPicture()));
+-
+ 	// make sure MetaContact is at least in one group
+ 	addToGroup( Group::topLevel() );
+ 			 // I'm not sure this is correct -Olivier
+@@ -242,7 +234,6 @@ void MetaContact::removeContact(Contact *c, bool deleted)
+ 
+ 			kDebug( 14010 ) << "Contact disconnected";
+ 
+-			KABCPersistence::self()->write( this );
+ 		}
+ 
+ 		// Reparent the contact
+@@ -668,14 +659,7 @@ QString MetaContact::customDisplayName() const
+ QString MetaContact::displayName() const
+ {
+ 	PropertySource source = displayNameSource();
+-	if ( source == SourceKABC )
+-	{
+-		// kabc source, try to get from addressbook
+-		// if the metacontact has a kabc association
+-		if ( !kabcId().isEmpty() )
+-			return nameFromKABC(kabcId());
+-	}
+-	else if ( source == SourceContact || d->displayName.isEmpty())
++	if ( source == SourceContact || d->displayName.isEmpty())
+ 	{
+ 		if ( d->displayNameSourceContact==0 )
+ 		{
+@@ -697,25 +681,6 @@ QString MetaContact::displayName() const
+ 	return d->displayName;
+ }
+ 
+-QString nameFromKABC( const QString &id ) /*const*/
+-{
+-	KABC::AddressBook* ab = KABCPersistence::self()->addressBook();
+-	if ( ! id.isEmpty() && !id.contains(':') )
+-	{
+-		KABC::Addressee theAddressee = ab->findByUid(id);
+-		if ( theAddressee.isEmpty() )
+-		{
+-			kDebug( 14010 ) << "no KABC::Addressee found for ( " << id << " ) " << " in current address book";
+-		}
+-		else
+-		{
+-			return theAddressee.formattedName();
+-		}
+-	}
+-	// no kabc association, return null image
+-	return QString();
+-}
+-
+ QString nameFromContact( Kopete::Contact *c) /*const*/
+ {
+ 	if ( !c )
+@@ -787,36 +752,6 @@ QImage photoFromContact( Kopete::Contact *contact) /*const*/
+ 	return img;
+ }
+ 
+-QImage photoFromKABC( const QString &id ) /*const*/
+-{
+-	KABC::AddressBook* ab = KABCPersistence::self()->addressBook();
+-	if ( ! id.isEmpty() && !id.contains(':') )
+-	{
+-		KABC::Addressee theAddressee = ab->findByUid(id);
+-		if ( theAddressee.isEmpty() )
+-		{
+-			kDebug( 14010 ) << "no KABC::Addressee found for ( " << id << " ) " << " in current address book";
+-		}
+-		else
+-		{
+-			KABC::Picture pic = theAddressee.photo();
+-			if ( pic.data().isNull() && pic.url().isEmpty() )
+-				pic = theAddressee.logo();
+-
+-			if ( pic.isIntern())
+-			{
+-				return pic.data();
+-			}
+-			else
+-			{
+-				return QPixmap( pic.url() ).toImage();
+-			}
+-		}
+-	}
+-	// no kabc association, return null image
+-	return QImage();
+-}
+-
+ Contact *MetaContact::displayNameSourceContact() const
+ {
+ 	return d->displayNameSourceContact;
+@@ -926,9 +861,6 @@ void MetaContact::slotPropertyChanged( PropertyContainer* _subcontact, const QSt
+ 			}
+ 			else if(photoSourceContact() == subcontact)
+ 			{
+-				if(d->photoSyncedWithKABC)
+-					setPhotoSyncedWithKABC(true);
+-
+ 				setPhotoSourceContact(subcontact);
+ 			}
+ 		}
+@@ -1120,28 +1052,6 @@ void MetaContact::slotAllPluginsLoaded()
+ 	setPhotoSourceContact( findContact( d->photoSourcePID, d->photoSourceAID, d->photoSourceCID) );
+ }
+ 
+-void MetaContact::slotUpdateAddressBookPicture()
+-{
+-	KABC::AddressBook* ab = KABCPersistence::self()->addressBook();
+-	QString id = kabcId();
+-	if ( !id.isEmpty() && !id.contains(':') )
+-	{
+-		KABC::Addressee theAddressee = ab->findByUid(id);
+-		if ( theAddressee.isEmpty() )
+-		{
+-			kDebug( 14010 ) << "no KABC::Addressee found for ( " << id << " ) " << " in current address book";
+-		}
+-		else
+-		{
+-			KABC::Picture pic = theAddressee.photo();
+-			if ( pic.data().isNull() && pic.url().isEmpty() )
+-				pic = theAddressee.logo();
+-
+-			d->kabcPicture.setPicture(pic);
+-		}
+-	}
+-}
+-
+ bool MetaContact::isTemporary() const
+ {
+ 	return d->temporary;
+@@ -1197,84 +1107,14 @@ void MetaContact::setKabcId( const QString& newKabcId )
+ 	d->kabcId = newKabcId;
+ 	if ( loading() )
+ 	{
+-		// TODO: speed up: this slot is called in *every* metacontact instance and is slow because it finding kabc id
+-		slotUpdateAddressBookPicture();
+ 	}
+ 	else
+ 	{
+-		KABCPersistence::self()->write( this );
+ 		emit onlineStatusChanged( this, d->onlineStatus );
+ 		emit persistentDataChanged();
+ 	}
+ }
+ 
+-bool MetaContact::isPhotoSyncedWithKABC() const
+-{
+-	return d->photoSyncedWithKABC;
+-}
+-
+-void MetaContact::setPhotoSyncedWithKABC(bool b)
+-{
+-	d->photoSyncedWithKABC=b;
+-	if( b && !loading() )
+-	{
+-		QVariant newValue;
+-
+-		switch( photoSource() )
+-		{
+-			case SourceContact:
+-			{
+-				Contact *source = photoSourceContact();
+-				if(source != 0L)
+-					newValue = source->property( Kopete::Global::Properties::self()->photo() ).value();
+-				break;
+-			}
+-			case SourceCustom:
+-			{
+-				if( !d->customPicture.isNull() )
+-					newValue = d->customPicture.path();
+-				break;
+-			}
+-			// Don't sync the photo with KABC if the source is KABC !
+-			default:
+-				return;
+-		}
+-
+-		if ( !d->kabcId.isEmpty() && !newValue.isNull())
+-		{
+-			KABC::Addressee theAddressee = KABCPersistence::self()->addressBook()->findByUid( kabcId() );
+-
+-			if ( !theAddressee.isEmpty() )
+-			{
+-				QImage img;
+-				if(newValue.canConvert( QVariant::Image ))
+-					img=newValue.value<QImage>();
+-				else if(newValue.canConvert( QVariant::Pixmap ))
+-					img=newValue.value<QPixmap>().toImage();
+-
+-				if(img.isNull())
+-				{
+-					// Some protocols like MSN save the photo as a url in
+-					// contact properties, we should not use this url
+-					// to sync with kabc but try first to embed the
+-					// photo data in the kabc addressee, because it could
+-					// be remote resource and the local url makes no sense
+-					QImage fallBackImage = QImage(newValue.toString());
+-					if(fallBackImage.isNull())
+-						theAddressee.setPhoto(newValue.toString());
+-					else
+-						theAddressee.setPhoto(fallBackImage);
+-				}
+-				else
+-					theAddressee.setPhoto(img);
+-
+-				KABCPersistence::self()->addressBook()->insertAddressee(theAddressee);
+-				KABCPersistence::self()->writeAddressBook( theAddressee.resource() );
+-			}
+-
+-		}
+-	}
+-}
+ 
+ QList<Contact *> MetaContact::contacts() const
+ {
+diff --git a/libkopete/kopetemetacontact.h b/libkopete/kopetemetacontact.h
+index 55b202d57..80613ec64 100644
+--- a/libkopete/kopetemetacontact.h
++++ b/libkopete/kopetemetacontact.h
+@@ -64,7 +64,6 @@ class KOPETE_EXPORT MetaContact : public ContactListElement
+ 	Q_PROPERTY( bool canAcceptFiles READ canAcceptFiles )
+ 	//Q_PROPERTY( ulong idleTime READ idleTime )
+ 	Q_PROPERTY( QUuid metaContactId READ metaContactId WRITE setMetaContactId )
+-	Q_PROPERTY( bool photoSyncedWithKABC READ isPhotoSyncedWithKABC WRITE setPhotoSyncedWithKABC )
+ 
+ public:
+ 	typedef QList<MetaContact *> List;
+@@ -275,19 +274,6 @@ public:
+ 	 */
+ 	void setPhotoSourceContact( Contact* contact );
+ 
+-	/**
+-	 * @return true if when a subcontact change his photo, the photo will be set to the kabc contact.
+-	 */
+-	bool isPhotoSyncedWithKABC() const;
+-
+-	/**
+-	 * Set if the photo should be synced with the adressbook when the photosource change his photo
+-	 *
+-	 * If  \p b is true, the photo will be synced immediately if possible
+-	 */
+-	void setPhotoSyncedWithKABC(bool b);
+-
+-
+ 	/**
+ 	 * Temporary contacts will not be serialized.
+ 	 * If they are added to the contact list, they appears in a special "Not in your contact list" group.
+@@ -601,11 +587,6 @@ private slots:
+ 	 */
+ 	void slotContactDestroyed( Kopete::Contact* );
+ 
+-	/**
+-	 * Update the KABC Picture when the addressbook is changed.
+-	 */
+-	void slotUpdateAddressBookPicture();
+-
+ protected:
+ 	//QImage photoFromContact( Kopete::Contact *c) const;
+ 	//QImage photoFromKABC( const QString &id ) const;
+@@ -622,9 +603,7 @@ private:
+ 
+ // util functions shared with metacontact property dialog
+ KOPETE_EXPORT QImage photoFromContact( Kopete::Contact *c) /*const*/;
+-KOPETE_EXPORT QImage photoFromKABC( const QString &id ) /*const*/;
+ KOPETE_EXPORT QString nameFromContact( Kopete::Contact *c) /*const*/;
+-KOPETE_EXPORT QString nameFromKABC( const QString &id ) /*const*/;
+ 
+ } //END namespace Kopete
+ 
+diff --git a/libkopete/kopetepicture.cpp b/libkopete/kopetepicture.cpp
+index c84ab34d2..c5c0e143b 100644
+--- a/libkopete/kopetepicture.cpp
++++ b/libkopete/kopetepicture.cpp
+@@ -18,8 +18,6 @@
+ 
+ #include <qbuffer.h>
+ 
+-#include <kabc/picture.h>
+-
+ #include <kcodecs.h>
+ #include <kstandarddirs.h>
+ #include <kdebug.h>
+@@ -56,12 +54,6 @@ Picture::Picture(const QImage &image)
+ 	setPicture(image);
+ }
+ 
+-Picture::Picture(const KABC::Picture &picture)
+- : d(new Private)
+-{
+-	setPicture(picture);
+-}
+-
+ Picture::Picture(const Picture &other)
+  : d(other.d)
+ {}
+@@ -172,19 +164,6 @@ void Picture::setPicture(const QString &path)
+ 	d->pictureBase64.clear();
+ }
+ 
+-void Picture::setPicture(const KABC::Picture &picture)
+-{
+-	// No need to call detach() here because setPicture will do it.
+-	if ( picture.isIntern())
+-	{
+-		setPicture( picture.data() );
+-	}
+-	else
+-	{
+-		setPicture( picture.url() );
+-	}
+-}
+-
+ void Picture::detach()
+ {
+ 	// there is no detach in KSharedPtr.
+diff --git a/libkopete/ui/addressbooklinkwidget.h b/libkopete/ui/addressbooklinkwidget.h
+index ddb17156d..c33395f60 100644
+--- a/libkopete/ui/addressbooklinkwidget.h
++++ b/libkopete/ui/addressbooklinkwidget.h
+@@ -24,7 +24,6 @@
+ #ifndef ADDRESSBOOKLINKWIDGET_H
+ #define ADDRESSBOOKLINKWIDGET_H
+ 
+-#include <kabc/addressee.h>
+ #include <kopete_export.h>
+ 
+ #include "ui_addressbooklinkwidget_base.h"
+@@ -47,10 +46,6 @@ Q_OBJECT
+ public:
+ 	explicit AddressBookLinkWidget( QWidget * parent = 0, const char * name = 0 );
+ 	~AddressBookLinkWidget() {}
+-	/**
+-	 * Set the currently selected addressee
+-	 */
+-	void setAddressee( const KABC::Addressee& addr );
+ 	/**
+ 	 * Set the current metacontact so that the selector dialog may be preselected
+ 	 */
+@@ -60,11 +55,7 @@ public:
+ 	 */
+ 	QString uid() const;
+ signals:
+-	/**
+-	 * Emitted when the selected addressee changed.  addr is the KABC::Addressee that was selected. If addr.isEmpty() is empty, the clear button was clicked.
+-	 */
+-	void addresseeChanged( const KABC::Addressee& addr );
+-	
++
+ 	/**
+ 	 * Provided so you can perform your own actions instead of opening the AddressBookSelectorWidget.
+ 	 * To do so, QObject::disconnect() btnSelectAddressee and connect your own slot to this signal
+diff --git a/libkopete/ui/contactaddednotifydialog.cpp b/libkopete/ui/contactaddednotifydialog.cpp
+index e5724c42e..d8432e8f8 100644
+--- a/libkopete/ui/contactaddednotifydialog.cpp
++++ b/libkopete/ui/contactaddednotifydialog.cpp
+@@ -26,16 +26,12 @@
+ #include <kpushbutton.h>
+ #include <kiconloader.h>
+ 
+-#include <kabc/addressee.h>
+-
+ #include "kopetegroup.h"
+ #include "kopeteaccount.h"
+ #include "kopeteuiglobal.h"
+ #include "kopeteprotocol.h"
+ #include "kopetecontactlist.h"
+ #include "kopetemetacontact.h"
+-#include "addressbooklinkwidget.h"
+-#include "addressbookselectordialog.h"
+ #include "ui_contactaddednotifywidget.h"
+ 
+ namespace Kopete {
+@@ -99,7 +95,6 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const QString& contactId,
+ 	}
+ 	d->widget->m_groupList->setEditText(QString()); //default to top-level
+ 
+-	connect( d->widget->widAddresseeLink, SIGNAL(addresseeChanged(KABC::Addressee)), this, SLOT(slotAddresseeSelected(KABC::Addressee)) );
+ 	connect( d->widget->m_infoButton, SIGNAL(clicked()), this, SLOT(slotInfoClicked()) );
+ 
+ 	connect( this, SIGNAL(okClicked()) , this , SLOT(slotFinished()));
+@@ -146,19 +141,9 @@ MetaContact *ContactAddedNotifyDialog::addContact() const
+ 	if(!metacontact)
+ 		return 0L;
+ 
+-	metacontact->setKabcId(d->addressbookId);
+-
+ 	return metacontact;
+ }
+ 
+-void ContactAddedNotifyDialog::slotAddresseeSelected( const KABC::Addressee & addr )
+-{
+-	if ( !addr.isEmpty() )
+-	{
+-		d->addressbookId = addr.uid();
+-	}
+-}
+-
+ void ContactAddedNotifyDialog::slotInfoClicked()
+ {
+ 	emit infoClicked(d->contactId);
+diff --git a/libkopete/ui/contactaddednotifydialog.h b/libkopete/ui/contactaddednotifydialog.h
+index d0077b160..5bd8c1b7c 100644
+--- a/libkopete/ui/contactaddednotifydialog.h
++++ b/libkopete/ui/contactaddednotifydialog.h
+@@ -20,10 +20,6 @@
+ #include <kdialog.h>
+ #include "kopete_export.h"
+ 
+-namespace KABC {
+-	class Addressee;
+-}
+-
+ namespace Kopete {
+ 
+ class Group;
+@@ -160,7 +156,6 @@ signals:
+ 
+ 
+ private slots:
+-	void slotAddresseeSelected( const KABC::Addressee &);
+ 	void slotInfoClicked();
+ 	void slotFinished();
+ 
+diff --git a/libkopete/ui/contactaddednotifywidget.ui b/libkopete/ui/contactaddednotifywidget.ui
+index a754917e5..69496c437 100644
+--- a/libkopete/ui/contactaddednotifywidget.ui
++++ b/libkopete/ui/contactaddednotifywidget.ui
+@@ -196,9 +196,6 @@ Leave it empty if you want to see the contact's nickname as their display name.<
+                             </property>
+                         </spacer>
+         </item>
+-        <item>
+-         <widget class="Kopete::UI::AddressBookLinkWidget" name="widAddresseeLink" />
+-        </item>
+        </layout>
+       </item>
+      </layout>
+@@ -236,13 +233,6 @@ Leave it empty if you want to see the contact's nickname as their display name.<
+    <header>klineedit.h</header>
+    <container>0</container>
+    <pixmap></pixmap>
+-  </customwidget>
+-    <customwidget>
+-           <class>Kopete::UI::AddressBookLinkWidget</class>
+-   <extends></extends>
+-	   <header>addressbooklinkwidget.h</header>
+-   <container>0</container>
+-   <pixmap></pixmap>
+   </customwidget>
+   <customwidget>
+    <class>KPushButton</class>
+diff --git a/protocols/bonjour/bonjoureditaccountwidget.cpp b/protocols/bonjour/bonjoureditaccountwidget.cpp
+index 53ee146b5..5b01c5f1e 100644
+--- a/protocols/bonjour/bonjoureditaccountwidget.cpp
++++ b/protocols/bonjour/bonjoureditaccountwidget.cpp
+@@ -28,8 +28,6 @@
+ #include "bonjourprotocol.h"
+ #include <kconfigdialog.h>
+ #include <kuser.h>
+-#include <kpimidentities/identity.h>
+-#include <kpimidentities/identitymanager.h>
+ 
+ BonjourEditAccountWidget::BonjourEditAccountWidget( QWidget* parent, Kopete::Account* account)
+ : QWidget( parent ), KopeteEditAccountWidget( account )
+@@ -63,19 +61,6 @@ BonjourEditAccountWidget::BonjourEditAccountWidget( QWidget* parent, Kopete::Acc
+ 			names = user.property(KUser::FullName).toString().split(' ');
+ 		}
+ 
+-		// Next try via the default identity
+-		KPIMIdentities::IdentityManager manager(true);
+-		const KPIMIdentities::Identity & ident = manager.defaultIdentity();
+-
+-		if (! ident.isNull()) {
+-			// Get the full name from identity (only if not available via KUser)
+-			if ( names.isEmpty() )
+-				names = ident.fullName().split(' ');
+-
+-			// Get the email address
+-			emailAddress = ident.primaryEmailAddress();
+-		}
+-
+ 		// Split the names array into firstName and lastName
+ 		if (! names.isEmpty()) {
+ 			firstName = names.takeFirst();
diff --git a/nonprism/kopete/kopete-pthread-link.patch b/nonprism/kopete/kopete-pthread-link.patch
new file mode 100644
index 000000000..d917fe65e
--- /dev/null
+++ b/nonprism/kopete/kopete-pthread-link.patch
@@ -0,0 +1,12 @@
+diff --git a/protocols/jabber/libjingle/CMakeLists.txt b/protocols/jabber/libjingle/CMakeLists.txt
+index 7ea8c3eb6..4b73085b8 100644
+--- a/protocols/jabber/libjingle/CMakeLists.txt
++++ b/protocols/jabber/libjingle/CMakeLists.txt
+@@ -288,6 +288,7 @@ set ( call_LIBS
+ 	${MEDIASTREAMER_LIBRARIES}
+ 	${LIBORTP_LIBRARY}
+ 	${CMAKE_DL_LIBS}
++        pthread
+ )
+ 
+ if ( NOT WIN32 )
diff --git a/nonprism/kdenetwork-kopete/libre-nonprism.patch b/nonprism/kopete/libre-nonprism.patch
index 8af3a77b7..712220546 100644
--- a/nonprism/kdenetwork-kopete/libre-nonprism.patch
+++ b/nonprism/kopete/libre-nonprism.patch
@@ -94,7 +94,7 @@ diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
  		</sect2>
  		<sect2 id="protocols-others">
  			<title>Other protocols</title>
--			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  Meanwhile, SMS, Skype and SILC are provided in this way.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
+-			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  Meanwhile, SMS and SILC are provided in this way.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
 +			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
  		</sect2>
  	</sect1>
diff --git a/pcr-testing/calamares/PKGBUILD b/pcr-testing/calamares/PKGBUILD
index d57545e04..90779af2f 100644
--- a/pcr-testing/calamares/PKGBUILD
+++ b/pcr-testing/calamares/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=calamares
 pkgver=3.1.9
-pkgrel='parabola1.1'
+pkgrel='parabola5.1'
 pkgdesc='Distribution-independent installer framework - Parabola edition'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,8 +19,12 @@ depends=(${_runtime_couplings[@]} 'dmidecode' 'gptfdisk' 'hwinfo' 'kconfig' 'kco
          'qt5ct' 'qt5-styleplugins' 'qt5-svg' 'yaml-cpp')
 
 _git_tag="${pkgver}-${pkgrel%%.*}"
-source=("https://notabug.org/bill-auger/calamares/archive/v${_git_tag}.tar.gz")
-sha256sums=('4ce0da2894a7f474c10af65d4c32fd595640bf2307cddaffd0f6636a717f4b65')
+source=("https://notabug.org/bill-auger/calamares/archive/v${_git_tag}.tar.gz"
+        welcome-lxde.txt
+        welcome-mate.txt)
+sha256sums=('819fa6cb493592e99be5ef1cc7589b7fff00471eee7a622c6e53a8478abf4410'
+            'f4eac2d05a33daaf75e81b4240124dbbd98e662797335ab116501e92b20e9849'
+            '6211c6a404fc1a9437d291603fe9990580561f1057463a1f414f3662ff798a24')
 
 
 build()
@@ -33,7 +37,7 @@ build()
         -DCMAKE_INSTALL_LIBDIR=lib                                                  \
         -DSKIP_MODULES="dracut dracutlukscfg dummycpp dummyprocess dummypython      \
                         dummypythonqt initramfs initramfscfg interactiveterminal    \
-                        license plymouthcfg removeuser tracking webview"         ..
+                        license plymouthcfg removeuser webview"                  ..
 }
 
 package()
@@ -43,5 +47,6 @@ package()
   make DESTDIR=${pkgdir} install
 
   # ASSERT: one welcome-<DESKTOP>*.txt for each DESKTOP in calamares GS::DESKTOPS_KEY
+  install -d ${pkgdir}/usr/share/calamares/welcome/
   cp ${srcdir}/welcome-*.txt ${pkgdir}/usr/share/calamares/welcome/
 }
diff --git a/pcr-testing/parabola-laf/PKGBUILD b/pcr-testing/parabola-laf/PKGBUILD
index 29ca7ad89..7dda06277 100644
--- a/pcr-testing/parabola-laf/PKGBUILD
+++ b/pcr-testing/parabola-laf/PKGBUILD
@@ -2,7 +2,7 @@
 
 
 pkgname=parabola-laf
-pkgver=v0.6
+pkgver=0.8
 pkgrel=1
 pkgdesc="User skeleton, artwork, and utilities for Parabola graphical desktop systems"
 arch=('any')
@@ -18,12 +18,12 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd "${pkgname}"
-  git tag | sort | tail -n1
+  git tag | sort | tail -n1 | sed 's|^v\(.*\)|\1|'
 }
 
 package() {
   cd "${pkgname}"
-  git checkout ${pkgver}
+  git checkout "v${pkgver}"
 
   mkdir -p $pkgdir/usr/share/backgrounds
   mkdir -p $pkgdir/usr/share/pixmaps
diff --git a/pcr-testing/wbar/PKGBUILD b/pcr-testing/wbar/PKGBUILD
new file mode 100644
index 000000000..ec8ee3f46
--- /dev/null
+++ b/pcr-testing/wbar/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: bill-auger <bill-auger@programmer.net>
+
+
+pkgname=wbar
+pkgver=2.3.4
+pkgrel=3
+pkgdesc="Minimalist quick-launch tool"
+arch=('i686' 'x86_64')
+license=('GPL')
+url=https://code.google.com/archive/p/wbar/
+
+depends=('imlib2')
+makedepends=('intltool' 'libglade')
+
+source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wbar/wbar-2.3.4.tgz
+        wbar-dock.png)
+sha256sums=('46a69849e4436529aefb5cfb2c94b520d05a53c237e7773b90207f67f97a93e3'
+            '902dbf06f596bf4453e60b5caa5f173cfc2644dd054e27b50b7e028d0968edd0')
+
+_build_dir=${pkgname}-${pkgver}
+
+
+prepare() {
+  cd ${_build_dir}
+
+  sed -i 's|AM_INIT_AUTOMAKE(\[\(.*\)\])|AM_INIT_AUTOMAKE(\[\1subdir-objects \])|' ./configure.ac
+  sed -i 's|\$(top_srcdir)/src/||g'                                                ./src/Makefile.am
+  sed -i 's|= PACKAGE_NAME" "DEFAULT_ARGV;|= PACKAGE_NAME " " DEFAULT_ARGV;|'      ./src/core/Main.cc
+  sed -i 's|= PACKAGE_NAME" "DEFAULT_ARGV;|= PACKAGE_NAME " " DEFAULT_ARGV;|'      ./src/config/Functions.cc
+  sed -i 's|("killall "PACKAGE_NAME)|("killall " PACKAGE_NAME)|'                   ./src/config/Run.cc
+  sed -i 's| PIXMAPDIR"/"PACKAGE_NAME"| PIXMAPDIR "/" PACKAGE_NAME "|'             ./src/config/Functions.cc
+}
+
+build() {
+  cd ${_build_dir}
+
+  autoreconf -fiv
+  ./configure
+  make
+}
+
+package() {
+  cd ${_build_dir}
+
+  make DESTDIR=${pkgdir} install
+
+  install -d usr/share/pixmaps/wbar
+  install -m 644 ${srcdir}/wbar-dock.png ${pkgdir}/usr/share/pixmaps/wbar/
+}
diff --git a/pcr-testing/wbar/wbar-dock.png b/pcr-testing/wbar/wbar-dock.png
new file mode 100644
index 000000000..353b3c65b
--- /dev/null
+++ b/pcr-testing/wbar/wbar-dock.png
diff --git a/pcr/apertium-tolk-svn/PKGBUILD b/pcr/apertium-tolk-svn/PKGBUILD
index f09506184..0df36f89a 100644
--- a/pcr/apertium-tolk-svn/PKGBUILD
+++ b/pcr/apertium-tolk-svn/PKGBUILD
@@ -31,6 +31,11 @@ build() {
   
   sh autogen.sh
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$_svnmod"
+
   make DESTDIR="$pkgdir/" install || return 1
-}
\ No newline at end of file
+}
diff --git a/pcr/armory/PKGBUILD b/pcr/armory/PKGBUILD
index 0b0482797..631c3d03a 100644
--- a/pcr/armory/PKGBUILD
+++ b/pcr/armory/PKGBUILD
@@ -1,45 +1,77 @@
-# Maintainer  : Aurélien Desbrières <aurelien@hackers.camp>
-# Contributor : 2bluesc <2bluesc at gmail.com>
-# Contributor : mazzolino <maze+aur at strahlungsfrei.de>
-# Contributor : Pieter Kokx <pieter@kokx.nl>
+# Maintainer: Aurélien Desbrières <aurelien@hackers.camp>
+# Maintainer (Arch): Jonathan la Cour <jon@lacour.me>
+# Contributor (Arch): Patrick Glandien <patrick@synix.io>
+# Contributor (Arch): William Grieshaber <me@zee.li>
+# Contributor (Arch): portals <portals at riseup.net> Base on work of: 2bluesc <2bluesc at gmail.com> and mazzolino <maze+aur at strahlungsfrei.de>
+# Contributor (Arch): Pieter Kokx <pieter@kokx.nl>
 
 pkgname=armory
-_pkgname=BitcoinArmory
-pkgver=0.92.3
-_pkgver=0.92.3
-pkgrel=2
-pkgdesc="Python-Based Bitcoin Software"
-arch=('i686' 'x86_64')
-url="https://github.com/etotheipi/BitcoinArmory"
-license=('AGPL3')
-groups=()
-depends=('crypto++' 'swig' 'python2' 'twisted' 'qt4' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
-makedepends=('git' 'gcc' 'make')
-provides=('armory')
-conflicts=('armory')
-replaces=()
-backup=()
-options=()
-install=
-source=("run-armory.sh" "build_detect_platform-01.patch" "http://github.com/etotheipi/BitcoinArmory/archive/v$_pkgver.tar.gz")
-noextract=()
+pkgver=0.96.3.99
+pkgrel=1
+pkgdesc="Full-featured Bitcoin wallet management application"
+arch=(i686 x86_64)
+url="https://github.com/goatpig/BitcoinArmory"
+license=(AGPL3 MIT)
+depends=(crypto++ swig qt4 qt5-tools python2 python2-twisted python2-pyqt4 python2-bsddb python2-psutil)
+optdepends=('bitcoin-daemon: Communicate with the Bitcoin network')
+provides=(armory)
+conflicts=(armory armory-git armory-bin armory-goatpig-git)
+install="${pkgname}.install"
+
+# Signed hashes available at
+# https://github.com/goatpig/BitcoinArmory/releases with GPG ID 8C5211764922589A
+source=("https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/armory_${pkgver}_src.tar.gz"
+        'run-armory.sh')
+sha512sums=('afe73e2f52834dead3f085eca3daf27406f64c30678d1b68ee3de47acb7d38a2c5ae2d326e686cce0a91f1cf97ea69e8f81d208da4d0e57a0b6c152482ef7059'
+            'af44a8edfdf751f3343a8bdf6fa21c125389de3435c4b03c7f581b980525a9f32af177f496830f847b70c8e2619c42908536698e0fd28f862f16083cf7396715')
+
+prepare() {
+  msg 'Validating Checksums GPG signature...'
+  curl -sL https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/sha256sum.txt.asc -o sha256sum.txt.asc
+  gpg --recv-key 8C5211764922589A
+  gpg --verify sha256sum.txt.asc
+  msg2 'Checksums GPG signature OK.'
+
+  msg 'Validating Checksums...'
+  grep "${pkgver}_src.tar.gz" 'sha256sum.txt.asc' | tr -d '\r' | sha256sum -c -
+  msg2 'Checksums OK.'
+
+  cd "$srcdir/${pkgname}_${pkgver}-src"
+
+  ## Get Python2 Version
+  _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
+  _py2ver=${_py2longver%.*}
+  PYTHON_VERSION=${_py2ver} ./autogen.sh
+}
 
 build() {
-    cd $srcdir/BitcoinArmory-$_pkgver/
+  cd "$srcdir/${pkgname}_${pkgver}-src"
 
-    patch -p0 -i $srcdir//build_detect_platform-01.patch
+  ## Get Python2 Version
+  _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
+  _py2ver=${_py2longver%.*}
+  PYTHON_VERSION=${_py2ver} ./configure
 
-    make PYVER=python2.7
+  ## Build using current python2 version
+  PYTHON_VERSION=${_py2ver} make
 }
 
 package() {
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armory.desktop" "$pkgdir/usr/share/applications/armory.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armoryoffline.desktop" "$pkgdir/usr/share/applications/armoryoffline.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armorytestnet.desktop" "$pkgdir/usr/share/applications/armorytestnet.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/img/armory_icon_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_64x64.png"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/img/armory_icon_green_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_green_64x64.png"
+
   install -Dm 755 "$srcdir/run-armory.sh" "$pkgdir/usr/bin/armory"
 
   mkdir -p "$pkgdir/opt"
-  cp -R "$srcdir/$_pkgname-$_pkgver/" "$pkgdir/opt/"
-  mv "$pkgdir/opt/$_pkgname-$_pkgver" "$pkgdir/opt/$_pkgname"
+  cp -R "$srcdir/${pkgname}_${pkgver}-src/." "$pkgdir/opt/$pkgname/"
+
+  mkdir -p "$pkgdir/usr/local/bin"
+  ln -s "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/local/bin/$pkgname"
 
-  rm -rf "$pkgdir/opt/$_pkgname/cppForSwig/"
-  rm -rf "$pkgdir/opt/$_pkgname/.git/"
-  rm -rf "$pkgdir/opt/$_pkgname/.gitignore"
+  rm -rf "$pkgdir/opt/$pkgname/cppForSwig/"
+  rm -rf "$pkgdir/opt/$pkgname/.git/"
+  rm -rf "$pkgdir/opt/$pkgname/.gitignore"
 }
diff --git a/pcr/armory/PKGBUILD.old b/pcr/armory/PKGBUILD.old
new file mode 100644
index 000000000..0b0482797
--- /dev/null
+++ b/pcr/armory/PKGBUILD.old
@@ -0,0 +1,45 @@
+# Maintainer  : Aurélien Desbrières <aurelien@hackers.camp>
+# Contributor : 2bluesc <2bluesc at gmail.com>
+# Contributor : mazzolino <maze+aur at strahlungsfrei.de>
+# Contributor : Pieter Kokx <pieter@kokx.nl>
+
+pkgname=armory
+_pkgname=BitcoinArmory
+pkgver=0.92.3
+_pkgver=0.92.3
+pkgrel=2
+pkgdesc="Python-Based Bitcoin Software"
+arch=('i686' 'x86_64')
+url="https://github.com/etotheipi/BitcoinArmory"
+license=('AGPL3')
+groups=()
+depends=('crypto++' 'swig' 'python2' 'twisted' 'qt4' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
+makedepends=('git' 'gcc' 'make')
+provides=('armory')
+conflicts=('armory')
+replaces=()
+backup=()
+options=()
+install=
+source=("run-armory.sh" "build_detect_platform-01.patch" "http://github.com/etotheipi/BitcoinArmory/archive/v$_pkgver.tar.gz")
+noextract=()
+
+build() {
+    cd $srcdir/BitcoinArmory-$_pkgver/
+
+    patch -p0 -i $srcdir//build_detect_platform-01.patch
+
+    make PYVER=python2.7
+}
+
+package() {
+  install -Dm 755 "$srcdir/run-armory.sh" "$pkgdir/usr/bin/armory"
+
+  mkdir -p "$pkgdir/opt"
+  cp -R "$srcdir/$_pkgname-$_pkgver/" "$pkgdir/opt/"
+  mv "$pkgdir/opt/$_pkgname-$_pkgver" "$pkgdir/opt/$_pkgname"
+
+  rm -rf "$pkgdir/opt/$_pkgname/cppForSwig/"
+  rm -rf "$pkgdir/opt/$_pkgname/.git/"
+  rm -rf "$pkgdir/opt/$_pkgname/.gitignore"
+}
diff --git a/pcr/armory/armory.install b/pcr/armory/armory.install
new file mode 100644
index 000000000..7bbaf885f
--- /dev/null
+++ b/pcr/armory/armory.install
@@ -0,0 +1,13 @@
+ARMORY_IMG_DIR="/usr/share/armory/img"
+
+post_install() {
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_64x64.png" armoryicon
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_64x64.png" armoryofflineicon
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_green_64x64.png" armorytestneticon
+}
+
+pre_remove() {
+  xdg-icon-resource uninstall --size 64 armoryicon
+  xdg-icon-resource uninstall --size 64 armorytestneticon
+  xdg-icon-resource uninstall --size 64 armoryofflineicon
+}
diff --git a/pcr/armory/build_detect_platform-01.patch b/pcr/armory/build_detect_platform-01.patch
deleted file mode 100644
index ca3a5cc8d..000000000
--- a/pcr/armory/build_detect_platform-01.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cppForSwig/leveldb/build_detect_platform	2014-04-21 15:57:03.485118965 +0200
-+++ cppForSwig/leveldb/build_detect_platform_fix	2014-04-21 15:59:19.714407671 +0200
-@@ -185,9 +185,7 @@
- 
-     # Test whether Snappy library is installed
-     # http://code.google.com/p/snappy/
--    $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null  <<EOF
--      #include <snappy.h>
--      int main() {}
-+
- EOF
-     if [ "$?" = 0 ]; then
-         COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
diff --git a/pcr/armory/run-armory.sh b/pcr/armory/run-armory.sh
index fe3368474..aa1b3c315 100644
--- a/pcr/armory/run-armory.sh
+++ b/pcr/armory/run-armory.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-python2 /opt/BitcoinArmory/ArmoryQt.py $@
+python2 /opt/armory/ArmoryQt.py $@
diff --git a/pcr/arora/PKGBUILD b/pcr/arora/PKGBUILD
index 9c5d89b1a..c3e39fcc8 100644
--- a/pcr/arora/PKGBUILD
+++ b/pcr/arora/PKGBUILD
@@ -29,7 +29,7 @@ sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31'
           '3eea200350f7436bb2d744f8b6af1b5bbb758e51'
           '2d515947a8cbeea831490727e88c89ebee17c313')
 
-install=install
+#install=install
 
 prepare() {
         cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/pcr/base-meta/PKGBUILD b/pcr/base-meta/PKGBUILD
index 6124894e1..22564c020 100644
--- a/pcr/base-meta/PKGBUILD
+++ b/pcr/base-meta/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: David P. <megver83@parabola.nu>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=base-meta
-pkgver=20170324
+pkgver=20180106
 pkgrel=1
 pkgdesc="Base packages metapackage."
 arch=('any')
 url="https://git.parabola.nu/abslibre.git/"
 license=('GPL')
 groups=('base-openrc')
-depends=('bash' 'bzip2' 'coreutils' 'diffutils' 'e2fsprogs' 'file' 'findutils' 'gawk' 'gcc-libs'
-         'gettext' 'glibc' 'grep' 'gzip' 'iproute2' 'iputils' 'jfsutils' 'less' 'logrotate'
-         'man-db' 'man-pages' 'nano' 'pciutils' 'pcmciautils' 'perl' 'procps-ng' 'psmisc'
-         'reiserfsprogs' 's-nail' 'sed' 'shadow' 'sysfsutils' 'tar' 'texinfo' 'usbutils'
-         'util-linux' 'vi' 'which' 'xfsprogs')
+depends=('bash' 'bzip2' 'coreutils' 'diffutils' 'e2fsprogs' 'file' 'filesystem-nosystemd'
+         'findutils' 'gawk' 'gcc-libs' 'gettext' 'glibc' 'grep' 'gzip' 'iproute2' 'iputils'
+         'jfsutils' 'less' 'logrotate' 'man-db' 'man-pages' 'nano' 'pciutils' 'pcmciautils'
+         'perl' 'procps-ng' 'psmisc' 'reiserfsprogs' 's-nail' 'sed' 'shadow' 'sysfsutils'
+         'tar' 'texinfo' 'usbutils' 'util-linux-nosystemd' 'vi' 'which' 'xfsprogs')
 optdepends=('your-privacy: To remove support for protocols and services known to endanger privacy.')
diff --git a/pcr/cadabra/PKGBUILD b/pcr/cadabra/PKGBUILD
index c435d111e..c39878e75 100644
--- a/pcr/cadabra/PKGBUILD
+++ b/pcr/cadabra/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="${pkgbase^} is a computer algebra system (CAS)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://$pkgbase.phi-sci.com/"
 license=('GPL')
-groups=$pkgbase
+groups=($pkgbase)
 makedepends=('lie' 'modglue' 'gmp' 'pcre' 'gtkmm' 'texlive-core')
 install=$pkgbase.install
 source=(http://$pkgbase.phi-sci.com/$pkgbase-$pkgver.tar.gz)
diff --git a/pcr/filesystem-nosystemd/PKGBUILD b/pcr/filesystem-nosystemd/PKGBUILD
new file mode 100644
index 000000000..4b288ccd5
--- /dev/null
+++ b/pcr/filesystem-nosystemd/PKGBUILD
@@ -0,0 +1,167 @@
+# $Id$
+# Maintainer (Arch): Sébastien Luttringer
+# Contributor (Arch): Tom Gundersen <teg@jklm.no>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+
+pkgname=filesystem-nosystemd
+pkgver=2017.10
+pkgrel=2.parabola3
+pkgdesc='Base Parabola GNU/Linux-libre files'
+arch=('i686' 'x86_64' 'armv7h')
+license=('GPL')
+url='https://www.parabola.nu'
+groups=('base-openrc')
+install='filesystem.install'
+makedepends=('asciidoc')
+depends=('iana-etc')
+provides=("filesystem=$pkgver")
+replaces=(filesystem-parabola)
+conflicts=(filesystem-parabola filesystem)
+backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
+        'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
+        'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
+source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
+        'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
+        'shells' 'gshadow' 'profile' 'parabola.7.txt' 'locale.sh')
+sha256sums=('faed5839ed5e6797d7fc67f7fc0b003554d32250f3ae2d3241603c70cdc646b0'
+            '3ad448c78cab733759ae3365620504b1444e854effd066f1c7174652f046ebe1'
+            'e9fd66742e96d16f4a244a3037522467c12e301f8e1337cda61eb67b78198534'
+            'f7b38167196943d8fb9d2e75358c7262d5fe1082b257c4c8caffe3b6de429cb5'
+            'f21f35e7d3083aeee19beb48478130d119b2572922a4889df98326d551540eda'
+            '00d5d103837480d26cd350753382c3211df6bc304ee59ffaab130fad108f6a86'
+            'a55259d43b287c35ee94c736f79eea68c72318e67e5f7b8c0a6dfbcf0d4fee13'
+            '34b820ca01b9ad7e4792e92122b39e891e647c016b7ecccb220d6f4e72eee5c7'
+            '86dff00854a7f2280bb799484ccc39ad449a171448926880742ae64f41666a43'
+            '05c90d4208ae9a59156fa6449b00d92cd3dc1aba8ae746bd78e813a74e309ede'
+            '13d1f59c1d0860bf43da996e2b9a6ab2744791614241ed9a1376b7e7e30de3a8'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+            'b4b5823ea612d18b8aaa59e3c662fb756001f1ce2fcc936a4d741b11002ed19d'
+            '74d2be3dd69600bcf0da751a1804a386bf4ad143b76d79c336acaa5c600e7991'
+            '6cff886fe9e23096d5f67b7857a747ebaf10431be5a2afc40236de5ad13a654f'
+            '33d4bec57c59f378e79ed8f3e4387e65fdd5cfd3d551d7cb015f7cf5cfad72f5'
+            '93d7d21f7e5a644ba533847beff35167efc4624571c9b68bea6cf2b6a13ab5ff'
+            '887e2fe6128172ab737d45b6703728ceef80d066ef64ee16eb9db22bef676734'
+            '331805ff85b80ae2444be58740f1cf41be56fb6e254e930677f1e36e8f95bee1')
+
+
+lint() {
+	# ensure that passwd is sync'd to shadow and group is sync'd to gshadow.
+	local r=0
+
+	local passwd shadow group gshadow
+
+	for f in passwd shadow group gshadow; do
+		mapfile -t "$f" < <(cut -d: -f1 "$f" | sort)
+	done
+
+	# we can cheat and do simple string comparison only because we can make some
+	# assumptions about the data in these files
+	if [[ ${passwd[*]} != "${shadow[*]}" ]]; then
+		error 'passwd is not in sync with shadow!'
+		r=1
+	fi
+
+	if [[ ${group[*]} != "${gshadow[*]}" ]]; then
+		error 'group is not in sync with gshadow!'
+		r=1
+	fi
+
+	return $r
+}
+
+build() {
+	cd "$srcdir"
+
+	lint
+
+	a2x -d manpage -f manpage parabola.7.txt
+}
+
+package() {
+	cd "$pkgdir"
+
+	#
+	# setup root filesystem
+	#
+	for d in boot dev etc home mnt usr var opt srv/http run; do
+		install -d -m755 $d
+	done
+	install -d -m555 proc
+	install -d -m555 sys
+	install -d -m0750 root
+	install -d -m1777 tmp
+	# vsftpd won't run with write perms on /srv/ftp
+	install -d -m555 -g ftp srv/ftp
+
+	# setup /etc and /usr/share/factory/etc
+	install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc
+	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
+		install -m644 "$srcdir"/$f etc/
+		install -m644 "$srcdir"/$f usr/share/factory/etc/
+	done
+	ln -s ../proc/self/mounts etc/mtab
+	for f in gshadow shadow crypttab; do
+		install -m600 "$srcdir"/$f etc/
+		install -m600 "$srcdir"/$f usr/share/factory/etc/
+	done
+	touch etc/parabola-release
+	ln -sv parabola-release etc/arch-release
+	install -m755 "$srcdir"/locale.sh etc/profile.d/locale.sh
+	install -Dm644 "$srcdir"/os-release "$pkgdir"/usr/lib/os-release
+	#ln -s ../usr/lib/os-release etc/os-release
+
+	# setup /var
+	for d in cache local opt log/old lib/misc empty; do
+		install -d -m755 var/$d
+	done
+	install -d -m1777 var/{tmp,spool/mail}
+
+	# allow setgid games to write scores
+	install -d -m775 -g games var/games
+	ln -s spool/mail var/mail
+	ln -s ../run var/run
+	ln -s ../run/lock var/lock
+
+	#
+	# setup /usr hierarchy
+	#
+	for d in bin include lib share/misc src; do
+		install -d -m755 usr/$d
+	done
+	for d in $(seq 8); do
+		install -d -m755 usr/share/man/man$d
+	done
+
+	#
+	# add lib symlinks
+	#
+	ln -s usr/lib "$pkgdir"/lib
+	[[ $CARCH = 'x86_64' ]] && (
+		ln -s usr/lib "$pkgdir"/lib64
+		ln -s lib "$pkgdir"/usr/lib64
+	)
+
+	#
+	# add bin symlinks
+	#
+	ln -s usr/bin "$pkgdir"/bin
+	ln -s usr/bin "$pkgdir"/sbin
+	ln -s bin "$pkgdir"/usr/sbin
+
+	#
+	# install parabola(7) manpage
+	#
+	install -D -m644 "$srcdir"/parabola.7 usr/share/man/man7/parabola.7
+
+	#
+	# setup /usr/local hierarchy
+	#
+	for d in bin etc games include lib man sbin share src; do
+		install -d -m755 usr/local/$d
+	done
+	ln -s ../man usr/local/share/man
+
+	# remove conflict with systemd
+	rm usr/share/factory/etc/nsswitch.conf
+}
diff --git a/pcr/filesystem-nosystemd/crypttab b/pcr/filesystem-nosystemd/crypttab
new file mode 100644
index 000000000..96065a060
--- /dev/null
+++ b/pcr/filesystem-nosystemd/crypttab
@@ -0,0 +1,17 @@
+# crypttab: mappings for encrypted partitions
+#
+# Each mapped device will be created in /dev/mapper, so your /etc/fstab
+# should use the /dev/mapper/<name> paths for encrypted devices.
+#
+# The Arch/Parabola specific syntax has been deprecated, see crypttab(5) for the
+# new supported syntax.
+#
+# NOTE: Do not list your root (/) partition here, it must be set up
+#       beforehand by the initramfs (/etc/mkinitcpio.conf).
+
+# <name>       <device>                                     <password>              <options>
+# home         UUID=b8ad5c18-f445-495d-9095-c9ec4f9d2f37    /etc/mypassword1
+# data1        /dev/sda3                                    /etc/mypassword2
+# data2        /dev/sda5                                    /etc/cryptfs.key
+# swap         /dev/sdx4                                    /dev/urandom            swap,cipher=aes-cbc-essiv:sha256,size=256
+# vol          /dev/sdb7                                    none
diff --git a/pcr/filesystem-nosystemd/filesystem.install b/pcr/filesystem-nosystemd/filesystem.install
new file mode 100644
index 000000000..6e78d4583
--- /dev/null
+++ b/pcr/filesystem-nosystemd/filesystem.install
@@ -0,0 +1,54 @@
+# args: <group> [options]
+_addgroup() {
+	if ! getent group "$1" >/dev/null && groupadd "$@" >/dev/null; then
+		need_group_update=1
+	fi
+}
+
+# args: <group> [options]
+_adduser() {
+	if ! getent passwd "$1" >/dev/null && useradd "$@" >/dev/null; then
+		need_passwd_update=1
+	fi
+}
+
+post_upgrade() {
+	_addgroup optical -g 93
+	_addgroup audio   -g 92
+	_addgroup video   -g 91
+	_addgroup floppy  -g 94
+	_addgroup storage -g 95
+	_addgroup log     -g 19
+	_addgroup utmp    -g 20
+	_addgroup power   -g 98
+	_addgroup network -g 90
+	_addgroup games   -g 50
+	_addgroup uucp    -g 14
+	_addgroup proc    -g 26
+	_addgroup http    -g 33
+	_adduser  http    -u 33 -d /srv/http -g http -s /usr/bin/nologin
+	_addgroup scanner -g 96
+	_addgroup rfkill  -g 24
+	_addgroup lock    -g 54
+	_addgroup input   -g 97
+
+	# update shadow files if needed
+	if (( need_group_update )); then
+		grpconv >/dev/null
+	fi
+
+	if (( need_passwd_update )); then
+		pwconv >/dev/null
+	fi
+
+	if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
+		echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
+	fi
+
+	# set "Last password change" > 0; otherwise su $user wont work
+	for user in bin daemon mail ftp http nobody; do
+		if LANG=C chage -l ${user} | grep -q 'password must be changed'; then
+			chage -d 14871 ${user}
+		fi
+	done
+}
diff --git a/pcr/filesystem-nosystemd/fstab b/pcr/filesystem-nosystemd/fstab
new file mode 100644
index 000000000..b6716c14a
--- /dev/null
+++ b/pcr/filesystem-nosystemd/fstab
@@ -0,0 +1,4 @@
+# 
+# /etc/fstab: static file system information
+#
+# <file system>	<dir>	<type>	<options>	<dump>	<pass>
diff --git a/pcr/filesystem-nosystemd/group b/pcr/filesystem-nosystemd/group
new file mode 100644
index 000000000..002b8e075
--- /dev/null
+++ b/pcr/filesystem-nosystemd/group
@@ -0,0 +1,34 @@
+root:x:0:root
+bin:x:1:root,bin,daemon
+daemon:x:2:root,bin,daemon
+sys:x:3:root,bin
+adm:x:4:root,daemon
+tty:x:5:
+disk:x:6:root
+lp:x:7:daemon
+mem:x:8:
+kmem:x:9:
+wheel:x:10:root
+ftp:x:11:
+mail:x:12:
+uucp:x:14:
+log:x:19:root
+utmp:x:20:
+locate:x:21:
+rfkill:x:24:
+smmsp:x:25:
+proc:x:26:
+http:x:33:
+games:x:50:
+lock:x:54:
+network:x:90:
+video:x:91:
+audio:x:92:
+optical:x:93:
+floppy:x:94:
+storage:x:95:
+scanner:x:96:
+input:x:97:
+power:x:98:
+nobody:x:99:
+users:x:100:
diff --git a/pcr/filesystem-nosystemd/gshadow b/pcr/filesystem-nosystemd/gshadow
new file mode 100644
index 000000000..8d8a4e899
--- /dev/null
+++ b/pcr/filesystem-nosystemd/gshadow
@@ -0,0 +1,34 @@
+root:::root
+bin:::root,bin,daemon
+daemon:::root,bin,daemon
+sys:::root,bin
+adm:::root,daemon
+tty:::
+disk:::root
+lp:::daemon
+mem:::
+kmem:::
+wheel:::root
+ftp:::
+mail:::
+uucp:::
+log:::root
+utmp:x::
+locate:::
+rfkill:x::
+smmsp:::
+proc:::
+http:::
+games:::
+lock:::
+network:x::
+video:x::
+audio:::
+optical:::
+floppy:x::
+storage:x::
+scanner:x::
+input:x::
+power:x::
+nobody:::
+users:::
diff --git a/pcr/filesystem-nosystemd/host.conf b/pcr/filesystem-nosystemd/host.conf
new file mode 100644
index 000000000..cf52fe561
--- /dev/null
+++ b/pcr/filesystem-nosystemd/host.conf
@@ -0,0 +1,8 @@
+#
+# /etc/host.conf
+#
+
+order hosts,bind
+multi on
+
+# End of file
diff --git a/pcr/filesystem-nosystemd/hosts b/pcr/filesystem-nosystemd/hosts
new file mode 100644
index 000000000..1747f9196
--- /dev/null
+++ b/pcr/filesystem-nosystemd/hosts
@@ -0,0 +1,9 @@
+#
+# /etc/hosts: static lookup table for host names
+#
+
+#<ip-address>	<hostname.domain.org>	<hostname>
+127.0.0.1	localhost.localdomain	localhost
+::1		localhost.localdomain	localhost
+
+# End of file
diff --git a/pcr/filesystem-nosystemd/issue b/pcr/filesystem-nosystemd/issue
new file mode 100644
index 000000000..b001c55dd
--- /dev/null
+++ b/pcr/filesystem-nosystemd/issue
@@ -0,0 +1,2 @@
+Parabola GNU/Linux-libre \r  (\n) (\l)
+
diff --git a/pcr/filesystem-nosystemd/ld.so.conf b/pcr/filesystem-nosystemd/ld.so.conf
new file mode 100644
index 000000000..dfac45683
--- /dev/null
+++ b/pcr/filesystem-nosystemd/ld.so.conf
@@ -0,0 +1,7 @@
+#
+# /etc/ld.so.conf
+#
+
+include /etc/ld.so.conf.d/*.conf
+
+# End of file
diff --git a/pcr/filesystem-nosystemd/locale.sh b/pcr/filesystem-nosystemd/locale.sh
new file mode 100644
index 000000000..11b7dc9ec
--- /dev/null
+++ b/pcr/filesystem-nosystemd/locale.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+if [ -z "$LANG" ]; then
+  if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
+    . "$XDG_CONFIG_HOME/locale.conf"
+  elif [ -n "$HOME" ] && [ -r "$HOME/.config/locale.conf" ]; then
+    . "$HOME/.config/locale.conf"
+  elif [ -r /etc/locale.conf ]; then
+    . /etc/locale.conf
+  fi
+fi
+
+LANG=${LANG:-C}
+export LANG
+[ -n "$LC_CTYPE" ]          && export LC_CTYPE
+[ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
+[ -n "$LC_TIME" ]           && export LC_TIME
+[ -n "$LC_COLLATE" ]        && export LC_COLLATE
+[ -n "$LC_MONETARY" ]       && export LC_MONETARY
+[ -n "$LC_MESSAGES" ]       && export LC_MESSAGES
+[ -n "$LC_PAPER" ]          && export LC_PAPER
+[ -n "$LC_NAME" ]           && export LC_NAME
+[ -n "$LC_ADDRESS" ]        && export LC_ADDRESS
+[ -n "$LC_TELEPHONE" ]      && export LC_TELEPHONE
+[ -n "$LC_MEASUREMENT" ]    && export LC_MEASUREMENT
+[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION
diff --git a/pcr/filesystem-nosystemd/motd b/pcr/filesystem-nosystemd/motd
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pcr/filesystem-nosystemd/motd
diff --git a/pcr/filesystem-nosystemd/nsswitch.conf b/pcr/filesystem-nosystemd/nsswitch.conf
new file mode 100644
index 000000000..25125e13e
--- /dev/null
+++ b/pcr/filesystem-nosystemd/nsswitch.conf
@@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: compat mymachines
+group: compat mymachines
+shadow: compat
+
+publickey: files
+
+hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf
diff --git a/pcr/filesystem-nosystemd/os-release b/pcr/filesystem-nosystemd/os-release
new file mode 100644
index 000000000..768bfbc92
--- /dev/null
+++ b/pcr/filesystem-nosystemd/os-release
@@ -0,0 +1,9 @@
+NAME="Parabola"
+PRETTY_NAME="Parabola GNU/Linux-libre"
+ID=parabola
+ID_LIKE="arch archlinux"
+ANSI_COLOR="1;35"
+HOME_URL="https://www.parabola.nu/"
+SUPPORT_URL="irc://chat.freenode.net#parabola"
+BUG_REPORT_URL="https://labs.parabola.nu/"
+
diff --git a/pcr/filesystem-nosystemd/parabola.7.txt b/pcr/filesystem-nosystemd/parabola.7.txt
new file mode 100644
index 000000000..48b5d7f02
--- /dev/null
+++ b/pcr/filesystem-nosystemd/parabola.7.txt
@@ -0,0 +1,89 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet:
+/////
+
+parabola(7)
+============
+
+NAME
+----
+parabola - basic configuration
+
+SYNOPSIS
+--------
+Overview of the basic configuration of Parabola GNU/Linux-libre.
+
+DESCRIPTION
+-----------
+Parabola exposes the user to the system without hiding any details.
+This man page gives a brief overview of the configuration files that should be set up on a fresh install.
+
+SYSTEM SERVICES[[S]]
+--------------------
+System services to be started at boot can be enabled using 'rc-update add <name> <runlevel>'.
+To view available services, use 'rc-status --all'.
+
+HOSTNAME[[H]]
+-------------
+The hostname of the machine can be set using 'hostnamectl set-hostname <hostname>'.
+It will then be written to /etc/hostname.
+
+LOCALIZATION[[L]]
+-----------------
+Various locales may be enabled in /etc/locale.gen and are generated by 'locale-gen'.
+The system-wide locale to be used can be configured in /etc/locale.conf.
+These settings can be overridden on a per-user basis by keeping a user-specific locale.conf in $HOME/.config/locale.conf.
+The user-specific file will take precedence if it exists.
+
+VIRTUAL CONSOLE[[V]]
+--------------------
+The virtual console is configured in /etc/conf.d/keymaps.
+It allows you to set a font and a keyboard layout, among other things.
+Note that these settings only apply to the console and do not apply if you use X.
+
+TIME[[T]]
+---------
+A relative *symlink* needs to be created from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/.
+
+   'ln -s /etc/localtime /usr/share/zoneinfo/Europe/Paris'
+
+The real-time clock, which keeps track of time when the computer is off, can be configured to either
+be in UTC or in local time in /etc/conf.d/hwclock.
+The default is UTC.
+
+FILE SYSTEMS[[F]]
+-----------------
+File systems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab.
+
+INITRAMFS[[R]]
+--------------
+The initramfs is generated by 'mkinitcpio -p <preset>'.
+The default preset is "linux-libre".
+The initramfs can be configured in /etc/mkinitcpio.conf and must be regenerated after making configuration changes.
+
+PACKAGE MANAGER[[P]]
+--------------------
+The package manager, pacman, is configured in /etc/pacman.conf.
+
+BOOT LOADER[[B]]
+----------------
+GRUB's configuration is generated from /etc/default/grub by 'grub-mkconfig -o /boot/grub/grub.cfg'.
+Syslinux is configured in /boot/syslinux/syslinux.cfg.
+
+MODULES[[M]]
+------------
+Most modules should be loaded on-demand.
+Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/,
+and modules to be blacklisted from automatically loading can be configured in /etc/modprobe.d/.
+
+SEE ALSO
+--------
+
+*hostname*(5), *locale.conf*(5), *timezone*(3), *hwclock*(8),
+*fstab*(5), *crypttab*(5), *mkinitcpio*(8), *pacman*(8), *pacman.conf*(5),
+*grub-mkconfig*(8), *syslinux*(1), *modules-load.d*(5), *modprobe.d*(5)
+
+AUTHORS
+-------
+Written by Tom Gundersen.
+Rebranded for Parabola by Nicolás Reynolds and André Silva.
diff --git a/pcr/filesystem-nosystemd/passwd b/pcr/filesystem-nosystemd/passwd
new file mode 100644
index 000000000..59704dbef
--- /dev/null
+++ b/pcr/filesystem-nosystemd/passwd
@@ -0,0 +1,7 @@
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/usr/bin/nologin
+daemon:x:2:2:daemon:/:/usr/bin/nologin
+mail:x:8:12:mail:/var/spool/mail:/usr/bin/nologin
+ftp:x:14:11:ftp:/srv/ftp:/usr/bin/nologin
+http:x:33:33:http:/srv/http:/usr/bin/nologin
+nobody:x:99:99:nobody:/:/usr/bin/nologin
diff --git a/pcr/filesystem-nosystemd/profile b/pcr/filesystem-nosystemd/profile
new file mode 100644
index 000000000..60c1821dd
--- /dev/null
+++ b/pcr/filesystem-nosystemd/profile
@@ -0,0 +1,27 @@
+# /etc/profile
+
+#Set our umask
+umask 022
+
+# Set our default path
+PATH="/usr/local/sbin:/usr/local/bin:/usr/bin"
+export PATH
+
+# Load profiles from /etc/profile.d
+if test -d /etc/profile.d/; then
+	for profile in /etc/profile.d/*.sh; do
+		test -r "$profile" && . "$profile"
+	done
+	unset profile
+fi
+
+# Source global bash config
+if test "$PS1" && test "$BASH" && test -z ${POSIXLY_CORRECT+x} && test -r /etc/bash.bashrc; then
+	. /etc/bash.bashrc
+fi
+
+# Termcap is outdated, old, and crusty, kill it.
+unset TERMCAP
+
+# Man is much better than us at figuring this out
+unset MANPATH
diff --git a/pcr/filesystem-nosystemd/resolv.conf b/pcr/filesystem-nosystemd/resolv.conf
new file mode 100644
index 000000000..cecafba03
--- /dev/null
+++ b/pcr/filesystem-nosystemd/resolv.conf
@@ -0,0 +1,8 @@
+#
+# /etc/resolv.conf
+#
+
+#search <yourdomain.tld>
+#nameserver <ip>
+
+# End of file
diff --git a/pcr/filesystem-nosystemd/securetty b/pcr/filesystem-nosystemd/securetty
new file mode 100644
index 000000000..5a2235ce7
--- /dev/null
+++ b/pcr/filesystem-nosystemd/securetty
@@ -0,0 +1,15 @@
+#
+# /etc/securetty
+#
+
+console
+tty1
+tty2
+tty3
+tty4
+tty5
+tty6
+ttyS0
+hvc0
+
+# End of file
diff --git a/pcr/filesystem-nosystemd/shadow b/pcr/filesystem-nosystemd/shadow
new file mode 100644
index 000000000..ccab68d33
--- /dev/null
+++ b/pcr/filesystem-nosystemd/shadow
@@ -0,0 +1,7 @@
+root::14871::::::
+bin:x:14871::::::
+daemon:x:14871::::::
+mail:x:14871::::::
+ftp:x:14871::::::
+http:x:14871::::::
+nobody:x:14871::::::
diff --git a/pcr/filesystem-nosystemd/shells b/pcr/filesystem-nosystemd/shells
new file mode 100644
index 000000000..18c1aeffa
--- /dev/null
+++ b/pcr/filesystem-nosystemd/shells
@@ -0,0 +1,8 @@
+#
+# /etc/shells
+#
+
+/bin/sh
+/bin/bash
+
+# End of file
diff --git a/pcr/gforth/PKGBUILD b/pcr/gforth/PKGBUILD
index c7e1e0512..489d88f15 100644
--- a/pcr/gforth/PKGBUILD
+++ b/pcr/gforth/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="Fast and portable implementation of the ANS Forth language"
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL3')
 depends=('libtool')
-source=("https://ftp.gnu.org/gnu/gforth/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
 options=('libtool')
 install=$pkgname.install
 sha512sums=('f034234acfb0fc727f28b564432219a100b916c6df4b847794a55b2fc3b8ed8714eca6de0df67c7c427b7c2bb4dd00f65cfd34e6eb60181e41ab84fea30304e4'
diff --git a/pcr/gimpfx-foundry/PKGBUILD b/pcr/gimpfx-foundry/PKGBUILD
index c49167eab..8351549eb 100644
--- a/pcr/gimpfx-foundry/PKGBUILD
+++ b/pcr/gimpfx-foundry/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.6_1
 pkgrel=2.1
 pkgdesc="Collection of Gimp scripts"
 url="http://gimpfx-foundry.sourceforge.net/"
-license="GPL"
+license=("GPL")
 arch=('any')
 depends=('gimp')
 source=(http://downloads.sourceforge.net/sourceforge/gimpfx-foundry/${pkgname}-${pkgver/_/-}.tar.gz)
diff --git a/pcr/gna-unrar/PKGBUILD b/pcr/gna-unrar/PKGBUILD
index c29b72408..0da97c7f2 100644
--- a/pcr/gna-unrar/PKGBUILD
+++ b/pcr/gna-unrar/PKGBUILD
@@ -7,7 +7,7 @@
 _pkgname=unrar
 pkgname=gna-unrar
 pkgver=0.0.1
-url=(http://home.gna.org/unrar/)
+url=http://home.gna.org/unrar/
 license=(GPL)
 source=(http://download.gna.org/$_pkgname/$_pkgname-$pkgver.tar.gz)
 md5sums=('ac284a6739e3b8c794e7f9e8c20ed8f8')
diff --git a/pcr/gnash-git/PKGBUILD b/pcr/gnash-git/PKGBUILD
index 67f9d1eb2..c419d3b78 100644
--- a/pcr/gnash-git/PKGBUILD
+++ b/pcr/gnash-git/PKGBUILD
@@ -9,13 +9,13 @@
 pkgname=gnash-git
 _gitname=gnash
 pkgver=0.8.11.r22395.g8a11e6058
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU SWF Player based on GameSWF - git development version"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gnash/"
 license=('GPL3')
 depends=('curl' 'giflib' 'sdl' 'libjpeg' 'libpng' 'libgl' 
-  'glu' 'fontconfig' 'cairo' 'ffmpeg' 'jemalloc' 'boost-libs' 
+  'glu' 'fontconfig' 'cairo' 'ffmpeg' 'jemalloc' 'boost-libs<1.66'
   'gtk2' 'libldap' 'hicolor-icon-theme' 'desktop-file-utils' 'gconf' 
   'gtkglext' 'agg' 'gdk-pixbuf2')
 makedepends=('mesa' 'xulrunner' 'pkgconfig' 'boost' 'git')
diff --git a/pcr/imagemagick-nox/PKGBUILD b/pcr/imagemagick-nox/PKGBUILD
index ef0bdf4b9..744c2dc01 100644
--- a/pcr/imagemagick-nox/PKGBUILD
+++ b/pcr/imagemagick-nox/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgbase=imagemagick
 pkgname=imagemagick-nox
 
-pkgver=6.9.9.23
+pkgver=7.0.7.19
 pkgrel=1
 arch=(i686 x86_64 armv7h)
 
@@ -14,97 +14,106 @@ pkgdesc="An image viewing/manipulation program (without X11 support)"
 url="http://www.imagemagick.org/"
 license=(custom)
 
-# Remove libxt, libxext, opencl-headers, opencl-id-loader, libcl, glu
-makedepends=(libltdl lcms2 fontconfig ghostscript
-             openexr libwmf librsvg libxml2 liblqr openjpeg2 libraw libraqm
-             libwebp subversion)
 # Remove libxt, libxext, libcl, opencl-icd-loader
-depends=(libltdl lcms2 fontconfig liblqr libraqm)
-optdepends=('imagemagick-doc: for additional information'
-            'ghostscript: for Ghostscript support'
-            'openexr: for OpenEXR support'
-            'openjpeg2: for JP2 support'
-            'libwmf: for WMF support'
-            'librsvg: for SVG support'
-            'libxml2: for XML support'
-            'libpng: for PNG support'
-            'libwebp: for WEBP support'
-            'libraw: for DNG support')
-backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
-        "etc/ImageMagick-${pkgver%%.*}/colors.xml"
-        "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
-        "etc/ImageMagick-${pkgver%%.*}/log.xml"
-        "etc/ImageMagick-${pkgver%%.*}/magic.xml"
-        "etc/ImageMagick-${pkgver%%.*}/mime.xml"
-        "etc/ImageMagick-${pkgver%%.*}/policy.xml"
-        "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
-        "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
-options=('!docs' 'libtool' '!emptydirs')
+depends=(libltdl lcms2 fontconfig liblqr libraqm libpng)
+# Remove libxt, libxext, opencl-headers, opencl-id-loader, libcl, glu
+makedepends=(ghostscript openexr libwmf librsvg libxml2 openjpeg2 libraw libwebp
+             chrpath ocl-icd subversion)
+checkdepends=(gsfonts ttf-dejavu)
+_relname=ImageMagick-${pkgver%%.*}
+_tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
 provides=("$_pkgbase=$pkgver")
 conflicts=("$_pkgbase")
 replaces=("imagemagick-srv")
 
-source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
-        perlmagick.rpath.patch)
-sha256sums=('88a422ecc2888745373586b04f1ebd8e91ca090bbf133c2270f66fc716fba631'
+source=(https://www.imagemagick.org/download/$_tarname.tar.xz{,.asc}
+        parabola-fonts.diff)
+sha256sums=('5f1156824c37e5dde6ec37c5b1c51d9806f6d0e97aeaeb1e6907d7aba15951d9'
             'SKIP'
-            '17218bbecc17f3c7a86935a09d5a47e46113a1fc28f7d91c2fe495019cc36088')
-validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
+            'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
+validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
+shopt -s extglob
 
 prepare() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  mkdir -p binpkg/usr/lib/pkgconfig binpkg/usr/share
+
+  cd $_tarname
+
+  # Fix up typemaps to match our packages, where possible
+  patch -Np1 -i $srcdir/parabola-fonts.diff
 
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  patch -p0 -i "$srcdir/perlmagick.rpath.patch"
-  autoreconf --force --install
+  # Don't run auto(re)conf; assumes use of git
 }
 
 build() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
-  [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
-  [[ $CARCH = "armv7h" ]] && EXTRAOPTS="--with-gcc-arch=armv7h"
+  cd $_tarname
 
   no_x=yes with_x=no \
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
-    --enable-hdri --with-wmf --with-openexr --with-xml \
-    --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
-    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
-    --disable-opencl --with-openjp2 --without-gvc --without-djvu --without-autotrace \
-    --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-dejavu-font-dir=/usr/share/fonts/TTF \
+    --with-gs-font-dir=/usr/share/fonts/gsfonts \
+    PSDelegate=/usr/bin/gs \
+    XPSDelegate=/usr/bin/gxps \
+    PCLDelegate=/usr/bin/gpcl6 \
+    --enable-hdri \
+    --disable-opencl \
+    --with-gslib \
+    --with-lqr \
+    --with-modules \
+    --with-openexr \
+    --with-openjp2 \
+    --with-perl \
+    --with-perl-options="INSTALLDIRS=vendor" \
+    --with-rsvg \
+    --with-webp \
+    --with-wmf \
+    --with-xml \
+    --without-autotrace \
+    --without-djvu \
+    --without-dps \
+    --without-fftw \
+    --without-fpx \
+    --without-gcc-arch \
+    --without-gvc \
+    --without-jbig
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  # make check
+  cd $_tarname
+  ulimit -n 4096
+  make check
 }
 
-package() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+package_imagemagick-nox() {
+  depends=("libmagick=$pkgver-$pkgrel")
+  optdepends=('imagemagick-doc: manual and API docs')
+  options=('!emptydirs')
 
-  make -j1 DESTDIR="${pkgdir}" install
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
+  cd $_tarname
+  make DESTDIR="$srcdir/binpkg" install
 
-  # Cleaning
-  rm -f "$pkgdir"/usr/lib/*.la
+  mkdir -p "$pkgdir/usr/"{lib,share}
+  mv "$srcdir/binpkg/usr/bin" "$pkgdir/usr/"
+  mv "$srcdir/binpkg/usr/lib/perl5" "$pkgdir/usr/lib"
+  mv "$srcdir/binpkg/usr/share/man" "$pkgdir/usr/share"
 
   # remove useless display
   rm -vf "$pkgdir/usr/bin/display"
 
-  # template start; name=perl-binary-module-dependency; version=1;
-  if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
-    _perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
-    _perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
-    depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
-  fi
-  # template end;
+  find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} +
+
+# template start; name=perl-binary-module-dependency; version=1;
+if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
+        _perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
+        _perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
+        depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
+fi
+# template end;
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE
 }
diff --git a/pcr/imagemagick-nox/parabola-fonts.diff b/pcr/imagemagick-nox/parabola-fonts.diff
new file mode 100644
index 000000000..63a547c4d
--- /dev/null
+++ b/pcr/imagemagick-nox/parabola-fonts.diff
@@ -0,0 +1,107 @@
+diff -u -r ImageMagick-6.9.9-25/config/type-dejavu.xml.in ImageMagick-6.9.9-25-archfonts/config/type-dejavu.xml.in
+--- ImageMagick-6.9.9-25/config/type-dejavu.xml.in	2017-11-30 19:24:05.000000000 +0100
++++ ImageMagick-6.9.9-25-archfonts/config/type-dejavu.xml.in	2017-12-02 18:44:53.410304554 +0100
+@@ -13,27 +13,6 @@
+   ImageMagick DejaVU font configuration.
+ -->
+ <typemap>
+-  <type name="DejaVu-LGC-Sans-Bold" fullname="DejaVu LGC Sans Bold" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSans-Bold.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Bold-Oblique" fullname="DejaVu LGC Sans Bold Oblique" family="DejaVuGC Sans" style="Oblique" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSans-BoldOblique.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Book" fullname="DejaVu LGC Sans Book" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSans.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Condensed" fullname="DejaVu LGC Sans Condensed" family="DejaVuGC Sans" style="Normal" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Condensed-Bold" fullname="DejaVu LGC Sans Condensed Bold" family="DejaVuGC Sans" style="Normal" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed-Bold.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Condensed-Bold-Oblique" fullname="DejaVu LGC Sans Condensed Bold Oblique" family="DejaVuGC Sans" style="Oblique" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed-BoldOblique.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Condensed-Oblique" fullname="DejaVu LGC Sans Condensed Oblique" family="DejaVuGC Sans" style="Oblique" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed-Oblique.ttf"/>
+-  <type name="DejaVu-LGC-Sans-ExtraLight" fullname="DejaVu LGC Sans ExtraLight" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="200" glyphs="@dejavu_font_dir@DejaVuLGCSans-ExtraLight.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Mono-Bold" fullname="DejaVu LGC Sans Mono Bold" family="DejaVuGC Sans Mono" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansMono-Bold.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Mono-Bold-Oblique" fullname="DejaVu LGC Sans Mono Bold Oblique" family="DejaVuGC Sans Mono" style="Oblique" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansMono-BoldOblique.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Mono-Book" fullname="DejaVu LGC Sans Mono Book" family="DejaVuGC Sans Mono" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansMono.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Mono-Oblique" fullname="DejaVu LGC Sans Mono Oblique" family="DejaVuGC Sans Mono" style="Oblique" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansMono-Oblique.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Oblique" fullname="DejaVu LGC Sans Oblique" family="DejaVuGC Sans" style="Oblique" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSans-Oblique.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Bold" fullname="DejaVu LGC Serif Bold" family="DejaVuGC Serif" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerif-Bold.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Bold-Italic" fullname="DejaVu LGC Serif Bold Italic" family="DejaVuGC Serif" style="Italic" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerif-BoldItalic.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Book" fullname="DejaVu LGC Serif Book" family="DejaVuGC Serif" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerif.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Condensed" fullname="DejaVu LGC Serif Condensed" family="DejaVuGC Serif" style="Normal" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Condensed-Bold" fullname="DejaVu LGC Serif Condensed Bold" family="DejaVuGC Serif" style="Normal" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed-Bold.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Condensed-Bold-Italic" fullname="DejaVu LGC Serif Condensed Bold Italic" family="DejaVuGC Serif" style="Italic" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed-BoldItalic.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Condensed-Italic" fullname="DejaVu LGC Serif -Condensed Italic" family="DejaVuGC Serif" style="Italic" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed-Italic.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Italic" fullname="DejaVu LGC Serif Italic" family="DejaVuGC Serif" style="Italic" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerif-Italic.ttf"/>
+   <type name="DejaVu-Sans-Bold" fullname="DejaVu Sans Bold" family="DejaVu Sans" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuSans-Bold.ttf"/>
+   <type name="DejaVu-Sans-Bold-Oblique" fullname="DejaVu Sans Bold Oblique" family="DejaVu Sans" style="Oblique" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuSans-BoldOblique.ttf"/>
+   <type name="DejaVu-Sans-Book" fullname="DejaVu Sans Book" family="DejaVu Sans" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuSans.ttf"/>
+diff -u -r ImageMagick-6.9.9-25/config/type-ghostscript.xml.in ImageMagick-6.9.9-25-archfonts/config/type-ghostscript.xml.in
+--- ImageMagick-6.9.9-25/config/type-ghostscript.xml.in	2017-11-30 19:24:05.000000000 +0100
++++ ImageMagick-6.9.9-25-archfonts/config/type-ghostscript.xml.in	2017-12-02 19:08:05.669243822 +0100
+@@ -13,38 +13,38 @@
+   ImageMagick Ghostscript font configuration.
+ -->
+ <typemap>
+-  <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010013l.afm" glyphs="@ghostscript_font_dir@a010013l.pfb"/>
+-  <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010033l.afm" glyphs="@ghostscript_font_dir@a010033l.pfb"/>
+-  <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010015l.afm" glyphs="@ghostscript_font_dir@a010015l.pfb"/>
+-  <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010035l.afm" glyphs="@ghostscript_font_dir@a010035l.pfb"/>
+-  <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018015l.afm" glyphs="@ghostscript_font_dir@b018015l.pfb"/>
+-  <type name="Bookman-DemiItalic" fullname="Bookman DemiBold Italic" family="Bookman" foundry="URW" weight="600" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018035l.afm" glyphs="@ghostscript_font_dir@b018035l.pfb"/>
+-  <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018012l.afm" glyphs="@ghostscript_font_dir@b018012l.pfb"/>
+-  <type name="Bookman-LightItalic" fullname="Bookman Light Italic" family="Bookman" foundry="URW" weight="300" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018032l.afm" glyphs="@ghostscript_font_dir@b018032l.pfb"/>
+-  <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022003l.afm" glyphs="@ghostscript_font_dir@n022003l.pfb"/>
+-  <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022004l.afm" glyphs="@ghostscript_font_dir@n022004l.pfb"/>
+-  <type name="Courier-Oblique" fullname="Courier Regular Oblique" family="Courier" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022023l.afm" glyphs="@ghostscript_font_dir@n022023l.pfb"/>
+-  <type name="Courier-BoldOblique" fullname="Courier Bold Oblique" family="Courier" foundry="URW" weight="700" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022024l.afm" glyphs="@ghostscript_font_dir@n022024l.pfb"/>
+-  <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019003l.afm" glyphs="@ghostscript_font_dir@n019003l.pfb"/>
+-  <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019003l.afm" glyphs="@ghostscript_font_dir@n019003l.pfb"/>
+-  <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019004l.afm" glyphs="@ghostscript_font_dir@n019004l.pfb"/>
+-  <type name="Helvetica-Oblique" fullname="Helvetica Regular Italic" family="Helvetica" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019023l.afm" glyphs="@ghostscript_font_dir@n019023l.pfb"/>
+-  <type name="Helvetica-BoldOblique" fullname="Helvetica Bold Italic" family="Helvetica" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019024l.afm" glyphs="@ghostscript_font_dir@n019024l.pfb"/>
+-  <type name="Helvetica-Narrow" fullname="Helvetica Narrow" family="Helvetica Narrow" foundry="URW" weight="400" style="normal" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019043l.afm" glyphs="@ghostscript_font_dir@n019043l.pfb"/>
+-  <type name="Helvetica-Narrow-Oblique" fullname="Helvetica Narrow Oblique" family="Helvetica Narrow" foundry="URW" weight="400" style="oblique" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019063l.afm" glyphs="@ghostscript_font_dir@n019063l.pfb"/>
+-  <type name="Helvetica-Narrow-Bold" fullname="Helvetica Narrow Bold" family="Helvetica Narrow" foundry="URW" weight="700" style="normal" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019044l.afm" glyphs="@ghostscript_font_dir@n019044l.pfb"/>
+-  <type name="Helvetica-Narrow-BoldOblique" fullname="Helvetica Narrow Bold Oblique" family="Helvetica Narrow" foundry="URW" weight="700" style="oblique" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019064l.afm" glyphs="@ghostscript_font_dir@n019064l.pfb"/>
+-  <type name="NewCenturySchlbk-Roman" fullname="New Century Schoolbook" family="NewCenturySchlbk" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059013l.afm" glyphs="@ghostscript_font_dir@c059013l.pfb"/>
+-  <type name="NewCenturySchlbk-Italic" fullname="New Century Schoolbook Italic" family="NewCenturySchlbk" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059033l.afm" glyphs="@ghostscript_font_dir@c059033l.pfb"/>
+-  <type name="NewCenturySchlbk-Bold" fullname="New Century Schoolbook Bold" family="NewCenturySchlbk" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059016l.afm" glyphs="@ghostscript_font_dir@c059016l.pfb"/>
+-  <type name="NewCenturySchlbk-BoldItalic" fullname="New Century Schoolbook Bold Italic" family="NewCenturySchlbk" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059036l.afm" glyphs="@ghostscript_font_dir@c059036l.pfb"/>
+-  <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052003l.afm" glyphs="@ghostscript_font_dir@p052003l.pfb"/>
+-  <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052023l.afm" glyphs="@ghostscript_font_dir@p052023l.pfb"/>
+-  <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052004l.afm" glyphs="@ghostscript_font_dir@p052004l.pfb"/>
+-  <type name="Palatino-BoldItalic" fullname="Palatino Bold Italic" family="Palatino" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052024l.afm" glyphs="@ghostscript_font_dir@p052024l.pfb"/>
+-  <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021003l.afm" glyphs="@ghostscript_font_dir@n021003l.pfb"/>
+-  <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021004l.afm" glyphs="@ghostscript_font_dir@n021004l.pfb"/>
+-  <type name="Times-Italic" fullname="Times Regular Italic" family="Times" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021023l.afm" glyphs="@ghostscript_font_dir@n021023l.pfb"/>
+-  <type name="Times-BoldItalic" fullname="Times Medium Italic" family="Times" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021024l.afm" glyphs="@ghostscript_font_dir@n021024l.pfb"/>
+-  <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@s050000l.afm" glyphs="@ghostscript_font_dir@s050000l.pfb" version="0.1" encoding="AdobeCustom"/>
++  <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-Book.otf"/>
++  <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-BookOblique.otf"/>
++  <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-Demi.otf"/>
++  <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-DemiOblique.otf"/>
++  <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-Demi.otf"/>
++  <type name="Bookman-DemiItalic" fullname="Bookman DemiBold Italic" family="Bookman" foundry="URW" weight="600" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-DemiItalic.otf"/>
++  <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-Light.otf"/>
++  <type name="Bookman-LightItalic" fullname="Bookman Light Italic" family="Bookman" foundry="URW" weight="300" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-LightItalic.otf"/>
++  <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-Regular.otf"/>
++  <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-Bold.otf"/>
++  <type name="Courier-Oblique" fullname="Courier Regular Oblique" family="Courier" foundry="URW" weight="400" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-Italic.otf"/>
++  <type name="Courier-BoldOblique" fullname="Courier Bold Oblique" family="Courier" foundry="URW" weight="700" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-BoldItalic.otf"/>
++  <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Regular.otf"/>
++  <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Regular.otf"/>
++  <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Bold.otf"/>
++  <type name="Helvetica-Oblique" fullname="Helvetica Regular Italic" family="Helvetica" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Italic.otf"/>
++  <type name="Helvetica-BoldOblique" fullname="Helvetica Bold Italic" family="Helvetica" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-BoldItalic.otf"/>
++  <type name="Helvetica-Narrow" fullname="Helvetica Narrow" family="Helvetica Narrow" foundry="URW" weight="400" style="normal" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-Regular.otf"/>
++  <type name="Helvetica-Narrow-Oblique" fullname="Helvetica Narrow Oblique" family="Helvetica Narrow" foundry="URW" weight="400" style="oblique" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-Oblique.otf"/>
++  <type name="Helvetica-Narrow-Bold" fullname="Helvetica Narrow Bold" family="Helvetica Narrow" foundry="URW" weight="700" style="normal" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-Bold.otf"/>
++  <type name="Helvetica-Narrow-BoldOblique" fullname="Helvetica Narrow Bold Oblique" family="Helvetica Narrow" foundry="URW" weight="700" style="oblique" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-BdOblique.otf"/>
++  <type name="NewCenturySchlbk-Roman" fullname="New Century Schoolbook" family="NewCenturySchlbk" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-Roman.otf"/>
++  <type name="NewCenturySchlbk-Italic" fullname="New Century Schoolbook Italic" family="NewCenturySchlbk" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-Italic.otf"/>
++  <type name="NewCenturySchlbk-Bold" fullname="New Century Schoolbook Bold" family="NewCenturySchlbk" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-Bold.otf"/>
++  <type name="NewCenturySchlbk-BoldItalic" fullname="New Century Schoolbook Bold Italic" family="NewCenturySchlbk" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-BdIta.otf"/>
++  <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-Roman.otf"/>
++  <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-Italic.otf"/>
++  <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-Bold.otf"/>
++  <type name="Palatino-BoldItalic" fullname="Palatino Bold Italic" family="Palatino" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-BoldItalic.otf"/>
++  <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-Regular.otf"/>
++  <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-Bold.otf"/>
++  <type name="Times-Italic" fullname="Times Regular Italic" family="Times" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-Italic.otf"/>
++  <type name="Times-BoldItalic" fullname="Times Medium Italic" family="Times" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-BoldItalic.otf"/>
++  <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@StandardSymbolsPS.otf" version="2.0" encoding="AdobeCustom"/>
+ </typemap>
diff --git a/pcr/imagemagick-nox/perlmagick.rpath.patch b/pcr/imagemagick-nox/perlmagick.rpath.patch
deleted file mode 100644
index a5b1a82e2..000000000
--- a/pcr/imagemagick-nox/perlmagick.rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2013-02-21 03:26:56.785156600 -0500
-+++ Makefile.in	2013-02-21 03:39:03.102411457 -0500
-@@ -10469,6 +10469,8 @@
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
diff --git a/pcr/inkscape-gtk3/PKGBUILD b/pcr/inkscape-gtk3/PKGBUILD
index ec07194ec..1953fca7b 100644
--- a/pcr/inkscape-gtk3/PKGBUILD
+++ b/pcr/inkscape-gtk3/PKGBUILD
@@ -13,7 +13,7 @@ pkgrel=19
 pkgdesc='Professional vector graphics editor with GTK3 and Python3'
 url='https://inkscape.org/'
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64' 'armv7h')
+arch=('i686' 'x86_64')
 makedepends=('boost' 'intltool')
 depends=('gdl' 'gnome-vfs' 'gsl' 'gtkmm3' 'gtkspell3' 'imagemagick' 'libcdr' 'libexif'
          'libvisio' 'libxslt' 'poppler-glib' 'popt' 'python' 'ttf-dejavu')
diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD
index ad700ca6f..91e7a4b98 100644
--- a/pcr/lcmc/PKGBUILD
+++ b/pcr/lcmc/PKGBUILD
@@ -4,9 +4,9 @@ pkgname=lcmc
 pkgver=1.5.1
 pkgrel=1
 pkgdesc='Linux Cluster Management Console'
-arch=any
+arch=(any)
 url=http://$pkgname.sourceforge.net/
-license=GPL
+license=(GPL)
 depends=(
   java-runtime
   libxtst
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index 8825deea0..e47910cea 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -10,7 +10,7 @@ arch=(
   i686
 )
 url=http://$pkgname.org/
-license=GPL3
+license=(GPL3)
 depends=(
   alsa-lib
   bzip2
@@ -38,8 +38,8 @@ makedepends=(
   yasm
   libvdpau
 )
-source=http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz
-sha512sums=88bbe82fc3edfde17339cbd5fbae5ab074e750ad750fafcabc2c1fa408f352e38f32d8c0df0ff6c926d449bff29c725fc2c219d8b6e0398e3b93d43f086c9f10
+source=(http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz)
+sha512sums=(88bbe82fc3edfde17339cbd5fbae5ab074e750ad750fafcabc2c1fa408f352e38f32d8c0df0ff6c926d449bff29c725fc2c219d8b6e0398e3b93d43f086c9f10)
 
 build() {
   cd $pkgname-$pkgver
diff --git a/pcr/libfilteraudio-git/PKGBUILD b/pcr/libfilteraudio-git/PKGBUILD
index 5a4af5445..9204788fa 100644
--- a/pcr/libfilteraudio-git/PKGBUILD
+++ b/pcr/libfilteraudio-git/PKGBUILD
@@ -4,8 +4,8 @@
 
 _pkgname=libfilteraudio
 pkgname=libfilteraudio-git
-pkgver=r92.612c5a1
-pkgrel=1.1
+pkgver=r95.ada2f4f
+pkgrel=1
 pkgdesc="An easy to use audio filtering library made from webrtc code"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/irungentoo/filter_audio"
diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD
index 4fd891ca4..56c0a8256 100644
--- a/pcr/libqb/PKGBUILD
+++ b/pcr/libqb/PKGBUILD
@@ -1,4 +1,4 @@
-# Mainteinar: fauno <fauno@parabola.nu>
+# Maintainer: fauno <fauno@parabola.nu>
 # Maintainer (arch):  Marcin Wieczorek <marcin@marcin.co>
 # Contributor: ovi chis <ovi@ovios.org>
 
diff --git a/pcr/librevpn-git/PKGBUILD b/pcr/librevpn-git/PKGBUILD
index d1feb074b..b05802097 100644
--- a/pcr/librevpn-git/PKGBUILD
+++ b/pcr/librevpn-git/PKGBUILD
@@ -38,8 +38,8 @@ optdepends=(
 )
 provides=($_pkgname)
 conflicts=($_pkgname)
-source=$_srcname-$_commit.tar.xz::http://repo.hackcoop.com.ar/$_pkgname.git/snapshot/$_commit.tar.xz
-sha512sums=$_sha512sums
+source=($_srcname-$_commit.tar.xz::http://repo.hackcoop.com.ar/$_pkgname.git/snapshot/$_commit.tar.xz)
+sha512sums=($_sha512sums)
 
 build() {
   cd $srcdir/$_commit
diff --git a/pcr/librevpn/PKGBUILD b/pcr/librevpn/PKGBUILD
index a8036f48f..2397f19f2 100644
--- a/pcr/librevpn/PKGBUILD
+++ b/pcr/librevpn/PKGBUILD
@@ -19,8 +19,8 @@ optdepends=(
   'ruby: for graph'
   sudo
 )
-source=http://repo.hackcoop.com.ar/$pkgname.git/snapshot/$pkgname-$pkgver.tar.xz
-sha512sums=96a0de4e35d1fd45652c4b7ee25d7335d9b3816065b48e978274845c328b68a03623abf812119af34f1856bd05170cac8ad59f233fc3dcd63ea6c84c89a80968
+source=(http://repo.hackcoop.com.ar/$pkgname.git/snapshot/$pkgname-$pkgver.tar.xz)
+sha512sums=(96a0de4e35d1fd45652c4b7ee25d7335d9b3816065b48e978274845c328b68a03623abf812119af34f1856bd05170cac8ad59f233fc3dcd63ea6c84c89a80968)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/pcr/lightspark-git/PKGBUILD b/pcr/lightspark-git/PKGBUILD
index aeaf2fd26..c351a9834 100644
--- a/pcr/lightspark-git/PKGBUILD
+++ b/pcr/lightspark-git/PKGBUILD
@@ -7,13 +7,13 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 _pkgname=lightspark
 pkgname=$_pkgname-git
-pkgver=0.8.0.r45.g06d58822
+pkgver=0.8.0.r123.gda0e6514
 pkgrel=1
 pkgdesc="An open source flash player implementation"
 arch=('i686' 'x86_64')
 url="http://lightspark.sourceforge.net"
 license=('LGPL3')
-depends=('gtk2' 'boost-libs' 'glew' 'ffmpeg' 'curl' 'desktop-file-utils' 'rtmpdump' 'sdl2_mixer' 'glibmm')
+depends=('gtk2' 'boost-libs<1.66' 'glew' 'ffmpeg' 'curl' 'desktop-file-utils' 'rtmpdump' 'sdl2_mixer' 'glibmm')
 makedepends=('git' 'cmake' 'nasm' 'llvm' 'boost')
 optdepends=('gnash-gtk: Gnash fallback support')
 provides=("$_pkgname")
diff --git a/pcr/log4c/PKGBUILD b/pcr/log4c/PKGBUILD
index b351eb717..054bcc833 100644
--- a/pcr/log4c/PKGBUILD
+++ b/pcr/log4c/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Logging FrameWork for C, as Log4j or Log4Cpp"
 url="http://log4c.sourceforge.net/"
 arch=('i686' 'x86_64')
-license="LGPL"
+license=("LGPL")
 depends=('expat')
 source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
 sha256sums=('5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea')
diff --git a/pcr/log4cxx/PKGBUILD b/pcr/log4cxx/PKGBUILD
index 6c060d3af..003022ab3 100644
--- a/pcr/log4cxx/PKGBUILD
+++ b/pcr/log4cxx/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.10.0
 pkgrel=3.1
 pkgdesc="A C++ port of Log4j"
 url="http://logging.apache.org/log4cxx"
-license="APACHE"
+license=("APACHE")
 depends=('apr-util' 'libxml2')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('autoconf' 'automake' 'libtool' 'patch' 'zip' 'gzip' 'sed')
diff --git a/pcr/luabind/PKGBUILD b/pcr/luabind/PKGBUILD
index d55f2b29e..08111724b 100644
--- a/pcr/luabind/PKGBUILD
+++ b/pcr/luabind/PKGBUILD
@@ -14,7 +14,7 @@ arch=(
   mips64el
 )
 url="http://www.rasterbar.com/products/$pkgname.html"
-license=MIT
+license=(MIT)
 makedepends=(
   boost
   boost-build
diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD
index 8889aa921..6f50cdea5 100644
--- a/pcr/mednafen-server/PKGBUILD
+++ b/pcr/mednafen-server/PKGBUILD
@@ -6,9 +6,9 @@ pkgver=0.5.2
 pkgrel=1
 pkgdesc='A server multi-system gaming emulator'
 url=http://$_pkgname.sourceforge.net/
-license=GPL
+license=(GPL)
 arch=('i686' 'x86_64' 'mips64el')
-backup=etc/$pkgname/standard.conf
+backup=(etc/$pkgname/standard.conf)
 source=(http://downloads.sourceforge.net/project/$_pkgname/${_pkgname^}-Server/$pkgver/$pkgname-$pkgver.tar.gz
         $pkgname.service)
 sha512sums=('7ca094c7123e147bfaaedc254958fa664b7d71b141f8409b251bb646e04a7a6a5bc7f01ecac049b3895334a09a02e7449ac90e6db1d469322dba44f7281edf15'
diff --git a/pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch b/pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch
deleted file mode 100644
index 7f8f7164c..000000000
--- a/pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 12 Oct 2016 13:41:33 -0400
-Subject: [PATCH] Fix linkage against shared glapi
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/gallium/targets/osmesa/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
-index 5d39486..04add87 100644
---- a/src/gallium/targets/osmesa/Makefile.am
-+++ b/src/gallium/targets/osmesa/Makefile.am
-@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \
- 	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
- 	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
- 	$(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \
--	$(top_builddir)/src/mapi/glapi/libglapi.la \
-+	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
- 	$(SHARED_GLAPI_LIB) \
- 	$(OSMESA_LIB_DEPS) \
- 	$(CLOCK_LIB)
--- 
-2.9.3
-
diff --git a/pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch b/pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch
deleted file mode 100644
index 376828e67..000000000
--- a/pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 16875ea5b9170f2213fd486d763f27a9d6dfc1b5 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Tue, 25 Oct 2016 09:35:13 +0200
-Subject: [PATCH 1/3] glapi: Link with glapi when built shared
-
-This patch explicitly links to libglapi when built shared.
-This was specially needed to avoid undefined non-weak-symbol as shown
-with:
-
-ldd  -r /usr/lib64/dri/i915_dri.so
-	linux-vdso.so.1 (0x00007fff821f4000)
-	libdrm_intel.so.1 => /lib64/libdrm_intel.so.1 (0x00007f6adf2c7000)
-	libdrm_nouveau.so.2 => /lib64/libdrm_nouveau.so.2 (0x00007f6adf0be000)
-	libdrm_radeon.so.1 => /lib64/libdrm_radeon.so.1 (0x00007f6adeeb2000)
-	libselinux.so.1 => /lib64/libselinux.so.1 (0x00007f6adec8b000)
-	libdrm.so.2 => /lib64/libdrm.so.2 (0x00007f6adea7c000)
-	libexpat.so.1 => /lib64/libexpat.so.1 (0x00007f6ade84f000)
-	libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f6ade633000)
-	libdl.so.2 => /lib64/libdl.so.2 (0x00007f6ade42f000)
-	libm.so.6 => /lib64/libm.so.6 (0x00007f6ade125000)
-	libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007f6addf0e000)
-	libc.so.6 => /lib64/libc.so.6 (0x00007f6addb4c000)
-	/lib64/ld-linux-x86-64.so.2 (0x000056274e913000)
-	libpciaccess.so.0 => /lib64/libpciaccess.so.0 (0x00007f6add941000)
-	libpcre.so.1 => /lib64/libpcre.so.1 (0x00007f6add6ce000)
-undefined symbol: _glapi_get_dispatch_table_size	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_get_context	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_add_dispatch	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_check_multithread	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_tls_Context	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_set_context	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_set_dispatch	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_tls_Dispatch	(/usr/lib64/dri/i915_dri.so)
-
-v3: Add gallium counterpart for radeon cases
-Reported-by: Jonathan Dieter <jdieter@lesbg.com>
-
-v2: Add Bugzilla and Signed-off
-
-Fixes: 0cbc90c57c ("mesa: dri: Add shared glapi to LIBADD on Android")
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98428
-Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
----
- src/gallium/targets/dri/Makefile.am | 2 --
- src/mesa/drivers/dri/Makefile.am    | 3 ---
- 2 files changed, 5 deletions(-)
-
-diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
-index bca747f..05f6c8c 100644
---- a/src/gallium/targets/dri/Makefile.am
-+++ b/src/gallium/targets/dri/Makefile.am
-@@ -1,10 +1,8 @@
- include $(top_srcdir)/src/gallium/Automake.inc
- 
--if HAVE_ANDROID
- if HAVE_SHARED_GLAPI
- SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
- endif
--endif
- 
- AM_CFLAGS = \
- 	-I$(top_srcdir)/src/mapi \
-diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
-index 1c6dd08..8e68fc0 100644
---- a/src/mesa/drivers/dri/Makefile.am
-+++ b/src/mesa/drivers/dri/Makefile.am
-@@ -6,12 +6,9 @@ MEGADRIVERS_DEPS =
- 
- SUBDIRS+=common
- 
--# On Android, we need to explicitly link to libglapi.so.
--if HAVE_ANDROID
- if HAVE_SHARED_GLAPI
- SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
- endif
--endif
- 
- if HAVE_I915_DRI
- SUBDIRS += i915
--- 
-2.7.4
-
diff --git a/pcr/mesa-vanilla/LICENSE b/pcr/mesa-vanilla/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/pcr/mesa-vanilla/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/pcr/mesa-vanilla/PKGBUILD b/pcr/mesa-vanilla/PKGBUILD
deleted file mode 100644
index 2460800ef..000000000
--- a/pcr/mesa-vanilla/PKGBUILD
+++ /dev/null
@@ -1,262 +0,0 @@
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
-
-# Based on mesa package from Arch and Arch ARM
-
-pkgbase=mesa-vanilla
-pkgname=('opencl-mesa-vanilla' 'libva-mesa-driver-vanilla' 'mesa-vdpau-vanilla' 'mesa-vanilla'
-         'mesa-libgl-vanilla' 'vulkan-radeon-vanilla')
-[[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]] && pkgname+=('vulkan-intel-vanilla')
-pkgver=17.0.3
-pkgrel=1
-arch=('i686' 'x86_64' 'armv7h')
-makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
-             'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
-             'libomxil-bellagio' 'libclc' 'clang' 'lm_sensors') # Implement 'lm_sensors' extra functionality, for i2c on video drivers
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-        LICENSE
-        remove-libpthread-stubs.patch
-        0001-Fix-linkage-against-shared-glapi.patch
-        0001-glapi-Link-with-glapi-when-built-shared.patch
-        drirc)
-sha256sums=('ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed'
-            'SKIP'
-            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
-            '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f'
-            'c68d1522f9bce4ce31c92aa7a688da49f13043f5bb2254795b76dea8f47130b7'
-            '064dcd5a3ab1b7c23383e2cafbd37859e4c353f8839671d9695c6f7c2ef3260b'
-            '2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
-validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') #  "Andres Gomez <tanty@igalia.com>"
-
-prepare() {
-  cd ${srcdir}/mesa-${pkgver}
-
-  # Now mesa checks for libpthread-stubs - so remove the check
-  patch -Np1 -i ../remove-libpthread-stubs.patch
-
-  # non-upstreamed ones
-  patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch
-  patch -Np1 -i ../0001-glapi-Link-with-glapi-when-built-shared.patch
-
-  autoreconf -fiv
-}
-
-build() {
-  # copy source to build mesa-libcl-icd package
-  cp -a ${srcdir}/{mesa,opencl}-${pkgver}
-
-  cd ${srcdir}/mesa-${pkgver}
-
-  # softpipe,llvmpipe
-  if [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]]; then
-    DRI=i915,i965,r200,radeon,nouveau,swrast
-    # Implement 'swr' (OpenSWR) software driver (only support x86 hardware with AVX extension, see: http://openswr.org/)
-    GALLIUM=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr
-    VULKAN=intel,radeon
-  elif [[ "${CARCH}" = 'armv7h' ]]; then
-    DRI=r200,radeon,nouveau,swrast
-    # Implement PCI and PCI-e drivers, due some ARM hardware does suport PCI and PCIe drivers, see:
-    #  https://lwn.net/Articles/586802/
-    #  https://www.linaro.org/blog/core-dump/kvm-pciemsi-passthrough-armarm64/
-    # nVidia, are avaliable on Tegra hardware and AMD will support K12 hardware, see:
-    #  https://en.wikipedia.org/wiki/Tegra
-    #  https://en.wikipedia.org/wiki/AMD_K12
-    GALLIUM=freedreno,etnaviv,vc4,imx,r300,r600,radeonsi,nouveau,svga,swrast,virgl
-    VULKAN=radeon
-  fi
-
-  # Implement 'gallium-extra-hud' extra functionality
-  # Implement opencl/vaapi/vdpau/xa on ARM archictecture, does support it and easy to maintain the PKGBUILD
-  #  ARM archictecture support PCI and PCIe drivers, see:
-  #    https://lwn.net/Articles/586802/
-  #    https://www.linaro.org/blog/core-dump/kvm-pciemsi-passthrough-armarm64/
-  #  Some ARM video drivers like freedreno/nouveau does support OpenCL, see:
-  #    Mali (Lima)                                  : https://en.wikipedia.org/wiki/Mali_(GPU)#Variants
-  #    Adreno (Freedreno, is not avaliable on mesa) : https://en.wikipedia.org/wiki/Adreno#Variants
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=${GALLIUM} \
-    --with-dri-drivers=${DRI} \
-    --with-egl-platforms=x11,drm,wayland \
-    --with-vulkan-drivers=${VULKAN} \
-    --disable-xvmc \
-    --enable-gallium-llvm \
-    --enable-llvm-shared-libs \
-    --enable-shared-glapi \
-    --disable-libglvnd \
-    --enable-egl \
-    --enable-glx \
-    --enable-glx-tls \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-gbm \
-    --enable-dri \
-    --enable-gallium-osmesa \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-vdpau \
-    --enable-omx \
-    --enable-nine \
-    --enable-opencl \
-    --enable-opencl-icd \
-    --enable-gallium-extra-hud \
-    --enable-lmsensors \
-    --with-clang-libdir=/usr/lib
-
-  make
-
-  # fake installation
-  mkdir $srcdir/fakeinstall
-  make DESTDIR=${srcdir}/fakeinstall install
-}
-
-package_opencl-mesa-vanilla() {
-  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
-  depends=('mesa-vanilla' 'opencl-icd-loader' 'expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors')
-  optdepends=('opencl-headers: headers necessary for OpenCL development')
-  provides=('opencl-driver')
-  conflicts=('opencl-mesa' 'opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst')
-  replaces=('opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst')
-
-  install -m755 -d ${pkgdir}/etc
-  cp -rv ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
-
-  install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libMesaOpenCL* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so ${pkgdir}/usr/lib/gallium-pipe/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
-}
-
-package_vulkan-intel-vanilla() {
-  pkgdesc="Intel's Vulkan mesa driver"
-  depends=('mesa-vanilla' 'wayland' 'libx11' 'libxshmfence')
-  provides=('vulkan-driver')
-  conflicts=('vulkan-intel')
-
-  install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
-  cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
-
-  install -m755 -d ${pkgdir}/usr/{include/vulkan,lib}
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-intel"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/"
-}
-
-package_vulkan-radeon-vanilla() {
-  pkgdesc="Radeon's Vulkan mesa driver"
-  depends=('mesa-vanilla' 'wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs')
-  provides=('vulkan-driver')
-  conflicts=('vulkan-radeon')
- 
-  install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
-  cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
-
-  install -m755 -d ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libvulkan_radeon.so ${pkgdir}/usr/lib/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-radeon"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-radeon/"
-}
-
-package_libva-mesa-driver-vanilla() {
-  pkgdesc="VA-API implementation for gallium"
-  depends=('mesa-vanilla' 'libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors')
-  conflicts=('libva-mesa-driver')
-
-  install -m755 -d ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/"
-}
-
-package_mesa-vdpau-vanilla() {
-  pkgdesc="Mesa VDPAU drivers"
-  depends=('mesa-vanilla' 'libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors')
-  conflicts=('mesa-vdpau')
-
-  install -m755 -d ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/"
-}
-
-package_mesa-vanilla() {
-  pkgdesc="A free implementation of the OpenGL specification"
-  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' 
-           'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs' 'mesa-libgl-vanilla' 'lm_sensors')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages'
-              'mesa-vdpau: for accelerated video playback'
-              'libva-mesa-driver: for accelerated video playback')
-  provides_x86_64=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                   'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver' 'mesa')
-  conflicts_x86_64=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                    'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'mesa'
-                    'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils')
-  replaces_x86_64=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                   'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri'
-                   'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils')
-  provides_i686=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver' 'mesa')
-  conflicts_i686=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                  'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'mesa'
-                  'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils')
-  replaces_i686=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri'
-                 'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils')
-  provides_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri'
-                   'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'opengl-driver' 'mesa')
-  conflicts_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri'
-                    'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'mesa'
-                    'nvidia-utils' 'catalyst-utils')
-  replaces_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri'
-                   'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri'
-                   'nvidia-utils' 'catalyst-utils')
-
-  install -m755 -d ${pkgdir}/etc
-  cp -v ${srcdir}/drirc ${pkgdir}/etc
-
-  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
-  # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
-  cp -av ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri
-
-  cp -rv ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/d3d  ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/lib{gbm,glapi}.so* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libOSMesa.so* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libwayland*.so* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libxatracker.so* ${pkgdir}/usr/lib/
-
-  cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
-  cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
-
-  # remove vulkan headers
-  rm -rf ${pkgdir}/usr/include/vulkan
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-}
-
-package_mesa-libgl-vanilla() {
-  pkgdesc="Mesa 3-D graphics library"
-  depends=('libdrm' 'libxdamage' 'libxshmfence' 'libxxf86vm' 'wayland')
-  provides=('libgl' 'libegl' 'libgles' 'mesa-libgl' 'libglvnd')
-  conflicts=('mesa-libgl' 'libglvnd' 'nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl')
-  replaces=('nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl')
-
-  install -m755 -d "${pkgdir}/usr/lib/"
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so*        ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL.so*       ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libGLES*.so*     ${pkgdir}/usr/lib/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
-}
diff --git a/pcr/mesa-vanilla/drirc b/pcr/mesa-vanilla/drirc
deleted file mode 100644
index 946cbc803..000000000
--- a/pcr/mesa-vanilla/drirc
+++ /dev/null
@@ -1,18 +0,0 @@
-<driconf>
-    <!-- Please always enable app-specific workarounds for all drivers and
-         screens. -->
-    <device>
-        <application name="Warsow (32-bit)" executable="warsow.i386">
-            <option name="allow_glsl_extension_directive_midshader" value="true" />
-        </application>
-
-        <application name="Warsow (64-bit)" executable="warsow.x86_64">
-            <option name="allow_glsl_extension_directive_midshader" value="true" />
-        </application>
-
-        <application name="Rust" executable="rust">
-            <option name="glsl_zero_init" value="true"/>
-        </application>
-        </application>
-    </device>
-</driconf>
diff --git a/pcr/mesa-vanilla/remove-libpthread-stubs.patch b/pcr/mesa-vanilla/remove-libpthread-stubs.patch
deleted file mode 100644
index efe8aaddd..000000000
--- a/pcr/mesa-vanilla/remove-libpthread-stubs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 54416b4..8a708d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -824,7 +824,7 @@ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
- 
- dnl pthread-stubs is mandatory on targets where it exists
- case "$host_os" in
--cygwin* )
-+cygwin* | linux* )
-     pthread_stubs_possible="no"
-     ;;
- * )
diff --git a/pcr/mplayer-vaapi/PKGBUILD b/pcr/mplayer-vaapi/PKGBUILD
deleted file mode 100644
index 1aa250c90..000000000
--- a/pcr/mplayer-vaapi/PKGBUILD
+++ /dev/null
@@ -1,103 +0,0 @@
-# $Id: PKGBUILD 128869 2015-03-07 20:24:16Z foutrelis $
-# Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
-# Contributor (Arch): Hugo Doria <hugo@archlinux.org>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
-
-pkgname=mplayer-vaapi
-pkgver=36265
-pkgrel=14.parabola2
-pkgdesc="A movie player, compiled with VA API, without nonfree faac support and using of UnRAR executable disabled"
-arch=('i686' 'x86_64')
-url="http://gitorious.org/vaapi/mplayer"
-license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
-         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
-         'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'libx264' 'speex' 'faad2'
-         'lirc' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
-         'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'opus'
-         'libbluray' 'libva' 'libass' 'rtmpdump' 'gsm' 'desktop-file-utils')
-depends+=('libx264.so')
-makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa' 'x264')
-provides=("mplayer=$pkgver")
-conflicts=('mplayer' 'mplayer-vaapi-libre' 'mplayer-libre-vaapi' 'mplayer-vaapi-parabola')
-replaces=('mplayer-vaapi-libre' 'mplayer-libre-vaapi' 'mplayer-vaapi-parabola')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(http://pkgbuild.com/~foutrelis/sources/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-        cdio-includes.patch
-        tweak-desktop-file.patch
-        subreader-fix-srt-parsing.patch
-        include-samba-4.0.patch)
-options=('!buildflags' '!emptydirs')
-install=mplayer-vaapi.install
-sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a'
-            'SKIP'
-            '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
-            '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
-            '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3'
-            '169eb47b3b838ea95e50c871bdbbfb6fe0b9349b054da830f55f3b4d5055e4f3')
-validpgpkeys=('86CFFCA918CF3AF47147588051E8B148A9999C34')
-
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/cdio-includes.patch"
-  patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
-
-  # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139
-  patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch"
-
-  # https://bugs.archlinux.org/task/41588
-  patch -Np1 -i "$srcdir/include-samba-4.0.patch"
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-runtime-cpudetection \
-    --disable-gui \
-    --disable-arts \
-    --disable-gif \
-    --disable-liblzo \
-    --enable-speex \
-    --disable-cdparanoia \
-    --disable-openal \
-    --disable-libdv \
-    --disable-musepack \
-    --disable-esd \
-    --disable-mga \
-    --disable-ass-internal \
-    --disable-faac \
-    --disable-unrarexec \
-    --enable-xvmc \
-    --enable-radio \
-    --enable-radio-capture \
-    --enable-smb \
-    --disable-vdpau \
-    --enable-vaapi \
-    --language=all \
-    --confdir=/etc/mplayer
-
-  [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
-  install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop"
-  install -d "$pkgdir/usr/share/mplayer/"
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
-  rm -rf "$pkgdir/usr/share/mplayer/font"
-  install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mplayer-vaapi/cdio-includes.patch b/pcr/mplayer-vaapi/cdio-includes.patch
deleted file mode 100644
index 894650717..000000000
--- a/pcr/mplayer-vaapi/cdio-includes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35421)
-+++ configure	(working copy)
-@@ -5968,8 +5968,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c	(revision 35421)
-+++ gui/win32/interface.c	(working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
-
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c	(revision 35421)
-+++ stream/stream_cdda.c	(working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/pcr/mplayer-vaapi/include-samba-4.0.patch b/pcr/mplayer-vaapi/include-samba-4.0.patch
deleted file mode 100644
index 2ed272b6a..000000000
--- a/pcr/mplayer-vaapi/include-samba-4.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
---- a/stream/stream_smb.c	2013-03-16 13:38:34.000000000 +0000
-+++ b/stream/stream_smb.c	2013-10-31 20:05:32.473947926 +0000
-@@ -18,7 +18,7 @@
- 
- #include "config.h"
- 
--#include <libsmbclient.h>
-+#include <samba-4.0/libsmbclient.h>
- #include <unistd.h>
- 
- #include "mp_msg.h"
diff --git a/pcr/mplayer-vaapi/mplayer-vaapi.install b/pcr/mplayer-vaapi/mplayer-vaapi.install
deleted file mode 100644
index a44f19aef..000000000
--- a/pcr/mplayer-vaapi/mplayer-vaapi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-post_upgrade() {
-  post_install
-}
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mplayer-vaapi/subreader-fix-srt-parsing.patch b/pcr/mplayer-vaapi/subreader-fix-srt-parsing.patch
deleted file mode 100644
index f1c087377..000000000
--- a/pcr/mplayer-vaapi/subreader-fix-srt-parsing.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: sub/subreader.c
-===================================================================
---- sub/subreader.c	(revision 36284)
-+++ sub/subreader.c	(revision 36285)
-@@ -378,14 +378,14 @@
-     int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0;
- 
-     while (!current->text[0]) {
--        char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep;
-+        char line[LINE_LEN + 1], full_line[LINE_LEN + 1];
-         int i;
- 
-         /* Parse SubRip header */
-         if (!stream_read_line(st, line, LINE_LEN, utf16))
-             return NULL;
--        if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",
--                     &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10)
-+        if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",
-+                     &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
-             continue;
- 
-         current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10;
-@@ -442,7 +442,7 @@
- #endif
-     while (!current->text[0]) {
- 	if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
--	if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
-+	if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
- 	    continue;
- 	current->start = a1*360000+a2*6000+a3*100+a4/10;
- 	current->end   = b1*360000+b2*6000+b3*100+b4/10;
-@@ -1123,7 +1123,7 @@
- 		{*uses_time=1;return SUB_MPL2;}
- 	if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",     &i, &i, &i, &i, &i, &i, &i, &i)==8)
- 		{*uses_time=1;return SUB_SUBRIP;}
--	if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10)
-+	if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8)
- 		{*uses_time=1;return SUB_SUBVIEWER;}
- 	if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4)
- 		{*uses_time=1;return SUB_SUBVIEWER2;}
diff --git a/pcr/mplayer-vaapi/tweak-desktop-file.patch b/pcr/mplayer-vaapi/tweak-desktop-file.patch
deleted file mode 100644
index 606e356b0..000000000
--- a/pcr/mplayer-vaapi/tweak-desktop-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mplayer.desktop.orig	2012-07-08 22:18:27.000000000 +0300
-+++ mplayer.desktop	2012-07-08 22:19:08.000000000 +0300
-@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques
- Comment[it]=Riproduce filmati e musica
- Comment[ja]=動画や音声のファイルを再生します
- Icon=mplayer
--TryExec=gmplayer
--Exec=gmplayer %F
-+TryExec=mplayer
-+Exec=mplayer -really-quiet %F
- Terminal=false
-+NoDisplay=true
- Categories=GTK;AudioVideo;Audio;Video;Player;TV;
- MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;
diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD
index b475d8745..faa6ad78b 100644
--- a/pcr/netatalk/PKGBUILD
+++ b/pcr/netatalk/PKGBUILD
@@ -6,19 +6,21 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=netatalk
-pkgver=3.1.8
+pkgver=3.1.11
 pkgrel=1
 pkgdesc='Open-source implementation of the Apple Filing Protocol'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url='http://netatalk.sourceforge.net'
 license=('GPL')
-depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python2' 'dbus-glib' 'python2-dbus')
+depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python2' 'dbus-glib' 'python2-dbus' 'pam')
 replaces=('netatalk-git' 'netatalk2')
 backup=('etc/afp.conf'
 	'etc/extmap.conf')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
 	python2.patch)
+sha256sums=('3434472ba96d3bbe3b024274438daad83b784ced720f7662a4c1d0a1078799a6'
+	'582337cd434f5f3c89a00d99162747bd5f9ada57eef234ef8b49c16be7c19346')
 
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -39,5 +41,3 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums=('734745743b2d5fe39f3d6716f377e6255d6a061e3c615a4fe30db388ec6d848f6db063d733dfa24ccf967f1e9042841bce4824f4bed391952c4304ee11e11b0d'
-            '1c53f057ce19afcec15e3efa76aad310dc89bf14be7779c59066fd7389744198ae0008ea17c9ca23c1d5be93a8f5bbe1772c7da56fbce99a276260d59bb9f42a')
diff --git a/pcr/netatalk/avahi-client.patch b/pcr/netatalk/avahi-client.patch
deleted file mode 100644
index a1eef2b33..000000000
--- a/pcr/netatalk/avahi-client.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- macros/zeroconf.m4.orig	2014-06-08 21:23:46.000000000 +0400
-+++ macros/zeroconf.m4	2014-06-08 21:36:25.000000000 +0400
-@@ -25,23 +25,7 @@
- 			zeroconf_dir="$zeroconf"
- 		fi
- 
--        # mDNS support using mDNSResponder
--        AC_CHECK_HEADER(
--            dns_sd.h,
--            AC_CHECK_LIB(
--                dns_sd,
--                DNSServiceRegister,
--                AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration]))
--        )
--
--        if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then
--            ZEROCONF_LIBS="-ldns_sd"
--            AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration])
--            found_zeroconf=yes
--        fi
--
-         # mDNS support using Avahi
--        if test x"$found_zeroconf" != x"yes" ; then
-             AC_CHECK_HEADER(
-                 avahi-client/client.h,
-                 AC_CHECK_LIB(
-@@ -62,10 +46,26 @@
-                 found_zeroconf=yes
-                 ;;
-             esac
-+
-+        # mDNS support using mDNSResponder
-+        if test x"$found_zeroconf" != x"yes" ; then
-+            AC_CHECK_HEADER(
-+                dns_sd.h,
-+                AC_CHECK_LIB(
-+                    dns_sd,
-+                    DNSServiceRegister,
-+                    AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration]))
-+            )
-+
-+            if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then
-+                ZEROCONF_LIBS="-ldns_sd"
-+                AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration])
-+                found_zeroconf=yes
-+            fi
-+        fi
- 	    	CPPFLAGS="$savedcppflags"
- 		    LDFLAGS="$savedldflags"
-     	fi
--	fi
- 
- 	netatalk_cv_zeroconf=no
- 	AC_MSG_CHECKING([whether to enable Zerconf support])
diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog
deleted file mode 100644
index 8e1937a6c..000000000
--- a/pcr/netatalk/netatalk.changelog
+++ /dev/null
@@ -1,138 +0,0 @@
-2013-06-03 SJ_UnderWater
-
-	* 3.0.4-2:
-	move sbindir
-
-2013-05-26 SJ_UnderWater
-
-	* 3.0.4-1:
-	package update
-	minor fixes
-	dbus-glib dependency
-
-2013-03-27 SJ_UnderWater
-
-	* 3.0.3-1:
-	package update
-	minor fixes
-	python dependency
-
-2013-01-27 SJ_UnderWater
-
-	* 3.0.2-1:
-	package update
-	libevent fix
-	copy newer ./missing
-
-2013-01-05 SJ_UnderWater
-
-	* 3.0.1-5:
-	fixed AM deprecations
-	minor install fix
-
-2012-11-28 SJ_UnderWater
-
-	* 3.0.1-4 :
-	fixed mimic model
-
-2012-10-08 SJ_UnderWater
-
-	* 3.0.1-3 :
-	moved systemd from /etc
-	better rc.d install test
-
-2012-10-05 SJ_UnderWater
-
-	* 3.0.1-2 :
-	removed rc.d references
-
-2012-10-04 SJ_UnderWater
-
-	* 3.0.1-1 :
-	new version
-	moved to systemd
-	moved state to /var/db
-
-2012-07-14 SJ_UnderWater
-
-	* 3.0-3 :
-	moved localstate dir
-	to /etc for historical
-	reasons
-
-2012-07-12 SJ_UnderWater
-
-	* 3.0-2 :
-	disable bundled libevent
-
-2012-07-11 SJ_UnderWater
-
-	* 3.0-1 :
-	updated to new release
-	DDP moved to new pkg
-
-2012-06-12 SJ_UnderWater
-
-	* 2.2.3-4 :
-	added kill timing
-
-2012-06-04 SJ_UnderWater
-
-	* 2.2.3-3 :
-	removed conflicting files
-
-2012-06-02 SJ_UnderWater
-
-	* 2.2.3-2 :
-	Missing UAM links
-
-2012-05-29 SJ_UnderWater
-
-	* 2.2.3-1 :
-	updated package version
-	allowing headers and m4
-
-2012-05-01 SJ_UnderWater
-
-	* 2.2.2-6 :
-	moved to .rc files
-	refactored PKGBUILD
-	install rc.d files
-
-2012-04-25 SJ_UnderWater
-
-	* 2.2.2-5 :
-	init rebuild
-	fix dep check
-	fix get_pid
-	function relocation
-
-2012-04-21 SJ_UnderWater
-
-	* 2.2.2-4 :
-	moved to package()
-	added backup
-	split backup
-	moved depends
-
-2012-04-08 SJ_UnderWater
-
-	* 2.2.2-3 :
-	fixed extra dependencies
-	FHS compliance
-	NAMCAP checking
-	moved cups to optdepends
-
-2012-04-07 SJ_UnderWater
-
-	* 2.2.2-2 :
-	added Install
-	changed "conflicts" with "replace"
-	cleaned up PKGBUILD
-
-	* 2.2.2-1 :
-	added ChangeLog.
-	moved to split package format
-	bidirectional dependency-checking
-	moved to release package format
-	PKGBUILD compliance
diff --git a/pcr/olsrd/PKGBUILD b/pcr/olsrd/PKGBUILD
index 3f45ce5e9..7bcd86680 100644
--- a/pcr/olsrd/PKGBUILD
+++ b/pcr/olsrd/PKGBUILD
@@ -9,7 +9,7 @@ url="http://www.olsr.org"
 license=('BSD')
 depends=('glibc')
 makedepends=('bison')
-backup=etc/olsrd.conf
+backup=(etc/olsrd.conf)
 install=olsrd.install
 source=(http://www.olsr.org/releases/0.6/${pkgname}-${pkgver}.tar.bz2 rc.d.olsrd)
 md5sums=('a75fc9b6252df5b5f49f13418fafeff1' 'bc3e393e0179ffff0a6d6c9d6a5c4b60')
diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD
index e33a1cbba..1d103837c 100644
--- a/pcr/openrc/PKGBUILD
+++ b/pcr/openrc/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase=openrc
 pkgname=('openrc' 'openrc-init')
-pkgver=0.34.8
-pkgrel=1.parabola3
+pkgver=0.34.11
+pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 url="https://wiki.gentoo.org/wiki/Project:OpenRC"
 license=('BSD2')
@@ -14,7 +14,7 @@ source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/OpenRC/openrc/archive/$
         "${pkgbase}.logrotate"
         'openrc-install.hook'
         'openrc-remove.hook')
-sha512sums=('2309e0d330c35467dd6008f1458ac9680207a4c783d4f4e6008a84a313088cfe796dd134dfec79699b8f9c90002b0ae621bb78a9925b987ae98fbd8ad75b947a'
+sha512sums=('76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be'
             '690612fddfb2c4cf8f6b5ba7239b9faf29eb3d9b152ab4dcf62694aa2852780440d08cee56d98a9597607f446b3697c911269562821a8402bb5747cbbae34bd9'
             'c31c94574f1c604930b572ed74eabdfcbedb344c54668ddeb3214d71de660e9fa8ff445b04ff817f16e62bce43376680d0a1b6c65baa8f6dba30e4ffa230c04a'
             '96bd71dd4fbe1417a640ac7526e83e1b2290732d5e558d7942c87db0dc1ccb7614763d7748b219ac5982b0db66cba9c124506ec939a661d73db4d0b2642f431e')
diff --git a/pcr/opensysusers/PKGBUILD b/pcr/opensysusers/PKGBUILD
index 93d33bc0e..e49c7162e 100644
--- a/pcr/opensysusers/PKGBUILD
+++ b/pcr/opensysusers/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: David P. <megver83@parabola.nu>
-# Maintainer (Artix): Chris Cromer <chris@cromer.cl>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer (Artix): Chris Cromer <chris@artixlinux.org>
 
 _url="https://github.com/artix-linux/opensysusers/archive"
 
 pkgname=opensysusers
-pkgver=0.3.1
+pkgver=0.3.2
 pkgrel=1.parabola1
 pkgdesc="A standalone utility for handling systemd-style sysusers.d users and groups"
 arch=('any')
@@ -15,7 +16,7 @@ depends=('shadow')
 optdepends=('openrc: update automatically on boot')
 source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz"
         'opensysusers.hook')
-sha512sums=('f2c6969f8b6730ae7e64501bc277e8647da052e477850b3f6c02249106245b791fa9192ca8b711bf50dd35b164ac0d29ea4095c1b68b4ebc2a06c741a3ca03ea'
+sha512sums=('713bce28364e4cb19271ad8f3f5fe4e45b688d1c3724c6cdfc6e014fe5ebdd107c1a0f46897e3cb1b885fca3385e46e6cb3cba119558b52580381260a21a23a0'
             '1f5d110e0575ac41b66b3710e26a85cb9806589fb543c2ffaed81643225de0e23d473342931c12dd725e3b4744a5fb71b7bb9c5731dc0a7dfb02add019acebc9')
 
 package() {
diff --git a/pcr/pencil2d/PKGBUILD b/pcr/pencil2d/PKGBUILD
index 5d385eeaa..1ffcba796 100644
--- a/pcr/pencil2d/PKGBUILD
+++ b/pcr/pencil2d/PKGBUILD
@@ -10,7 +10,7 @@ arch=(
   i686
 )
 url=http://http://www.pencil2d.org/
-license=GPL2
+license=(GPL2)
 depends=(
   desktop-file-utils
   ming
diff --git a/pcr/perl-linux-desktopfiles/PKGBUILD b/pcr/perl-linux-desktopfiles/PKGBUILD
index cd4fb923b..70a5c91e9 100644
--- a/pcr/perl-linux-desktopfiles/PKGBUILD
+++ b/pcr/perl-linux-desktopfiles/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="Perl module to get and parse the Linux .desktop files"
 arch=('any')
 url="https://metacpan.org/module/Linux::DesktopFiles"
 
-source="http://cpan.metacpan.org/authors/id/T/TR/TRIZEN/${_pkgname}-${pkgver}.tar.gz"
+source=("http://cpan.metacpan.org/authors/id/T/TR/TRIZEN/${_pkgname}-${pkgver}.tar.gz")
 sha256sums=('45afb52301ed1553fa741c40e62dc91280bb0e6e58dad83e6a49415a02f0973b')
 
 license=('GPLv3')
diff --git a/pcr/qtile/PKGBUILD b/pcr/qtile/PKGBUILD
index 46a66aab6..c30883294 100644
--- a/pcr/qtile/PKGBUILD
+++ b/pcr/qtile/PKGBUILD
@@ -2,19 +2,19 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=qtile
-pkgver=0.10.6
+pkgver=0.10.7
 pkgrel=1
 pkgdesc="A full-featured, pure-Python tiling window manager."
 arch=('any')
 url="http://www.qtile.org"
 license=('MIT')
-depends=('python' 'pango' 'python-xcffib>=0.4.1' 'python-cairocffi>=0.7.2')
+depends=('python' 'pango' 'python-xcffib>=0.5.1' 'python-cairocffi>=0.8.0')
 makedepends=('python-distribute')
 optdepends=('python-setproctitle: change the process name to qtile')
 conflicts=('qtile-git')
 install=${pkgname}.install
 source=("https://github.com/qtile/qtile/archive/v${pkgver}.tar.gz")
-md5sums=('c0c42fb746f21f6f9d6b549595f6e16e')
+sha256sums=('cbde17f5afdf2af7c80dd47c0f0ed5f8d716e3c87082c091b38e0d241ba39753')
 
 package() {
   cd "$srcdir/$pkgname-$pkgver/"
diff --git a/pcr/sobby/PKGBUILD b/pcr/sobby/PKGBUILD
index 646386ba9..2a3070791 100644
--- a/pcr/sobby/PKGBUILD
+++ b/pcr/sobby/PKGBUILD
@@ -4,7 +4,7 @@ pkgver=0.4.8
 pkgrel=2
 pkgdesc="Standalone obby server"
 url="http://gobby.0x539.de/trac/"
-license="GPL"
+license=("GPL")
 depends=('obby=0.4.8' 'libxml++')
 makedepends=('pkgconfig' 'net6>=1.3.12')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/pcr/toilet/PKGBUILD b/pcr/toilet/PKGBUILD
deleted file mode 100644
index 48deb1b9b..000000000
--- a/pcr/toilet/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer (Arch): Christian Neukirchen <chneukirchen@gmail.com>
-# Contributor (Arch): bl4ckb1t <bl4ckb1t@gmail.com>
-pkgname=toilet
-pkgver=0.3
-pkgrel=1
-pkgdesc="free replacement for the FIGlet utility."
-arch=('i686' 'x86_64')
-url="http://libcaca.zoy.org/wiki/toilet"
-license=('custom:WTFPL')
-depends=('libcaca')
-replaces=('figlet')
-conflicts=('figlet')
-provides=('figlet')
-source=(http://libcaca.zoy.org/files/toilet/$pkgname-$pkgver.tar.gz)
-md5sums=('9b72591cb22a30c42a3184b17cabca6f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/pcr/ttf-montserrat/PKGBUILD b/pcr/ttf-montserrat/PKGBUILD
index 1069ddb19..f38fc6a0d 100644
--- a/pcr/ttf-montserrat/PKGBUILD
+++ b/pcr/ttf-montserrat/PKGBUILD
@@ -3,16 +3,14 @@
 # Contributor (Arch): scolobb <scolobb at colimite fr> #THX for the mirror
 
 pkgname=ttf-montserrat
-provides="ttf-montserrat"
+provides=("ttf-montserrat")
 pkgdesc="Gorgeous geometric font with extended latin support (Regular, Alternates, Subrayada)"
 url="http://montserrat.zkysky.com.ar/en"
 pkgver=1.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('SIL Open Font')
-depends=
 install=ttf.install
-makedepends=
 #source=('http://colimite.fr/aur-mirrors/Montserrat.tar.gz') #BACKUP
 source=('http://marvid.fr/~eeva/mirror/Montserrat.tar.gz')
 sha512sums=('1d36ad8eb439ee2a2eee405bab2535cdf1e798e10d2e1ad93e86abb93656033d9136bda0482fd0d0f1a41473aca2078f5969a1385cdafa4ac7f667ef54f1e30e')
@@ -32,4 +30,4 @@ package() {
   install -m644 MontserratAlternates-Regular.ttf "${pkgdir}/usr/share/fonts/TTF/MontserratAlternates-Regular.ttf"
   install -m644 MontserratSubrayada-Bold.ttf     "${pkgdir}/usr/share/fonts/TTF/MontserratSubrayada-Bold.ttf"
   install -m644 MontserratSubrayada-Regular.ttf  "${pkgdir}/usr/share/fonts/TTF/MontserratSubrayada-Regular.ttf"
-}
\ No newline at end of file
+}
diff --git a/libre/uboot-tools/PKGBUILD b/pcr/uboot-tools/PKGBUILD
index 8ce453e11..65fa2cfc8 100644
--- a/libre/uboot-tools/PKGBUILD
+++ b/pcr/uboot-tools/PKGBUILD
@@ -1,18 +1,21 @@
-# $Id: PKGBUILD 137412 2015-07-25 19:38:49Z anatolik $
+# $Id$
 # Maintainer (Arch): Anatol Pomozov
 # Contributor (Arch): Michael Lass <bevan@bi-co.net>
 # Contributor (Arch): Philipp Schrader <philipp.schrader+arch@gmail.com>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=uboot-tools
-pkgver=2015.07
+pkgver=2017.07
 pkgrel=1
 pkgdesc='U-Boot bootloader utility tools'
-arch=(i686 x86_64 armv7h)
+arch=(armv7h)
 url='http://www.denx.de/wiki/U-Boot/WebHome'
 license=(GPL)
-depends=(glibc openssl)
-source=(ftp://ftp.denx.de/pub/u-boot/u-boot-$pkgver.tar.bz2)
-sha1sums=('1e4e8df0ab7cfc2ee4ff6bf44c1b2085544d36f0')
+depends=(openssl)
+source=(ftp://ftp.denx.de/pub/u-boot/u-boot-$pkgver.tar.bz2{,.sig})
+validpgpkeys=('E872DB409C1A687EFBE8633687F9F635D31D7652')
+sha256sums=('5374bfdc8acb9a38c025371b1ff20f45e7533668e84e685d0df5d9e7c0e4feff'
+            'SKIP')
 
 build() {
   cd u-boot-$pkgver
diff --git a/pcr/unrar-emulator/PKGBUILD b/pcr/unrar-emulator/PKGBUILD
index 38e026356..49b151d8a 100644
--- a/pcr/unrar-emulator/PKGBUILD
+++ b/pcr/unrar-emulator/PKGBUILD
@@ -8,7 +8,7 @@ arch=('any')
 license=('AGPL3')
 desc="Script to emulate nonfree unrar"
 depends=('bash' 'libarchive' 'unar')
-url=('https://projects.parabola.nu/software-emulators.git')
+url='https://projects.parabola.nu/software-emulators.git'
 source=($url/plain/unrar-emulator/unrar.sh)
 sha512sums=('c3f015dc8a7a1ddb2a4e94c80ff6ec59f3da368b8d616c43765e60e6b01ecd168e8babe051a945901935a6ac7d4f1368d5240257bdfad024a5b3fa21109f6ef6')
 
diff --git a/pcr/xcftools/PKGBUILD b/pcr/xcftools/PKGBUILD
index 5df38533f..401d04727 100644
--- a/pcr/xcftools/PKGBUILD
+++ b/pcr/xcftools/PKGBUILD
@@ -18,8 +18,8 @@ depends=(
   libpng
   perl
 )
-optdepends=gimp
-makedepends=libpng
+optdepends=(gimp)
+makedepends=(libpng)
 source=(
   http://henning.makholm.net/$pkgname/$pkgname-$pkgver.tar.gz
   $pkgname.patch
diff --git a/pcr/xdesktopwaves/PKGBUILD b/pcr/xdesktopwaves/PKGBUILD
index 3d24450d3..a51d00b1c 100644
--- a/pcr/xdesktopwaves/PKGBUILD
+++ b/pcr/xdesktopwaves/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=1.3
 pkgrel=1
 pkgdesc="xdesktopwaves is a cellular automata setting the background of your X Windows desktop under water. Windows and mouse are like ships on the sea."
 arch=('i686' 'x86_64')
-url=("http://xdesktopwaves.sourceforge.net/")
+url="http://xdesktopwaves.sourceforge.net/"
 license=('GPL2')
 depends=('xorg-server')
 makedepends=('make' 'gcc')
diff --git a/pcr/xen/21_linux_xen_multiboot_arch b/pcr/xen/21_linux_xen_multiboot_arch
index ef3a39b54..877bf2233 100755
--- a/pcr/xen/21_linux_xen_multiboot_arch
+++ b/pcr/xen/21_linux_xen_multiboot_arch
@@ -85,18 +85,14 @@ linux_entry ()
   type="$4"
   args="$5"
   xen_args="$6"
-  ver=""
-  if $($grub_file --is-x86-multiboot2 ${xen_dirname}/${xen_basename}); then
-     ver="2"
-  fi
   if [ -z "$boot_device_id" ]; then
       boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
   fi
   if [ x$type != xsimple ] ; then
       if [ x$type = xrecovery ] ; then
-	  title="$(gettext_printf "%s, with Xen %s and Linux-%s (recovery mode)" "${os}" "${xen_version}" "${version}")"
+	  title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")"
       else
-	  title="$(gettext_printf "%s, with Xen %s and Linux-%s" "${os}" "${xen_version}" "${version}")"
+	  title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")"
       fi
       replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
       if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
@@ -126,16 +122,16 @@ linux_entry ()
         else
             xen_rm_opts="no-real-mode edd=off"
         fi
-	multiboot${ver}	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
+	${xen_loader}	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
 	echo	'$(echo "$lmessage" | grub_quote)'
-	module${ver}	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
+	${module_loader}	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
 EOF
   if test -n "${initrd}" ; then
     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
     message="$(gettext_printf "Loading initial ramdisk ...")"
     sed "s/^/$submenu_indentation/" << EOF
 	echo	'$(echo "$message" | grub_quote)'
-	module${ver}	--nounzip   ${rel_dirname}/${initrd}
+	${module_loader}	--nounzip   ${rel_dirname}/${initrd}
 EOF
   fi
   sed "s/^/$submenu_indentation/" << EOF
@@ -224,20 +220,30 @@ while [ "x${xen_list}" != "x" ] ; do
     if [ "x$is_top_level" != xtrue ]; then
 	echo "	submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
     fi
+    if ($grub_file --is-arm64-efi $current_xen); then
+	xen_loader="xen_hypervisor"
+	module_loader="xen_module"
+    else
+	if ($grub_file --is-x86-multiboot2 $current_xen); then
+	    xen_loader="multiboot2"
+	    module_loader="module2"
+	else
+	    xen_loader="multiboot"
+	    module_loader="module"
+        fi
+    fi
     while [ "x$list" != "x" ] ; do
 	linux=`version_find_latest $list`
 	gettext_printf "Found linux-libre image: %s\n" "$linux" >&2
 	basename=`basename $linux`
 	dirname=`dirname $linux`
 	rel_dirname=`make_system_path_relative_to_its_root $dirname`
-	version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
+	version=`echo $basename | sed -e "s,vmlinuz-,,g"`
 	alt_version=`echo $version | sed -e "s,\.old$,,g"`
 	linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
 
 	initrd=
-	for i in "initramfs-linux-${version}.img" \
-	   "initrd.img-${version}" "initrd-${version}.img" \
-	   "initrd-${version}.gz" \
+	for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
 	   "initrd-${version}" "initramfs-${version}.img" \
 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
diff --git a/pcr/xen/ChangeLog b/pcr/xen/ChangeLog
index b23e810df..ced200187 100644
--- a/pcr/xen/ChangeLog
+++ b/pcr/xen/ChangeLog
@@ -1,169 +1,40 @@
-2015-06-24 John Thomson
-	* 4.7.0-1
-	Xen 4.7.0
-
-2015-06-11 John Thomson
-	* 4.6.1-7
-	Apply XSA patch: 175, 178, 181
-
-2015-05-23 John Thomson
-	* 4.6.1-6
-	Apply XSA patch: 180
-
-2015-05-19 John Thomson
-	* 4.6.1-5
-	Apply XSA patch: 176
-
-2016-05-12 John Thomson
-	* 4.6.1-4
-	Apply XSA patch: 179
-	Patches for GCC6
-
-2016-04-19 John Thomson
-	* 4.6.1-3
-	Apply XSA patch: 173
-
-2016-03-31 John Thomson
-	* 4.6.1-2
-	Apply XSA patch: 172
-
-2016-02-19 John Thomson
-	* 4.6.1-1
-	Xen source package updated to 4.6.1
-	Apply XSA patch: 170
-
-2016-02-19 John Thomson
-	* 4.5.2-1
-	Xen source package updated to 4.5.2
-	Build xen.efi with mingw-w64-binutils
-	Build ovmf
-	Apply XSA patches: 154, 156, 158 to 160, 162 to 168, and 170
-
-2015-07-04 David Sutton <kantras - gmail.com>
-	* 4.5.1-1
-	New major release from upstream
-	Added -fno-caller-saves CFLAG to PKGBUILD to work around GCC5 issues
-	Added in some compile fixes for GCC 5
-	Disabled OVMF for now until patched for GCC 5
-
-2015-05-13 David Sutton <kantras - gmail.com>
-	* 4.5.0-3
-	Added Security patches
-
-2015-04-08 David Sutton <kantras - gmail.com>
-	* 4.5.0-2
-	Updated PKGBUILD to use absolute instead of relative paths for install
-	Updated efi-xen.cfg with syntax fix
-	Added gnuttls-3.4.0 patch 
-	Added security patches
-
-2015-03-01 David Sutton <kantras - gmail.com>
-	* 4.5.0-1 
-	New major release from upstream
-	Cleaned up old XSA patches
-	Removed old systemd support patches and realigned with the new upstream methods
-
-2014-10-26 David Sutton <kantras - gmail.com>
-	* 4.4.1-3
-	Enabled OVMF support and added patches to fix compile
-	Enabled spice support and added patch to enable qemu support in qemu-xen
-	Added figlet as an make dependancy for the ascii art version number
-	Including an example xen.cfg package for people who will be using EFI
-	Additional cleanup (explictly disabling some unnecessary libraries)
-
-2014-10-12 David Sutton <kantras - gmail.com>
-	* 4.4.1-2:
-	Added XSA 104, 105, 106, 107 and 108 security patches
-	Added .config to resolve compile issues where /etc/sysconfig exists
-
-2014-09-04 David Sutton <kantras - gmail.com>
-	* 4.4.1-1:
-	New Upstream release
-	Cleared out unnecessary patches (security, gcc compile and pit)
-
-2014-06-22 David Sutton <kantras - gmail.com>
-	* 4.4.0-6:
-	Added additional patch to support XSA 100 on AMD platform
-
-2014-06-17 David Sutton <kantras - gmail.com>
-	* 4.4.0-5:
-	Added XSA 96 and 100 security patches
-	Added patch to explictly disable searching for bluez libs
-	Cleaned up PKGBUILD
-
-2014-05-17 David Sutton <kantras - gmail.com>
-	* 4.4.0-4:
-	Added patch to fix shutdown issues with pvh domains
-
-2014-05-01 David Sutton <kantras - gmail.com>
-	* 4.4.0-3:
-        Added XSA 92 Security patch
-        Added fix for compiling under GCC 4.9.0 (From Fedora Rawhide SRPM)
-        Added updates to 09_xen to closer match system 10_linux
-
-2014-03-11 David Sutton <kantras - gmail.com>
-	* 4.4.0-2:
-	Moved xen-syms file so 09_xen won't pick it up as a potential kernel.
-	Added XSA 89 Security patch
-	Minor PKGBUILD cleanup/changes
-
-2014-03-10 David Sutton <kantras - gmail.com>
-	* 4.4.0-1:
-	New upstream release
-	Cleaned up old unnecessary patches
-
-2014-02-19 David Sutton <kantras - gmail.com>
-	* 4.3.2-1:
-	New upstream release
-	Removed unnecessary security patches (since now integrated into source)
-	Attempts to pull down additional required source file to ensure not corrupted
-	Added missing dependancy libseccomp
-
-2013-11-25 David Sutton <kantras - gmail.com>
-	* 4.3.1-2:
-	Changed bluez dependancy from bluez4 to bluez
-	Added recent security patches
-
-2013-10-31 David Sutton <kantras - gmail.com>
-	* 4.3.1-1:
-	New upstream release
-	Removed unnecessary security patches (already merged)
-	Fixed BIOS Workaround patch to apply to the new source files
-	Fixed ATI Passthrough patch to apply to the new source files
-	Updated paths in all patches
-
-2013-09-29 David Sutton <kantras - gmail.com>
-	* 4.3.0-7:
-	Fixed optdepends in PKGBUILD
-	Added in a pre_remove function in xen.install to disable services
-	Minor text formating changes in xen.install
-	Added XSA 62,63,64 and 66 patches (Xen Security Advisories)
-
-2013-09-29 David Sutton <kantras - gmail.com>
-	* 4.3.0-6:
-	Fixed 09_xen so it can detect lts kernels
-
-2013-09-28 David Sutton <kantras - gmail.com>
-	* 4.3.0-5:
-	Fixed mount option in 09_xen from ro to rw
-	Added in dummy /etc/xen/grub.conf to control settings in 09_xen
-	Fix library sanitize so that it returns to the base directory
-	Move the syms file to /usr/share/xen so that it is out of the way of boot but still accessible
-	Added optional dependancy for openvswitch
-
-2013-08-13 David Sutton <kantras - gmail.com>
-	* 4.3.0-4 :
-	Added patch for qemu-xen to add a TOM register for PCI Hole mapping
-	Protected /etc/conf.d/xendomains from being overwritten
-	Included ATI Passthrough patch (not enabled by default, compile tested only)
-
-2013-07-23 David Sutton <kantras - gmail.com>
-
-        * 4.3.0-3 :
-        added ChangeLog.
-        Cleaned up PKGBUILD to match Arch Package Standards
-        Fixed some path references - /var/run to /run
-        Removed some unnecessary empty directories
-        Updated xenconsoled and xenstored so they use /run for pid file
-        Updated auto-created /run directories to include xenstored
-
+2018-01-04 John Thomson
+    * 4.10.0-2
+    XSA-253 x86: memory leak with MSR emulation
+
+2017-12-13 John Thomson
+    * 4.10.0-1
+    Xen 4.10 release
+
+2017-12-04 John Thomson
+    * 4.10.0rc8
+    Xen 4.10 release candidate 8
+
+2017-12-01 John Thomson
+    * 4.10.0rc7
+    Xen 4.10 release candidate 7
+
+2017-11-23 John Thomson
+    * 4.10.0rc6
+    Xen 4.10 release candidate 6
+
+2017-11-18 John Thomson
+    * 4.10.0rc5
+    Xen 4.10 release candidate 5
+    grub multiboot2 config generator updated
+
+2017-11-13 John Thomson
+    * 4.10.0rc4
+    Xen 4.10 release candidate 4
+
+2017-11-02 John Thomson
+    * 4.10.0rc3
+    Xen 4.10 release candidate 3
+
+2017-10-23 John Thomson
+    * 4.10.0rc2
+    Xen 4.10 release candidate 2
+
+2017-10-18 John Thomson
+    * 4.10.0rc1
+    Xen 4.10 release candidate 1
diff --git a/pcr/xen/PKGBUILD b/pcr/xen/PKGBUILD
index a55df5075..2e0dd94d8 100644
--- a/pcr/xen/PKGBUILD
+++ b/pcr/xen/PKGBUILD
@@ -1,4 +1,4 @@
-# current version adapted from https://gitlab.com/johnth/aur-xen/blob/ea6a7a5938eb8bb4fbcd5de11220b2a7bbe12121/PKGBUILD
+# current version adapted from https://gitlab.com/archlinux-packages-johnth/xen/tree/xen-4.10
 
 # Maintainer (AUR): John Thomson <aur.xen at j0aur.mm.st>
 # Contributor (Arch): David Sutton <kantras - gmail.com>
@@ -34,10 +34,10 @@ _build_livepatch="${build_livepatch:-false}"
 pkgbase=xen
 pkgname=(xen{,-docs,-syms})
 _pkgname=xen
-pkgver=4.9.0
+pkgver=4.10.0
 _pkgver=${pkgver/rc/-rc}
-pkgrel=1.parabola2
-pkgdesc="Virtual Machine Hypervisor & Tools (Parabola rebranded)"
+pkgrel=1
+pkgdesc='Virtual Machine Hypervisor & Tools (Parabola rebranded)'
 arch=(x86_64 armv7h)
 depends=(
     bridge-utils
@@ -45,6 +45,7 @@ depends=(
     gnutls
     iproute2
     libaio
+    libcacard
     libcap-ng
     libiscsi
     libnl
@@ -86,6 +87,11 @@ makedepends=(
     gcc-multilib
     iasl
 )
+[[ "$CARCH" == 'i686' ]] && makedepends+=(
+    bin86
+    dev86
+    iasl
+)
 
 ## For building Xen EFI boot file.
 ## mingw-w64-binutils only needed if 
@@ -93,15 +99,19 @@ makedepends=(
 _binutils_efi=false
 
 if [[ "$CARCH" == 'x86_64' ]]; then
-    _binutils_emulations="$(ld -V)"
-    if [[ "$_binutils_emulations" == *'i386pep'* ]]; then
-        _binutils_efi=true
-        echo '#ld has efi support'
+    if which ld 2>&1 > /dev/null; then
+        _binutils_emulations="$(ld -V)"
+        if [[ "$_binutils_emulations" == *'i386pep'* ]]; then
+            _binutils_efi=true
+            msg '#ld has efi support'
+        else
+            makedepends+=(
+                mingw-w64-binutils
+            )
+            msg '#ld does not have efi support, using mingw'
+        fi
     else
-        makedepends+=(
-            mingw-w64-binutils
-        )
-        echo '#ld does not have efi support, using mingw'
+        true
     fi
 fi
 
@@ -111,9 +121,9 @@ changelog=ChangeLog
 
 ##SeaBIOS & OVMF tags are in src/xen-*/tools/Config.mk
 ##grep -rE '_(REVISION|VERSION|TAG)( \?| :){0,1}=' src/xen**/{Config.mk,stubdom/configure,tools/firmware/etherboot/Makefile}
-_git_tag_seabios='#tag=rel-1.10.0'
-_git_tag_ovmf='#tag=5920a9d16b1ab887c2858224316a98e961d71b05'
-_git_tag_ipxe='827dd1bfee67daa683935ce65316f7e0f057fe1c'
+_git_tag_seabios='#tag=rel-1.10.2'
+_git_tag_ovmf='#tag=947f3737abf65fda63f3ffd97fddfa6986986868'
+_git_tag_ipxe='356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d'
 
 if [[ "$_build_stubdom" == true ]]; then
     if [[ "$CARCH" == *'arm'* ]]; then
@@ -135,18 +145,6 @@ source=(
     ## Compile patches
     ati-passthrough.patch
     patch-ovmf-use-python2.patch
-    patch-ovmf-apply-inbuild-patches.patch
-    patch-ovmf-patches-series.patch
-    #patch-build-efi-with-mingw.patch::https://github.com/jakogut/xen-igvtg-aur/raw/28c81072e419d72a100ada9c393e37fae35ad263/xen_efi_build.patch
-    patch-inbuild-ovmf-5-hiilib.c-pointer-zero.patch::'https://github.com/tianocore/edk2/commit/fe4a28ccbfd33cae9e1f56b174d46b4eb2329efd.patch'
-    patch-inbuild-ipxe-gcc7-implicit-fallthrough.patch::'https://github.com/ipxe/ipxe/commit/5f85cbb9ee1c00cec81a848a9e871ad5d1e7f53f.patch'
-    patch-inbuild-ipxe-gcc7-implicit-fallthrough-ath5k.patch::'https://github.com/ipxe/ipxe/commit/45f2265bfcbbf2afd7fac24372ae26e453f2b52d.patch'
-    patch-inbuild-ipxe-gcc7-implicit-fallthrough-curses.patch::'https://github.com/ipxe/ipxe/commit/28e26dd2503e6006fabb26f8c33050ba93a99623.patch'
-    patch-ipxe-patches-series.patch
-    patch-gcc7-vtpm-implicit-fallthrough.patch
-    patch-gcc7-vtpmmgr-make-inline-static.patch
-    patch-gcc7-minios-udivmod.patch
-    patch-gcc7-rombios.patch::'https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff_plain;h=672949d6c61d9cba01c5b414eed9d522082f04d3'
 
     ## Files
     xen.install
@@ -155,10 +153,11 @@ source=(
     "tmpfiles.d-$_pkgname.conf"
 
     ## XSA patches
+    https://xenbits.xen.org/xsa/xsa253.patch
 )
 
 if [[ "$_build_stubdom" == true ]]; then
-    echo '#building with stubdom'
+    msg '#building with stubdom'
     source+=(
         http://xenbits.xen.org/xen-extfiles/lwip-1.3.0.tar.gz
         http://xenbits.xen.org/xen-extfiles/zlib-1.2.3.tar.gz
@@ -193,37 +192,18 @@ fi
 
 validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9')
 #gpg --keyserver pgp.mit.edu --recv-key 23E3222C145F4475FA8060A783FE14C957E82BD9
-sha256sums=(
-    'cade643fe3310d4d6f97d0c215c6fa323bc1130d7e64d7e2043ffaa73a96f33b'
-    'SKIP'
-    '36deacb946c59ad1d6600f6e5b89d6a7a8961e65eb000900e184075920120f49'
-
-    'SKIP'
-    'SKIP'
-
-    'd93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3'
-    '5fb65130f96d1728368a09042e55f622c14117572030ce2141bff4ae150e4a01'
-    'a853a38b8fd661d6b99979831cdae014cd23d831b57a90a467400660343f23f6'
-    '81b93e8c9e0ecb0d8c0555892b27b7e6c39d961af33cdea53ac72070e3e741b2'
-    #'a8ce42777e22af49080131e174b6b89c6e7597539838fb8b17a12280fd10b10b'
-    '79d8ce76bdeb72a1583254f1fb80309e56428d7406a6605a5ec860dc5a1beb3d'
-    'e042b0161d76ee9af7b113c46703dde2663f762d696f4290585be36d907e97a5'
-    '2be4efb8be044c9b2459d09f5a6390fecb218ed4cb38964bce0674882817b91a'
-    'db21442e38be53d342c7574c7c17fb8ce45e57c11dd1ad99e60641ea4061653b'
-    '9135c1ca7aed28a86afc7a0feb2930bd95b4fabf865dd368e8912cc77d38fb33'
-    '0ce9de822712e2b538dc144ba23b584970ac73b327277917b4afaa321c5b4b0c'
-    '5727d42575dfac1870d235fab23b8a230857cfdf44372bc1d98bb6384b752367'
-    'b6fa5bff89242719b20747d7eb197d0aeb59f8a89e841137f0b0cab17de20686'
-    '70b41197cde89d71e37d0c0d2af7087f4ec0a85db3f3e01f22cd2f91bf68b3c8'
-
-    #pkgbuild files
-    '330bcc5ab22e982d37495b57176d306353c220fec7c2b6c4a78a9133382a623e'
-    '9b2e6880d6345d1029317d7d65c85e07039b795c988b6852159d2ad673b13930'
-    '95f09bccc104d98c14559000823cb50f0d076f6a65b9f3b4e7725762b84ab5c7'
-    '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
-
-    ## XSA patches
-)
+sha256sums=('0262a7023f8b12bcacfb0b25e69b2a63291f944f7683d54d8f33d4b2ca556844'
+            'SKIP'
+            '251e5516d7de470c434ae5c393aacca2b61fb24d93770592a4a20add60b785c4'
+            'SKIP'
+            'SKIP'
+            'd93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3'
+            '5fb65130f96d1728368a09042e55f622c14117572030ce2141bff4ae150e4a01'
+            '55145ff9c1570257478842e4001b0dafe007d90f5b06db17231bc5bf20f3b23d'
+            '8101316cfdf4b59e9c39b7372d4240a4552971c0fa53a4719bbb7a22f5622f4e'
+            'efb3c5713d556aa4890136ebf61502060cf90234fbd2e85701ad7a7ed2524fb1'
+            '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
+            'bba1abb5e4368421de29385e37f8477bf3534d3ba3ff7e2aae9c9d3da53f1393')
 
 
 if [[ "$_build_stubdom" == true ]]; then
@@ -270,8 +250,9 @@ prepare() {
     ### Patching
 
     # XSA Patches
-    echo 'XSA patches'
+    msg 'XSA patches'
     # Security Patches - Base
+    patch -Np1 -i "$srcdir/xsa253.patch"
 
     # Security Patches - qemu-xen-traditional
     cd 'tools/qemu-xen-traditional/'
@@ -283,13 +264,11 @@ prepare() {
 
 
     # Compile Patches
-    echo 'Compile patches'
-    patch -Np1 -i "$srcdir/patch-gcc7-rombios.patch"
+    msg 'Compile patches'
 
     # Build EFI binary with mingw
     if [[ "$_binutils_efi" != true ]]; then
         if $(stat /usr/x86_64-w64-mingw32/bin/ld >/dev/null 2>&1); then
-            #patch -Np1 -i "$srcdir/patch-build-efi-with-mingw.patch"
             sed -i.bak '/ EFI_LD/s/LD/LD_EFI/' xen/arch/x86/Makefile
             sed -i.bak 's/LD/LD_EFI/' xen/arch/x86/efi/Makefile
             sed -i.bak '/EFI_MOUNTPOINT .*/aLD_EFI ?= $(LD)' xen/Makefile
@@ -302,10 +281,8 @@ prepare() {
 
     # OVMF Compile support (Pulls from GIT repo, so patching to patch after pull request)
     patch -Np1 -i "$srcdir/patch-ovmf-use-python2.patch"
-    patch -Np1 -i "$srcdir/patch-ovmf-apply-inbuild-patches.patch"
-    mkdir -p tools/firmware/ovmf-patches
-    patch -Np1 -i "$srcdir/patch-ovmf-patches-series.patch"
-    cp "$srcdir"/patch-inbuild-ovmf*.patch tools/firmware/ovmf-patches/
+    #mkdir -p tools/firmware/ovmf-patches
+    #cp "$srcdir"/patch-inbuild-ovmf*.patch tools/firmware/ovmf-patches/
 
     # Uncomment line below if you want to enable ATI Passthrough support (some reported successes, untested with 4.4)
     #patch -Np1 -i "$srcdir/ati-passthrough.patch"
@@ -321,10 +298,20 @@ prepare() {
     sed -i 's:/var/run:/run:' ${_var_run_fixed_paths[@]}
 
     ## Fix python version in shebang
-    echo 'Fix python shebang to python2'
+    msg 'Fix python shebang to python2'
     _python_files=( $(grep -Rlse '^#!/usr/bin/.*python$' || : ) )
     sed -Ei 's|(^#!.*/usr/bin/(env ){0,1})python$|\1python2|' ${_python_files[@]}
 
+    ## Fix systemd-modules-load.d/xen.conf
+    ## remove nonexistent modules
+    find tools -iname 'configure*' -exec sed -i -E -e '
+        /^LINUX_BACKEND_MODULES="$/,/^"$/ {
+            #Address range where this variable is set
+            /"/b;               #Do noting if the line contains "
+            /^xen-/!d;          #Delete if does not start with xen
+            s/scsibk/scsiback/; #Change scsibk to scsiback
+        };' {} \;
+
     if [[ "$_build_stubdom" == true ]]; then
         # Copy supporting tarballs into place
         ln -s "$srcdir/lwip-1.3.0.tar.gz" stubdom/
@@ -339,18 +326,14 @@ prepare() {
 
         ## Stubdom patches
         cd 'extras/mini-os'
-        patch -Np1 -i "$srcdir/patch-gcc7-minios-udivmod.patch"
         cd '../../'
 
         #vtpm
-        patch -Np1 -i "$srcdir/patch-gcc7-vtpmmgr-make-inline-static.patch"
-        patch -Np1 -i "$srcdir/patch-gcc7-vtpm-implicit-fallthrough.patch"
     fi
 
     #etherboot
     ln -s "$srcdir/ipxe-git-$_git_tag_ipxe.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
-    patch -Np1 -i "$srcdir/patch-ipxe-patches-series.patch"
-    cp "$srcdir"/patch-inbuild-ipxe*.patch tools/firmware/etherboot/patches/
+    #cp "$srcdir"/patch-inbuild-ipxe*.patch tools/firmware/etherboot/patches/
 }
 
 build() {
@@ -412,9 +395,9 @@ package_xen() {
         'openvswitch: Optional advanced networking support'
         'urlgrabber: Required for xenpvnetboot'
     )
-    conflicts=(xen-{git,rc,igvtg,4.{5,6,7}} xenstore)
+    conflicts=(xen-{git,rc,igvtg,4.{8,9}} xenstore)
     provides=(xenstore)
-    replaces=(xen-{git,rc,4.{5,6,7}})
+    replaces=(xen-{git,rc,4.{8,9}})
     backup=(
         etc/conf.d/xen{domains,commons}
         "etc/$_pkgname/grub.conf"
diff --git a/pcr/xen/efi-xen.cfg b/pcr/xen/efi-xen.cfg
index 3c8e4d04c..d9f61958a 100644
--- a/pcr/xen/efi-xen.cfg
+++ b/pcr/xen/efi-xen.cfg
@@ -3,5 +3,5 @@ default=xen
 
 [xen]
 options=console=vga dom0_mem=1024M,max:1024M dom0_max_vcpus=4 loglvl=all noreboot
-kernel=vmlinuz-linux-libre root=<Root Device> rw
+kernel=vmlinuz-linux-libre root=<Root Device> rw 
 ramdisk=initramfs-linux-libre.img
diff --git a/pcr/xen/patch-gcc7-minios-udivmod.patch b/pcr/xen/patch-gcc7-minios-udivmod.patch
deleted file mode 100644
index 868e63c20..000000000
--- a/pcr/xen/patch-gcc7-minios-udivmod.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-gcc7 generates a call to __udivmoddi4 ...
-
-stubdom/mini-os-x86_32-grub/mini-os.o: In function `_strtoll_r':
-stubdom/newlib-x86_32/i686-xen-elf/newlib/libc/stdlib/../../../../../newlib-1.16.0/newlib/libc/stdlib/strtoll_r.c:110: undefined reference to `__udivmoddi4'
-make[2]: *** [Makefile:167: stubdom/mini-os-x86_32-grub/mini-os] Error 1
-
-... which the linker only finds if libgcc.a is provided on the commandline.
-
-Signed-off-by: Olaf Hering <olaf@aepfle.de>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index ef8559b..b9c1336 100644
---- a/Makefile
-+++ b/Makefile
-@@ -162,7 +162,7 @@ $(OBJ_DIR)/arch/x86/minios-x86%.lds:  arch/x86/minios-x86.lds.S
- 	$(CPP) $(ASFLAGS) -P $< -o $@
- 
- $(OBJ_DIR)/$(TARGET): $(OBJS) $(APP_O) arch_lib $(OBJ_DIR)/$(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds
--	$(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o
-+	$(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) $$(gcc -print-libgcc-file-name $(CFLAGS)) -o $@.o
- 	$(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o
- 	$(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@
- 	gzip -f -9 -c $@ >$@.gz
-
-_______________________________________________
-Xen-devel mailing list
-Xen-devel@lists.xen.org
-https://lists.xen.org/xen-devel
diff --git a/pcr/xen/patch-gcc7-vtpm-implicit-fallthrough.patch b/pcr/xen/patch-gcc7-vtpm-implicit-fallthrough.patch
deleted file mode 100644
index 068752d2d..000000000
--- a/pcr/xen/patch-gcc7-vtpm-implicit-fallthrough.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-GCC-7 have -Wimplicit-fallthrough enabled with -Wextra. Add appropriate
-comment which both mute the warning and improve readibility.
-
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
----
- stubdom/Makefile                        |  1 +
- stubdom/vtpm-implicit-fallthrough.patch | 10 ++++++++++
- 2 files changed, 11 insertions(+)
- create mode 100644 stubdom/vtpm-implicit-fallthrough.patch
-
-diff --git a/stubdom/Makefile b/stubdom/Makefile
-index db01827..5055e31 100644
---- a/stubdom/Makefile
-+++ b/stubdom/Makefile
-@@ -228,6 +228,7 @@ tpm_emulator-$(XEN_TARGET_ARCH): tpm_emulator-$(TPMEMU_VERSION).tar.gz
- 	patch -d $@ -p1 < vtpm-deepquote.patch
- 	patch -d $@ -p1 < vtpm-deepquote-anyloc.patch
- 	patch -d $@ -p1 < vtpm-cmake-Wextra.patch
-+	patch -d $@ -p1 < vtpm-implicit-fallthrough.patch
- 	mkdir $@/build
- 	cd $@/build; CC=${CC} $(CMAKE) .. -DCMAKE_C_FLAGS:STRING="-std=c99 -DTPM_NO_EXTERN $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-declaration-after-statement"
- 	touch $@
-diff --git a/stubdom/vtpm-implicit-fallthrough.patch b/stubdom/vtpm-implicit-fallthrough.patch
-new file mode 100644
-index 0000000..db97be5
---- /dev/null
-+++ b/stubdom/vtpm-implicit-fallthrough.patch
-@@ -0,0 +1,10 @@
-+--- tpm_emulator-x86_64/tpm/tpm_cmd_handler.c.orig	2017-04-27 13:37:14.408000000 +0200
-++++ tpm_emulator-x86_64/tpm/tpm_cmd_handler.c	2017-04-27 13:39:53.585000000 +0200
-+@@ -3397,6 +3397,7 @@
-+                   sizeof(rsp->auth2->nonceOdd.nonce));
-+       tpm_hmac_update(&hmac, (BYTE*)&rsp->auth2->continueAuthSession, 1);
-+       tpm_hmac_final(&hmac, rsp->auth2->auth);
-++      /* fall-thru */
-+     case TPM_TAG_RSP_AUTH1_COMMAND:
-+       tpm_hmac_init(&hmac, rsp->auth1->secret, sizeof(rsp->auth1->secret));
-+       tpm_hmac_update(&hmac, rsp->auth1->digest, sizeof(rsp->auth1->digest));
--- 
-2.7.4
-
-
-_______________________________________________
-Xen-devel mailing list
-Xen-devel@lists.xen.org
-https://lists.xen.org/xen-devel
diff --git a/pcr/xen/patch-gcc7-vtpmmgr-make-inline-static.patch b/pcr/xen/patch-gcc7-vtpmmgr-make-inline-static.patch
deleted file mode 100644
index a2c96691a..000000000
--- a/pcr/xen/patch-gcc7-vtpmmgr-make-inline-static.patch
+++ /dev/null
@@ -1,1161 +0,0 @@
-gcc7 is more strict with functions marked as inline. They are not
-automatically inlined. Instead a function call is generated, but the
-actual code is not visible by the linker.
-
-Do a mechanical change and mark every 'inline' as 'static inline'. For
-simpler review the static goes into an extra line.
-
-Signed-off-by: Olaf Hering <olaf@aepfle.de>
----
- stubdom/vtpmmgr/marshal.h      | 76 ++++++++++++++++++++++++++++++++++++++++++
- stubdom/vtpmmgr/tcg.h          | 14 ++++++++
- stubdom/vtpmmgr/tpm2_marshal.h | 58 ++++++++++++++++++++++++++++++++
- stubdom/vtpmmgr/tpmrsa.h       |  1 +
- 4 files changed, 149 insertions(+)
-
-diff --git a/stubdom/vtpmmgr/marshal.h b/stubdom/vtpmmgr/marshal.h
-index d826f19d89..dce19c6439 100644
---- a/stubdom/vtpmmgr/marshal.h
-+++ b/stubdom/vtpmmgr/marshal.h
-@@ -47,16 +47,19 @@ typedef enum UnpackPtr {
- 	UNPACK_ALLOC
- } UnpackPtr;
- 
-+static
- inline BYTE* pack_BYTE(BYTE* ptr, BYTE t) {
- 	ptr[0] = t;
- 	return ++ptr;
- }
- 
-+static
- inline BYTE* unpack_BYTE(BYTE* ptr, BYTE* t) {
- 	t[0] = ptr[0];
- 	return ++ptr;
- }
- 
-+static
- inline int unpack3_BYTE(BYTE* ptr, UINT32* pos, UINT32 max, BYTE *t)
- {
- 	if (*pos + 1 > max)
-@@ -72,18 +75,21 @@ inline int unpack3_BYTE(BYTE* ptr, UINT32* pos, UINT32 max, BYTE *t)
- #define unpack3_BOOL(p, x, m, t) unpack3_BYTE(p, x, m, t)
- #define sizeof_BOOL(t) 1
- 
-+static
- inline BYTE* pack_UINT16(void* ptr, UINT16 t) {
- 	UINT16* p = ptr;
- 	*p = cpu_to_be16(t);
- 	return ptr + sizeof(UINT16);
- }
- 
-+static
- inline BYTE* unpack_UINT16(void* ptr, UINT16* t) {
- 	UINT16* p = ptr;
- 	*t = be16_to_cpu(*p);
- 	return ptr + sizeof(UINT16);
- }
- 
-+static
- inline int unpack3_UINT16(BYTE* ptr, UINT32* pos, UINT32 max, UINT16 *t)
- {
- 	if (*pos + 2 > max)
-@@ -93,18 +99,21 @@ inline int unpack3_UINT16(BYTE* ptr, UINT32* pos, UINT32 max, UINT16 *t)
- 	return 0;
- }
- 
-+static
- inline BYTE* pack_UINT32(void* ptr, UINT32 t) {
- 	UINT32* p = ptr;
- 	*p = cpu_to_be32(t);
- 	return ptr + sizeof(UINT32);
- }
- 
-+static
- inline BYTE* unpack_UINT32(void* ptr, UINT32* t) {
- 	UINT32* p = ptr;
- 	*t = be32_to_cpu(*p);
- 	return ptr + sizeof(UINT32);
- }
- 
-+static
- inline int unpack3_UINT32(BYTE* ptr, UINT32* pos, UINT32 max, UINT32 *t)
- {
- 	if (*pos + 4 > max)
-@@ -236,16 +245,19 @@ inline int unpack3_UINT32(BYTE* ptr, UINT32* pos, UINT32 max, UINT32 *t)
- #define sizeof_TCS_KEY_HANDLE(t) sizeof_UINT32(t)
- 
- 
-+static
- inline BYTE* pack_BUFFER(BYTE* ptr, const BYTE* buf, UINT32 size) {
- 	memcpy(ptr, buf, size);
- 	return ptr + size;
- }
- 
-+static
- inline BYTE* unpack_BUFFER(BYTE* ptr, BYTE* buf, UINT32 size) {
- 	memcpy(buf, ptr, size);
- 	return ptr + size;
- }
- 
-+static
- inline int unpack3_BUFFER(BYTE* ptr, UINT32* pos, UINT32 max, BYTE* buf, UINT32 size) {
- 	if (*pos + size > max)
- 		return TPM_SIZE;
-@@ -256,11 +268,13 @@ inline int unpack3_BUFFER(BYTE* ptr, UINT32* pos, UINT32 max, BYTE* buf, UINT32
- 
- #define sizeof_BUFFER(b, s) s
- 
-+static
- inline BYTE* unpack_ALIAS(BYTE* ptr, BYTE** buf, UINT32 size) {
- 	*buf = ptr;
- 	return ptr + size;
- }
- 
-+static
- inline BYTE* unpack_ALLOC(BYTE* ptr, BYTE** buf, UINT32 size) {
- 	if(size) {
- 		*buf = malloc(size);
-@@ -271,6 +285,7 @@ inline BYTE* unpack_ALLOC(BYTE* ptr, BYTE** buf, UINT32 size) {
- 	return ptr + size;
- }
- 
-+static
- inline BYTE* unpack_PTR(BYTE* ptr, BYTE** buf, UINT32 size, UnpackPtr alloc) {
- 	if(alloc == UNPACK_ALLOC) {
- 		return unpack_ALLOC(ptr, buf, size);
-@@ -279,6 +294,7 @@ inline BYTE* unpack_PTR(BYTE* ptr, BYTE** buf, UINT32 size, UnpackPtr alloc) {
- 	}
- }
- 
-+static
- inline int unpack3_PTR(BYTE* ptr, UINT32* pos, UINT32 max, BYTE** buf, UINT32 size, UnpackPtr alloc) {
- 	if (size > max || *pos + size > max)
- 		return TPM_SIZE;
-@@ -292,14 +308,17 @@ inline int unpack3_PTR(BYTE* ptr, UINT32* pos, UINT32 max, BYTE** buf, UINT32 si
- }
- #define unpack3_VPTR(ptr, pos, max, buf, size, alloc) unpack3_PTR(ptr, pos, max, (void*)(buf), size, alloc)
- 
-+static
- inline BYTE* pack_TPM_AUTHDATA(BYTE* ptr, const TPM_AUTHDATA* d) {
- 	return pack_BUFFER(ptr, *d, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline BYTE* unpack_TPM_AUTHDATA(BYTE* ptr, TPM_AUTHDATA* d) {
- 	return unpack_BUFFER(ptr, *d, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline int unpack3_TPM_AUTHDATA(BYTE* ptr, UINT32* pos, UINT32 len, TPM_AUTHDATA* d) {
- 	return unpack3_BUFFER(ptr, pos, len, *d, TPM_DIGEST_SIZE);
- }
-@@ -325,6 +344,7 @@ inline int unpack3_TPM_AUTHDATA(BYTE* ptr, UINT32* pos, UINT32 len, TPM_AUTHDATA
- #define sizeof_TPM_TAG(t) sizeof_UINT16(t)
- #define sizeof_TPM_STRUCTURE_TAG(t) sizeof_UINT16(t)
- 
-+static
- inline BYTE* pack_TPM_VERSION(BYTE* ptr, const TPM_VERSION* t) {
- 	ptr[0] = t->major;
- 	ptr[1] = t->minor;
-@@ -333,6 +353,7 @@ inline BYTE* pack_TPM_VERSION(BYTE* ptr, const TPM_VERSION* t) {
- 	return ptr + 4;
- }
- 
-+static
- inline BYTE* unpack_TPM_VERSION(BYTE* ptr, TPM_VERSION* t) {
- 	t->major = ptr[0];
- 	t->minor = ptr[1];
-@@ -341,6 +362,7 @@ inline BYTE* unpack_TPM_VERSION(BYTE* ptr, TPM_VERSION* t) {
- 	return ptr + 4;
- }
- 
-+static
- inline int unpack3_TPM_VERSION(BYTE* ptr, UINT32 *pos, UINT32 max, TPM_VERSION* t) {
- 	if (*pos + 4 > max)
- 		return TPM_SIZE;
-@@ -355,6 +377,7 @@ inline int unpack3_TPM_VERSION(BYTE* ptr, UINT32 *pos, UINT32 max, TPM_VERSION*
- 
- #define sizeof_TPM_VERSION(x) 4
- 
-+static
- inline BYTE* pack_TPM_CAP_VERSION_INFO(BYTE* ptr, const TPM_CAP_VERSION_INFO* v) {
- 	ptr = pack_TPM_STRUCTURE_TAG(ptr, v->tag);
- 	ptr = pack_TPM_VERSION(ptr, &v->version);
-@@ -366,6 +389,7 @@ inline BYTE* pack_TPM_CAP_VERSION_INFO(BYTE* ptr, const TPM_CAP_VERSION_INFO* v)
- 	return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM_CAP_VERSION_INFO(BYTE* ptr, TPM_CAP_VERSION_INFO* v, UnpackPtr alloc) {
- 	ptr = unpack_TPM_STRUCTURE_TAG(ptr, &v->tag);
- 	ptr = unpack_TPM_VERSION(ptr, &v->version);
-@@ -377,14 +401,17 @@ inline BYTE* unpack_TPM_CAP_VERSION_INFO(BYTE* ptr, TPM_CAP_VERSION_INFO* v, Unp
- 	return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM_DIGEST(BYTE* ptr, const TPM_DIGEST* d) {
- 	return pack_BUFFER(ptr, d->digest, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline BYTE* unpack_TPM_DIGEST(BYTE* ptr, TPM_DIGEST* d) {
- 	return unpack_BUFFER(ptr, d->digest, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline int unpack3_TPM_DIGEST(BYTE* ptr, UINT32* pos, UINT32 max, TPM_DIGEST* d) {
- 	return unpack3_BUFFER(ptr, pos, max, d->digest, TPM_DIGEST_SIZE);
- }
-@@ -409,20 +436,24 @@ inline int unpack3_TPM_DIGEST(BYTE* ptr, UINT32* pos, UINT32 max, TPM_DIGEST* d)
- #define pack_TPM_CHOSENID_HASH(ptr, d) pack_TPM_DIGEST(ptr, d)
- #define unpack_TPM_CHOSENID_HASH(ptr, d) unpack_TPM_DIGEST(ptr, d)
- 
-+static
- inline BYTE* pack_TPM_NONCE(BYTE* ptr, const TPM_NONCE* n) {
- 	return pack_BUFFER(ptr, n->nonce, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline BYTE* unpack_TPM_NONCE(BYTE* ptr, TPM_NONCE* n) {
- 	return unpack_BUFFER(ptr, n->nonce, TPM_DIGEST_SIZE);
- }
- 
- #define sizeof_TPM_NONCE(x) TPM_DIGEST_SIZE
- 
-+static
- inline int unpack3_TPM_NONCE(BYTE* ptr, UINT32* pos, UINT32 max, TPM_NONCE* n) {
- 	return unpack3_BUFFER(ptr, pos, max, n->nonce, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline BYTE* pack_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, const TPM_SYMMETRIC_KEY_PARMS* k) {
- 	ptr = pack_UINT32(ptr, k->keyLength);
- 	ptr = pack_UINT32(ptr, k->blockSize);
-@@ -430,6 +461,7 @@ inline BYTE* pack_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, const TPM_SYMMETRIC_KEY_PAR
- 	return pack_BUFFER(ptr, k->IV, k->ivSize);
- }
- 
-+static
- inline BYTE* pack_TPM_SYMMETRIC_KEY(BYTE* ptr, const TPM_SYMMETRIC_KEY* k) {
- 	ptr = pack_UINT32(ptr, k->algId);
- 	ptr = pack_UINT16(ptr, k->encScheme);
-@@ -437,6 +469,7 @@ inline BYTE* pack_TPM_SYMMETRIC_KEY(BYTE* ptr, const TPM_SYMMETRIC_KEY* k) {
- 	return pack_BUFFER(ptr, k->data, k->size);
- }
- 
-+static
- inline int unpack3_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 max, TPM_SYMMETRIC_KEY_PARMS* k, UnpackPtr alloc) {
- 	return unpack3_UINT32(ptr, pos, max, &k->keyLength) ||
- 		unpack3_UINT32(ptr, pos, max, &k->blockSize) ||
-@@ -444,10 +477,12 @@ inline int unpack3_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 max, T
- 		unpack3_PTR(ptr, pos, max, &k->IV, k->ivSize, alloc);
- }
- 
-+static
- inline int sizeof_TPM_SYMMETRIC_KEY_PARMS(const TPM_SYMMETRIC_KEY_PARMS* k) {
- 	return 12 + k->ivSize;
- }
- 
-+static
- inline int unpack3_TPM_SYMMETRIC_KEY(BYTE* ptr, UINT32* pos, UINT32 max, TPM_SYMMETRIC_KEY* k, UnpackPtr alloc) {
- 	return unpack3_UINT32(ptr, pos, max, &k->algId) ||
- 		unpack3_UINT16(ptr, pos, max, &k->encScheme) ||
-@@ -455,6 +490,7 @@ inline int unpack3_TPM_SYMMETRIC_KEY(BYTE* ptr, UINT32* pos, UINT32 max, TPM_SYM
- 		unpack3_PTR(ptr, pos, max, &k->data, k->size, alloc);
- }
- 
-+static
- inline BYTE* pack_TPM_RSA_KEY_PARMS(BYTE* ptr, const TPM_RSA_KEY_PARMS* k) {
- 	ptr = pack_UINT32(ptr, k->keyLength);
- 	ptr = pack_UINT32(ptr, k->numPrimes);
-@@ -462,6 +498,7 @@ inline BYTE* pack_TPM_RSA_KEY_PARMS(BYTE* ptr, const TPM_RSA_KEY_PARMS* k) {
- 	return pack_BUFFER(ptr, k->exponent, k->exponentSize);
- }
- 
-+static
- inline int unpack3_TPM_RSA_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 max, TPM_RSA_KEY_PARMS* k, UnpackPtr alloc) {
- 	return unpack3_UINT32(ptr, pos, max, &k->keyLength) ||
- 		unpack3_UINT32(ptr, pos, max, &k->numPrimes) ||
-@@ -469,11 +506,13 @@ inline int unpack3_TPM_RSA_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 max, TPM_RSA
- 		unpack3_PTR(ptr, pos, max, &k->exponent, k->exponentSize, alloc);
- }
- 
-+static
- inline int sizeof_TPM_RSA_KEY_PARMS(const TPM_RSA_KEY_PARMS* k) {
- 	return 12 + k->exponentSize;
- }
- 
- 
-+static
- inline BYTE* pack_TPM_KEY_PARMS(BYTE* ptr, const TPM_KEY_PARMS* k) {
- 	ptr = pack_TPM_ALGORITHM_ID(ptr, k->algorithmID);
- 	ptr = pack_TPM_ENC_SCHEME(ptr, k->encScheme);
-@@ -493,6 +532,7 @@ inline BYTE* pack_TPM_KEY_PARMS(BYTE* ptr, const TPM_KEY_PARMS* k) {
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 len, TPM_KEY_PARMS* k, UnpackPtr alloc) {
- 	int rc = unpack3_TPM_ALGORITHM_ID(ptr, pos, len, &k->algorithmID) ||
- 		unpack3_TPM_ENC_SCHEME(ptr, pos, len, &k->encScheme) ||
-@@ -511,6 +551,7 @@ inline int unpack3_TPM_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 len, TPM_KEY_PAR
- 	return TPM_FAIL;
- }
- 
-+static
- inline int sizeof_TPM_KEY_PARMS(const TPM_KEY_PARMS* k) {
- 	int rc = 0;
- 	rc += sizeof_TPM_ALGORITHM_ID(&k->algorithmID);
-@@ -532,52 +573,62 @@ inline int sizeof_TPM_KEY_PARMS(const TPM_KEY_PARMS* k) {
- 	return rc;
- }
- 
-+static
- inline BYTE* pack_TPM_STORE_PUBKEY(BYTE* ptr, const TPM_STORE_PUBKEY* k) {
- 	ptr = pack_UINT32(ptr, k->keyLength);
- 	ptr = pack_BUFFER(ptr, k->key, k->keyLength);
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_STORE_PUBKEY(BYTE* ptr, UINT32* pos, UINT32 max, TPM_STORE_PUBKEY* k, UnpackPtr alloc) {
- 	return unpack3_UINT32(ptr, pos, max, &k->keyLength) ||
- 		unpack3_PTR(ptr, pos, max, &k->key, k->keyLength, alloc);
- }
- 
-+static
- inline int sizeof_TPM_STORE_PUBKEY(const TPM_STORE_PUBKEY* k) {
- 	return 4 + k->keyLength;
- }
- 
-+static
- inline BYTE* pack_TPM_PUBKEY(BYTE* ptr, const TPM_PUBKEY* k) {
- 	ptr = pack_TPM_KEY_PARMS(ptr, &k->algorithmParms);
- 	return pack_TPM_STORE_PUBKEY(ptr, &k->pubKey);
- }
- 
-+static
- inline int unpack3_TPM_PUBKEY(BYTE* ptr, UINT32* pos, UINT32 len, TPM_PUBKEY* k, UnpackPtr alloc) {
- 	return unpack3_TPM_KEY_PARMS(ptr, pos, len, &k->algorithmParms, alloc) ||
- 		unpack3_TPM_STORE_PUBKEY(ptr, pos, len, &k->pubKey, alloc);
- }
- 
-+static
- inline BYTE* pack_TPM_PCR_SELECTION(BYTE* ptr, const TPM_PCR_SELECTION* p) {
- 	ptr = pack_UINT16(ptr, p->sizeOfSelect);
- 	ptr = pack_BUFFER(ptr, p->pcrSelect, p->sizeOfSelect);
- 	return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM_PCR_SELECTION(BYTE* ptr, TPM_PCR_SELECTION* p, UnpackPtr alloc) {
- 	ptr = unpack_UINT16(ptr, &p->sizeOfSelect);
- 	ptr = unpack_PTR(ptr, &p->pcrSelect, p->sizeOfSelect, alloc);
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_PCR_SELECTION(BYTE* ptr, UINT32* pos, UINT32 max, TPM_PCR_SELECTION* p, UnpackPtr alloc) {
- 	return unpack3_UINT16(ptr, pos, max, &p->sizeOfSelect) ||
- 		unpack3_PTR(ptr, pos, max, &p->pcrSelect, p->sizeOfSelect, alloc);
- }
- 
-+static
- inline int sizeof_TPM_PCR_SELECTION(const TPM_PCR_SELECTION* p) {
- 	return 2 + p->sizeOfSelect;
- }
- 
-+static
- inline BYTE* pack_TPM_PCR_INFO(BYTE* ptr, const TPM_PCR_INFO* p) {
- 	ptr = pack_TPM_PCR_SELECTION(ptr, &p->pcrSelection);
- 	ptr = pack_TPM_COMPOSITE_HASH(ptr, &p->digestAtRelease);
-@@ -585,12 +636,14 @@ inline BYTE* pack_TPM_PCR_INFO(BYTE* ptr, const TPM_PCR_INFO* p) {
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_PCR_INFO(BYTE* ptr, UINT32* pos, UINT32 max, TPM_PCR_INFO* p, UnpackPtr alloc) {
- 	return unpack3_TPM_PCR_SELECTION(ptr, pos, max, &p->pcrSelection, alloc) ||
- 		unpack3_TPM_COMPOSITE_HASH(ptr, pos, max, &p->digestAtRelease) ||
- 		unpack3_TPM_COMPOSITE_HASH(ptr, pos, max, &p->digestAtCreation);
- }
- 
-+static
- inline int sizeof_TPM_PCR_INFO(const TPM_PCR_INFO* p) {
- 	int rc = 0;
- 	rc += sizeof_TPM_PCR_SELECTION(&p->pcrSelection);
-@@ -599,6 +652,7 @@ inline int sizeof_TPM_PCR_INFO(const TPM_PCR_INFO* p) {
- 	return rc;
- }
- 
-+static
- inline BYTE* pack_TPM_PCR_INFO_LONG(BYTE* ptr, const TPM_PCR_INFO_LONG* p) {
- 	ptr = pack_TPM_STRUCTURE_TAG(ptr, p->tag);
- 	ptr = pack_TPM_LOCALITY_SELECTION(ptr, p->localityAtCreation);
-@@ -610,6 +664,7 @@ inline BYTE* pack_TPM_PCR_INFO_LONG(BYTE* ptr, const TPM_PCR_INFO_LONG* p) {
- 	return ptr;
- }
- 
-+static
- inline int sizeof_TPM_PCR_INFO_LONG(const TPM_PCR_INFO_LONG* p) {
- 	int rc = 0;
- 	rc += sizeof_TPM_STRUCTURE_TAG(p->tag);
-@@ -622,6 +677,7 @@ inline int sizeof_TPM_PCR_INFO_LONG(const TPM_PCR_INFO_LONG* p) {
- 	return rc;
- }
- 
-+static
- inline int unpack3_TPM_PCR_INFO_LONG(BYTE* ptr, UINT32* pos, UINT32 max, TPM_PCR_INFO_LONG* p, UnpackPtr alloc) {
- 	return unpack3_TPM_STRUCTURE_TAG(ptr, pos, max, &p->tag) ||
- 		unpack3_TPM_LOCALITY_SELECTION(ptr, pos, max,
-@@ -637,6 +693,7 @@ inline int unpack3_TPM_PCR_INFO_LONG(BYTE* ptr, UINT32* pos, UINT32 max, TPM_PCR
- 		unpack3_TPM_COMPOSITE_HASH(ptr, pos, max, &p->digestAtRelease);
- }
- 
-+static
- inline BYTE* pack_TPM_PCR_COMPOSITE(BYTE* ptr, const TPM_PCR_COMPOSITE* p) {
- 	ptr = pack_TPM_PCR_SELECTION(ptr, &p->select);
- 	ptr = pack_UINT32(ptr, p->valueSize);
-@@ -644,12 +701,14 @@ inline BYTE* pack_TPM_PCR_COMPOSITE(BYTE* ptr, const TPM_PCR_COMPOSITE* p) {
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_PCR_COMPOSITE(BYTE* ptr, UINT32* pos, UINT32 max, TPM_PCR_COMPOSITE* p, UnpackPtr alloc) {
- 	return unpack3_TPM_PCR_SELECTION(ptr, pos, max, &p->select, alloc) ||
- 		unpack3_UINT32(ptr, pos, max, &p->valueSize) ||
- 		unpack3_PTR(ptr, pos, max, (BYTE**)&p->pcrValue, p->valueSize, alloc);
- }
- 
-+static
- inline BYTE* pack_TPM_KEY(BYTE* ptr, const TPM_KEY* k) {
- 	ptr = pack_TPM_VERSION(ptr, &k->ver);
- 	ptr = pack_TPM_KEY_USAGE(ptr, k->keyUsage);
-@@ -665,6 +724,7 @@ inline BYTE* pack_TPM_KEY(BYTE* ptr, const TPM_KEY* k) {
- 	return pack_BUFFER(ptr, k->encData, k->encDataSize);
- }
- 
-+static
- inline int unpack3_TPM_KEY(BYTE* ptr, UINT32* pos, UINT32 max, TPM_KEY* k, UnpackPtr alloc) {
- 	int rc = unpack3_TPM_VERSION(ptr, pos, max, &k->ver) ||
- 		unpack3_TPM_KEY_USAGE(ptr, pos, max, &k->keyUsage) ||
-@@ -682,6 +742,7 @@ inline int unpack3_TPM_KEY(BYTE* ptr, UINT32* pos, UINT32 max, TPM_KEY* k, Unpac
- 		unpack3_PTR(ptr, pos, max, &k->encData, k->encDataSize, alloc);
- }
- 
-+static
- inline int sizeof_TPM_KEY(const TPM_KEY* k) {
- 	int rc = 0;
- 	rc += sizeof_TPM_VERSION(&k->ver);
-@@ -699,18 +760,21 @@ inline int sizeof_TPM_KEY(const TPM_KEY* k) {
- 	return rc;
- }
- 
-+static
- inline BYTE* pack_TPM_BOUND_DATA(BYTE* ptr, const TPM_BOUND_DATA* b, UINT32 payloadSize) {
- 	ptr = pack_TPM_VERSION(ptr, &b->ver);
- 	ptr = pack_TPM_PAYLOAD_TYPE(ptr, b->payload);
- 	return pack_BUFFER(ptr, b->payloadData, payloadSize);
- }
- 
-+static
- inline BYTE* unpack_TPM_BOUND_DATA(BYTE* ptr, TPM_BOUND_DATA* b, UINT32 payloadSize, UnpackPtr alloc) {
- 	ptr = unpack_TPM_VERSION(ptr, &b->ver);
- 	ptr = unpack_TPM_PAYLOAD_TYPE(ptr, &b->payload);
- 	return unpack_PTR(ptr, &b->payloadData, payloadSize, alloc);
- }
- 
-+static
- inline BYTE* pack_TPM_STORED_DATA(BYTE* ptr, const TPM_STORED_DATA* d) {
- 	ptr = pack_TPM_VERSION(ptr, &d->ver);
- 	ptr = pack_UINT32(ptr, d->sealInfoSize);
-@@ -722,6 +786,7 @@ inline BYTE* pack_TPM_STORED_DATA(BYTE* ptr, const TPM_STORED_DATA* d) {
- 	return ptr;
- }
- 
-+static
- inline int sizeof_TPM_STORED_DATA(const TPM_STORED_DATA* d) {
- 	int rv = sizeof_TPM_VERSION(&d->ver) + sizeof_UINT32(d->sealInfoSize);
- 	if (d->sealInfoSize) {
-@@ -732,6 +797,7 @@ inline int sizeof_TPM_STORED_DATA(const TPM_STORED_DATA* d) {
- 	return rv;
- }
- 
-+static
- inline int unpack3_TPM_STORED_DATA(BYTE* ptr, UINT32* pos, UINT32 len, TPM_STORED_DATA* d, UnpackPtr alloc) {
- 	int rc = unpack3_TPM_VERSION(ptr, pos, len, &d->ver) ||
- 		unpack3_UINT32(ptr, pos, len, &d->sealInfoSize);
-@@ -746,6 +812,7 @@ inline int unpack3_TPM_STORED_DATA(BYTE* ptr, UINT32* pos, UINT32 len, TPM_STORE
- 	return rc;
- }
- 
-+static
- inline BYTE* pack_TPM_STORED_DATA12(BYTE* ptr, const TPM_STORED_DATA12* d) {
- 	ptr = pack_TPM_STRUCTURE_TAG(ptr, d->tag);
- 	ptr = pack_TPM_ENTITY_TYPE(ptr, d->et);
-@@ -758,6 +825,7 @@ inline BYTE* pack_TPM_STORED_DATA12(BYTE* ptr, const TPM_STORED_DATA12* d) {
- 	return ptr;
- }
- 
-+static
- inline int sizeof_TPM_STORED_DATA12(const TPM_STORED_DATA12* d) {
- 	int rv = sizeof_TPM_STRUCTURE_TAG(&d->ver) +
- 		 sizeof_TPM_ENTITY_TYPE(&d->et) +
-@@ -770,6 +838,7 @@ inline int sizeof_TPM_STORED_DATA12(const TPM_STORED_DATA12* d) {
- 	return rv;
- }
- 
-+static
- inline int unpack3_TPM_STORED_DATA12(BYTE* ptr, UINT32* pos, UINT32 len, TPM_STORED_DATA12* d, UnpackPtr alloc) {
- 	int rc = unpack3_TPM_STRUCTURE_TAG(ptr, pos, len, &d->tag) ||
- 		unpack3_TPM_ENTITY_TYPE(ptr, pos, len, &d->et) ||
-@@ -786,6 +855,7 @@ inline int unpack3_TPM_STORED_DATA12(BYTE* ptr, UINT32* pos, UINT32 len, TPM_STO
- 	return rc;
- }
- 
-+static
- inline BYTE* pack_TPM_AUTH_SESSION(BYTE* ptr, const TPM_AUTH_SESSION* auth) {
- 	ptr = pack_TPM_AUTH_HANDLE(ptr, auth->AuthHandle);
- 	ptr = pack_TPM_NONCE(ptr, &auth->NonceOdd);
-@@ -794,6 +864,7 @@ inline BYTE* pack_TPM_AUTH_SESSION(BYTE* ptr, const TPM_AUTH_SESSION* auth) {
- 	return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM_AUTH_SESSION(BYTE* ptr, TPM_AUTH_SESSION* auth) {
- 	ptr = unpack_TPM_NONCE(ptr, &auth->NonceEven);
- 	ptr = unpack_BOOL(ptr, &auth->fContinueAuthSession);
-@@ -801,6 +872,7 @@ inline BYTE* unpack_TPM_AUTH_SESSION(BYTE* ptr, TPM_AUTH_SESSION* auth) {
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_AUTH_SESSION(BYTE* ptr, UINT32* pos, UINT32 len, TPM_AUTH_SESSION* auth) {
- 	return unpack3_TPM_NONCE(ptr, pos, len, &auth->NonceEven) ||
- 		unpack3_BOOL(ptr, pos, len, &auth->fContinueAuthSession) ||
-@@ -808,6 +880,7 @@ inline int unpack3_TPM_AUTH_SESSION(BYTE* ptr, UINT32* pos, UINT32 len, TPM_AUTH
- }
- 
- 
-+static
- inline int sizeof_TPM_AUTH_SESSION(const TPM_AUTH_SESSION* auth) {
- 	int rv = 0;
- 	rv += sizeof_TPM_AUTH_HANDLE(auth->AuthHandle);
-@@ -817,6 +890,7 @@ inline int sizeof_TPM_AUTH_SESSION(const TPM_AUTH_SESSION* auth) {
- 	return rv;
- }
- 
-+static
- inline BYTE* pack_TPM_RQU_HEADER(BYTE* ptr,
- 		TPM_TAG tag,
- 		UINT32 size,
-@@ -826,6 +900,7 @@ inline BYTE* pack_TPM_RQU_HEADER(BYTE* ptr,
- 	return pack_UINT32(ptr, ord);
- }
- 
-+static
- inline BYTE* unpack_TPM_RQU_HEADER(BYTE* ptr,
- 		TPM_TAG* tag,
- 		UINT32* size,
-@@ -836,6 +911,7 @@ inline BYTE* unpack_TPM_RQU_HEADER(BYTE* ptr,
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_RQU_HEADER(BYTE* ptr, UINT32* pos, UINT32 max,
- 		TPM_TAG* tag, UINT32* size, TPM_COMMAND_CODE* ord) {
- 	return
-diff --git a/stubdom/vtpmmgr/tcg.h b/stubdom/vtpmmgr/tcg.h
-index 813ce57a2d..423131dc25 100644
---- a/stubdom/vtpmmgr/tcg.h
-+++ b/stubdom/vtpmmgr/tcg.h
-@@ -461,6 +461,7 @@ typedef struct TPM_CAP_VERSION_INFO {
-    BYTE* vendorSpecific;
- } TPM_CAP_VERSION_INFO;
- 
-+static
- inline void free_TPM_CAP_VERSION_INFO(TPM_CAP_VERSION_INFO* v) {
-    free(v->vendorSpecific);
-    v->vendorSpecific = NULL;
-@@ -494,6 +495,7 @@ typedef struct TPM_SYMMETRIC_KEY {
-    BYTE* data;
- } TPM_SYMMETRIC_KEY;
- 
-+static
- inline void free_TPM_SYMMETRIC_KEY_PARMS(TPM_SYMMETRIC_KEY_PARMS* p) {
-    free(p->IV);
-    p->IV = NULL;
-@@ -510,6 +512,7 @@ typedef struct TPM_RSA_KEY_PARMS {
- 
- #define TPM_RSA_KEY_PARMS_INIT { 0, 0, 0, NULL }
- 
-+static
- inline void free_TPM_RSA_KEY_PARMS(TPM_RSA_KEY_PARMS* p) {
-    free(p->exponent);
-    p->exponent = NULL;
-@@ -528,6 +531,7 @@ typedef struct TPM_KEY_PARMS {
- 
- #define TPM_KEY_PARMS_INIT { 0, 0, 0, 0 }
- 
-+static
- inline void free_TPM_KEY_PARMS(TPM_KEY_PARMS* p) {
-    if(p->parmSize) {
-       switch(p->algorithmID) {
-@@ -550,6 +554,7 @@ typedef struct TPM_STORE_PUBKEY {
- 
- #define TPM_STORE_PUBKEY_INIT { 0, NULL }
- 
-+static
- inline void free_TPM_STORE_PUBKEY(TPM_STORE_PUBKEY* p) {
-    free(p->key);
-    p->key = NULL;
-@@ -562,6 +567,7 @@ typedef struct TPM_PUBKEY {
- 
- #define TPM_PUBKEY_INIT { TPM_KEY_PARMS_INIT, TPM_STORE_PUBKEY_INIT }
- 
-+static
- inline void free_TPM_PUBKEY(TPM_PUBKEY* k) {
-    free_TPM_KEY_PARMS(&k->algorithmParms);
-    free_TPM_STORE_PUBKEY(&k->pubKey);
-@@ -574,6 +580,7 @@ typedef struct TPM_PCR_SELECTION {
- 
- #define TPM_PCR_SELECTION_INIT { 0, NULL }
- 
-+static
- inline void free_TPM_PCR_SELECTION(TPM_PCR_SELECTION* p) {
-    free(p->pcrSelect);
-    p->pcrSelect = NULL;
-@@ -594,6 +601,7 @@ typedef struct TPM_PCR_INFO_LONG {
- #define TPM_PCR_INFO_LONG_INIT { 0, 0, 0, TPM_PCR_SELECTION_INIT, \
-                                  TPM_PCR_SELECTION_INIT }
- 
-+static
- inline void free_TPM_PCR_INFO_LONG(TPM_PCR_INFO_LONG* p) {
-    free_TPM_PCR_SELECTION(&p->creationPCRSelection);
-    free_TPM_PCR_SELECTION(&p->releasePCRSelection);
-@@ -607,6 +615,7 @@ typedef struct TPM_PCR_INFO {
- 
- #define TPM_PCR_INFO_INIT { TPM_PCR_SELECTION_INIT }
- 
-+static
- inline void free_TPM_PCR_INFO(TPM_PCR_INFO* p) {
-    free_TPM_PCR_SELECTION(&p->pcrSelection);
- }
-@@ -619,6 +628,7 @@ typedef struct TPM_PCR_COMPOSITE {
- 
- #define TPM_PCR_COMPOSITE_INIT { TPM_PCR_SELECTION_INIT, 0, NULL }
- 
-+static
- inline void free_TPM_PCR_COMPOSITE(TPM_PCR_COMPOSITE* p) {
-    free_TPM_PCR_SELECTION(&p->select);
-    free(p->pcrValue);
-@@ -643,6 +653,7 @@ typedef struct TPM_KEY {
-    .pubKey = TPM_STORE_PUBKEY_INIT, \
-    .encDataSize = 0, .encData = NULL }
- 
-+static
- inline void free_TPM_KEY(TPM_KEY* k) {
-    if(k->PCRInfoSize) {
-       free_TPM_PCR_INFO(&k->PCRInfo);
-@@ -660,6 +671,7 @@ typedef struct TPM_BOUND_DATA {
- 
- #define TPM_BOUND_DATA_INIT { .payloadData = NULL }
- 
-+static
- inline void free_TPM_BOUND_DATA(TPM_BOUND_DATA* d) {
-    free(d->payloadData);
-    d->payloadData = NULL;
-@@ -676,6 +688,7 @@ typedef struct TPM_STORED_DATA {
- #define TPM_STORED_DATA_INIT { .sealInfoSize = 0, sealInfo = TPM_PCR_INFO_INIT,\
-    .encDataSize = 0, .encData = NULL }
- 
-+static
- inline void free_TPM_STORED_DATA(TPM_STORED_DATA* d) {
-    if(d->sealInfoSize) {
-       free_TPM_PCR_INFO(&d->sealInfo);
-@@ -696,6 +709,7 @@ typedef struct TPM_STORED_DATA12 {
- #define TPM_STORED_DATA12_INIT { .sealInfoLongSize = 0, \
-    sealInfoLong = TPM_PCR_INFO_INIT, .encDataSize = 0, .encData = NULL }
- 
-+static
- inline void free_TPM_STORED_DATA12(TPM_STORED_DATA12* d) {
-    if(d->sealInfoLongSize) {
-       free_TPM_PCR_INFO_LONG(&d->sealInfoLong);
-diff --git a/stubdom/vtpmmgr/tpm2_marshal.h b/stubdom/vtpmmgr/tpm2_marshal.h
-index aaa44645a2..ba070ad38e 100644
---- a/stubdom/vtpmmgr/tpm2_marshal.h
-+++ b/stubdom/vtpmmgr/tpm2_marshal.h
-@@ -52,6 +52,7 @@
- #define pack_TPM_BUFFER(ptr, buf, size) pack_BUFFER(ptr, buf, size)
- #define unpack_TPM_BUFFER(ptr, buf, size) unpack_BUFFER(ptr, buf, size)
- 
-+static
- inline BYTE* pack_BYTE_ARRAY(BYTE* ptr, const BYTE* array, UINT32 size)
- {
-     int i;
-@@ -60,21 +61,25 @@ inline BYTE* pack_BYTE_ARRAY(BYTE* ptr, const BYTE* array, UINT32 size)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMA_SESSION(BYTE* ptr, const TPMA_SESSION *attr)
- {
-     return pack_BYTE(ptr, (BYTE)(*attr));
- }
- 
-+static
- inline BYTE* unpack_TPMA_SESSION(BYTE* ptr, TPMA_SESSION *attr)
- {
-     return unpack_BYTE(ptr, (BYTE *)attr);
- }
- 
-+static
- inline BYTE* pack_TPMI_ALG_HASH(BYTE* ptr, const TPMI_ALG_HASH *hash)
- {
-     return pack_UINT16(ptr, *hash);
- }
- 
-+static
- inline BYTE* unpack_TPMI_ALG_HASH(BYTE *ptr, TPMI_ALG_HASH *hash)
- {
-     return unpack_UINT16(ptr, hash);
-@@ -125,6 +130,7 @@ inline BYTE* unpack_TPMI_ALG_HASH(BYTE *ptr, TPMI_ALG_HASH *hash)
- #define pack_TPMI_RH_LOCKOUT(ptr, l)            pack_TPM2_HANDLE(ptr, l)
- #define unpack_TPMI_RH_LOCKOUT(ptr, l)          unpack_TPM2_HANDLE(ptr, l)
- 
-+static
- inline BYTE* pack_TPM2B_DIGEST(BYTE* ptr, const TPM2B_DIGEST *digest)
- {
-     ptr = pack_UINT16(ptr, digest->size);
-@@ -132,6 +138,7 @@ inline BYTE* pack_TPM2B_DIGEST(BYTE* ptr, const TPM2B_DIGEST *digest)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2B_DIGEST(BYTE* ptr, TPM2B_DIGEST *digest)
- {
-     ptr = unpack_UINT16(ptr, &digest->size);
-@@ -139,6 +146,7 @@ inline BYTE* unpack_TPM2B_DIGEST(BYTE* ptr, TPM2B_DIGEST *digest)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMT_TK_CREATION(BYTE* ptr,const TPMT_TK_CREATION *ticket )
- {
-     ptr = pack_TPM_ST(ptr , &ticket->tag);
-@@ -147,6 +155,7 @@ inline BYTE* pack_TPMT_TK_CREATION(BYTE* ptr,const TPMT_TK_CREATION *ticket )
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMT_TK_CREATION(BYTE* ptr, TPMT_TK_CREATION *ticket )
- {
-     ptr = unpack_TPM_ST(ptr, &ticket->tag);
-@@ -155,6 +164,7 @@ inline BYTE* unpack_TPMT_TK_CREATION(BYTE* ptr, TPMT_TK_CREATION *ticket )
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2B_NAME(BYTE* ptr,const TPM2B_NAME *name )
- {
-     ptr = pack_UINT16(ptr, name->size);
-@@ -162,6 +172,7 @@ inline BYTE* pack_TPM2B_NAME(BYTE* ptr,const TPM2B_NAME *name )
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2B_NAME(BYTE* ptr, TPM2B_NAME *name)
- {
-     ptr = unpack_UINT16(ptr, &name->size);
-@@ -169,6 +180,7 @@ inline BYTE* unpack_TPM2B_NAME(BYTE* ptr, TPM2B_NAME *name)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2B_NONCE(BYTE* ptr, const TPM2B_NONCE *nonce)
- {
-     return pack_TPM2B_DIGEST(ptr, (const TPM2B_DIGEST*)nonce);
-@@ -176,6 +188,7 @@ inline BYTE* pack_TPM2B_NONCE(BYTE* ptr, const TPM2B_NONCE *nonce)
- 
- #define unpack_TPM2B_NONCE(ptr, nonce)  unpack_TPM2B_DIGEST(ptr, (TPM2B_DIGEST*)nonce)
- 
-+static
- inline BYTE* pack_TPM2B_AUTH(BYTE* ptr, const TPM2B_AUTH *auth)
- {
-     return pack_TPM2B_DIGEST(ptr, (const TPM2B_DIGEST*)auth);
-@@ -183,6 +196,7 @@ inline BYTE* pack_TPM2B_AUTH(BYTE* ptr, const TPM2B_AUTH *auth)
- 
- #define unpack_TPM2B_AUTH(ptr, auth)    unpack_TPM2B_DIGEST(ptr, (TPM2B_DIGEST*)auth)
- 
-+static
- inline BYTE* pack_TPM2B_DATA(BYTE* ptr, const TPM2B_DATA *data)
- {
-     return pack_TPM2B_DIGEST(ptr, (const TPM2B_DIGEST*)data);
-@@ -190,6 +204,7 @@ inline BYTE* pack_TPM2B_DATA(BYTE* ptr, const TPM2B_DATA *data)
- 
- #define unpack_TPM2B_DATA(ptr, data)    unpack_TPM2B_DIGEST(ptr, (TPM2B_DIGEST*)data)
- 
-+static
- inline BYTE* pack_TPM2B_SENSITIVE_DATA(BYTE* ptr, const TPM2B_SENSITIVE_DATA *data)
- {
-     return pack_TPM2B_DIGEST(ptr, (const TPM2B_DIGEST*)data);
-@@ -197,6 +212,7 @@ inline BYTE* pack_TPM2B_SENSITIVE_DATA(BYTE* ptr, const TPM2B_SENSITIVE_DATA *da
- 
- #define unpack_TPM2B_SENSITIVE_DATA(ptr, data)  unpack_TPM2B_DIGEST(ptr, (TPM2B_DIGEST*)data)
- 
-+static
- inline BYTE* pack_TPM2B_PUBLIC_KEY_RSA(BYTE* ptr, const TPM2B_PUBLIC_KEY_RSA *rsa)
- {
-     return pack_TPM2B_DIGEST(ptr, (const TPM2B_DIGEST*)rsa);
-@@ -204,6 +220,7 @@ inline BYTE* pack_TPM2B_PUBLIC_KEY_RSA(BYTE* ptr, const TPM2B_PUBLIC_KEY_RSA *rs
- 
- #define unpack_TPM2B_PUBLIC_KEY_RSA(ptr, rsa)   unpack_TPM2B_DIGEST(ptr, (TPM2B_DIGEST*)rsa)
- 
-+static
- inline BYTE* pack_TPM2B_PRIVATE(BYTE* ptr, const TPM2B_PRIVATE *Private)
- {
-     ptr = pack_UINT16(ptr, Private->size);
-@@ -211,6 +228,7 @@ inline BYTE* pack_TPM2B_PRIVATE(BYTE* ptr, const TPM2B_PRIVATE *Private)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2B_PRIVATE(BYTE* ptr, TPM2B_PRIVATE *Private)
- {
-     ptr = unpack_UINT16(ptr, &Private->size);
-@@ -218,6 +236,7 @@ inline BYTE* unpack_TPM2B_PRIVATE(BYTE* ptr, TPM2B_PRIVATE *Private)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_PCR_SELECTION_ARRAY(BYTE* ptr, const TPMS_PCR_SELECTION *sel, UINT32 count)
- {
-     int i;
-@@ -229,6 +248,7 @@ inline BYTE* pack_TPMS_PCR_SELECTION_ARRAY(BYTE* ptr, const TPMS_PCR_SELECTION *
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMS_PCR_SELECTION_ARRAY(BYTE* ptr, TPMS_PCR_SELECTION *sel, UINT32 count)
- {
-     int i;
-@@ -240,6 +260,7 @@ inline BYTE* unpack_TPMS_PCR_SELECTION_ARRAY(BYTE* ptr, TPMS_PCR_SELECTION *sel,
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPML_PCR_SELECTION(BYTE* ptr, const TPML_PCR_SELECTION *sel)
- {
-     ptr = pack_UINT32(ptr, sel->count);
-@@ -247,6 +268,7 @@ inline BYTE* pack_TPML_PCR_SELECTION(BYTE* ptr, const TPML_PCR_SELECTION *sel)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPML_PCR_SELECTION(BYTE* ptr, TPML_PCR_SELECTION *sel)
- {
-     ptr = unpack_UINT32(ptr, &sel->count);
-@@ -254,6 +276,7 @@ inline BYTE* unpack_TPML_PCR_SELECTION(BYTE* ptr, TPML_PCR_SELECTION *sel)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPML_DIGEST(BYTE* ptr,TPML_DIGEST *digest)
- {
-     int i;
-@@ -265,6 +288,7 @@ inline BYTE* unpack_TPML_DIGEST(BYTE* ptr,TPML_DIGEST *digest)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_CREATION_DATA(BYTE* ptr,const TPMS_CREATION_DATA *data)
- {
-     ptr = pack_TPML_PCR_SELECTION(ptr, &data->pcrSelect);
-@@ -276,6 +300,7 @@ inline BYTE* pack_TPMS_CREATION_DATA(BYTE* ptr,const TPMS_CREATION_DATA *data)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMS_CREATION_DATA(BYTE* ptr, TPMS_CREATION_DATA *data)
- {
-     ptr = unpack_TPML_PCR_SELECTION(ptr, &data->pcrSelect);
-@@ -288,6 +313,7 @@ inline BYTE* unpack_TPMS_CREATION_DATA(BYTE* ptr, TPMS_CREATION_DATA *data)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2B_CREATION_DATA(BYTE* ptr, const TPM2B_CREATION_DATA *data )
- {
-     ptr = pack_UINT16(ptr, data->size);
-@@ -295,6 +321,7 @@ inline BYTE* pack_TPM2B_CREATION_DATA(BYTE* ptr, const TPM2B_CREATION_DATA *data
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2B_CREATION_DATA(BYTE* ptr, TPM2B_CREATION_DATA * data)
- {
-     ptr = unpack_UINT16(ptr, &data->size);
-@@ -302,6 +329,7 @@ inline BYTE* unpack_TPM2B_CREATION_DATA(BYTE* ptr, TPM2B_CREATION_DATA * data)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_SENSITIVE_CREATE(BYTE* ptr, const TPMS_SENSITIVE_CREATE *create)
- {
-     ptr = pack_TPM2B_AUTH(ptr, &create->userAuth);
-@@ -309,6 +337,7 @@ inline BYTE* pack_TPMS_SENSITIVE_CREATE(BYTE* ptr, const TPMS_SENSITIVE_CREATE *
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2B_SENSITIVE_CREATE(BYTE* ptr, const TPM2B_SENSITIVE_CREATE *create)
- {
-     BYTE* sizePtr = ptr;
-@@ -318,6 +347,7 @@ inline BYTE* pack_TPM2B_SENSITIVE_CREATE(BYTE* ptr, const TPM2B_SENSITIVE_CREATE
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMU_SYM_MODE(BYTE* ptr, const TPMU_SYM_MODE *p,
-                                 const TPMI_ALG_SYM_OBJECT *sel)
- {
-@@ -336,6 +366,7 @@ inline BYTE* pack_TPMU_SYM_MODE(BYTE* ptr, const TPMU_SYM_MODE *p,
-     }
-     return ptr;
- }
-+static
- inline BYTE* unpack_TPMU_SYM_MODE(BYTE* ptr, TPMU_SYM_MODE *p,
-                                   const TPMI_ALG_SYM_OBJECT *sel)
- {
-@@ -355,6 +386,7 @@ inline BYTE* unpack_TPMU_SYM_MODE(BYTE* ptr, TPMU_SYM_MODE *p,
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMU_SYM_KEY_BITS(BYTE* ptr, const TPMU_SYM_KEY_BITS *p,
-                                     const TPMI_ALG_SYM_OBJECT *sel)
- {
-@@ -376,6 +408,7 @@ inline BYTE* pack_TPMU_SYM_KEY_BITS(BYTE* ptr, const TPMU_SYM_KEY_BITS *p,
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMU_SYM_KEY_BITS(BYTE* ptr, TPMU_SYM_KEY_BITS *p,
-                                       const TPMI_ALG_SYM_OBJECT *sel)
- {
-@@ -397,6 +430,7 @@ inline BYTE* unpack_TPMU_SYM_KEY_BITS(BYTE* ptr, TPMU_SYM_KEY_BITS *p,
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMT_SYM_DEF_OBJECT(BYTE* ptr, const TPMT_SYM_DEF_OBJECT *p)
- {
-     ptr = pack_TPMI_ALG_SYM_OBJECT(ptr, &p->algorithm);
-@@ -405,6 +439,7 @@ inline BYTE* pack_TPMT_SYM_DEF_OBJECT(BYTE* ptr, const TPMT_SYM_DEF_OBJECT *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMT_SYM_DEF_OBJECT(BYTE *ptr, TPMT_SYM_DEF_OBJECT *p)
- {
-     ptr = unpack_TPMI_ALG_SYM_OBJECT(ptr, &p->algorithm);
-@@ -416,6 +451,7 @@ inline BYTE* unpack_TPMT_SYM_DEF_OBJECT(BYTE *ptr, TPMT_SYM_DEF_OBJECT *p)
- #define pack_TPMS_SCHEME_OAEP(p, t)     pack_TPMI_ALG_HASH(p, &((t)->hashAlg))
- #define unpack_TPMS_SCHEME_OAEP(p, t)   unpack_TPMI_ALG_HASH(p, &((t)->hashAlg))
- 
-+static
- inline BYTE* pack_TPMU_ASYM_SCHEME(BYTE *ptr, const TPMU_ASYM_SCHEME *p,
-                                    const TPMI_ALG_RSA_SCHEME *s)
- {
-@@ -438,6 +474,7 @@ inline BYTE* pack_TPMU_ASYM_SCHEME(BYTE *ptr, const TPMU_ASYM_SCHEME *p,
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMU_ASYM_SCHEME(BYTE *ptr, TPMU_ASYM_SCHEME *p,
-                                      const TPMI_ALG_RSA_SCHEME *s)
- {
-@@ -462,6 +499,7 @@ inline BYTE* unpack_TPMU_ASYM_SCHEME(BYTE *ptr, TPMU_ASYM_SCHEME *p,
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMT_RSA_SCHEME(BYTE* ptr, const TPMT_RSA_SCHEME *p)
- {
-     ptr = pack_TPMI_ALG_RSA_SCHEME(ptr, &p->scheme);
-@@ -469,6 +507,7 @@ inline BYTE* pack_TPMT_RSA_SCHEME(BYTE* ptr, const TPMT_RSA_SCHEME *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMT_RSA_SCHEME(BYTE* ptr, TPMT_RSA_SCHEME *p)
- {
-     ptr = unpack_TPMI_ALG_RSA_SCHEME(ptr, &p->scheme);
-@@ -476,6 +515,7 @@ inline BYTE* unpack_TPMT_RSA_SCHEME(BYTE* ptr, TPMT_RSA_SCHEME *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMT_RSA_DECRYPT(BYTE* ptr, const TPMT_RSA_DECRYPT *p)
- {
-     ptr = pack_TPMI_ALG_RSA_SCHEME(ptr, &p->scheme);
-@@ -483,6 +523,7 @@ inline BYTE* pack_TPMT_RSA_DECRYPT(BYTE* ptr, const TPMT_RSA_DECRYPT *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_RSA_PARMS(BYTE* ptr, const TPMS_RSA_PARMS *p)
- {
-     ptr = pack_TPMT_SYM_DEF_OBJECT(ptr, &p->symmetric);
-@@ -492,6 +533,7 @@ inline BYTE* pack_TPMS_RSA_PARMS(BYTE* ptr, const TPMS_RSA_PARMS *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMS_RSA_PARMS(BYTE *ptr, TPMS_RSA_PARMS *p)
- {
-     ptr = unpack_TPMT_SYM_DEF_OBJECT(ptr, &p->symmetric);
-@@ -501,6 +543,7 @@ inline BYTE* unpack_TPMS_RSA_PARMS(BYTE *ptr, TPMS_RSA_PARMS *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMU_PUBLIC_PARMS(BYTE* ptr, const TPMU_PUBLIC_PARMS *param,
-                                     const TPMI_ALG_PUBLIC *selector)
- {
-@@ -518,6 +561,7 @@ inline BYTE* pack_TPMU_PUBLIC_PARMS(BYTE* ptr, const TPMU_PUBLIC_PARMS *param,
-     return NULL;
- }
- 
-+static
- inline BYTE* unpack_TPMU_PUBLIC_PARMS(BYTE* ptr, TPMU_PUBLIC_PARMS *param,
-                                       const TPMI_ALG_PUBLIC *selector)
- {
-@@ -535,18 +579,21 @@ inline BYTE* unpack_TPMU_PUBLIC_PARMS(BYTE* ptr, TPMU_PUBLIC_PARMS *param,
-     return NULL;
- }
- 
-+static
- inline BYTE* pack_TPMS_ECC_POINT(BYTE* ptr, const TPMS_ECC_POINT *point)
- {
-     assert(false);
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMS_ECC_POINT(BYTE* ptr, TPMS_ECC_POINT *point)
- {
-     assert(false);
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMU_PUBLIC_ID(BYTE* ptr, const TPMU_PUBLIC_ID *id,
-                                  const TPMI_ALG_PUBLIC *selector)
- {
-@@ -564,6 +611,7 @@ inline BYTE* pack_TPMU_PUBLIC_ID(BYTE* ptr, const TPMU_PUBLIC_ID *id,
-     return NULL;
- }
- 
-+static
- inline BYTE* unpack_TPMU_PUBLIC_ID(BYTE* ptr, TPMU_PUBLIC_ID *id, TPMI_ALG_PUBLIC *selector)
- {
-     switch (*selector) {
-@@ -580,6 +628,7 @@ inline BYTE* unpack_TPMU_PUBLIC_ID(BYTE* ptr, TPMU_PUBLIC_ID *id, TPMI_ALG_PUBLI
-     return NULL;
- }
- 
-+static
- inline BYTE* pack_TPMT_PUBLIC(BYTE* ptr, const TPMT_PUBLIC *public)
- {
-     ptr = pack_TPMI_ALG_PUBLIC(ptr, &public->type);
-@@ -591,6 +640,7 @@ inline BYTE* pack_TPMT_PUBLIC(BYTE* ptr, const TPMT_PUBLIC *public)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMT_PUBLIC(BYTE* ptr, TPMT_PUBLIC *public)
- {
-     ptr = unpack_TPMI_ALG_PUBLIC(ptr, &public->type);
-@@ -602,6 +652,7 @@ inline BYTE* unpack_TPMT_PUBLIC(BYTE* ptr, TPMT_PUBLIC *public)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2B_PUBLIC(BYTE* ptr, const TPM2B_PUBLIC *public)
- {
-     BYTE *sizePtr = ptr;
-@@ -611,6 +662,7 @@ inline BYTE* pack_TPM2B_PUBLIC(BYTE* ptr, const TPM2B_PUBLIC *public)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2B_PUBLIC(BYTE* ptr, TPM2B_PUBLIC *public)
- {
-     ptr = unpack_UINT16(ptr, &public->size);
-@@ -618,6 +670,7 @@ inline BYTE* unpack_TPM2B_PUBLIC(BYTE* ptr, TPM2B_PUBLIC *public)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_PCR_SELECTION(BYTE* ptr, const TPMS_PCR_SELECTION *selection)
- {
-     ptr = pack_TPMI_ALG_HASH(ptr, &selection->hash);
-@@ -626,6 +679,7 @@ inline BYTE* pack_TPMS_PCR_SELECTION(BYTE* ptr, const TPMS_PCR_SELECTION *select
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_PCR_SELECTION_Array(BYTE* ptr, const TPMS_PCR_SELECTION *selections,
-                                            const UINT32 cnt)
- {
-@@ -635,6 +689,7 @@ inline BYTE* pack_TPMS_PCR_SELECTION_Array(BYTE* ptr, const TPMS_PCR_SELECTION *
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM_AuthArea(BYTE* ptr, const TPM_AuthArea *auth)
- {
-     BYTE* sizePtr = ptr;
-@@ -647,6 +702,7 @@ inline BYTE* pack_TPM_AuthArea(BYTE* ptr, const TPM_AuthArea *auth)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM_AuthArea(BYTE* ptr, TPM_AuthArea *auth)
- {
-     ptr = unpack_UINT32(ptr, &auth->size);
-@@ -657,6 +713,7 @@ inline BYTE* unpack_TPM_AuthArea(BYTE* ptr, TPM_AuthArea *auth)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2_RSA_KEY(BYTE* ptr, const TPM2_RSA_KEY *key)
- {
-     ptr = pack_TPM2B_PRIVATE(ptr, &key->Private);
-@@ -664,6 +721,7 @@ inline BYTE* pack_TPM2_RSA_KEY(BYTE* ptr, const TPM2_RSA_KEY *key)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2_RSA_KEY(BYTE* ptr, TPM2_RSA_KEY *key)
- {
-     ptr = unpack_TPM2B_PRIVATE(ptr, &key->Private);
-diff --git a/stubdom/vtpmmgr/tpmrsa.h b/stubdom/vtpmmgr/tpmrsa.h
-index 08213bbb7a..65fd32a45c 100644
---- a/stubdom/vtpmmgr/tpmrsa.h
-+++ b/stubdom/vtpmmgr/tpmrsa.h
-@@ -62,6 +62,7 @@ TPM_RESULT tpmrsa_pub_encrypt_oaep( tpmrsa_context *ctx,
-       unsigned char *output );
- 
- /* free tpmrsa key */
-+static
- inline void tpmrsa_free( tpmrsa_context *ctx ) {
-    mpi_free( &ctx->RN ); mpi_free( &ctx->E  ); mpi_free( &ctx->N  );
- }
-
-_______________________________________________
-Xen-devel mailing list
-Xen-devel@lists.xen.org
-https://lists.xen.org/xen-devel
diff --git a/pcr/xen/patch-ipxe-patches-series.patch b/pcr/xen/patch-ipxe-patches-series.patch
deleted file mode 100644
index 30e916417..000000000
--- a/pcr/xen/patch-ipxe-patches-series.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: [PATCH] Fix gcc7 warn
-
----
- tools/firmware/etherboot/patches/series | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tools/firmware/etherboot/patches/series b/tools/firmware/etherboot/patches/series
-index 86cb300..780c6c6 100644
---- a/tools/firmware/etherboot/patches/series
-+++ b/tools/firmware/etherboot/patches/series
-@@ -1 +1,4 @@
- boot_prompt_option.patch
-+patch-inbuild-ipxe-gcc7-implicit-fallthrough.patch
-+patch-inbuild-ipxe-gcc7-implicit-fallthrough-ath5k.patch
-+patch-inbuild-ipxe-gcc7-implicit-fallthrough-curses.patch
--- 
-2.13.0
-
diff --git a/pcr/xen/patch-ovmf-apply-inbuild-patches.patch b/pcr/xen/patch-ovmf-apply-inbuild-patches.patch
deleted file mode 100644
index 2c2f3ed75..000000000
--- a/pcr/xen/patch-ovmf-apply-inbuild-patches.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 088d0d605131eeb43dc1c4ab21631ea7e51f8501 Mon Sep 17 00:00:00 2001
-From: John Thomson <git@johnthomson.fastmail.com.au>
-Date: Sat, 24 Jun 2017 09:38:13 +1000
-Subject: [PATCH] Fix OVMF apply patches series
-
----
- tools/firmware/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
-index a5a6802..875e7e5 100644
---- a/tools/firmware/Makefile
-+++ b/tools/firmware/Makefile
-@@ -20,6 +20,9 @@ ovmf-dir:
- 	sed 's|python |python2 |g' -i "ovmf-dir/BaseTools/BinWrappers/PosixLike"/* || true
- 	sed 's|python |python2 |g' -i "ovmf-dir/BaseTools/Tests/GNUmakefile"
- 	cp ovmf-makefile ovmf-dir/Makefile;
-+	for i in $$(cat ovmf-patches/series); do \
-+		patch -d ovmf-dir -Np1 < ovmf-patches/$$i || exit 1; \
-+	done
- 
- seabios-dir:
- 	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir
--- 
-2.13.1
-
diff --git a/pcr/xen/patch-ovmf-patches-series.patch b/pcr/xen/patch-ovmf-patches-series.patch
deleted file mode 100644
index 0f230e504..000000000
--- a/pcr/xen/patch-ovmf-patches-series.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 30f9f61c42b9530332a856a5bc09db52c446289d Mon Sep 17 00:00:00 2001
-From: John Thomson <git@johnthomson.fastmail.com.au>
-Date: Sat, 24 Jun 2017 09:48:02 +1000
-Subject: [PATCH] Add ovmf patches series file
-
----
- tools/firmware/ovmf-patches/series | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 tools/firmware/ovmf-patches/series
-
-diff --git a/tools/firmware/ovmf-patches/series b/tools/firmware/ovmf-patches/series
-new file mode 100644
-index 0000000..ac6bda5
---- /dev/null
-+++ b/tools/firmware/ovmf-patches/series
-@@ -0,0 +1 @@
-+patch-inbuild-ovmf-5-hiilib.c-pointer-zero.patch
--- 
-2.13.1
-
diff --git a/pcr/xen/xen.install b/pcr/xen/xen.install
index f629e6643..2c03573e7 100644
--- a/pcr/xen/xen.install
+++ b/pcr/xen/xen.install
@@ -34,7 +34,6 @@ GRUB_DEFAULT="xen-gnulinux-simple-a-unique-id-from-your-grub-goes-here"
 run grub-mkconfig
 
 ##########
-
 Direct EFI boot preperation:
 Create a xen.cfg file in the same directory as xen.efi.
 These need to be in ESP, or in a directory accessible from you EFI bootloader.
@@ -54,6 +53,7 @@ install_msg() {
 
 In order to complete the installation, and enable Xen,
 at the very least you must:
+
 1. Configure your bootloader to boot Xen:
 __EOF__
     xen_boot