21 files changed, 314 insertions, 482 deletions
diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD
index 57eb9688c..d8fc3e7c5 100644
--- a/system/binutils/APKBUILD
+++ b/system/binutils/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
 pkgname=binutils
-pkgver=2.30
-pkgrel=2
+pkgver=2.31.1
+pkgrel=0
 pkgdesc="Tools necessary to build programs"
 url="http://www.gnu.org/software/binutils/"
 depends=""
@@ -19,7 +19,6 @@ source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
 	disable-gnu-mbind.patch
 	disable-ifunc-tests.patch
 	disable-preinit-array-tests.patch
-	mips-illegal-memcpy.patch
 	remove-no-static-plt-test.patch
 	remove-pr2404-tests.patch
 	remove-pr19719-test.patch
@@ -111,12 +110,11 @@ libs() {
 	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
 }
 
-sha512sums="e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839  binutils-2.30.tar.xz
+sha512sums="0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30  binutils-2.31.1.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 d378fdf1964f8f2bd0b1e62827ac5884bdf943aa435ec89c29fc84bb045d406b733fffaff8fdd8bd1cba8ddea7701c4cf6ccf3ed76a8a3df9c72b447737575a6  disable-gnu-mbind.patch
-ba2b5c8cdfa95db7a1f05da8a2c1ffc3bcb35300abf7061e52249d9b29037e3fdef1aed830686bca2df74b9f5d48684e9c8e2f49715455bf90dca6e3bfc077eb  disable-ifunc-tests.patch
+474ab24097bbb5b24433620549e5234fe65c547824c1342f693c718ffbc81e2d968259cce2d650b55200dd1ec89da207ea2db10c551cd9941285c4600b4297b2  disable-ifunc-tests.patch
 3537752e63cef0b5ef136d003ff7e814ba66b12624d817430112d0f291a792e8960fa69a78036f526af835441b3ee483d6a53d55c7b3dd8ee96f0399682dbcbe  disable-preinit-array-tests.patch
-06422157349abf02e79a5ef8bd9f51100e7e996aab65250d518e0cf0d7ac8ed922d3bf1603c4f5b4fd8fb179266b7b4c41db32dcb241d60a7f1c21d1df0c36dd  mips-illegal-memcpy.patch
 b40f9a3841a7af8fc12e8a4044cd672df5614bfda8461b0ca45efa57a42c3bc8490e491ea490c6c05d319a52d69993c4fca33a0aeb044090e7b7f4e4e30c6517  remove-no-static-plt-test.patch
 32ab4215669c728648179c124632467573a3d4675e79f0f0d221c22eb2ec1ca5488b79910bd09142f90a1e0d0b81d99ca4846297f4f9561f158db63745facb66  remove-pr2404-tests.patch
 a193d1fa7f42d91915960460a15e4d24e0df529d81e23014bcf45d283fae76bb7b300fdcb0d0a9d521cdb9137322efa1dc357112596d6ae7a7fd05988ac359b9  remove-pr19719-test.patch
diff --git a/system/binutils/CVE-2017-7614.patch b/system/binutils/CVE-2017-7614.patch
deleted file mode 100644
index 5f3b550f2..000000000
--- a/system/binutils/CVE-2017-7614.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From ad32986fdf9da1c8748e47b8b45100398223dba8 Mon Sep 17 00:00:00 2001
-From: Nick Clifton <nickc@redhat.com>
-Date: Tue, 4 Apr 2017 11:23:36 +0100
-Subject: [PATCH] Fix null pointer dereferences when using a link built with
- clang.
-
-	PR binutils/21342
-	* elflink.c (_bfd_elf_define_linkage_sym): Prevent null pointer
-	dereference.
-	(bfd_elf_final_link): Only initialize the extended symbol index
-	section if there are extended symbol tables to list.
----
- bfd/elflink.c | 35 +++++++++++++++++++++--------------
- 2 files changed, 29 insertions(+), 14 deletions(-)
-
-diff --git a/bfd/elflink.c b/bfd/elflink.c
-index 776357f..9bf75c8 100644
---- a/bfd/elflink.c
-+++ b/bfd/elflink.c
-@@ -119,15 +119,18 @@ _bfd_elf_define_linkage_sym (bfd *abfd,
- 	 defined in shared libraries can't be overridden, because we
- 	 lose the link to the bfd which is via the symbol section.  */
-       h->root.type = bfd_link_hash_new;
-+      bh = &h->root;
-     }
-+  else
-+    bh = NULL;
- 
--  bh = &h->root;
-   bed = get_elf_backend_data (abfd);
-   if (!_bfd_generic_link_add_one_symbol (info, abfd, name, BSF_GLOBAL,
- 					 sec, 0, NULL, FALSE, bed->collect,
- 					 &bh))
-     return NULL;
-   h = (struct elf_link_hash_entry *) bh;
-+  BFD_ASSERT (h != NULL);
-   h->def_regular = 1;
-   h->non_elf = 0;
-   h->root.linker_def = 1;
-@@ -12038,24 +12041,28 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
-     {
-       /* Finish up and write out the symbol string table (.strtab)
- 	 section.  */
--      Elf_Internal_Shdr *symstrtab_hdr;
-+      Elf_Internal_Shdr *symstrtab_hdr = NULL;
-       file_ptr off = symtab_hdr->sh_offset + symtab_hdr->sh_size;
- 
--      symtab_shndx_hdr = & elf_symtab_shndx_list (abfd)->hdr;
--      if (symtab_shndx_hdr != NULL && symtab_shndx_hdr->sh_name != 0)
-+      if (elf_symtab_shndx_list (abfd))
- 	{
--	  symtab_shndx_hdr->sh_type = SHT_SYMTAB_SHNDX;
--	  symtab_shndx_hdr->sh_entsize = sizeof (Elf_External_Sym_Shndx);
--	  symtab_shndx_hdr->sh_addralign = sizeof (Elf_External_Sym_Shndx);
--	  amt = bfd_get_symcount (abfd) * sizeof (Elf_External_Sym_Shndx);
--	  symtab_shndx_hdr->sh_size = amt;
-+	  symtab_shndx_hdr = & elf_symtab_shndx_list (abfd)->hdr;
- 
--	  off = _bfd_elf_assign_file_position_for_section (symtab_shndx_hdr,
--							   off, TRUE);
-+	  if (symtab_shndx_hdr != NULL && symtab_shndx_hdr->sh_name != 0)
-+	    {
-+	      symtab_shndx_hdr->sh_type = SHT_SYMTAB_SHNDX;
-+	      symtab_shndx_hdr->sh_entsize = sizeof (Elf_External_Sym_Shndx);
-+	      symtab_shndx_hdr->sh_addralign = sizeof (Elf_External_Sym_Shndx);
-+	      amt = bfd_get_symcount (abfd) * sizeof (Elf_External_Sym_Shndx);
-+	      symtab_shndx_hdr->sh_size = amt;
- 
--	  if (bfd_seek (abfd, symtab_shndx_hdr->sh_offset, SEEK_SET) != 0
--	      || (bfd_bwrite (flinfo.symshndxbuf, amt, abfd) != amt))
--	    return FALSE;
-+	      off = _bfd_elf_assign_file_position_for_section (symtab_shndx_hdr,
-+							       off, TRUE);
-+
-+	      if (bfd_seek (abfd, symtab_shndx_hdr->sh_offset, SEEK_SET) != 0
-+		  || (bfd_bwrite (flinfo.symshndxbuf, amt, abfd) != amt))
-+		return FALSE;
-+	    }
- 	}
- 
-       symstrtab_hdr = &elf_tdata (abfd)->strtab_hdr;
--- 
-2.9.3
-
diff --git a/system/binutils/disable-ifunc-tests.patch b/system/binutils/disable-ifunc-tests.patch
index 6fbc5c874..b50d20b0e 100644
--- a/system/binutils/disable-ifunc-tests.patch
+++ b/system/binutils/disable-ifunc-tests.patch
@@ -1,12 +1,12 @@
---- binutils-2.30/ld/testsuite/ld-ifunc/ifunc.exp.old	2018-01-13 07:31:16.000000000 -0600
-+++ binutils-2.30/ld/testsuite/ld-ifunc/ifunc.exp	2018-02-27 14:46:07.596544780 -0600
-@@ -36,7 +36,8 @@
- 	  || (([istarget "*-*-linux*"]
- 	       || [istarget "*-*-gnu*"])
- 	      && ![istarget "*-*-*aout*"]
--	      && ![istarget "*-*-*oldld*"]))) } {
-+	      && ![istarget "*-*-*oldld*"]
-+	      && ![istarget "*-*-*musl*"]))) } {
+--- binutils-2.31.1/ld/testsuite/ld-ifunc/ifunc.exp.old	2018-06-27 07:55:16.000000000 +0000
++++ binutils-2.31.1/ld/testsuite/ld-ifunc/ifunc.exp	2018-10-12 03:23:09.240000000 +0000
+@@ -34,7 +34,8 @@
+       && ([istarget "*-*-elf*"]
+ 	  || [istarget "*-*-nacl*"]
+ 	  || [istarget "*-*-linux*"]
+-	  || [istarget "*-*-gnu*"])) } {
++	  || [istarget "*-*-gnu*"])
++      && ![istarget "*-*-musl*"]) } {
      verbose "IFUNC tests not run - target does not support IFUNC"
      return
  }
diff --git a/system/binutils/hash-style-configure-flag.patch b/system/binutils/hash-style-configure-flag.patch
deleted file mode 100644
index 6d4db4bca..000000000
--- a/system/binutils/hash-style-configure-flag.patch
+++ /dev/null
@@ -1,348 +0,0 @@
-From 2760f24c4942853eac7b921e4b8843d57a602654 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@gmail.com>
-Date: Tue, 8 Aug 2017 07:25:39 +0930
-Subject: [PATCH] Add configure flag to enable gnu hash style by default.
-
-ld/
-	* configure.ac: Add --enable-default-hash-style option.
-	* ldmain.c (main): Set link_info.emit_hash to DEFAULT_EMIT_SYSV_HASH.
-	Set link_info.emit_gnu_hash to DEFAULT_EMIT_GNU_HASH.
-	* configure: Regenerate.
-	* config.in: Regenerate.
-
-gold/
-	* configure.ac: Add --enable-default-hash-style option.
-	* options.h (hash_style): Use DEFAULT_HASH_STYLE as default value.
-	* configure: Regenerate.
-	* config.in: Regenerate.
----
- gold/ChangeLog    |  8 ++++++++
- gold/config.in    |  3 +++
- gold/configure    | 27 +++++++++++++++++++++++++++
- gold/configure.ac | 20 ++++++++++++++++++++
- gold/options.h    |  2 +-
- ld/ChangeLog      |  9 +++++++++
- ld/config.in      |  6 ++++++
- ld/configure      | 42 ++++++++++++++++++++++++++++++++++++++----
- ld/configure.ac   | 34 ++++++++++++++++++++++++++++++++++
- ld/ldmain.c       |  3 ++-
- 10 files changed, 148 insertions(+), 6 deletions(-)
-
-diff --git a/gold/ChangeLog b/gold/ChangeLog
-index d598386..93836dd 100644
---- a/gold/ChangeLog
-+++ b/gold/ChangeLog
-@@ -1,3 +1,11 @@
-+2017-08-08  Romain Geissler  <romain.geissler@gmail.com>
-+	    Alan Modra  <amodra@gmail.com>
-+
-+	* configure.ac: Add --enable-default-hash-style option.
-+	* options.h (hash_style): Use DEFAULT_HASH_STYLE as default value.
-+	* configure: Regenerate.
-+	* config.in: Regenerate.
-+
- 2017-02-22  Alan Modra  <amodra@gmail.com>
- 
- 	* powerpc.cc (Target_powerpc::make_iplt_section): Check that
-diff --git a/gold/config.in b/gold/config.in
-index d9f7b76..5855fca 100644
---- a/gold/config.in
-+++ b/gold/config.in
-@@ -10,6 +10,9 @@
- /* Define if building universal (internal helper macro) */
- #undef AC_APPLE_UNIVERSAL_BUILD
- 
-+/* Set the default --hash-style value */
-+#undef DEFAULT_HASH_STYLE
-+
- /* Define to 1 if you want to enable -z relro in ELF linker by default. */
- #undef DEFAULT_LD_Z_RELRO
- 
-diff --git a/gold/configure b/gold/configure
-index cb020be..90a706d 100755
---- a/gold/configure
-+++ b/gold/configure
-@@ -797,6 +797,7 @@ enable_threads
- enable_plugins
- enable_relro
- enable_targets
-+enable_default_hash_style
- with_lib_path
- enable_dependency_tracking
- enable_nls
-@@ -1447,6 +1448,8 @@ Optional Features:
-   --enable-plugins        linker plugins
-   --enable-relro          enable -z relro in ELF linker by default
-   --enable-targets        alternative target configurations
-+  --enable-default-hash-style={sysv,gnu,both}
-+                          use this default hash style
-   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking   do not reject slow dependency extractors
-   --disable-nls           do not use Native Language Support
-@@ -3410,6 +3413,30 @@ if test -n "$enable_targets"; then
-   done
- fi
- 
-+# Decide which "--hash-style" to use by default
-+# Provide a configure time option to override our default.
-+# Check whether --enable-default-hash-style was given.
-+if test "${enable_default_hash_style+set}" = set; then :
-+  enableval=$enable_default_hash_style; case "${enable_default_hash_style}" in
-+  sysv | gnu | both) ;;
-+  *) as_fn_error "bad value ${enable_default_hash_style} for enable-default-hash-style option" "$LINENO" 5 ;;
-+esac
-+else
-+  case "${target}" in
-+  # Enable gnu hash only on GNU targets, but not mips
-+  mips*-*-*) enable_default_hash_style=sysv ;;
-+  *-*-gnu* | *-*-linux* | *-*-nacl*) enable_default_hash_style=both ;;
-+  *) enable_default_hash_style=sysv ;;
-+esac
-+fi
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define DEFAULT_HASH_STYLE "${enable_default_hash_style}"
-+_ACEOF
-+
-+
- # See which specific instantiations we need.
- targetobjs=
- all_targets=
-diff --git a/gold/configure.ac b/gold/configure.ac
-index cbe3380..d7fa1f8 100644
---- a/gold/configure.ac
-+++ b/gold/configure.ac
-@@ -161,6 +161,26 @@ if test -n "$enable_targets"; then
-   done
- fi
- 
-+# Decide which "--hash-style" to use by default
-+# Provide a configure time option to override our default.
-+AC_ARG_ENABLE([default-hash-style],
-+AS_HELP_STRING([--enable-default-hash-style={sysv,gnu,both}],
-+	       [use this default hash style]),
-+[case "${enable_default_hash_style}" in
-+  sysv | gnu | both) ;;
-+  *) AC_MSG_ERROR([bad value ${enable_default_hash_style} for enable-default-hash-style option]) ;;
-+esac],
-+[case "${target}" in
-+  # Enable gnu hash only on GNU targets, but not mips
-+  mips*-*-*) enable_default_hash_style=sysv ;;
-+  *-*-gnu* | *-*-linux* | *-*-nacl*) enable_default_hash_style=both ;;
-+  *) enable_default_hash_style=sysv ;;
-+esac])
-+
-+AC_DEFINE_UNQUOTED([DEFAULT_HASH_STYLE],
-+  ["${enable_default_hash_style}"],
-+  [Set the default --hash-style value])
-+
- # See which specific instantiations we need.
- targetobjs=
- all_targets=
-diff --git a/gold/options.h b/gold/options.h
-index a8b1d46..ce21a42 100644
---- a/gold/options.h
-+++ b/gold/options.h
-@@ -921,7 +921,7 @@ class General_options
- 		N_("Min fraction of empty buckets in dynamic hash"),
- 		N_("FRACTION"));
- 
--  DEFINE_enum(hash_style, options::TWO_DASHES, '\0', "sysv",
-+  DEFINE_enum(hash_style, options::TWO_DASHES, '\0', DEFAULT_HASH_STYLE,
- 	      N_("Dynamic hash style"), N_("[sysv,gnu,both]"),
- 	      {"sysv", "gnu", "both"});
- 
-diff --git a/ld/ChangeLog b/ld/ChangeLog
-index ba7d1d4..cf91d55 100644
---- a/ld/ChangeLog
-+++ b/ld/ChangeLog
-@@ -1,3 +1,12 @@
-+2017-08-08  Romain Geissler  <romain.geissler@gmail.com>
-+	    Alan Modra  <amodra@gmail.com>
-+
-+	* configure.ac: Add --enable-default-hash-style option.
-+	* ldmain.c (main): Set link_info.emit_hash to DEFAULT_EMIT_SYSV_HASH.
-+	Set link_info.emit_gnu_hash to DEFAULT_EMIT_GNU_HASH.
-+	* configure: Regenerate.
-+	* config.in: Regenerate.
-+
- 2017-03-02  Tristan Gingold  <gingold@adacore.com>
- 
- 	* configure: Regenerate.
-diff --git a/ld/config.in b/ld/config.in
-index 2c6d698..b2318e1 100644
---- a/ld/config.in
-+++ b/ld/config.in
-@@ -7,6 +7,12 @@
- #endif
- #define __CONFIG_H__ 1
- 
-+/* Define to 1 if you want to emit gnu hash in the ELF linker by default. */
-+#undef DEFAULT_EMIT_GNU_HASH
-+
-+/* Define to 1 if you want to emit sysv hash in the ELF linker by default. */
-+#undef DEFAULT_EMIT_SYSV_HASH
-+
- /* Define if you want compressed debug sections by default. */
- #undef DEFAULT_FLAG_COMPRESS_DEBUG
- 
-diff --git a/ld/configure b/ld/configure
-index 36af969..40c67fd 100755
---- a/ld/configure
-+++ b/ld/configure
-@@ -793,6 +793,7 @@ enable_gold
- enable_got
- enable_compressed_debug_sections
- enable_relro
-+enable_default_hash_style
- enable_werror
- enable_build_warnings
- enable_nls
-@@ -1452,6 +1453,8 @@ Optional Features:
-   --enable-compressed-debug-sections={all,ld,none}
-                           compress debug sections by default]
-   --enable-relro          enable -z relro in ELF linker by default
-+  --enable-default-hash-style={sysv,gnu,both}
-+                          use this default hash style
-   --enable-werror         treat compile warnings as errors
-   --enable-build-warnings enable build-time compiler warnings
-   --disable-nls           do not use Native Language Support
-@@ -11724,7 +11727,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11727 "configure"
-+#line 11730 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11830,7 +11833,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11833 "configure"
-+#line 11836 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15555,6 +15558,33 @@ if test "${enable_relro+set}" = set; then :
- esac
- fi
- 
-+# Decide which "--hash-style" to use by default
-+# Provide a configure time option to override our default.
-+# Check whether --enable-default-hash-style was given.
-+if test "${enable_default_hash_style+set}" = set; then :
-+  enableval=$enable_default_hash_style; case "${enable_default_hash_style}" in
-+  sysv | gnu | both) ;;
-+  *) as_fn_error "bad value ${enable_default_hash_style} for enable-default-hash-style option" "$LINENO" 5 ;;
-+esac
-+else
-+  case "${target}" in
-+  # Enable gnu hash only on GNU targets, but not mips
-+  mips*-*-*) enable_default_hash_style=sysv ;;
-+  *-*-gnu* | *-*-linux* | *-*-nacl*) enable_default_hash_style=both ;;
-+  *) enable_default_hash_style=sysv ;;
-+esac
-+fi
-+
-+
-+case "${enable_default_hash_style}" in
-+  sysv | both) ac_default_emit_sysv_hash=1 ;;
-+  *) ac_default_emit_sysv_hash=0 ;;
-+esac
-+
-+case "${enable_default_hash_style}" in
-+  gnu | both) ac_default_emit_gnu_hash=1 ;;
-+  *) ac_default_emit_gnu_hash=0 ;;
-+esac
- 
- # Set the 'development' global.
- . $srcdir/../bfd/development.sh
-@@ -17212,9 +17242,13 @@ cat >>confdefs.h <<_ACEOF
- #define DEFAULT_LD_Z_RELRO $ac_default_ld_z_relro
- _ACEOF
- 
-+cat >>confdefs.h <<_ACEOF
-+#define DEFAULT_EMIT_SYSV_HASH $ac_default_emit_sysv_hash
-+_ACEOF
- 
--
--
-+cat >>confdefs.h <<_ACEOF
-+#define DEFAULT_EMIT_GNU_HASH $ac_default_emit_gnu_hash
-+_ACEOF
- 
- 
- 
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 36a9f50..1876ad7 100644
---- a/ld/configure.ac
-+++ b/ld/configure.ac
-@@ -166,6 +166,32 @@ AC_ARG_ENABLE(relro,
-   no)  ac_default_ld_z_relro=0 ;;
- esac])dnl
- 
-+# Decide which "--hash-style" to use by default
-+# Provide a configure time option to override our default.
-+AC_ARG_ENABLE([default-hash-style],
-+AS_HELP_STRING([--enable-default-hash-style={sysv,gnu,both}],
-+	       [use this default hash style]),
-+[case "${enable_default_hash_style}" in
-+  sysv | gnu | both) ;;
-+  *) AC_MSG_ERROR([bad value ${enable_default_hash_style} for enable-default-hash-style option]) ;;
-+esac],
-+[case "${target}" in
-+  # Enable gnu hash only on GNU targets, but not mips
-+  mips*-*-*) enable_default_hash_style=sysv ;;
-+  *-*-gnu* | *-*-linux* | *-*-nacl*) enable_default_hash_style=both ;;
-+  *) enable_default_hash_style=sysv ;;
-+esac])
-+
-+case "${enable_default_hash_style}" in
-+  sysv | both) ac_default_emit_sysv_hash=1 ;;
-+  *) ac_default_emit_sysv_hash=0 ;;
-+esac
-+
-+case "${enable_default_hash_style}" in
-+  gnu | both) ac_default_emit_gnu_hash=1 ;;
-+  *) ac_default_emit_gnu_hash=0 ;;
-+esac
-+
- AM_BINUTILS_WARNINGS
- 
- AM_LC_MESSAGES
-@@ -394,6 +420,14 @@ AC_DEFINE_UNQUOTED(DEFAULT_LD_Z_RELRO,
-   $ac_default_ld_z_relro,
-   [Define to 1 if you want to enable -z relro in ELF linker by default.])
- 
-+AC_DEFINE_UNQUOTED([DEFAULT_EMIT_SYSV_HASH],
-+  [$ac_default_emit_sysv_hash],
-+  [Define to 1 if you want to emit sysv hash in the ELF linker by default.])
-+
-+AC_DEFINE_UNQUOTED([DEFAULT_EMIT_GNU_HASH],
-+  [$ac_default_emit_gnu_hash],
-+  [Define to 1 if you want to emit gnu hash in the ELF linker by default.])
-+
- AC_SUBST(elf_list_options)
- AC_SUBST(elf_shlib_list_options)
- AC_SUBST(elf_plt_unwind_list_options)
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index 1e48b1a..579d961 100644
---- a/ld/ldmain.c
-+++ b/ld/ldmain.c
-@@ -282,7 +282,8 @@ main (int argc, char **argv)
-   link_info.keep_memory = TRUE;
-   link_info.combreloc = TRUE;
-   link_info.strip_discarded = TRUE;
--  link_info.emit_hash = TRUE;
-+  link_info.emit_hash = DEFAULT_EMIT_SYSV_HASH;
-+  link_info.emit_gnu_hash = DEFAULT_EMIT_GNU_HASH;
-   link_info.callbacks = &link_callbacks;
-   link_info.input_bfds_tail = &link_info.input_bfds;
-   /* SVR4 linkers seem to set DT_INIT and DT_FINI based on magic _init
--- 
-2.14.2
-
diff --git a/system/binutils/mips-illegal-memcpy.patch b/system/binutils/mips-illegal-memcpy.patch
deleted file mode 100644
index d76af178a..000000000
--- a/system/binutils/mips-illegal-memcpy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- binutils-2.29/gas/config/tc-mips.c.old	2017-07-04 03:43:20.000000000 -0500
-+++ binutils-2.29/gas/config/tc-mips.c	2017-08-25 17:21:51.449460074 -0500
-@@ -13956,7 +13956,7 @@
- 	suffix = 0;
-       if (suffix)
- 	{
--	  memcpy (name + opend - 2, name + opend, length - opend + 1);
-+	  memmove (name + opend - 2, name + opend, length - opend + 1);
- 	  insn = (struct mips_opcode *) hash_find (hash, name);
- 	  if (insn)
- 	    {
diff --git a/system/bubblewrap/APKBUILD b/system/bubblewrap/APKBUILD
index 2e1c8a628..0147c92c6 100644
--- a/system/bubblewrap/APKBUILD
+++ b/system/bubblewrap/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: 
 pkgname=bubblewrap
-pkgver=0.3.0
+pkgver=0.3.1
 pkgrel=0
 pkgdesc="Unprivileged sandboxing tool"
 url="https://github.com/projectatomic/bubblewrap"
@@ -46,6 +46,6 @@ bashcomp() {
 	mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/
 }
 
-sha512sums="0dc033f83547112cedc706e4ef80e39ba0ee63f3750f93454a7b1a38aeb922ee660b3491a5a5d060fce9a7c4b326798a66814ad94f53f1e666c27a557fec17a4  bubblewrap-0.3.0.tar.gz
+sha512sums="fbc44976f53fdf8913b94c57d1f26a3b87c773e86a289e58fd3d7b1c4ea7f33c862f1a38a4f791315358990928768a68334f0a171302c18a16c7e2e9f1a146dd  bubblewrap-0.3.1.tar.gz
 400a0446670ebf80f16739f1a7a2878aadc3099424f957ba09ec3df780506c23a11368f0578c9e352d7ca6473fa713df826fad7a20c50338aa5f9fa9ac6b84a4  realpath-workaround.patch
 f59cda3b09dd99db9ca6d97099a15bb2523e054063d677502317ae3165ba2e32105a0ae8f877afc3827bd28d093c9d9d413270f4c87d9fe5f26f3eee670d916e  musl-fixes.patch"
diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD
index 9ea4e8c6f..672ed2e3d 100644
--- a/system/cmake/APKBUILD
+++ b/system/cmake/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=cmake
-pkgver=3.12.1
+pkgver=3.12.3
 pkgrel=0
 pkgdesc="Cross-platform build system"
 url="https://cmake.org"
@@ -55,4 +55,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692  cmake-3.12.1.tar.gz"
+sha512sums="2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c  cmake-3.12.3.tar.gz"
diff --git a/system/console-setup/APKBUILD b/system/console-setup/APKBUILD
index 7ffab188d..4269c9b29 100644
--- a/system/console-setup/APKBUILD
+++ b/system/console-setup/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=console-setup
-pkgver=1.185
+pkgver=1.186
 pkgrel=0
 pkgdesc="Set up console font and keyboard layout"
 url="https://salsa.debian.org/installer-team/console-setup"
@@ -47,5 +47,5 @@ ckbcomp() {
 	mv "$pkgdir"/usr/bin/ckbcomp "$subpkgdir"/usr/bin/
 }
 
-sha512sums="413b7206d96913cd845dd0f3b2f78f631ef187fd56d3615a96de91189515f6eb9229bf3dadd5be44ef35a5b3ecd4be28cfe573459f3d411c201b506d77c62251  console-setup_1.185.tar.xz
+sha512sums="d3ca291cca5025a483f4ce0be9a5c351a3ee0f9ce791deb167089cfba2f77cceb8e4cc82e21c385f42da26534bb103c70c4f0cfcb038b80a1e05ab9ca4b52c7e  console-setup_1.186.tar.xz
 3b8e2c9d8551f9a51bcd33e58771a4f55ff2840f8fe392e0070bd2b6a3911cd9ed9377873538f6904fd99836ac4e0280c712be69d275aae9183dd12ff7efddae  console-setup.initd"
diff --git a/system/debianutils/APKBUILD b/system/debianutils/APKBUILD
index fbcdfe041..8e79a7eef 100644
--- a/system/debianutils/APKBUILD
+++ b/system/debianutils/APKBUILD
@@ -32,7 +32,7 @@ package() {
 }
 
 which() {
-	provides_priority="10"
+	provider_priority=10
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/which "$subpkgdir"/usr/bin/
 	# This will emit a warning about docs on abuild, but this is expected.
diff --git a/system/easy-kernel-power8-64k/APKBUILD b/system/easy-kernel-power8-64k/APKBUILD
index 88dd57ed3..5f543bfe1 100644
--- a/system/easy-kernel-power8-64k/APKBUILD
+++ b/system/easy-kernel-power8-64k/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
 _pkgname=easy-kernel-power8-64k
-pkgver=4.14.56
-pkgrel=9
+pkgver=4.14.76
+pkgrel=11
 pkgname=$_pkgname-$pkgver-mc$pkgrel
 _kflavour=power8-64k
 pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers (with 64K page size)"
@@ -77,7 +77,7 @@ modules() {
 }
 
 sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8  linux-4.14.tar.xz
-f76ae636da104c6f1d299a6aff18a5aa1166c9c06efbdf3270c911f26adc1760fbb4271ca2338ced47c7787c2ff54880e1945e2d6cf25fda880b5f735029d7a8  linux-4.14-mc9.patch.xz
+114611ae0cfaa3c277d857cd760047a47256f1f068297383b0a8d69b62e09de3c2cde617428ce207d156c63f6d89f4559d3dd29f72698d0e9ce68f27360e108c  linux-4.14-mc11.patch.xz
 e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be  ast-endianness.patch
 615b66b937aac3b2e5081db5bb0abb51bf32b9b1ba1b2d143d6b29187754ba83428a55944e8c81d58cab32d9f7d2909dc5c6156e9fda25bdad5c9e9db3335004  config-ppc64
 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e  futex-cmpxchg.patch"
diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD
index 4f3017ffd..06d0ecb79 100644
--- a/system/easy-kernel-power8/APKBUILD
+++ b/system/easy-kernel-power8/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
 _pkgname=easy-kernel-power8
-pkgver=4.14.56
-pkgrel=9
+pkgver=4.14.76
+pkgrel=11
 pkgname=$_pkgname-$pkgver-mc$pkgrel
 pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers"
 url="https://kernel.org/"
@@ -83,7 +83,7 @@ src() {
 	mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel-p8
 }
 sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8  linux-4.14.tar.xz
-f76ae636da104c6f1d299a6aff18a5aa1166c9c06efbdf3270c911f26adc1760fbb4271ca2338ced47c7787c2ff54880e1945e2d6cf25fda880b5f735029d7a8  linux-4.14-mc9.patch.xz
+114611ae0cfaa3c277d857cd760047a47256f1f068297383b0a8d69b62e09de3c2cde617428ce207d156c63f6d89f4559d3dd29f72698d0e9ce68f27360e108c  linux-4.14-mc11.patch.xz
 e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be  ast-endianness.patch
 fd810263d9aeeb2ec33c7872a9ccf52f474d79995d7f265f457226d62ab44456edf583e67fd4425c1e8025df0d359ebab566fbdcf8ce0a6c8c7ce36d726d3da6  config-ppc64
 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e  futex-cmpxchg.patch"
diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index c8ac1329a..86a80d91e 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
 _pkgname=easy-kernel
-pkgver=4.14.56
-pkgrel=9
+pkgver=4.14.76
+pkgrel=11
 pkgname=$_pkgname-$pkgver-mc$pkgrel
 pkgdesc="The Linux kernel, packaged for your convenience"
 url="https://kernel.org/"
@@ -103,7 +103,7 @@ src() {
 	mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel
 }
 sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8  linux-4.14.tar.xz
-f76ae636da104c6f1d299a6aff18a5aa1166c9c06efbdf3270c911f26adc1760fbb4271ca2338ced47c7787c2ff54880e1945e2d6cf25fda880b5f735029d7a8  linux-4.14-mc9.patch.xz
+114611ae0cfaa3c277d857cd760047a47256f1f068297383b0a8d69b62e09de3c2cde617428ce207d156c63f6d89f4559d3dd29f72698d0e9ce68f27360e108c  linux-4.14-mc11.patch.xz
 e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be  ast-endianness.patch
 3d3ee8f7c27ff20b9569ec4dadabd2c733102d1cf5fd3f6abfefaa4dc34e5161b793d82bce7c29f02aafe74791b345b516bf5b1503d36bf714ef2e70507a2bc3  config-ppc64
 1112f6c3fcfd7fdc0ef4d5e85df5d3adea430a9c7b4c2b34508a215f7ba14c863ccd7a5e17f13ed46c518bafec30cfb3ced70c465137c14ef5fc998b6cbcca1f  config-ppc
diff --git a/system/perl-encode-eucjpascii/APKBUILD b/system/perl-encode-eucjpascii/APKBUILD
new file mode 100644
index 000000000..a1febaadb
--- /dev/null
+++ b/system/perl-encode-eucjpascii/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=perl-encode-eucjpascii
+pkgver=0.03
+pkgrel=0
+pkgdesc="Perl mapping of EUC-JP to ASCII"
+url="https://metacpan.org/pod/Encode::EUCJPASCII"
+arch="all"
+license="Artistic-1.0-Perl AND GPL-2.0+"
+depends="perl"
+makedepends="perl-dev"
+source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz"
+builddir="$srcdir/Encode-EUCJPASCII-$pkgver"
+
+build() {
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="0d7a06e1f5eaa20451ef360ef78372cb0ecf0c9a525efed5db0b55b0fc98b47c87eff4f9be069bdd7be50156f8edfc0cb9a257e9efd5a33130cc745dca12b7d8  Encode-EUCJPASCII-0.03.tar.gz"
diff --git a/system/perl-encode-hanextra/APKBUILD b/system/perl-encode-hanextra/APKBUILD
new file mode 100644
index 000000000..e82241be9
--- /dev/null
+++ b/system/perl-encode-hanextra/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=perl-encode-hanextra
+pkgver=0.23
+pkgrel=0
+pkgdesc="Perl support for more Chinese encodings"
+url="https://metacpan.org/pod/Encode::HanExtra"
+arch="all"
+license="Artistic-1.0-Perl AND GPL-2.0+"
+depends="perl"
+makedepends="perl-module-install perl-dev"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/A/AU/AUDREYT/Encode-HanExtra-$pkgver.tar.gz"
+builddir="$srcdir/Encode-HanExtra-$pkgver"
+
+build() {
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="218083b9b3b4517cfc714169479cba0689a3586d9abb24bcc79d3401d37dd9412cb4e878b6aad06676d5c4f0e03cc69dcaf2e5f48036e2da6f336508c381e462  Encode-HanExtra-0.23.tar.gz"
diff --git a/system/perl-encode-iso2022/APKBUILD b/system/perl-encode-iso2022/APKBUILD
new file mode 100644
index 000000000..0c10974b1
--- /dev/null
+++ b/system/perl-encode-iso2022/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=perl-encode-iso2022
+pkgver=0.04
+pkgrel=0
+pkgdesc="Perl support for ISO-2022 encodings"
+url="https://metacpan.org/pod/Encode::ISO2022"
+arch="all"
+license="Artistic-1.0-Perl AND GPL-2.0+"
+depends="perl"
+makedepends="perl-dev"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Encode-ISO2022-$pkgver.tar.gz"
+builddir="$srcdir/Encode-ISO2022-$pkgver"
+
+build() {
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="d63de568cf81b74c618ee6e5299ec012fc1937ffdcaec31a3684609fefb2797286322037fdb6358d50afbf860b868c0e04542179a670800f3f591d0b48a497f1  Encode-ISO2022-0.04.tar.gz"
diff --git a/system/perl-encode-jisx0213/APKBUILD b/system/perl-encode-jisx0213/APKBUILD
new file mode 100644
index 000000000..64dbf52f3
--- /dev/null
+++ b/system/perl-encode-jisx0213/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=perl-encode-jisx0213
+pkgver=0.04
+pkgrel=0
+pkgdesc="Perl support for JIS X 0213 encodings"
+url="https://metacpan.org/pod/Encode::JISX0213"
+arch="all"
+license="Artistic-1.0-Perl AND GPL-2.0+"
+depends="perl perl-encode-iso2022"
+makedepends="perl-dev"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Encode-JISX0213-$pkgver.tar.gz"
+builddir="$srcdir/Encode-JISX0213-$pkgver"
+
+build() {
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="79a2d0639c0f9134ab7ff053b62cac950751cacb7ba91b7b6ff5c12787900c0ee7dc4037ff5819d11b1efc0bbb871926763930f6d5d40073c07a671cab44365a  Encode-JISX0213-0.04.tar.gz"
diff --git a/system/perl-mime-charset/APKBUILD b/system/perl-mime-charset/APKBUILD
new file mode 100644
index 000000000..7adb38810
--- /dev/null
+++ b/system/perl-mime-charset/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=perl-mime-charset
+pkgver=1.012.2
+pkgrel=0
+pkgdesc="Perl database for MIME character sets"
+url="https://metacpan.org/pod/MIME::Charset"
+arch="noarch"
+license="Artistic-1.0-Perl AND GPL-2.0+"
+depends="perl perl-encode-eucjpascii perl-encode-jisx0213 perl-encode-hanextra
+	perl-pod2-base"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/MIME-Charset-$pkgver.tar.gz"
+builddir="$srcdir/MIME-Charset-$pkgver"
+
+build() {
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="2273bf0b86eb042e5aa8bcf958eefefde7dce6701eea5ae8c0fe9997e7d3e90d837a7791ade30f84536a15116175c796daee60da6625f409d214844dfedfde4d  MIME-Charset-1.012.2.tar.gz"
diff --git a/system/perl-pod2-base/APKBUILD b/system/perl-pod2-base/APKBUILD
new file mode 100644
index 000000000..9d19f9e5c
--- /dev/null
+++ b/system/perl-pod2-base/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=perl-pod2-base
+pkgver=0.043
+pkgrel=0
+pkgdesc="Base module for POD translations"
+url="https://metacpan.org/pod/distribution/POD2-Base/lib/POD2/Base.pod"
+arch="noarch"
+license="Artistic-1.0-Perl AND GPL-2.0+"
+depends="perl"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/F/FE/FERREIRA/POD2-Base-$pkgver.tar.gz"
+builddir="$srcdir/POD2-Base-$pkgver"
+
+build() {
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="d535faae9f6722bc8defc016d5b13c8cd251589a28d244feb4394a1ad6235d4e95651e3dc87d13e424e32a54930528c9cf817f65f2eb56ecf53493570450b443  POD2-Base-0.043.tar.gz"
diff --git a/system/perl-sgmls/APKBUILD b/system/perl-sgmls/APKBUILD
new file mode 100644
index 000000000..111830823
--- /dev/null
+++ b/system/perl-sgmls/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=perl-sgmls
+pkgver=1.1
+pkgrel=0
+pkgdesc="Perl module for processing output from sgmls and nsgmls"
+url="https://metacpan.org/pod/release/RAAB/SGMLSpm-1.1/lib/SGMLS.pm"
+arch="noarch"
+license="GPL-2.0-only"
+depends="perl"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/R/RA/RAAB/SGMLSpm-$pkgver.tar.gz"
+sha512sums="0ca3f0f3265f20661ae88ad4764fbf82f226382f79f62c01653265cc7372524dfdf30ce5abffc0344624f5e6138e483952471f8c18d59794b40035af0b7526bc  SGMLSpm-1.1.tar.gz"
+builddir="$srcdir/SGMLSpm-$pkgver"
+
+prepare() {
+	chmod -R ug+w "$builddir"
+	cd "$builddir"
+	default_prepare
+}
+
+build() {
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
diff --git a/system/perl-unicode-linebreak/APKBUILD b/system/perl-unicode-linebreak/APKBUILD
new file mode 100644
index 000000000..c981c7e78
--- /dev/null
+++ b/system/perl-unicode-linebreak/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=perl-unicode-linebreak
+pkgver=2018.003
+_univer=8.0.0 # update this and unicode.org URLs if sombok is ever updated
+pkgrel=0
+pkgdesc="Perl implementation of the UAX#14 Unicode line-breaking algorithm"
+url="https://metacpan.org/release/Unicode-LineBreak"
+arch="all"
+license="Artistic-1.0-Perl AND GPL-2.0+"
+depends="perl perl-mime-charset"
+makedepends="perl-dev"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-$pkgver.tar.gz
+	ftp://unicode.org/Public/$_univer/ucd/auxiliary/GraphemeBreakTest.txt
+	ftp://unicode.org/Public/$_univer/ucd/auxiliary/LineBreakTest.txt"
+builddir="$srcdir/Unicode-LineBreak-$pkgver"
+
+prepare() {
+	cd "$builddir"
+	default_prepare
+	cp "$srcdir"/*Test.txt "$builddir"/test-data
+}
+
+build() {
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="37fa931978e1f88667b13ef25eb3b2414a6b055f03fec5925b3605e06026f06af332179e07f35d58f61924f43f305a5bc5ef1d76a61e1d56568abf60c9bf8fc7  Unicode-LineBreak-2018.003.tar.gz
+cc5a4fa7d53c127f749d0c45582f55f391ffdcfa2f2c91c41cb0a4f71e566f1657d4653a6a251c6ae4f769420701df6e0cf184e55413c602cbc5191f9dc99201  GraphemeBreakTest.txt
+d2ffb02fb4d402e6a90937743721692c008b78045e295bd77bcdfcabc99fb1fdbfb0b4679b410bce4487eba115a7ef2e6d6bb03b0a47a7220fa4308eafbac74e  LineBreakTest.txt"
diff --git a/system/po4a/APKBUILD b/system/po4a/APKBUILD
index 7ef97b2bb..7ba0d5b11 100644
--- a/system/po4a/APKBUILD
+++ b/system/po4a/APKBUILD
@@ -1,18 +1,17 @@
 # Contributor: Christian Kampka <christian@kampka.net>
 # Maintainer: 
 pkgname=po4a
-pkgver=0.51
-pkgrel=1
-_dlid=4214
+pkgver=0.54
+pkgrel=0
 pkgdesc="Tools for helping translation of documentation"
-url="https://po4a.alioth.debian.org"
+url="https://po4a.org"
 arch="noarch"
-options="!check"  # comments changed format, it fails
+options="!check"  # massive incompetence
 license="GPL-2.0-only"
-depends="perl gettext-tiny"
+depends="perl gettext-tiny perl-sgmls perl-unicode-linebreak"
 makedepends="docbook-xsl perl-module-build diffutils"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://alioth.debian.org/frs/download.php/file/${_dlid}/${pkgname}-${pkgver}.tar.gz"
+source="https://github.com/mquinson/po4a/releases/download/v$pkgver/po4a-$pkgver.tar.gz"
 
 build() {
 	cd "$builddir"
@@ -32,4 +31,4 @@ package() {
 	find ${pkgdir} -name .packlist -o -name perllocal.pod -delete
 }
 
-sha512sums="dd4ecf4eab59c41466b11828b7a4e5e06cfa8b8a188f808b05ef5aa163ba463ebf44485225c4bbdefcdd42b56d5956d9bc96c34dba12557f098723b7edde18b6  po4a-0.51.tar.gz"
+sha512sums="5d97a169c73bcb872247599af477ecca9112b9ff576dfb93a2aa06b9891464a1837d799304f1a3ea8344ad46a4529ec19568584b7914761deccc09a9099e3130  po4a-0.54.tar.gz"