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

28 files changed, 523 insertions, 330 deletions

diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index 583c62d64..b464d7f76 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -10,11 +10,11 @@ _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=4.13
-  _archrel=74
+  _archrel=75
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
-  _archrel=48
+  _archrel=49
   _parabolarel=1
 fi
 
diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD
index 9fd3bb793..1555321f6 100644
--- a/libre/bbswitch/PKGBUILD
+++ b/libre/bbswitch/PKGBUILD
@@ -10,11 +10,11 @@ _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=4.13
-  _archrel=80
+  _archrel=81
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
-  _archrel=37
+  _archrel=38
   _parabolarel=1
 fi
 
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 54b6f398a..250c1e861 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -9,8 +9,8 @@
 # Maintainer: Jesús E.<heckyel@parabola.nu>
 
 pkgname=calibre
-_commit="d695ad008a67de9753d79b0144125031713fa851"
-pkgver=3.9.0
+_commit="ae325d5a4d41e7f6cb61773b7ac6dfbf0e778983"
+pkgver=3.10.0
 pkgrel=1.parabola1
 _mathjax_ver=2.6.1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
@@ -32,9 +32,9 @@ source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/Megver83/calibre/repository
         "$pkgname-$pkgver.tar.gz.sig::https://gitlab.com/Megver83/calibre/raw/signatures/$pkgname-$pkgver-${_commit}.tar.gz.sig"
         "$pkgname-translations.zip::https://github.com/kovidgoyal/${pkgname}-translations/archive/master.zip"
         "MathJax-${_mathjax_ver}.tar.gz::https://github.com/kovidgoyal/MathJax/archive/${_mathjax_ver}.tar.gz")
-sha512sums=('90cfa8e9d76e2c8d6ff2338d37335dd41cdf9a2d2290bee1bb60cb97106f5a7783d0bbbde1a0bbc55ecbf8b8c302dc79c24dd800a3976426ce59a52019bb6aa7'
+sha512sums=('693b7ecd0ddf6cc9dea0ccbea6e9ea33b6da33f4add4581f9e360b0970a5655fec4c88b1d9a112430c7ece9951cd13b73634949095bb545f185e1efa6b2082a2'
             'SKIP'
-            '787916c15ee3edd73b435ea8dbb6e7274fd105231278dd605866768a6113f47a2e5b019eb2833d4e376457c1c29a68d34a64b2a45d1af3174e61ed513458b1cc'
+            'd03ea1a2426088caee4dce1a339e54c8634bb0469c78788b2653d50e0df7ab12ccaba18fe6170874799172d46011cbc4200401f02b68c5ce3ec1988d6db82018'
             '23e1f08cc8df16f27eb9316e3e2975bdf716d3205907dc55fa907282d70de4d7637e930a42f1bc002622d5831093efdc68c22be6f0512d4dedc7c0d8cda3230c')
 validpgpkeys=('6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
               '916FFBC76D2E641BA416BA53364F4E1483446AC5' # Jesús E.
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch
deleted file mode 100644
index b620a39d0..000000000
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
---- a/util/grub.d/10_linux.in	2015-10-16 08:28:56.901970897 -0300
-+++ b/util/grub.d/10_linux.in	2015-10-16 08:30:45.112786124 -0300
-@@ -139,6 +139,25 @@
- 	initrd	${rel_dirname}/${initrd}
- EOF
-   fi
-+  if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then
-+    if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then
-+    # TRANSLATORS: Device tree path isn't identifier. Should be translated.
-+    message="$(gettext_printf "Loading devices tree file ...")"
-+    sed "s/^/$submenu_indentation/" << EOF
-+	echo	'$(echo "$message" | grub_quote)'
-+	devicetree	${rel_dirname}/dtbs/${version}/am335x-bone.dtb
-+EOF
-+    fi
-+  elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then
-+    if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then
-+    # TRANSLATORS: Device tree path isn't identifier. Should be translated.
-+    message="$(gettext_printf "Loading devices tree file ...")"
-+    sed "s/^/$submenu_indentation/" << EOF
-+	echo	'$(echo "$message" | grub_quote)'
-+	devicetree	${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb
-+EOF
-+    fi
-+  fi
-   sed "s/^/$submenu_indentation/" << EOF
- }
- EOF
-@@ -222,6 +241,16 @@
-     linux_root_device_thisversion=${GRUB_DEVICE}
-   fi
- 
-+  if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then
-+    if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then
-+      gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2
-+    fi
-+  elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then
-+    if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then
-+      gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2
-+    fi
-+  fi
-+
-   if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
-     linux_entry "${OS}" "${version}" simple \
-     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
---- a/util/grub.d/20_linux_xen.in	2015-10-16 08:28:56.901970897 -0300
-+++ b/util/grub.d/20_linux_xen.in	2015-10-16 08:31:03.152921373 -0300
-@@ -132,6 +132,25 @@
- 	module	--nounzip   ${rel_dirname}/${initrd}
- EOF
-   fi
-+  if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then
-+    if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then
-+    # TRANSLATORS: Device tree path isn't identifier. Should be translated.
-+    message="$(gettext_printf "Loading devices tree file ...")"
-+    sed "s/^/$submenu_indentation/" << EOF
-+	echo	'$(echo "$message" | grub_quote)'
-+	devicetree	${rel_dirname}/dtbs/${version}/am335x-bone.dtb
-+EOF
-+    fi
-+  elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then
-+    if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then
-+    # TRANSLATORS: Device tree path isn't identifier. Should be translated.
-+    message="$(gettext_printf "Loading devices tree file ...")"
-+    sed "s/^/$submenu_indentation/" << EOF
-+	echo	'$(echo "$message" | grub_quote)'
-+	devicetree	${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb
-+EOF
-+    fi
-+  fi
-   sed "s/^/$submenu_indentation/" << EOF
- }
- EOF
-@@ -235,6 +254,16 @@
- 	    linux_root_device_thisversion=${GRUB_DEVICE}
- 	fi
- 
-+  if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then
-+    if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then
-+      gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2
-+    fi
-+  elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then
-+    if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then
-+      gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2
-+    fi
-+  fi
-+
- 	if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
- 	    linux_entry "${OS}" "${version}" "${xen_version}" simple \
- 		"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
diff --git a/libre/grub/0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch b/libre/grub/0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch
new file mode 100644
index 000000000..22d62926f
--- /dev/null
+++ b/libre/grub/0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch
@@ -0,0 +1,140 @@
+From 734668238fcc0ef691a080839e04f33854fa133a Mon Sep 17 00:00:00 2001
+From: Eric Biggers <ebiggers@google.com>
+Date: Thu, 29 Jun 2017 13:27:49 +0000
+Subject: Allow GRUB to mount ext2/3/4 filesystems that have the encryption
+ feature.
+
+On such a filesystem, inodes may have EXT4_ENCRYPT_FLAG set.
+For a regular file, this means its contents are encrypted; for a
+directory, this means the filenames in its directory entries are
+encrypted; and for a symlink, this means its target is encrypted.  Since
+GRUB cannot decrypt encrypted contents or filenames, just issue an error
+if it would need to do so.  This is sufficient to allow unencrypted boot
+files to co-exist with encrypted files elsewhere on the filesystem.
+
+(Note that encrypted regular files and symlinks will not normally be
+encountered outside an encrypted directory; however, it's possible via
+hard links, so they still need to be handled.)
+
+Tested by booting from an ext4 /boot partition on which I had run
+'tune2fs -O encrypt'.  I also verified that the expected error messages
+are printed when trying to access encrypted directories, files, and
+symlinks from the GRUB command line.  Also ran 'sudo ./grub-fs-tester
+ext4_encrypt'; note that this requires e2fsprogs v1.43+ and Linux v4.1+.
+
+Signed-off-by: Eric Biggers <ebiggers@google.com>
+---
+ grub-core/fs/ext2.c          | 23 ++++++++++++++++++++++-
+ tests/ext234_test.in         |  1 +
+ tests/util/grub-fs-tester.in | 10 ++++++++++
+ 3 files changed, 33 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index cdce63b..b8ad75a 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -102,6 +102,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
+ #define EXT4_FEATURE_INCOMPAT_MMP		0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
++#define EXT4_FEATURE_INCOMPAT_ENCRYPT          0x10000
+ 
+ /* The set of back-incompatible features this driver DOES support. Add (OR)
+  * flags here as the related features are implemented into the driver.  */
+@@ -109,7 +110,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
+                                        | EXT4_FEATURE_INCOMPAT_EXTENTS  \
+                                        | EXT4_FEATURE_INCOMPAT_FLEX_BG \
+                                        | EXT2_FEATURE_INCOMPAT_META_BG \
+-                                       | EXT4_FEATURE_INCOMPAT_64BIT)
++                                       | EXT4_FEATURE_INCOMPAT_64BIT \
++                                       | EXT4_FEATURE_INCOMPAT_ENCRYPT)
+ /* List of rationales for the ignored "incompatible" features:
+  * needs_recovery: Not really back-incompatible - was added as such to forbid
+  *                 ext2 drivers from mounting an ext3 volume with a dirty
+@@ -138,6 +140,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define EXT3_JOURNAL_FLAG_DELETED	4
+ #define EXT3_JOURNAL_FLAG_LAST_TAG	8
+ 
++#define EXT4_ENCRYPT_FLAG              0x800
+ #define EXT4_EXTENTS_FLAG		0x80000
+ 
+ /* The ext2 superblock.  */
+@@ -706,6 +709,12 @@ grub_ext2_read_symlink (grub_fshelp_node_t node)
+       grub_ext2_read_inode (diro->data, diro->ino, &diro->inode);
+       if (grub_errno)
+ 	return 0;
++
++      if (diro->inode.flags & grub_cpu_to_le32_compile_time (EXT4_ENCRYPT_FLAG))
++       {
++         grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "symlink is encrypted");
++         return 0;
++       }
+     }
+ 
+   symlink = grub_malloc (grub_le_to_cpu32 (diro->inode.size) + 1);
+@@ -749,6 +758,12 @@ grub_ext2_iterate_dir (grub_fshelp_node_t dir,
+ 	return 0;
+     }
+ 
++  if (diro->inode.flags & grub_cpu_to_le32_compile_time (EXT4_ENCRYPT_FLAG))
++    {
++      grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "directory is encrypted");
++      return 0;
++    }
++
+   /* Search the file.  */
+   while (fpos < grub_le_to_cpu32 (diro->inode.size))
+     {
+@@ -859,6 +874,12 @@ grub_ext2_open (struct grub_file *file, const char *name)
+ 	goto fail;
+     }
+ 
++  if (fdiro->inode.flags & grub_cpu_to_le32_compile_time (EXT4_ENCRYPT_FLAG))
++    {
++      err = grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "file is encrypted");
++      goto fail;
++    }
++
+   grub_memcpy (data->inode, &fdiro->inode, sizeof (struct grub_ext2_inode));
+   grub_free (fdiro);
+ 
+diff --git a/tests/ext234_test.in b/tests/ext234_test.in
+index 892b99c..4f1eb52 100644
+--- a/tests/ext234_test.in
++++ b/tests/ext234_test.in
+@@ -30,3 +30,4 @@ fi
+ "@builddir@/grub-fs-tester" ext3
+ "@builddir@/grub-fs-tester" ext4
+ "@builddir@/grub-fs-tester" ext4_metabg
++"@builddir@/grub-fs-tester" ext4_encrypt
+diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
+index 88cbe73..fd7e0f1 100644
+--- a/tests/util/grub-fs-tester.in
++++ b/tests/util/grub-fs-tester.in
+@@ -156,6 +156,12 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
+ 		# Could go further but what's the point?
+ 	    MAXBLKSIZE=$((65536*1024))
+ 	    ;;
++       xext4_encrypt)
++           # OS LIMITATION: Linux currently only allows the 'encrypt' feature
++           # in combination with block_size = PAGE_SIZE (4096 bytes on x86).
++           MINBLKSIZE=$(getconf PAGE_SIZE)
++           MAXBLKSIZE=$MINBLKSIZE
++           ;;
+ 	xext*)
+ 	    MINBLKSIZE=1024
+ 	    if [ $MINBLKSIZE -lt $SECSIZE ]; then
+@@ -796,6 +802,10 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
+ 		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext4" -O meta_bg,^resize_inode -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}"
+ 		    MOUNTFS=ext4
+ 		    ;;
++               xext4_encrypt)
++                   MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext4" -O encrypt -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}"
++                   MOUNTFS=ext4
++                   ;;
+ 		xext*)
+ 		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.$fs" -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;;
+ 		xxfs)
+-- 
+cgit v1.0-41-gc330
+
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 30aa70888..a2628e2dd 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -2,8 +2,9 @@
 # Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # Contributor (Arch): Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 ## '1' to enable Xen support, '0' to disable
 _XEN='1'
@@ -19,7 +20,7 @@ _GRUB_EMU_BUILD='0'
 
 _GRUB_EXTRAS_COMMIT=f2a079441939eee7251bf141986cdd78946e1d20
 
-_UNIFONT_VER='9.0.06'
+_UNIFONT_VER='10.0.06'
 
 [[ "${CARCH}" = 'armv7h' ]] && _EFI_ARCH='arm'
 [[ "${CARCH}" = 'x86_64' ]] && _EFI_ARCH='x86_64'
@@ -38,7 +39,7 @@ pkgname=('grub')
                                    'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab')
 pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)'
 pkgver='2.02'
-pkgrel='1.parabola1.2'
+pkgrel='3.parabola1'
 epoch='2'
 url='https://www.gnu.org/software/grub/'
 arch=('x86_64' 'i686' 'armv7h')
@@ -72,11 +73,12 @@ elif [[ "${CARCH}" = 'armv7h' ]]; then
 	replaces=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}")
 fi
 
-source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
-        "grub-extras::git+git://git.sv.gnu.org/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}"
+source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+        "https://git.savannah.nongnu.org/cgit/grub-extras.git/snapshot/grub-extras-${_GRUB_EXTRAS_COMMIT}.tar.gz"
         "https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig}
         '0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch'
         '0004-add-GRUB_COLOR_variables.patch'
+        '0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch'
         'grub.default'
         '0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch'
         '0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch'
@@ -85,20 +87,21 @@ source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
         '0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch'
         '0003-10_linux-20_linux_xen-rebrand-free-distros.patch')
 
-sha512sums=('cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088'
+sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
             'SKIP'
+            '2844601914cea6b1231eca0104853a93c4d67a5209933a0766f1475953300646'
+            '0d81571fc519573057b7641d26a31ead55cc0b02a931589fb346a3a534c3dcc1'
             'SKIP'
-            'dac2becc7fa76847231ce30a4b9e22fc9d45fb50846fc7f25611c5c2cbedc31e7745d9295bab3eb7a01efad4f1f2f1161c98efa60048e756421075220817f4b8'
-            'SKIP'
-            '3529ab4d08a4165e081c49dfc1cf40079ad9a1b9dd7ab6d39147fc347cb6aa615fd90292ecd5ecbfb543bf444bef27043a2392029d0210f9b4a6369365d3da1b'
-            '0ae2f50a397268ea0ff46faa180e699ba956acaa68504d9dde7c33ab194430df57c2e2e5f9fe30b6c31e7806666faad4b274747ba151035e338bcaab3d875c3e'
-            '96e49cf3d783f5c8caffd60ea6e72112a12854519dc89a18938f372f7413b3fe99339ed8ad9d660ba457e67436cf7c444dc852455b90efa5546729180b88c3a8'
-            '04262a4a95fa58967e147e39ea71b08cc99aa32a1f0357c46292743f3ea8c05a6ff6fcfc3516a9b61a2a3050781017ed2cabf53fc327b39f7e957d0ddf778165'
-            'a406ec5a83d1c03dadc1444d91f1b5e682bc74562dcf6e455009d043015dc2316509517f61c76e2ffec4dce5d03702ae47f2dd9b25671a4d7889e2744b090631'
-            '46fb2eeb2856bbdda8e115fc9beb61744e3a0bc9a178ec5d01c36a429691ca2362925382eca3144f2ee2438e69e508043d8f2445a6bef79e63e455fb08293426'
-            '55fb8ea488bb0936a4830eab943cdde986f351796cea259403fa947605c9d39526e0aec987da118cc6cf4c3bbe2a56326a218fbb0709ee7717a62a36a3d31697'
-            '378635a2a8a685f4efd300f19d7f2192dc664fd16811953520e0d49d90a5af377fa0dc45e0d2abc0d9f6750cd4cf885d6ef54445f7e8d3ed0025f2d087351bfc'
-            'eced721bab4256b9afb322cda7b599ac1cae9dfe2effd1d86569bd3bef056cab80783da25181e627abc2422f4048200ae8b46c7dfe5df4441a55ae00434cd172')
+            '3f68a78ecba0284b9d39af60431236cb2ebc8547d3dc1fb26a1ac7a6b9afbbc7'
+            'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
+            '535422c510a050d41efe7720dbe54de29e04bdb8f86fd5aea5feb0b24f7abe46'
+            '959f3d8d65d9504df798924554c3de0e92dfcd39e087b099a5f5e0a9b7885102'
+            '9ece1db537a989ce4dc55ece471883e19b8ab16902f8c4feb68436c3b5700f71'
+            'de71452b9b0fbfb08ea742e9fa217ab34fddf6312452f155fb9d82ebf1c024a5'
+            '222da944b4af43a1d86be0e3d91f2e1a82324fa51c7ad36cc25246ffa3739ab1'
+            '9002c69e74143553ef8cdd32ca04e8bdcb7a1a0ba1c4564163bae061fe68d855'
+            '6584a0dda9dbf6d70dbdfba619abbb628b1a092bd61d6d05e462d6771354223b'
+            '7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4')
 
 validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209'  # Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
               '95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy
@@ -113,6 +116,9 @@ prepare() {
 	## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
 	patch -Np1 -i "${srcdir}/0004-add-GRUB_COLOR_variables.patch"
 
+	msg "Patch to allow GRUB to mount ext2/3/4 filesystems that have the encryption feature"
+	patch -Np1 -i "${srcdir}/0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch"
+
 	msg 'Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme'
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
 
@@ -128,12 +134,14 @@ prepare() {
 	msg 'Remove not working langs which need LC_ALL=C.UTF-8'
 	sed -e 's#en@cyrillic en@greek##g' -i "po/LINGUAS"
 
-	msg 'Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847'
+	msg "Avoid problem with unifont during compile of grub"
+        # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847
 	cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "unifont.bdf"
 
 	msg "Add the grub-extra sources for BIOS build"
 	install -d "grub-extras"
-	cp -r "${srcdir}/grub-extras/915resolution" "grub-extras/915resolution"
+	cp -r "${srcdir}/grub-extras-${_GRUB_EXTRAS_COMMIT}/915resolution" \
+		"grub-extras/915resolution"
 	export GRUB_CONTRIB="${srcdir}/grub-${pkgver}/grub-extras/"
 }
 
diff --git a/libre/grub/grub.default b/libre/grub/grub.default
index 56585a47d..af9d70ca9 100644
--- a/libre/grub/grub.default
+++ b/libre/grub/grub.default
@@ -1,3 +1,5 @@
+# GRUB boot loader configuration
+
 GRUB_DEFAULT=0
 GRUB_TIMEOUT=5
 GRUB_DISTRIBUTOR="Parabola"
@@ -7,6 +9,9 @@ GRUB_CMDLINE_LINUX=""
 # Preload both GPT and MBR modules so that they are not missed
 GRUB_PRELOAD_MODULES="part_gpt part_msdos"
 
+# Uncomment to enable booting from LUKS encrypted devices
+#GRUB_ENABLE_CRYPTODISK=y
+
 # Uncomment to enable Hidden Menu, and optionally hide the timeout count
 #GRUB_HIDDEN_TIMEOUT=5
 #GRUB_HIDDEN_TIMEOUT_QUIET=true
@@ -25,14 +30,14 @@ GRUB_GFXMODE=auto
 # Uncomment to allow the kernel use the same resolution used by grub
 GRUB_GFXPAYLOAD_LINUX=keep
 
-# Uncomment if you want GRUB to pass to the Linux kernel the old parameter 
-# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" 
+# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
+# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
 #GRUB_DISABLE_LINUX_UUID=true
 
 # Uncomment to disable generation of recovery mode menu entries
 GRUB_DISABLE_RECOVERY=true
 
-# Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
+# Uncomment and set to the desired menu colors.  Used by normal and wallpaper
 # modes only.  Entries specified as foreground/background.
 GRUB_COLOR_NORMAL="magenta/black"
 GRUB_COLOR_HIGHLIGHT="white/magenta"
@@ -44,6 +49,8 @@ GRUB_COLOR_HIGHLIGHT="white/magenta"
 # Uncomment to get a beep at GRUB start
 #GRUB_INIT_TUNE="480 440 1"
 
+# Uncomment to make GRUB remember the last selection. This requires to
+# set 'GRUB_DEFAULT=saved' above.
 #GRUB_SAVEDEFAULT="true"
 
 # Disable advanced submenu
diff --git a/libre/icecat-ublock-origin/PKGBUILD b/libre/icecat-ublock-origin/PKGBUILD
index 333152e91..1e1775298 100644
--- a/libre/icecat-ublock-origin/PKGBUILD
+++ b/libre/icecat-ublock-origin/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
 
 pkgname=icecat-ublock-origin
-pkgver=1.14.14
+pkgver=1.14.16
 pkgrel=1
 pkgdesc='An efficient blocker add-on for various browsers. Fast, potent, and lean.'
 url=https://github.com/gorhill/uBlock
@@ -17,7 +17,7 @@ replaces=('icecat-adblock-plus')
 groups=('icecat-addons')
 source=("https://github.com/gorhill/uBlock/releases/download/$pkgver/uBlock0.firefox.xpi")
 noextract=("${source##*/}")
-sha256sums=('de45492595cf5a045825430c319ad57bbb6a9f90dbf10926fcdaae532e54bd7a')
+sha256sums=('e9fb28bb643556c920309d2170dbed87e0ec8921bf8cc9c5d9223fcc2556da90')
 
 
 package() {
diff --git a/libre/icedtea-web/PKGBUILD b/libre/icedtea-web/PKGBUILD
index 74341a9d9..300780bad 100644
--- a/libre/icedtea-web/PKGBUILD
+++ b/libre/icedtea-web/PKGBUILD
@@ -1,15 +1,16 @@
-# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>
+# Contributor (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Isaac David <isacdaavid () isacdaavid!info>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.6.2
-pkgrel=2.parabola1
+pkgver=1.7
+pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 url='http://icedtea.classpath.org/wiki/IcedTea-Web'
 license=('GPL2')
-makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit'
+makedepends=('java-environment-openjdk=8' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit'
              'epiphany')
 case "$CARCH" in
   i686|x86_64) makedepends+=('iceweasel') ;;
@@ -18,8 +19,10 @@ esac
 optdepends=('rhino: for using proxy auto config files')
 # Due to broken path names in the tarball that fails with LANG=C in our chroot
 noextract=("${pkgbase}-${pkgver}.tar.gz")
-source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz)
-sha256sums=('ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300')
+source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz{,.sig})
+validpgpkeys=('C058EF1E749812E6A486384B53B5CFF671EEED59') # Jiri Vanek <jvanek@redhat.com>
+sha256sums=('2030ea323964ae82eabe5436eef076de4b892786424ad9be21f3abc9d76c0291'
+            'SKIP')
 
 prepare() {
   cd "${srcdir}"
@@ -58,7 +61,6 @@ package_icedtea-web() {
   depends=('java-runtime-openjdk' 'desktop-file-utils')
   provides=('java-web-start')
   replaces=('icedtea-web-java7')
-  install=install_${pkgname}.sh
 
   cd "${srcdir}"/${pkgbase}-${pkgver}
   # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
diff --git a/libre/icedtea-web/install_icedtea-web.sh b/libre/icedtea-web/install_icedtea-web.sh
deleted file mode 100644
index 80312d4a6..000000000
--- a/libre/icedtea-web/install_icedtea-web.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/libre/iceweasel-ublock-origin/PKGBUILD b/libre/iceweasel-ublock-origin/PKGBUILD
index 1b1f299bd..a42323d55 100644
--- a/libre/iceweasel-ublock-origin/PKGBUILD
+++ b/libre/iceweasel-ublock-origin/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
 
 pkgname=iceweasel-ublock-origin
-pkgver=1.14.14
+pkgver=1.14.16
 pkgrel=1
 pkgdesc='An efficient blocker add-on for various browsers. Fast, potent, and lean.'
 url=https://github.com/gorhill/uBlock
@@ -17,7 +17,7 @@ replaces=('firefox-ublock-origin' 'firefox-adblock-plus' 'iceweasel-adblock-plus
 groups=('iceweasel-addons')
 source=("https://github.com/gorhill/uBlock/releases/download/$pkgver/uBlock0.webext.xpi")
 noextract=("${source##*/}")
-sha256sums=('820ed258a2c2134d672c43cfa050936eb9dd89a81af25f72b3d59e7a777634f7')
+sha256sums=('9796cc2a463567212ed69d7b6d0caad65ad1c4cd52e7fb7827182980bf6bf9b6')
 
 
 package() {
diff --git a/libre/java-common/PKGBUILD b/libre/java-common/PKGBUILD
index 0a9cbe958..ffc988808 100644
--- a/libre/java-common/PKGBUILD
+++ b/libre/java-common/PKGBUILD
@@ -1,14 +1,16 @@
 # Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 pkgname=java-runtime-common
 pkgbase=java-common
-pkgver=2
-pkgrel=2.parabola2
+pkgver=3
+pkgrel=1.parabola1
 pkgdesc='Common files for Java Runtime Environments (Parabola rebranded)'
 arch=('any')
-url='www.parabola.nu'
+url='https://www.parabola.nu/packages/libre/any/java-runtime-common/'
 license=('GPL')
 checkdepends=('wget')
+_shunitver=2.1.6
 conflicts=('java-common')
 replaces=('java-common')
 backup=(etc/profile.d/jre.sh
@@ -18,16 +20,17 @@ source=(profile_jre.csh
         profile_jre.sh
         bin_parabola-java
         test_parabola-java
-        https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz)
+        shunit2-${_shunitver}.tar.gz::https://github.com/kward/shunit2/archive/source.tar.gz)
 
 sha256sums=('fb981764fbdcb33976085405d002a1427b5401da5f13f1dd00008dbe8306583a'
             '36e07f9387f24ff0c6dff1b4c6d9011eedef4bd22634e0c5a6335817991dc151'
-            '103e0cbd0dd3b11376ba61e743f481f1a720c336f7b67d09a6b189f988e2fe6e'
-            '6e0f4173d4cfaad5ab0ed953fad770ee70b355349304c3bd34043edf0b6a7ab5'
-            '65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee')
+            'b5d2bbbad708a84d4f2674dcba9053d777c735130843f6f924f063f456f2601d'
+            'aab03dee5a3567c12d1af30374486aeaa6e317404ecf018dcb675124225f5853'
+            '6beca93d20b72b46083c8271c4cf1da21b45f250a92b401c2565c65e1d75138f')
 
 check() {
   cd "${srcdir}"
+  ln -s shunit2-source/${_shunitver} shunit2
   ./test_parabola-java
 }
 
@@ -47,7 +50,7 @@ package() {
   # Official list of binaries that Java headless runtime packages MUST provide
   # This list is based on Parabola' default Java implementation: "OpenJDK 7 Icedtea"
   for b in \
-    java keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200;
+    java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200;
   do
     ln -s /usr/lib/jvm/default-runtime/bin/${b} "${pkgdir}/usr/bin/${b}"
   done
diff --git a/libre/java-common/bin_parabola-java b/libre/java-common/bin_parabola-java
index 47f410096..7039f0f8f 100755
--- a/libre/java-common/bin_parabola-java
+++ b/libre/java-common/bin_parabola-java
@@ -45,7 +45,7 @@ get_default_java() {
 get_installed_javas() {
   if [ -d ${JVM_DIR} ]; then
     for dir in $(find ${JVM_DIR} -mindepth 1 -maxdepth 1 -type d | sort); do
-      if [ -x ${dir}/bin/javac ]; then
+      if [ -x ${dir}/bin/java ]; then
         javas+=(${dir/${JVM_DIR}\/})
       else
         if [ -x ${dir}/jre/bin/java ]; then
@@ -69,10 +69,10 @@ set_default_link_to() {
   ln -sf ${new_default} ${DEFAULT_PATH}
 
   unlink ${DEFAULT_PATH_JRE} 2>/dev/null
-  if [[ ${new_default} == */jre ]]; then
-    ln -sf ${new_default} ${DEFAULT_PATH_JRE}
-  else
+  if [[ -d ${new_default}/jre ]]; then
     ln -sf ${new_default}/jre ${DEFAULT_PATH_JRE}
+  else
+    ln -sf ${new_default} ${DEFAULT_PATH_JRE}
   fi
 }
 
@@ -91,6 +91,7 @@ do_status() {
     default_java=$(get_default_java)
     echo 'Available Java environments:'
     for java in ${installed_java[@]}; do
+      # We discoverd this Java env but its JRE is actually set as default
       if [ "${java}/jre" = "${default_java}" ]; then
         echo -e "  ${java} (${java}/jre default)"
       elif [ ${java} = "${default_java}" ]; then
@@ -136,6 +137,7 @@ do_unset() {
 do_fix() {
   default=$(get_default_java)
   if is_java_valid ${default}; then
+    # If its parent is also a valid Java environment
     if is_java_valid $(dirname ${default}); then
       unset_default_link
       set_default_link_to $(dirname ${default})
@@ -143,9 +145,13 @@ do_fix() {
   else
     prev=$(readlink ${DEFAULT_PATH})
     unset_default_link
-    prev_fix=("${prev/\/jre}" "${prev}/jre")
-    openjdk7=('java-7-openjdk' 'java-7-openjdk/jre')
-    to_check=(${prev_fix[@]} ${openjdk7[@]} $(get_installed_javas))
+    potential_fixes=("${prev/\/jre}" "${prev}/jre")
+    openjdk8=('java-8-openjdk' 'java-8-openjdk/jre')
+    # List of environments to check by order of preference:
+    # - first potential fixes of user choices,
+    # - then OpenJDK8 as it is considered a default in Parabola
+    # - finally, any installed environment
+    to_check=(${potential_fixes[@]} ${openjdk8[@]} $(get_installed_javas))
     for java in ${to_check[@]}; do
       if ! is_java_valid $(get_default_java) && is_java_valid ${java}; then
         set_default_link_to ${java}
diff --git a/libre/java-common/test_parabola-java b/libre/java-common/test_parabola-java
index 89b57655a..1fff993b5 100755
--- a/libre/java-common/test_parabola-java
+++ b/libre/java-common/test_parabola-java
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# To run this script, ensure shunit2 (https://code.google.com/p/shunit2/)
+# To run this script, ensure shunit2 (https://github.com/kward/shunit2)
 # is available on the local directory, then just run sh bin_parabola-java_tests
 #
 # inotifywait -r -m -e MODIFY . | while read l; do sh bin_parabola-java_tests; done
@@ -37,22 +37,32 @@ tearDown() {
 }
 
 # $1: path of Java environment to create
-create_valid_jre_env() {
-  mkdir -p ${JVM_DIR}/$1/bin
-  for binary in java keytool orbd; do
-    touch    ${JVM_DIR}/$1/bin/${binary}
-    chmod +x ${JVM_DIR}/$1/bin/${binary}
-  done
+create_raw_java_env() {
+  java_env_name=$1
+  bin_name=$2
+  mkdir -p ${JVM_DIR}/${java_env_name}/bin
+  touch    ${JVM_DIR}/${java_env_name}/bin/$bin_name
+  chmod +x ${JVM_DIR}/${java_env_name}/bin/$bin_name
+}
+
+create_valid_jre8_env() {
+  create_raw_java_env "$1/jre" "java"
 }
 
 # $1: path of Java environment to create
-create_valid_jdk_env() {
-  create_valid_jre_env "$1"
-  for binary in javac javah jhat; do
-    touch    ${JVM_DIR}/$1/bin/${binary}
-    chmod +x ${JVM_DIR}/$1/bin/${binary}
-  done
-  create_valid_jre_env "$1/jre"
+create_valid_jre8_jdk8_env() {
+  create_raw_java_env "$1" "java"
+  create_raw_java_env "$1" "javac"
+  create_valid_jre8_env "$1"
+}
+
+create_valid_jre9_env() {
+  create_raw_java_env "$1" "java"
+}
+
+create_valid_jre9_jdk9_env() {
+  create_raw_java_env "$1" "java"
+  create_raw_java_env "$1" "javac"
 }
 
 set_default_for_test() {
@@ -79,24 +89,78 @@ assertDefaultSetTo() {
 
 # do_status
 
-test_do_status() {
+test_do_status_with_jre8_default() {
   JAVA_NAME_1="a$(get_rand_str)"
   JAVA_NAME_2="b$(get_rand_str)"
-  create_valid_jre_env "${JAVA_NAME_1}/jre"
+  JAVA_NAME_3="c$(get_rand_str)"
+  create_valid_jre8_env "${JAVA_NAME_1}"
   set_default_for_test "${JAVA_NAME_1}/jre"
-  create_valid_jdk_env "${JAVA_NAME_2}"
-  expected=$(echo -e "Available Java environments:\n  ${JAVA_NAME_1}/jre (default)\n  ${JAVA_NAME_2}")
+  create_valid_jre8_jdk8_env "${JAVA_NAME_2}"
+  create_valid_jre9_env "${JAVA_NAME_3}"
+  mess="Available Java environments:"
+  mess+="\n  ${JAVA_NAME_1}/jre (default)"
+  mess+="\n  ${JAVA_NAME_2}"
+  mess+="\n  ${JAVA_NAME_3}"
+  expected=$(echo -e "${mess}")
+  assertEquals 'Wrong status output' "${expected}" "$(do_status)"
+}
+
+test_do_status_with_jre9_default() {
+  JAVA_NAME_1="a$(get_rand_str)"
+  JAVA_NAME_2="b$(get_rand_str)"
+  JAVA_NAME_3="c$(get_rand_str)"
+  create_valid_jre8_env "${JAVA_NAME_1}"
+  create_valid_jre8_jdk8_env "${JAVA_NAME_2}"
+  create_valid_jre9_env "${JAVA_NAME_3}"
+  set_default_for_test "${JAVA_NAME_3}"
+  mess="Available Java environments:"
+  mess+="\n  ${JAVA_NAME_1}/jre"
+  mess+="\n  ${JAVA_NAME_2}"
+  mess+="\n  ${JAVA_NAME_3} (default)"
+  expected=$(echo -e "${mess}")
+  assertEquals 'Wrong status output' "${expected}" "$(do_status)"
+}
+
+test_do_status_with_jdk9_default() {
+  JAVA_NAME_1="a$(get_rand_str)"
+  JAVA_NAME_2="b$(get_rand_str)"
+  JAVA_NAME_3="c$(get_rand_str)"
+  create_valid_jre8_env "${JAVA_NAME_1}"
+  create_valid_jre8_jdk8_env "${JAVA_NAME_2}"
+  create_valid_jre9_jdk9_env "${JAVA_NAME_3}"
+  set_default_for_test "${JAVA_NAME_3}"
+  mess="Available Java environments:"
+  mess+="\n  ${JAVA_NAME_1}/jre"
+  mess+="\n  ${JAVA_NAME_2}"
+  mess+="\n  ${JAVA_NAME_3} (default)"
+  expected=$(echo -e "${mess}")
   assertEquals 'Wrong status output' "${expected}" "$(do_status)"
 }
 
 test_do_status_no_default() {
   JAVA_NAME_1="a$(get_rand_str)"
   JAVA_NAME_2="b$(get_rand_str)"
-  create_valid_jre_env "${JAVA_NAME_1}/jre"
-  create_valid_jdk_env "${JAVA_NAME_2}"
+  JAVA_NAME_3="c$(get_rand_str)"
+  JAVA_NAME_4="d$(get_rand_str)"
+  create_valid_jre8_env "${JAVA_NAME_1}"
+  create_valid_jre8_jdk8_env "${JAVA_NAME_2}"
+  create_valid_jre9_env "${JAVA_NAME_3}"
+  create_valid_jre9_jdk9_env "${JAVA_NAME_4}"
   mess="Available Java environments:"
   mess+="\n  ${JAVA_NAME_1}/jre"
   mess+="\n  ${JAVA_NAME_2}"
+  mess+="\n  ${JAVA_NAME_3}"
+  mess+="\n  ${JAVA_NAME_4}"
+  mess+="\nNo Java environment set as default"
+  expected=$(echo -e "${mess}")
+  assertEquals 'Wrong status output' "${expected}" "$(do_status)"
+}
+
+test_do_status_no_duplicate_entry_jre9_jdk9() {
+  JAVA_NAME_1="a$(get_rand_str)"
+  create_valid_jre9_jdk9_env "${JAVA_NAME_1}"
+  mess="Available Java environments:"
+  mess+="\n  ${JAVA_NAME_1}"
   mess+="\nNo Java environment set as default"
   expected=$(echo -e "${mess}")
   assertEquals 'Wrong status output' "${expected}" "$(do_status)"
@@ -107,7 +171,7 @@ test_do_status_no_javas() {
 }
 
 test_do_status_jre_but_jdk_exists() {
-  create_valid_jdk_env "${JAVA_NAME}"
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   set_default_for_test "${JAVA_NAME}/jre"
   mess="Available Java environments:"
   mess+="\n  ${JAVA_NAME} (${JAVA_NAME}/jre default)"
@@ -117,27 +181,35 @@ test_do_status_jre_but_jdk_exists() {
 
 # do_get
 
-test_do_get_with_default() {
-  create_valid_jdk_env "${JAVA_NAME}"
+test_do_get_with_jdk8_default() {
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   set_default_for_test "${JAVA_NAME}"
   assertEquals 'Wrong result' "${JAVA_NAME}" "$(do_get)"
   assertDefaultSetTo "${JAVA_NAME}"
 }
 
 test_do_get_without_default() {
-  create_valid_jdk_env "${JAVA_NAME}"
+  create_valid_jre8_jdk8_env "$(get_rand_str)"
+  create_valid_jre9_jdk9_env "$(get_rand_str)"
   assertNull 'Wrong result' "$(do_get)"
 }
 
-test_do_get_without_default() {
+test_do_get_with_initial_null() {
   set_default_for_test "/dev/null"
   assertNull 'Wrong result' "$(do_get)"
 }
 
+test_do_get_with_jdk9_default() {
+  create_valid_jre9_jdk9_env "${JAVA_NAME}"
+  set_default_for_test "${JAVA_NAME}"
+  assertEquals 'Wrong result' "${JAVA_NAME}" "$(do_get)"
+  assertDefaultSetTo "${JAVA_NAME}"
+}
+
 # do_set
 
 test_do_set_new_invalid() {
-  create_valid_jdk_env "${JAVA_NAME}"
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   set_default_for_test "${JAVA_NAME}"
   output=$(do_set "INVALID")
   assertEquals 'Wrong status returned' 1 $?
@@ -146,32 +218,66 @@ test_do_set_new_invalid() {
 }
 
 test_do_set_current_invalid() {
-  create_valid_jdk_env "${JAVA_NAME}"
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   set_default_for_test "INVALID"
   $(do_set "${JAVA_NAME}")
   assertEquals 'Wrong status returned' 0 $?
   assertDefaultSetTo "${JAVA_NAME}"
 }
 
-test_do_set_with_default_already_set() {
-  create_valid_jre_env "${JAVA_NAME}/jre"
+test_do_set_jre8_with_default_already_set_to_jre8() {
+  create_valid_jre8_env "${JAVA_NAME}"
   set_default_for_test "${JAVA_NAME}/jre"
   JAVA_NAME_2="$(get_rand_str)"
-  create_valid_jre_env "${JAVA_NAME_2}/jre"
+  create_valid_jre8_env "${JAVA_NAME_2}"
   $(do_set "${JAVA_NAME_2}/jre")
   assertEquals 'Wrong status returned' 0 $?
   assertDefaultSetTo "${JAVA_NAME_2}/jre"
 }
 
-test_do_set_no_default() {
-  create_valid_jre_env "${JAVA_NAME}/jre"
+test_do_set_jre9_with_default_already_set_to_jre8() {
+  create_valid_jre8_env "${JAVA_NAME}"
+  set_default_for_test "${JAVA_NAME}/jre"
+  JAVA_NAME_2="$(get_rand_str)"
+  create_valid_jre9_env "${JAVA_NAME_2}"
+  $(do_set "${JAVA_NAME_2}")
+  assertEquals 'Wrong status returned' 0 $?
+  assertDefaultSetTo "${JAVA_NAME_2}"
+}
+
+test_do_set_jdk9_with_default_already_set_to_jdk8() {
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
+  set_default_for_test "${JAVA_NAME}"
+  JAVA_NAME_2="$(get_rand_str)"
+  create_valid_jre9_jdk9_env "${JAVA_NAME_2}"
+  $(do_set "${JAVA_NAME_2}")
+  assertEquals 'Wrong status returned' 0 $?
+  assertDefaultSetTo "${JAVA_NAME_2}"
+}
+
+test_do_set_jre8_no_previous_default() {
+  create_valid_jre8_env "${JAVA_NAME}"
   $(do_set "${JAVA_NAME}/jre")
   assertEquals 'Wrong status returned' 0 $?
   assertDefaultSetTo "${JAVA_NAME}/jre"
 }
 
-test_do_set_exists_jdk() {
-  create_valid_jdk_env "${JAVA_NAME}"
+test_do_set_jre9_no_previous_default() {
+  create_valid_jre9_env "${JAVA_NAME}"
+  $(do_set "${JAVA_NAME}")
+  assertEquals 'Wrong status returned' 0 $?
+  assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_set_jdk9_no_previous_default() {
+  create_valid_jre9_jdk9_env "${JAVA_NAME}"
+  $(do_set "${JAVA_NAME}")
+  assertEquals 'Wrong status returned' 0 $?
+  assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_set_jre8_while_jdk8_also_exists() {
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   output=$(do_set "${JAVA_NAME}/jre")
   assertEquals 'Wrong status returned' 0 $?
   assertDefaultSetTo "${JAVA_NAME}/jre"
@@ -181,33 +287,52 @@ test_do_set_exists_jdk() {
   #assertEquals 'Wrong message' "${expected}" "${output}"
 }
 
-test_do_set_cleanup_old_java_default() {
-  create_valid_jdk_env "${JAVA_NAME}"
+test_do_set_jdk8_cleanup_old_jre8_default() {
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   set_default_for_test "${JAVA_NAME}"
   output=$(do_set "${JAVA_NAME}/jre")
   assertEquals 'Wrong status returned' 0 $?
   assertDefaultSetTo "${JAVA_NAME}/jre"
 }
 
-test_do_set_devnull() {
-  create_valid_jdk_env "${JAVA_NAME}"
+test_do_set_jdk9_cleanup_old_jdk8_default() {
+  JAVA8_NAME=$(get_rand_str)
+  create_valid_jre8_jdk8_env "${JAVA8_NAME}"
+  set_default_for_test "${JAVA8_NAME}"
+  JAVA9_NAME=$(get_rand_str)
+  create_valid_jre9_jdk9_env "${JAVA9_NAME}"
+  output=$(do_set "${JAVA9_NAME}")
+  assertEquals 'Wrong status returned' 0 $?
+  assertDefaultSetTo "${JAVA9_NAME}"
+}
+
+test_do_set_jdk8_devnull() {
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   set_default_for_test "/dev/null"
   output=$(do_set "${JAVA_NAME}/jre")
   assertEquals 'Wrong status returned' 0 $?
   assertDefaultSetTo "${JAVA_NAME}/jre"
 }
 
+test_do_set_jdk9_devnull() {
+  create_valid_jre9_jdk9_env "${JAVA_NAME}"
+  set_default_for_test "/dev/null"
+  output=$(do_set "${JAVA_NAME}")
+  assertEquals 'Wrong status returned' 0 $?
+  assertDefaultSetTo "${JAVA_NAME}"
+}
+
 # do_unset
 
-test_do_unset_default_not_target() {
-  create_valid_jre_env "${JAVA_NAME}/jre"
+test_do_unset_jre8() {
+  create_valid_jre8_env "${JAVA_NAME}"
   set_default_for_test "${JAVA_NAME}/jre"
   do_unset
   assertDefaultNotSet
 }
 
 test_do_unset_no_default_link() {
-  create_valid_jdk_env "${JAVA_NAME}"
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   set_default_for_test "${JAVA_NAME}"
   unlink ${DEFAULT_PATH}
   do_unset
@@ -220,37 +345,90 @@ test_do_unset_devnull() {
   assertDefaultNotSet
 }
 
+test_do_unset_jre9() {
+  create_valid_jre9_env "${JAVA_NAME}"
+  set_default_for_test "${JAVA_NAME}"
+  do_unset
+  assertDefaultNotSet
+}
+
+test_do_unset_jdk9() {
+  create_valid_jre9_jdk9_env "${JAVA_NAME}"
+  set_default_for_test "${JAVA_NAME}"
+  do_unset
+  assertDefaultNotSet
+}
+
 # do_fix
 
-test_do_fix_default_valid() {
-  create_valid_jre_env "${JAVA_NAME}/jre"
+test_do_fix_default_valid_jre8() {
+  create_valid_jre8_env "${JAVA_NAME}"
   set_default_for_test "${JAVA_NAME}/jre"
   do_fix
   assertDefaultSetTo "${JAVA_NAME}/jre"
 }
 
-test_do_fix_no_default() {
-  create_valid_jre_env "${JAVA_NAME}/jre"
+test_do_fix_default_valid_jre9() {
+  create_valid_jre9_env "${JAVA_NAME}"
+  set_default_for_test "${JAVA_NAME}"
+  do_fix
+  assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_fix_default_valid_jdk9() {
+  create_valid_jre9_jdk9_env "${JAVA_NAME}"
+  set_default_for_test "${JAVA_NAME}"
+  do_fix
+  assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_fix_no_default_jre8() {
+  create_valid_jre8_env "${JAVA_NAME}"
   do_fix
   assertDefaultSetTo "${JAVA_NAME}/jre"
 }
 
+test_do_fix_no_default_jre9() {
+  create_valid_jre9_env "${JAVA_NAME}"
+  do_fix
+  assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_fix_no_default_jdk9() {
+  create_valid_jre9_jdk9_env "${JAVA_NAME}"
+  do_fix
+  assertDefaultSetTo "${JAVA_NAME}"
+}
+
 test_do_fix_default_invalid_openjdk7_jdk_installed() {
-  create_valid_jdk_env "java-7-openjdk"
-  create_valid_jdk_env "${JAVA_NAME}"
+  create_valid_jre8_jdk8_env "java-8-openjdk"
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
+  do_fix
+  assertDefaultSetTo "java-8-openjdk"
+}
+
+test_do_fix_jdk8_not_default_but_openjdk7_jre_installed() {
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
+  create_valid_jre8_env "java-8-openjdk"
+  do_fix
+  assertDefaultSetTo "java-8-openjdk/jre"
+}
+
+test_do_fix_jdk9_not_default_but_openjdk7_jre_installed() {
+  create_valid_jre9_jdk9_env "${JAVA_NAME}"
+  create_valid_jre8_env "java-8-openjdk"
   do_fix
-  assertDefaultSetTo "java-7-openjdk"
+  assertDefaultSetTo "java-8-openjdk/jre"
 }
 
-test_do_fix_default_invalid_openjdk7_jre_installed() {
-  create_valid_jdk_env "${JAVA_NAME}"
-  create_valid_jre_env "java-7-openjdk/jre"
+test_do_fix_default_invalid_random_java8_installed() {
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   do_fix
-  assertDefaultSetTo "java-7-openjdk/jre"
+  assertDefaultSetTo "${JAVA_NAME}"
 }
 
-test_do_fix_default_invalid_random_java_installed() {
-  create_valid_jdk_env "${JAVA_NAME}"
+test_do_fix_default_invalid_random_java9_installed() {
+  create_valid_jre9_jdk9_env "${JAVA_NAME}"
   do_fix
   assertDefaultSetTo "${JAVA_NAME}"
 }
@@ -260,27 +438,28 @@ test_do_fix_default_invalid_no_java_installed() {
   assertDefaultNotSet
 }
 
-test_do_fix_jre_but_jdk_exists() {
-  create_valid_jdk_env "${JAVA_NAME}"
+test_do_fix_jre8_but_jdk8_exists() {
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   set_default_for_test "${JAVA_NAME}/jre"
   do_fix
   assertDefaultSetTo "${JAVA_NAME}"
 }
 
 test_do_fix_jdk_but_jre_exists() {
-  create_valid_jdk_env "java-7-openjdk"
-  create_valid_jre_env "${JAVA_NAME}/jre"
+  create_valid_jre8_jdk8_env "java-7-openjdk"
+  create_valid_jre8_env "${JAVA_NAME}"
+  # Only JRE is installed but setting JDK as default
   set_default_for_test "${JAVA_NAME}"
   do_fix
   assertDefaultSetTo "${JAVA_NAME}/jre"
 }
 
 test_do_fix_devnull() {
-  create_valid_jdk_env "${JAVA_NAME}"
+  create_valid_jre8_jdk8_env "${JAVA_NAME}"
   set_default_for_test "/dev/null"
   do_fix
   assertDefaultSetTo "${JAVA_NAME}"
 }
 
 # load shunit2
-. shunit2-2.1.6/src/shunit2
+. shunit2/src/shunit2
diff --git a/libre/khotkeys/PKGBUILD b/libre/khotkeys/PKGBUILD
index c831ca188..e84975de0 100644
--- a/libre/khotkeys/PKGBUILD
+++ b/libre/khotkeys/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=khotkeys
-pkgver=5.11.0
+pkgver=5.11.1
 pkgrel=1.parabola1
 pkgdesc='KHotKeys, with DuckDuckGo HTML support'
 arch=('i686' 'x86_64' 'armv7h')
@@ -17,7 +17,7 @@ makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'kdesignerplugin')
 conflicts=('kdebase-workspace')
 groups=(plasma)
 source=("https://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('16cd090c27828196bfd3768b09200cd7ce09964c1b9cfa8d777c6f84bd5088f8'
+sha256sums=('850e226ca36549c560a5ee94a2fefe48f9e0b48c32898a86a66de3a4a20e3734'
             'SKIP')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
               '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon
diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD
index 188ecf430..b1db2a750 100644
--- a/libre/linux-libre-hardened/PKGBUILD
+++ b/libre/linux-libre-hardened/PKGBUILD
@@ -45,7 +45,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '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}
+        "https://repo.parabola.nu/other/rcn-libre-hardened/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'
@@ -74,7 +74,7 @@ sha512sums=('9ad6866c68f29f7e4f8b53d0b857f9b3c7f6abd0054460675c76f3100db34a77c27
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '1507b924cfc415398ee8972d61d669e501481e95a41d4851aae467f2e8894760842b0b89e1dad4f0791abe85d0e67fa995eefbfcf716ace8acbe8626a1d57314'
+            'c75381eb2e9171af04b970a6355a4a19b29f19df952c9023f69432f488fd1f933fb6c3cca97d6a713e7ef4b251192346d85a1f51ed6ab7c7579da9ab7cb1c32b'
             'SKIP'
             '8da49af5cce12f0bf21f5985cf85d13624404bab76cc0fd7a04b3ee6c046b5dceb4ae0bb821e060405366310473042892e716f530f04d1dab9a21ca1f778dd6c'
             '06f40e0f197b15dffc7c724aba9a41f2343c8528576700202f069d5cd00013e7e5e8d62153cf358d02c21e28d7cf2a66e3f5190677cb590ac07f36be58b43cab'
diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD
index cd77d95d3..2e05aa035 100644
--- a/libre/mesa/PKGBUILD
+++ b/libre/mesa/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase=mesa
 pkgname=("${pkgbase}")
-pkgver=17.2.1
-pkgrel=3.parabola1
+pkgver=17.2.3
+pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
@@ -17,16 +17,12 @@ license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         LICENSE
         drirc
-        0002-glvnd-fix-gl-dot-pc.patch
-        swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
-        swr-rast-remove-llvm-fence-atomics-from-generated-files.patch)
-sha256sums=('77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e'
+        0002-glvnd-fix-gl-dot-pc.patch)
+sha256sums=('a0b0ec8f7b24dd044d7ab30a8c7e6d3767521e245f88d4ed5dd93315dc56f837'
             'SKIP'
             '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
             '2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2'
-            '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966'
-            '2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b'
-            'a747e0046eab7bb9c73444549c9c63d078b11b756d2294ba9c7ee0612caf62db')
+            '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
 validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') #  "Andres Gomez <tanty@igalia.com>"
 validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
@@ -38,10 +34,6 @@ prepare() {
   # non-upstreamed ones
   patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch
 
-  # swr driver
-  patch -Np1 -i ../swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
-  patch -Np1 -i ../swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
-
   autoreconf -fiv
 }
 
diff --git a/libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch b/libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
deleted file mode 100644
index b9e81f9a3..000000000
--- a/libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/gallium/drivers/swr/rasterizer/core/utils.h b/src/gallium/drivers/swr/rasterizer/core/utils.h
-index b096d2120cb..3c849e82d3b 100644
---- a/src/gallium/drivers/swr/rasterizer/core/utils.h
-+++ b/src/gallium/drivers/swr/rasterizer/core/utils.h
-@@ -365,7 +365,8 @@ static INLINE std::string GetEnv(const std::string& variableName)
-     output.resize(valueSize - 1); // valueSize includes null, output.resize() does not
-     GetEnvironmentVariableA(variableName.c_str(), &output[0], valueSize);
- #else
--    output = getenv(variableName.c_str());
-+    char *o = getenv(variableName.c_str());
-+    output = o ? std::string(o) : std::string();
- #endif
- 
-     return output;
diff --git a/libre/mesa/swr-rast-remove-llvm-fence-atomics-from-generated-files.patch b/libre/mesa/swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
deleted file mode 100644
index 02a2feecf..000000000
--- a/libre/mesa/swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
-index 025d38a..ce892a9 100644
---- a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
-+++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
-@@ -140,6 +140,14 @@ def parse_ir_builder(input_file):
- 
-                     ignore = False
- 
-+                    # The following functions need to be ignored in openswr.
-+                    # API change in llvm-5.0 breaks baked autogen files
-+                    if (
-+                        (func_name == 'CreateFence' or
-+                         func_name == 'CreateAtomicCmpXchg' or
-+                         func_name == 'CreateAtomicRMW')):
-+                        ignore = True
-+
-                     # The following functions need to be ignored.
-                     if (func_name == 'CreateInsertNUWNSWBinOp' or
-                         func_name == 'CreateMaskedIntrinsic' or
diff --git a/libre/smplayer/PKGBUILD b/libre/smplayer/PKGBUILD
index 1b447158a..1d5c6a6a7 100644
--- a/libre/smplayer/PKGBUILD
+++ b/libre/smplayer/PKGBUILD
@@ -8,13 +8,13 @@
 # Contributor: Andreas Grapentin <andreas@grapentin.org>
 
 pkgname=smplayer
-pkgver=17.8.0
+pkgver=17.10.0
 pkgrel=1.parabola1
 pkgdesc='Media player with built-in codecs that can play virtually all video and audio formats, without nonfree smtube support'
-url='http://smplayer.sourceforge.net/'
+url='http://www.smplayer.info/'
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
-depends=('qt5-script' 'mpv' 'hicolor-icon-theme')
+depends=('qt5-script' 'mpv' 'hicolor-icon-theme' 'libx11' 'zlib' 'gcc-libs')
 makedepends=('qt5-tools')
 optdepends=('smplayer-themes: icon themes collection'
             'smplayer-skins: skin themes collection'
@@ -23,7 +23,7 @@ optdepends=('smplayer-themes: icon themes collection'
 source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
         disable-smtube-support.patch
         add-missing-QClipboard-include.patch)
-sha256sums=('70790ebdb91b25b4293212987c642285819c8fced4babf1dea54b26d8ffba76a'
+sha256sums=('3d40a999343c647cc758a8d5026be9d355dcc84317700128578e51db9f982375'
             'e86a0881d6696dfe2b5a2742947f317090194beab4986df7e9ac8845727e78de'
             'abb66acd70e61bc2bf7abfa2887b24b76004e00b9649a9b38aa44b4409fea08e')
 
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 0455ea8ca..1bfef5d50 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -10,12 +10,12 @@ 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='d52e2bb9c20216972754c054e8534bca28baab66'
+_commit='7ba74d5f939d0322d6ea730dd0b5ceefd7d7f527'
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
-pkgver=234.11
-pkgrel=8
-pkgrel+=.parabola3
+pkgver=235.8
+pkgrel=1
+pkgrel+=.parabola1
 arch=('i686' 'x86_64')
 arch+=('armv7h')
 url="https://www.github.com/systemd/systemd"
@@ -27,8 +27,9 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
 makedepends_i686=('gnu-efi-libs')
 makedepends_x86_64=('gnu-efi-libs')
 options=('strip')
-source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}"
-        'git://github.com/systemd/systemd.git' # pull in for tags
+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'
         'initcpio-install-systemd'
         'initcpio-install-udev'
@@ -50,7 +51,7 @@ source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}"
 sha512sums=('SKIP'
             'SKIP'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            'a70a779828e03c91275df1e046f78bdface08e2a8df0245a3f6e8d5904e3dbbe5d498cbf7f32d5ce61f2fb0d0a3d440d47ce9e41352a5547d80fa1bc29687159'
+            '86d7cacd7536b1069c82bbbb08de7ec81e7f0f18a19fc2b06fabe90db4700623eb3540b75121080d325672d92e26912632ae4f93fd3c0bb48eb3e5eedd88352c'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
             '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8'
             '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'
@@ -67,21 +68,8 @@ sha512sums=('SKIP'
             'b45c4e40f626a02951a852ea4cd2304f00a172dc64b5c38a97f5c68e4a89ceb4f4164cc9221533c4a5c52662e0b9629a82c521514bfcc21f0c11ce517643c2c1'
             'f5c4cbeecac8f9d8f009deb4ac1d0b797210bcd1a91fcc6bf8ec110320ad6ceb8fd2a28b184ca037d73078d09a22f224ad3fc46f4bbf972432cce23263b2e1dc'
             'e276fd1aedd7718333324fa9d99493fe99d951f446e3b590a99e2cc9562a0bd0e29693907997cb52096c39168c5be62ded3feedf93bacd3c9659d58775b6ca8d')
-validpgpkeys=(
-  '63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering
-)
 
 _backports=(
-  # cryptsetup: fix infinite timeout (#6486)
-  '0864d311766498563331f486909a0d950ba7de87'
-
-  # process-util: add getpid_cached() as a caching wrapper for getpid()
-  '5c30a6d2b805ae9b5dd0ad003b9ee86b8965bc47'
-  # tree-wide: make use of getpid_cached() wherever we can
-  'df0ff127758809a45105893772de76082d12a26d'
-
-  # call chase_symlinks without the /sysroot prefix (#6411) (FS#54958)
-  '98eda38aed6a10c4f6d6ad0cac6e5361e87de52b'
 )
 
 _reverts=(
@@ -130,6 +118,8 @@ prepare() {
   git remote add upstream ../systemd/
   git fetch --all
 
+  git checkout "${_commit}"
+
   _validate_tag || return
 
   local _commit
@@ -140,12 +130,6 @@ prepare() {
     git revert -n "$_commit"
   done
 
-  # core: store the invocation ID in the per-service keyring
-  # core: run each system service with a fresh session keyring
-  git show 'b3415f5daef49642be3d5f417b8880c078420ff7' \
-    '74dd6b515fa968c5710b396a7664cac335e25ca8' \
-    -- . ':!src/test/test-id128.c' | git apply --reverse --index
-
   # apply FSDG patches
   local _patch
   for _patch in "$srcdir"/????-FSDG-*.patch; do
@@ -163,9 +147,6 @@ build() {
   fi
 
   local meson_options=(
-    --buildtype=release
-    -Db_lto=true
-
     -Daudit=false
     -Dima=false
     -Dlz4=true
@@ -185,7 +166,7 @@ build() {
     meson_options+=(-Dgnuefi=true)
   fi
 
-  meson "$pkgbase-stable" build "${meson_options[@]}"
+  arch-meson "$pkgbase-stable" build "${meson_options[@]}"
 
   ninja -C build
 
@@ -227,6 +208,7 @@ build() {
 package_systemd() {
   pkgdesc="system and service manager"
   license=('GPL2' 'LGPL2.1')
+  groups=('base-devel')
   depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
            'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
            'util-linux' 'xz')
diff --git a/libre/systemd/initcpio-install-systemd b/libre/systemd/initcpio-install-systemd
index 5bf7b7f16..40a352c70 100644
--- a/libre/systemd/initcpio-install-systemd
+++ b/libre/systemd/initcpio-install-systemd
@@ -181,7 +181,7 @@ EOF
     (
       . "$_f_config"
       set -f
-      printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
+      printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
     )
 }
 
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index 685ea9f5b..16c0eb8b2 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -15,11 +15,11 @@ _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=4.13
-  _archrel=30
+  _archrel=31
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
-  _archrel=19
+  _archrel=20
   _parabolarel=1
 fi
 
diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD
index 3ba568eef..82c8038d6 100644
--- a/libre/vhba-module/PKGBUILD
+++ b/libre/vhba-module/PKGBUILD
@@ -10,7 +10,7 @@ _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=4.13
-  _archrel=15
+  _archrel=16
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
@@ -36,7 +36,7 @@ if [[ ${_kernelname} != "" ]]; then
   provides=("${pkgbase}")
 fi
 
-source=("http://downloads.sourceforge.net/cdemu/$pkgbase-$pkgver.tar.bz2"
+source=("https://downloads.sourceforge.net/cdemu/$pkgbase-$pkgver.tar.bz2"
         '60-vhba.rules' 'dkms.conf')
 sha256sums=('7970c93f989d9c4f2629371bf5ee7a76f95e4c12342c3320ddc528d0df02d9ec'
             '3052cb1cadbdf4bfb0b588bb8ed80691940d8dd63dc5502943d597eaf9f40c3b'
diff --git a/libre/virt-manager/PKGBUILD b/libre/virt-manager/PKGBUILD
index a94d77832..85ac437b0 100644
--- a/libre/virt-manager/PKGBUILD
+++ b/libre/virt-manager/PKGBUILD
@@ -8,14 +8,14 @@
 pkgbase=virt-manager
 pkgname=virt-install
 pkgver=1.4.3
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 pkgdesc="Console user interface for managing virtual machines, without non-FSDG compliant distros and operating systems support"
 arch=('any')
 url="http://virt-manager.org/"
 license=('GPL')
 depends=('python2-gobject' 'libvirt-glib' 'libvirt-python2'
 	 'python2-requests' 'python2-ipaddr' 'libosinfo')
-makedepends=('intltool')
+makedepends=('intltool' 'python2-cairo')
 source=("https://virt-manager.org/download/sources/virt-manager/virt-manager-$pkgver.tar.gz"
         'libre.patch')
 sha256sums=('528226b9a0fdd6cd66451a8217fc7c87f3deb6bebd08599c25fe5c7291fe6a24'
diff --git a/libre/xarchiver/PKGBUILD b/libre/xarchiver/PKGBUILD
index 74dac253b..b2a1337d7 100644
--- a/libre/xarchiver/PKGBUILD
+++ b/libre/xarchiver/PKGBUILD
@@ -1,14 +1,13 @@
 # $Id: PKGBUILD 212497 2017-02-15 05:21:07Z bgyorgy $
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
 # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
 # Contributor (Arch): Andrew Simmons <andrew.simmons@gmail.com>
 # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgbase=xarchiver
 pkgname=(xarchiver xarchiver-gtk2)
-pkgver=0.5.4.11
-_gitrev=79a73d46b782cf8bb93d058d00d2cb81a9b3df8a
+pkgver=0.5.4.12
 pkgrel=1.parabola1
 pkgdesc="GTK+ frontend to various command line archivers, without nonfree unrar support"
 arch=('i686' 'x86_64' 'armv7h')
@@ -16,19 +15,29 @@ url="https://github.com/ib/xarchiver"
 license=('GPL')
 depends=('gtk2' 'gtk3')
 makedepends=('docbook-xsl' 'intltool' 'xmlto')
-optdepends=('zip: ZIP support'
-            'unzip: ZIP support'
-            'p7zip: 7z support'
-            'lzop: LZOP support'
+optdepends=('arj: ARJ support'
+            'binutils: deb support'
+            'bzip2: bzip2 support'
             'cpio: RPM support'
-            'unar: RAR support')
-source=($pkgbase-$pkgver.tar.gz::https://github.com/ib/xarchiver/archive/$_gitrev.tar.gz
+            'gzip: gzip support'
+            'lha: LHA support'
+            'lrzip: lrzip support'
+            'lz4: LZ4 support'
+            'lzip: lzip support'
+            'lzop: LZOP support'
+            'p7zip: 7z support'
+            'tar: tar support'
+            'unar: RAR support'
+            'unzip: ZIP support'
+            'xz: xz support'
+            'zip: ZIP support')
+source=($pkgbase-$pkgver.tar.gz::https://github.com/ib/xarchiver/archive/$pkgver.tar.gz
         libre.patch)
-sha256sums=('2dabd6f5d96c5d886d9a5ed7d299cfc43d1fef88be37d1d298a78c4c01a63b45'
-            'a0ca78f2e7c6a95cc09e7a3483aed1923850e219316b123bb80f33a63d274386')
+sha256sums=('62885813edce274055e8fccd3f360b61a74a3b0e4854080201638fd1f3306370'
+            '285bbabbd88e94e4645582969cea9628a71c395278bc8e0e20e6aab93bbe609d')
 
 prepare() {
-  cd $pkgbase-$_gitrev
+  cd $pkgbase-$pkgver
 
   # Remove nonfree unRAR support
   patch -p1 -i ../libre.patch
@@ -38,14 +47,14 @@ prepare() {
 
 build() {
   # GTK+ 3 version
-  [ -d gtk3 ] || cp -r $pkgbase-$_gitrev gtk3
+  [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3
   cd gtk3
   ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4
   make -j1
 
   cd "$srcdir"
   # GTK+ 2 version
-  [ -d gtk2 ] || cp -r $pkgbase-$_gitrev gtk2
+  [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
   cd gtk2
   ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4 --enable-gtk2
   make -j1
diff --git a/libre/xarchiver/libre.patch b/libre/xarchiver/libre.patch
index c4be62bfc..a55f5608b 100644
--- a/libre/xarchiver/libre.patch
+++ b/libre/xarchiver/libre.patch
@@ -48,6 +48,7 @@
  StartupNotify=true
  Terminal=false
  Categories=GTK;Archiving;Compression;Utility;
--_Keywords=GTK;archiver;archiving;compression;front end;frontend;7-zip;7z;7za;7zip;7zr;ar;arj;bunzip2;bz2;bzip2;compress;cpio;deb;gtar;gunzip;gz;gzip;jar;lha;lsar;lz;lz4;lzh;lzip;lzma;lzo;lzop;rar;rar4;rar5;rpm;tar;unar;unarchiver;unarj;unrar;unzip;xz;zip;
-+_Keywords=GTK;archiver;archiving;compression;front end;frontend;7-zip;7z;7za;7zip;7zr;ar;arj;bunzip2;bz2;bzip2;compress;cpio;deb;gtar;gunzip;gz;gzip;jar;lha;lsar;lz;lz4;lzh;lzip;lzma;lzo;lzop;rar;rar4;rar5;rpm;tar;unar;unarchiver;unarj;unzip;xz;zip;
- MimeType=application/gzip;application/vnd.debian.binary-package;application/vnd.rar;application/x-7z-compressed;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-cpio-compressed;application/x-java-archive;application/x-lha;application/x-lz4;application/x-lz4-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-rar;application/x-rpm;application/x-source-rpm;application/x-tar;application/x-tarz;application/x-tzo;application/x-xz;application/x-xz-compressed-tar;application/zip;
+-_Keywords=GTK;archiver;archiving;compression;front end;frontend;7-zip;7z;7za;7zip;7zr;ar;arj;bunzip2;bz2;bzip2;compress;cpio;deb;epub;gtar;gunzip;gz;gzip;jar;lha;lrz;lrzip;lsar;lz;lz4;lzh;lzip;lzma;lzo;lzop;oxt;rar;rar4;rar5;rpm;tar;unar;unarchiver;unarj;unrar;unzip;xpi;xz;zip;zst;Zstandard;zstd;
++_Keywords=GTK;archiver;archiving;compression;front end;frontend;7-zip;7z;7za;7zip;7zr;ar;arj;bunzip2;bz2;bzip2;compress;cpio;deb;epub;gtar;gunzip;gz;gzip;jar;lha;lrz;lrzip;lsar;lz;lz4;lzh;lzip;lzma;lzo;lzop;oxt;rar;rar4;rar5;rpm;tar;unar;unarchiver;unarj;unzip;xpi;xz;zip;zst;Zstandard;zstd;
+ MimeType=application/epub+zip;application/gzip;application/vnd.debian.binary-package;application/vnd.openofficeorg.extension;application/vnd.rar;application/x-7z-compressed;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-cpio-compressed;application/x-java-archive;application/x-lha;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lz4;application/x-lz4-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-rar;application/x-rpm;application/x-source-rpm;application/x-tar;application/x-tarz;application/x-tzo;application/x-xpinstall;application/x-xz;application/x-xz-compressed-tar;application/zip;
+
diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD
index 6a525e0a8..e5a4f51cf 100644
--- a/libre/xsp/PKGBUILD
+++ b/libre/xsp/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=xsp
 pkgver=4.4
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 pkgdesc="A simple webserver based on mono - provides ASP.NET support (Parabola rebranded)"
 arch=('i686' 'x86_64' 'armv7h')
 license=('custom')