put user stuff in user, not system

162 files changed, 17 insertions, 14 deletions

diff --git a/README.rst b/README.rst
index ad7db9cd5..6646f9865 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,10 @@
  README for Adélie Linux Package Set
 =====================================
 :Authors:
-  * **A. Wilcox**, primary maintainer
+  * **A. Wilcox**, Distro Lead
+  * **Elizabeth Myers**, Platform Group
+  * **Horst Burkhardt**, Platform Group
+  * **William Pitcock**, Platform Group
   * **Adélie Linux Developers and Users**, contributions
 :Status:
   Production
@@ -24,8 +27,7 @@ Licenses
 `````````
 As the Adélie Linux project is an open-source Linux distribution, packages
 contained in this repository must also be provided under a license recognised
-by the OSI_.  A separate repository may be provided in the future for certain
-non-free components, such as device driver firmware.
+by the OSI_.  No exceptions will be made.
 
 .. _OSI: http://opensource.org/licenses/category
 
@@ -50,9 +52,8 @@ find what you need.
 
 ``system``: System-level packages
 `````````````````````````````````
-The ``system`` directory contains special packages used by Adélie for core
-system functionality.  This directory is kept separate from ``user`` to
-facilitate sharing of user packages with other APK-based distributions.
+The ``system`` directory contains packages used by Adélie for core system
+functionality.  Special care should be taken before bumping these packages.
 
 
 ``user``: User packages
@@ -75,12 +76,10 @@ As an overlay
 
 The ``user`` repository can be added as an overlay to any system running APK,
 which at the time of this writing includes Alpine Linux, postmarketOS, and a
-few others.  However, please do not add ``system`` to a computer running a
-different distribution unless you are fully aware of the concerns surrounding
-mixing packages in such a manner.  None of the packages in the ``system``
-repository are useful for an Alpine computer, and some packages (such as
-``baselayout`` or ``adelie-base``) may in fact damage your Alpine installation
-if installed.  Please be careful.
+few others.  However, please ensure you are fully aware of the concerns
+surrounding mixing packages in such a manner.  There may be different ABIs or
+library versions between each distribution, and packages may crash, experience
+instability, or fail to launch at all.  Please be careful.
 
 The domain ``distfiles.adelielinux.org`` is a round-robin for all available
 Adélie mirrors.  You may add a repository named above to
@@ -91,7 +90,7 @@ Adélie mirrors.  You may add a repository named above to
   https://distfiles.adelielinux.org/adelie/$version/$repo
 
 Where ``$version`` is the version of Adélie Linux you are running, or
-``current`` for automatic upgrades, or ``dev`` for a rolling-release
+``current`` for automatic stable upgrades, or ``dev`` for a rolling-release
 style distribution (which may be unstable - you have been warned!).
 
 ``$repo`` should be replaced with the name of the repository you are wanting
@@ -100,10 +99,14 @@ to use, such as ``user``.
 Run ``apk update`` to update the package index on your local system.  The
 packages will then be available to you.
 
+If you are using the repository on a non-Adélie system, you should use
+repository pinning for the Adélie repositories you add.  Please consult the
+APK manual for more information about repository pinning.
+
 
 As a repository
 ```````````````
 
 The Adélie Linux system is preconfigured to use packages in ``system`` and
-``user`` for APK.  No further configuration is required.
+``user`` for APK.  No further configuration should be required.
 
diff --git a/system/apr-util/APKBUILD b/user/apr-util/APKBUILD
index 415c3e9cd..415c3e9cd 100644
--- a/system/apr-util/APKBUILD
+++ b/user/apr-util/APKBUILD
diff --git a/system/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
index 93e3ac995..93e3ac995 100644
--- a/system/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
+++ b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
diff --git a/system/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD
index a963e33f8..a963e33f8 100644
--- a/system/ffmpeg/APKBUILD
+++ b/user/ffmpeg/APKBUILD
diff --git a/system/freetype/0001-Enable-table-validation-modules.patch b/user/freetype/0001-Enable-table-validation-modules.patch
index 3e9451fa8..3e9451fa8 100644
--- a/system/freetype/0001-Enable-table-validation-modules.patch
+++ b/user/freetype/0001-Enable-table-validation-modules.patch
diff --git a/system/freetype/0002-Enable-subpixel-rendering.patch b/user/freetype/0002-Enable-subpixel-rendering.patch
index dfb57966e..dfb57966e 100644
--- a/system/freetype/0002-Enable-subpixel-rendering.patch
+++ b/user/freetype/0002-Enable-subpixel-rendering.patch
diff --git a/system/freetype/0003-Enable-infinality-subpixel-hinting.patch b/user/freetype/0003-Enable-infinality-subpixel-hinting.patch
index bbfa2a2cd..bbfa2a2cd 100644
--- a/system/freetype/0003-Enable-infinality-subpixel-hinting.patch
+++ b/user/freetype/0003-Enable-infinality-subpixel-hinting.patch
diff --git a/system/freetype/0004-Enable-long-PCF-family-names.patch b/user/freetype/0004-Enable-long-PCF-family-names.patch
index 675423a7c..675423a7c 100644
--- a/system/freetype/0004-Enable-long-PCF-family-names.patch
+++ b/user/freetype/0004-Enable-long-PCF-family-names.patch
diff --git a/system/freetype/40-memcpy-fix.patch b/user/freetype/40-memcpy-fix.patch
index 89e61cd0b..89e61cd0b 100644
--- a/system/freetype/40-memcpy-fix.patch
+++ b/user/freetype/40-memcpy-fix.patch
diff --git a/system/freetype/APKBUILD b/user/freetype/APKBUILD
index fbb4e0103..fbb4e0103 100644
--- a/system/freetype/APKBUILD
+++ b/user/freetype/APKBUILD
diff --git a/system/freetype/freetype-profile.sh b/user/freetype/freetype-profile.sh
index a4cc6423b..a4cc6423b 100644
--- a/system/freetype/freetype-profile.sh
+++ b/user/freetype/freetype-profile.sh
diff --git a/system/glib-networking/APKBUILD b/user/glib-networking/APKBUILD
index 65ae109a0..65ae109a0 100644
--- a/system/glib-networking/APKBUILD
+++ b/user/glib-networking/APKBUILD
diff --git a/system/glib-networking/proxy-test.patch b/user/glib-networking/proxy-test.patch
index 2cab5d9f6..2cab5d9f6 100644
--- a/system/glib-networking/proxy-test.patch
+++ b/user/glib-networking/proxy-test.patch
diff --git a/system/glib/0001-gquark-fix-initialization-with-c-constructors.patch b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch
index 50a9a8c28..50a9a8c28 100644
--- a/system/glib/0001-gquark-fix-initialization-with-c-constructors.patch
+++ b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch
diff --git a/system/glib/APKBUILD b/user/glib/APKBUILD
index 89a98754f..89a98754f 100644
--- a/system/glib/APKBUILD
+++ b/user/glib/APKBUILD
diff --git a/system/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch
index d7006db87..d7006db87 100644
--- a/system/glib/broken-gio-tests.patch
+++ b/user/glib/broken-gio-tests.patch
diff --git a/system/glib/fix-spawn.patch b/user/glib/fix-spawn.patch
index df352fdc3..df352fdc3 100644
--- a/system/glib/fix-spawn.patch
+++ b/user/glib/fix-spawn.patch
diff --git a/system/glib/glib.trigger b/user/glib/glib.trigger
index cf23eff7d..cf23eff7d 100644
--- a/system/glib/glib.trigger
+++ b/user/glib/glib.trigger
diff --git a/system/glib/i386-fpu-test.patch b/user/glib/i386-fpu-test.patch
index 986c33164..986c33164 100644
--- a/system/glib/i386-fpu-test.patch
+++ b/user/glib/i386-fpu-test.patch
diff --git a/system/glib/musl-no-locale.patch b/user/glib/musl-no-locale.patch
index 4b36b0b2e..4b36b0b2e 100644
--- a/system/glib/musl-no-locale.patch
+++ b/user/glib/musl-no-locale.patch
diff --git a/system/glib/ridiculous-strerror-nonconformance.patch b/user/glib/ridiculous-strerror-nonconformance.patch
index 3ffc0aafa..3ffc0aafa 100644
--- a/system/glib/ridiculous-strerror-nonconformance.patch
+++ b/user/glib/ridiculous-strerror-nonconformance.patch
diff --git a/system/glib/thread-test-fix.patch b/user/glib/thread-test-fix.patch
index bcfcfc441..bcfcfc441 100644
--- a/system/glib/thread-test-fix.patch
+++ b/user/glib/thread-test-fix.patch
diff --git a/system/gnutls/APKBUILD b/user/gnutls/APKBUILD
index b64faaa64..b64faaa64 100644
--- a/system/gnutls/APKBUILD
+++ b/user/gnutls/APKBUILD
diff --git a/system/gnutls/tests-date-compat.patch b/user/gnutls/tests-date-compat.patch
index 2717ab230..2717ab230 100644
--- a/system/gnutls/tests-date-compat.patch
+++ b/user/gnutls/tests-date-compat.patch
diff --git a/system/gpgme/APKBUILD b/user/gpgme/APKBUILD
index 10ffc83de..10ffc83de 100644
--- a/system/gpgme/APKBUILD
+++ b/user/gpgme/APKBUILD
diff --git a/system/gpgme/fix-bashism.patch b/user/gpgme/fix-bashism.patch
index 19508c96e..19508c96e 100644
--- a/system/gpgme/fix-bashism.patch
+++ b/user/gpgme/fix-bashism.patch
diff --git a/system/graphviz/0001-clone-nameclash.patch b/user/graphviz/0001-clone-nameclash.patch
index 6222238d8..6222238d8 100644
--- a/system/graphviz/0001-clone-nameclash.patch
+++ b/user/graphviz/0001-clone-nameclash.patch
diff --git a/system/graphviz/APKBUILD b/user/graphviz/APKBUILD
index 7f5b34c1f..7f5b34c1f 100644
--- a/system/graphviz/APKBUILD
+++ b/user/graphviz/APKBUILD
diff --git a/system/graphviz/graphviz.pre-deinstall b/user/graphviz/graphviz.pre-deinstall
index cfc43bf6a..cfc43bf6a 100644
--- a/system/graphviz/graphviz.pre-deinstall
+++ b/user/graphviz/graphviz.pre-deinstall
diff --git a/system/graphviz/graphviz.trigger b/user/graphviz/graphviz.trigger
index 99d447b9b..99d447b9b 100644
--- a/system/graphviz/graphviz.trigger
+++ b/user/graphviz/graphviz.trigger
diff --git a/system/gsl/APKBUILD b/user/gsl/APKBUILD
index 2820f36d6..2820f36d6 100644
--- a/system/gsl/APKBUILD
+++ b/user/gsl/APKBUILD
diff --git a/system/gsl/aarch64-test-failure.patch b/user/gsl/aarch64-test-failure.patch
index 0b6e80380..0b6e80380 100644
--- a/system/gsl/aarch64-test-failure.patch
+++ b/user/gsl/aarch64-test-failure.patch
diff --git a/system/gsl/dont-disable-deprecated.patch b/user/gsl/dont-disable-deprecated.patch
index 40a7c3bce..40a7c3bce 100644
--- a/system/gsl/dont-disable-deprecated.patch
+++ b/user/gsl/dont-disable-deprecated.patch
diff --git a/system/hexchat/APKBUILD b/user/hexchat/APKBUILD
index 5f43c168d..5f43c168d 100644
--- a/system/hexchat/APKBUILD
+++ b/user/hexchat/APKBUILD
diff --git a/system/hexchat/libressl.patch b/user/hexchat/libressl.patch
index d829dee39..d829dee39 100644
--- a/system/hexchat/libressl.patch
+++ b/user/hexchat/libressl.patch
diff --git a/system/hexchat/pixdata.patch b/user/hexchat/pixdata.patch
index 4e720a848..4e720a848 100644
--- a/system/hexchat/pixdata.patch
+++ b/user/hexchat/pixdata.patch
diff --git a/system/i3lock/APKBUILD b/user/i3lock/APKBUILD
index c11e9bca8..c11e9bca8 100644
--- a/system/i3lock/APKBUILD
+++ b/user/i3lock/APKBUILD
diff --git a/system/jasper/APKBUILD b/user/jasper/APKBUILD
index 74504d503..74504d503 100644
--- a/system/jasper/APKBUILD
+++ b/user/jasper/APKBUILD
diff --git a/system/libbluray/APKBUILD b/user/libbluray/APKBUILD
index 925ad2cfd..925ad2cfd 100644
--- a/system/libbluray/APKBUILD
+++ b/user/libbluray/APKBUILD
diff --git a/system/libcanberra/APKBUILD b/user/libcanberra/APKBUILD
index 31cae167b..31cae167b 100644
--- a/system/libcanberra/APKBUILD
+++ b/user/libcanberra/APKBUILD
diff --git a/system/libgit2/APKBUILD b/user/libgit2/APKBUILD
index e7e4bbfad..e7e4bbfad 100644
--- a/system/libgit2/APKBUILD
+++ b/user/libgit2/APKBUILD
diff --git a/system/libgit2/build-both-static-dynamic.patch b/user/libgit2/build-both-static-dynamic.patch
index eeb179a1e..eeb179a1e 100644
--- a/system/libgit2/build-both-static-dynamic.patch
+++ b/user/libgit2/build-both-static-dynamic.patch
diff --git a/system/libgit2/libressl.patch b/user/libgit2/libressl.patch
index 967cdc498..967cdc498 100644
--- a/system/libgit2/libressl.patch
+++ b/user/libgit2/libressl.patch
diff --git a/system/libgit2/pkgconfig-do-not-quote-Libs.patch b/user/libgit2/pkgconfig-do-not-quote-Libs.patch
index 86133612e..86133612e 100644
--- a/system/libgit2/pkgconfig-do-not-quote-Libs.patch
+++ b/user/libgit2/pkgconfig-do-not-quote-Libs.patch
diff --git a/system/libnih/APKBUILD b/user/libnih/APKBUILD
index f12895d65..f12895d65 100644
--- a/system/libnih/APKBUILD
+++ b/user/libnih/APKBUILD
diff --git a/system/libnih/disable-broken-test.patch b/user/libnih/disable-broken-test.patch
index 15027945a..15027945a 100644
--- a/system/libnih/disable-broken-test.patch
+++ b/user/libnih/disable-broken-test.patch
diff --git a/system/libnih/musl-enomem-message.patch b/user/libnih/musl-enomem-message.patch
index 2adeff852..2adeff852 100644
--- a/system/libnih/musl-enomem-message.patch
+++ b/user/libnih/musl-enomem-message.patch
diff --git a/system/libnih/musl-fix-signals.patch b/user/libnih/musl-fix-signals.patch
index 97ef8196d..97ef8196d 100644
--- a/system/libnih/musl-fix-signals.patch
+++ b/user/libnih/musl-fix-signals.patch
diff --git a/system/libnih/parse-test-fix.patch b/user/libnih/parse-test-fix.patch
index e993bf324..e993bf324 100644
--- a/system/libnih/parse-test-fix.patch
+++ b/user/libnih/parse-test-fix.patch
diff --git a/system/libnotify/APKBUILD b/user/libnotify/APKBUILD
index a59730e1b..a59730e1b 100644
--- a/system/libnotify/APKBUILD
+++ b/user/libnotify/APKBUILD
diff --git a/system/libsndfile/APKBUILD b/user/libsndfile/APKBUILD
index 66abef4f7..66abef4f7 100644
--- a/system/libsndfile/APKBUILD
+++ b/user/libsndfile/APKBUILD
diff --git a/system/libsndfile/CVE-2017-12562.patch b/user/libsndfile/CVE-2017-12562.patch
index f195e87e4..f195e87e4 100644
--- a/system/libsndfile/CVE-2017-12562.patch
+++ b/user/libsndfile/CVE-2017-12562.patch
diff --git a/system/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch b/user/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
index 1dc5b57f1..1dc5b57f1 100644
--- a/system/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
+++ b/user/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
diff --git a/system/libsndfile/CVE-2017-8362.patch b/user/libsndfile/CVE-2017-8362.patch
index 54fbfb44c..54fbfb44c 100644
--- a/system/libsndfile/CVE-2017-8362.patch
+++ b/user/libsndfile/CVE-2017-8362.patch
diff --git a/system/libsndfile/varargs-32bit.patch b/user/libsndfile/varargs-32bit.patch
index 81f149add..81f149add 100644
--- a/system/libsndfile/varargs-32bit.patch
+++ b/user/libsndfile/varargs-32bit.patch
diff --git a/system/libssh2/APKBUILD b/user/libssh2/APKBUILD
index 1bfdfdef9..1bfdfdef9 100644
--- a/system/libssh2/APKBUILD
+++ b/user/libssh2/APKBUILD
diff --git a/system/libvpx/APKBUILD b/user/libvpx/APKBUILD
index 27de30e06..27de30e06 100644
--- a/system/libvpx/APKBUILD
+++ b/user/libvpx/APKBUILD
diff --git a/system/libvpx/libm-pc.patch b/user/libvpx/libm-pc.patch
index 87f07a398..87f07a398 100644
--- a/system/libvpx/libm-pc.patch
+++ b/user/libvpx/libm-pc.patch
diff --git a/system/lighttpd/APKBUILD b/user/lighttpd/APKBUILD
index 356bce93e..356bce93e 100644
--- a/system/lighttpd/APKBUILD
+++ b/user/lighttpd/APKBUILD
diff --git a/system/lighttpd/char-signedness.patch b/user/lighttpd/char-signedness.patch
index 43f7f5faf..43f7f5faf 100644
--- a/system/lighttpd/char-signedness.patch
+++ b/user/lighttpd/char-signedness.patch
diff --git a/system/lighttpd/lighttpd.conf b/user/lighttpd/lighttpd.conf
index cfec00065..cfec00065 100644
--- a/system/lighttpd/lighttpd.conf
+++ b/user/lighttpd/lighttpd.conf
diff --git a/system/lighttpd/lighttpd.confd b/user/lighttpd/lighttpd.confd
index da524afb4..da524afb4 100644
--- a/system/lighttpd/lighttpd.confd
+++ b/user/lighttpd/lighttpd.confd
diff --git a/system/lighttpd/lighttpd.initd b/user/lighttpd/lighttpd.initd
index 614cb2132..614cb2132 100644
--- a/system/lighttpd/lighttpd.initd
+++ b/user/lighttpd/lighttpd.initd
diff --git a/system/lighttpd/lighttpd.logrotate b/user/lighttpd/lighttpd.logrotate
index 8fbb20fb0..8fbb20fb0 100644
--- a/system/lighttpd/lighttpd.logrotate
+++ b/user/lighttpd/lighttpd.logrotate
diff --git a/system/lighttpd/lighttpd.pre-install b/user/lighttpd/lighttpd.pre-install
index 81ccda1f9..81ccda1f9 100644
--- a/system/lighttpd/lighttpd.pre-install
+++ b/user/lighttpd/lighttpd.pre-install
diff --git a/system/lighttpd/lighttpd.pre-upgrade b/user/lighttpd/lighttpd.pre-upgrade
index 18a7fef66..18a7fef66 120000
--- a/system/lighttpd/lighttpd.pre-upgrade
+++ b/user/lighttpd/lighttpd.pre-upgrade
diff --git a/system/lighttpd/mime-types.conf b/user/lighttpd/mime-types.conf
index f24d4d858..f24d4d858 100644
--- a/system/lighttpd/mime-types.conf
+++ b/user/lighttpd/mime-types.conf
diff --git a/system/lighttpd/mod_cgi.conf b/user/lighttpd/mod_cgi.conf
index 1cb3770f9..1cb3770f9 100644
--- a/system/lighttpd/mod_cgi.conf
+++ b/user/lighttpd/mod_cgi.conf
diff --git a/system/lighttpd/mod_fastcgi.conf b/user/lighttpd/mod_fastcgi.conf
index 549b84c2e..549b84c2e 100644
--- a/system/lighttpd/mod_fastcgi.conf
+++ b/user/lighttpd/mod_fastcgi.conf
diff --git a/system/lighttpd/mod_fastcgi_fpm.conf b/user/lighttpd/mod_fastcgi_fpm.conf
index 926137a43..926137a43 100644
--- a/system/lighttpd/mod_fastcgi_fpm.conf
+++ b/user/lighttpd/mod_fastcgi_fpm.conf
diff --git a/system/lm_sensors/APKBUILD b/user/lm_sensors/APKBUILD
index 694adb868..694adb868 100644
--- a/system/lm_sensors/APKBUILD
+++ b/user/lm_sensors/APKBUILD
diff --git a/system/lm_sensors/fancontrol.initd b/user/lm_sensors/fancontrol.initd
index cb29a9ee9..cb29a9ee9 100644
--- a/system/lm_sensors/fancontrol.initd
+++ b/user/lm_sensors/fancontrol.initd
diff --git a/system/lm_sensors/musl-fix-includes.patch b/user/lm_sensors/musl-fix-includes.patch
index 501f2dd76..501f2dd76 100644
--- a/system/lm_sensors/musl-fix-includes.patch
+++ b/user/lm_sensors/musl-fix-includes.patch
diff --git a/system/lm_sensors/sensord.confd b/user/lm_sensors/sensord.confd
index d82841aeb..d82841aeb 100644
--- a/system/lm_sensors/sensord.confd
+++ b/user/lm_sensors/sensord.confd
diff --git a/system/lm_sensors/sensord.initd b/user/lm_sensors/sensord.initd
index c100b1aa1..c100b1aa1 100644
--- a/system/lm_sensors/sensord.initd
+++ b/user/lm_sensors/sensord.initd
diff --git a/system/lm_sensors/sensors-detect-alpine.patch b/user/lm_sensors/sensors-detect-alpine.patch
index 319fcec06..319fcec06 100644
--- a/system/lm_sensors/sensors-detect-alpine.patch
+++ b/user/lm_sensors/sensors-detect-alpine.patch
diff --git a/system/lm_sensors/sensors.install b/user/lm_sensors/sensors.install
index d593f8414..d593f8414 100644
--- a/system/lm_sensors/sensors.install
+++ b/user/lm_sensors/sensors.install
diff --git a/system/ltrace/APKBUILD b/user/ltrace/APKBUILD
index bd07768bf..bd07768bf 100644
--- a/system/ltrace/APKBUILD
+++ b/user/ltrace/APKBUILD
diff --git a/system/ltrace/aarch-part2.patch b/user/ltrace/aarch-part2.patch
index c40d0a797..c40d0a797 100644
--- a/system/ltrace/aarch-part2.patch
+++ b/user/ltrace/aarch-part2.patch
diff --git a/system/ltrace/aarch64.patch b/user/ltrace/aarch64.patch
index a89c3073a..a89c3073a 100644
--- a/system/ltrace/aarch64.patch
+++ b/user/ltrace/aarch64.patch
diff --git a/system/ltrace/add_ppc64le.patch b/user/ltrace/add_ppc64le.patch
index 32efa8b52..32efa8b52 100644
--- a/system/ltrace/add_ppc64le.patch
+++ b/user/ltrace/add_ppc64le.patch
diff --git a/system/ltrace/musl.patch b/user/ltrace/musl.patch
index 2dc909c95..2dc909c95 100644
--- a/system/ltrace/musl.patch
+++ b/user/ltrace/musl.patch
diff --git a/system/mlt/APKBUILD b/user/mlt/APKBUILD
index 0dc7d8041..0dc7d8041 100644
--- a/system/mlt/APKBUILD
+++ b/user/mlt/APKBUILD
diff --git a/system/mlt/mlt-6.8.0-locale-header.patch b/user/mlt/mlt-6.8.0-locale-header.patch
index 5b45b600a..5b45b600a 100644
--- a/system/mlt/mlt-6.8.0-locale-header.patch
+++ b/user/mlt/mlt-6.8.0-locale-header.patch
diff --git a/system/mutt/APKBUILD b/user/mutt/APKBUILD
index 2b3424421..2b3424421 100644
--- a/system/mutt/APKBUILD
+++ b/user/mutt/APKBUILD
diff --git a/system/neon/APKBUILD b/user/neon/APKBUILD
index a0ddbd5d4..a0ddbd5d4 100644
--- a/system/neon/APKBUILD
+++ b/user/neon/APKBUILD
diff --git a/system/openldap/APKBUILD b/user/openldap/APKBUILD
index 84cbc1471..84cbc1471 100644
--- a/system/openldap/APKBUILD
+++ b/user/openldap/APKBUILD
diff --git a/system/openldap/CVE-2017-9287.patch b/user/openldap/CVE-2017-9287.patch
index 1599c1331..1599c1331 100644
--- a/system/openldap/CVE-2017-9287.patch
+++ b/user/openldap/CVE-2017-9287.patch
diff --git a/system/openldap/configs.patch b/user/openldap/configs.patch
index e7ec65c4b..e7ec65c4b 100644
--- a/system/openldap/configs.patch
+++ b/user/openldap/configs.patch
diff --git a/system/openldap/fix-manpages.patch b/user/openldap/fix-manpages.patch
index 179569494..179569494 100644
--- a/system/openldap/fix-manpages.patch
+++ b/user/openldap/fix-manpages.patch
diff --git a/system/openldap/libressl.patch b/user/openldap/libressl.patch
index ac0106418..ac0106418 100644
--- a/system/openldap/libressl.patch
+++ b/user/openldap/libressl.patch
diff --git a/system/openldap/openldap-2.4-ppolicy.patch b/user/openldap/openldap-2.4-ppolicy.patch
index c05790e3e..c05790e3e 100644
--- a/system/openldap/openldap-2.4-ppolicy.patch
+++ b/user/openldap/openldap-2.4-ppolicy.patch
diff --git a/system/openldap/openldap-2.4.11-libldap_r.patch b/user/openldap/openldap-2.4.11-libldap_r.patch
index 448249a3b..448249a3b 100644
--- a/system/openldap/openldap-2.4.11-libldap_r.patch
+++ b/user/openldap/openldap-2.4.11-libldap_r.patch
diff --git a/system/openldap/openldap-mqtt-overlay.patch b/user/openldap/openldap-mqtt-overlay.patch
index 795480f1e..795480f1e 100644
--- a/system/openldap/openldap-mqtt-overlay.patch
+++ b/user/openldap/openldap-mqtt-overlay.patch
diff --git a/system/openldap/openldap.post-install b/user/openldap/openldap.post-install
index e90d25760..e90d25760 100644
--- a/system/openldap/openldap.post-install
+++ b/user/openldap/openldap.post-install
diff --git a/system/openldap/openldap.post-upgrade b/user/openldap/openldap.post-upgrade
index 7be8906a9..7be8906a9 100644
--- a/system/openldap/openldap.post-upgrade
+++ b/user/openldap/openldap.post-upgrade
diff --git a/system/openldap/openldap.pre-install b/user/openldap/openldap.pre-install
index eb6b10fa4..eb6b10fa4 100644
--- a/system/openldap/openldap.pre-install
+++ b/user/openldap/openldap.pre-install
diff --git a/system/openldap/slapd.confd b/user/openldap/slapd.confd
index f69f92b4a..f69f92b4a 100644
--- a/system/openldap/slapd.confd
+++ b/user/openldap/slapd.confd
diff --git a/system/openldap/slapd.initd b/user/openldap/slapd.initd
index 350cc0d50..350cc0d50 100644
--- a/system/openldap/slapd.initd
+++ b/user/openldap/slapd.initd
diff --git a/system/orbit2/APKBUILD b/user/orbit2/APKBUILD
index 5caf3dcbc..5caf3dcbc 100644
--- a/system/orbit2/APKBUILD
+++ b/user/orbit2/APKBUILD
diff --git a/system/orbit2/glib-2.36.patch b/user/orbit2/glib-2.36.patch
index c94f920f7..c94f920f7 100644
--- a/system/orbit2/glib-2.36.patch
+++ b/user/orbit2/glib-2.36.patch
diff --git a/system/polkit/0001-Bug-50145-make-netgroup-support-optional.patch b/user/polkit/0001-Bug-50145-make-netgroup-support-optional.patch
index 1498e831a..1498e831a 100644
--- a/system/polkit/0001-Bug-50145-make-netgroup-support-optional.patch
+++ b/user/polkit/0001-Bug-50145-make-netgroup-support-optional.patch
diff --git a/system/polkit/APKBUILD b/user/polkit/APKBUILD
index fdc37d634..fdc37d634 100644
--- a/system/polkit/APKBUILD
+++ b/user/polkit/APKBUILD
diff --git a/system/polkit/CVE-2013-4288.patch b/user/polkit/CVE-2013-4288.patch
index 0ca8131e8..0ca8131e8 100644
--- a/system/polkit/CVE-2013-4288.patch
+++ b/user/polkit/CVE-2013-4288.patch
diff --git a/system/polkit/CVE-2015-3218.patch b/user/polkit/CVE-2015-3218.patch
index 977825102..977825102 100644
--- a/system/polkit/CVE-2015-3218.patch
+++ b/user/polkit/CVE-2015-3218.patch
diff --git a/system/polkit/CVE-2015-3255.patch b/user/polkit/CVE-2015-3255.patch
index 1bd7c6bcf..1bd7c6bcf 100644
--- a/system/polkit/CVE-2015-3255.patch
+++ b/user/polkit/CVE-2015-3255.patch
diff --git a/system/polkit/CVE-2015-4625.patch b/user/polkit/CVE-2015-4625.patch
index 4a43fb433..4a43fb433 100644
--- a/system/polkit/CVE-2015-4625.patch
+++ b/user/polkit/CVE-2015-4625.patch
diff --git a/system/polkit/automake.patch b/user/polkit/automake.patch
index 0f6825a26..0f6825a26 100644
--- a/system/polkit/automake.patch
+++ b/user/polkit/automake.patch
diff --git a/system/polkit/disable-ck-test.patch b/user/polkit/disable-ck-test.patch
index e1987d40d..e1987d40d 100644
--- a/system/polkit/disable-ck-test.patch
+++ b/user/polkit/disable-ck-test.patch
diff --git a/system/polkit/fix-consolekit-db-stat.patch b/user/polkit/fix-consolekit-db-stat.patch
index 3deceb639..3deceb639 100644
--- a/system/polkit/fix-consolekit-db-stat.patch
+++ b/user/polkit/fix-consolekit-db-stat.patch
diff --git a/system/polkit/fix-parallel-make.patch b/user/polkit/fix-parallel-make.patch
index b693a34dd..b693a34dd 100644
--- a/system/polkit/fix-parallel-make.patch
+++ b/user/polkit/fix-parallel-make.patch
diff --git a/system/polkit/fix-test-fgetpwent.patch b/user/polkit/fix-test-fgetpwent.patch
index 7bc6481cc..7bc6481cc 100644
--- a/system/polkit/fix-test-fgetpwent.patch
+++ b/user/polkit/fix-test-fgetpwent.patch
diff --git a/system/py-dbus/APKBUILD b/user/py-dbus/APKBUILD
index 87da11915..87da11915 100644
--- a/system/py-dbus/APKBUILD
+++ b/user/py-dbus/APKBUILD
diff --git a/system/qca/APKBUILD b/user/qca/APKBUILD
index 669389ac7..669389ac7 100644
--- a/system/qca/APKBUILD
+++ b/user/qca/APKBUILD
diff --git a/system/redis/APKBUILD b/user/redis/APKBUILD
index fc8ea8426..fc8ea8426 100644
--- a/system/redis/APKBUILD
+++ b/user/redis/APKBUILD
diff --git a/system/redis/fix-ppc-atomics.patch b/user/redis/fix-ppc-atomics.patch
index 0263bb531..0263bb531 100644
--- a/system/redis/fix-ppc-atomics.patch
+++ b/user/redis/fix-ppc-atomics.patch
diff --git a/system/redis/posix-runtest.patch b/user/redis/posix-runtest.patch
index 84d76ad10..84d76ad10 100644
--- a/system/redis/posix-runtest.patch
+++ b/user/redis/posix-runtest.patch
diff --git a/system/redis/redis.confd b/user/redis/redis.confd
index a79f61ccd..a79f61ccd 100644
--- a/system/redis/redis.confd
+++ b/user/redis/redis.confd
diff --git a/system/redis/redis.initd b/user/redis/redis.initd
index ce6aba7e3..ce6aba7e3 100755
--- a/system/redis/redis.initd
+++ b/user/redis/redis.initd
diff --git a/system/redis/redis.logrotate b/user/redis/redis.logrotate
index c77c9a0e8..c77c9a0e8 100644
--- a/system/redis/redis.logrotate
+++ b/user/redis/redis.logrotate
diff --git a/system/redis/redis.pre-install b/user/redis/redis.pre-install
index f73213126..f73213126 100644
--- a/system/redis/redis.pre-install
+++ b/user/redis/redis.pre-install
diff --git a/system/snappy/APKBUILD b/user/snappy/APKBUILD
index 588164d55..588164d55 100644
--- a/system/snappy/APKBUILD
+++ b/user/snappy/APKBUILD
diff --git a/system/spice/APKBUILD b/user/spice/APKBUILD
index a40b5853f..a40b5853f 100644
--- a/system/spice/APKBUILD
+++ b/user/spice/APKBUILD
diff --git a/system/upower/APKBUILD b/user/upower/APKBUILD
index 9c596f3e0..9c596f3e0 100644
--- a/system/upower/APKBUILD
+++ b/user/upower/APKBUILD
diff --git a/system/upower/daemon-fix-get_critical_action.patch b/user/upower/daemon-fix-get_critical_action.patch
index 6afe9b7a9..6afe9b7a9 100644
--- a/system/upower/daemon-fix-get_critical_action.patch
+++ b/user/upower/daemon-fix-get_critical_action.patch
diff --git a/system/upower/lib-add-propererror-and-cancellable-handling-to-UpClient.patch b/user/upower/lib-add-propererror-and-cancellable-handling-to-UpClient.patch
index 47e2f4799..47e2f4799 100644
--- a/system/upower/lib-add-propererror-and-cancellable-handling-to-UpClient.patch
+++ b/user/upower/lib-add-propererror-and-cancellable-handling-to-UpClient.patch
diff --git a/system/valgrind/APKBUILD b/user/valgrind/APKBUILD
index c5371950d..c5371950d 100644
--- a/system/valgrind/APKBUILD
+++ b/user/valgrind/APKBUILD
diff --git a/system/valgrind/arm.patch b/user/valgrind/arm.patch
index 8281c8ba1..8281c8ba1 100644
--- a/system/valgrind/arm.patch
+++ b/user/valgrind/arm.patch
diff --git a/system/valgrind/coregrind-elfv2.patch b/user/valgrind/coregrind-elfv2.patch
index 7e4a2d636..7e4a2d636 100644
--- a/system/valgrind/coregrind-elfv2.patch
+++ b/user/valgrind/coregrind-elfv2.patch
diff --git a/system/valgrind/uclibc.patch b/user/valgrind/uclibc.patch
index 69281ab2c..69281ab2c 100644
--- a/system/valgrind/uclibc.patch
+++ b/user/valgrind/uclibc.patch
diff --git a/system/vlc/APKBUILD b/user/vlc/APKBUILD
index a11b883f7..a11b883f7 100644
--- a/system/vlc/APKBUILD
+++ b/user/vlc/APKBUILD
diff --git a/system/vlc/check-headless.patch b/user/vlc/check-headless.patch
index 25016f437..25016f437 100644
--- a/system/vlc/check-headless.patch
+++ b/user/vlc/check-headless.patch
diff --git a/system/vlc/disable-sub-autodetect-fuzzy-1-test.patch b/user/vlc/disable-sub-autodetect-fuzzy-1-test.patch
index b3dd8a1b7..b3dd8a1b7 100644
--- a/system/vlc/disable-sub-autodetect-fuzzy-1-test.patch
+++ b/user/vlc/disable-sub-autodetect-fuzzy-1-test.patch
diff --git a/system/vlc/fribidi-update.patch b/user/vlc/fribidi-update.patch
index fd293eea4..fd293eea4 100644
--- a/system/vlc/fribidi-update.patch
+++ b/user/vlc/fribidi-update.patch
diff --git a/system/vlc/omxil-rpi-codecs.patch b/user/vlc/omxil-rpi-codecs.patch
index 9b7accfe7..9b7accfe7 100644
--- a/system/vlc/omxil-rpi-codecs.patch
+++ b/user/vlc/omxil-rpi-codecs.patch
diff --git a/system/vlc/tar-compat.patch b/user/vlc/tar-compat.patch
index 34169ef56..34169ef56 100644
--- a/system/vlc/tar-compat.patch
+++ b/user/vlc/tar-compat.patch
diff --git a/system/vlc/test-s390x.patch b/user/vlc/test-s390x.patch
index 8f221ee06..8f221ee06 100644
--- a/system/vlc/test-s390x.patch
+++ b/user/vlc/test-s390x.patch
diff --git a/system/vlc/vlc-daemon.pre-install b/user/vlc/vlc-daemon.pre-install
index aed6c1893..aed6c1893 100644
--- a/system/vlc/vlc-daemon.pre-install
+++ b/user/vlc/vlc-daemon.pre-install
diff --git a/system/vlc/vlc-libs.trigger b/user/vlc/vlc-libs.trigger
index c13bace99..c13bace99 100644
--- a/system/vlc/vlc-libs.trigger
+++ b/user/vlc/vlc-libs.trigger
diff --git a/system/vlc/vlc.confd b/user/vlc/vlc.confd
index 9a58842bd..9a58842bd 100644
--- a/system/vlc/vlc.confd
+++ b/user/vlc/vlc.confd
diff --git a/system/vlc/vlc.initd b/user/vlc/vlc.initd
index 541a07180..541a07180 100755
--- a/system/vlc/vlc.initd
+++ b/user/vlc/vlc.initd
diff --git a/system/wayland/APKBUILD b/user/wayland/APKBUILD
index a25cc87a1..a25cc87a1 100644
--- a/system/wayland/APKBUILD
+++ b/user/wayland/APKBUILD
diff --git a/system/weechat/APKBUILD b/user/weechat/APKBUILD
index 2fe4eb629..2fe4eb629 100644
--- a/system/weechat/APKBUILD
+++ b/user/weechat/APKBUILD
diff --git a/system/weechat/fix-python-linking.patch b/user/weechat/fix-python-linking.patch
index c94be8026..c94be8026 100644
--- a/system/weechat/fix-python-linking.patch
+++ b/user/weechat/fix-python-linking.patch
diff --git a/system/weechat/libintl-fix.patch b/user/weechat/libintl-fix.patch
index a67cb37b6..a67cb37b6 100644
--- a/system/weechat/libintl-fix.patch
+++ b/user/weechat/libintl-fix.patch
diff --git a/system/wget/APKBUILD b/user/wget/APKBUILD
index 5f7093ea5..5f7093ea5 100644
--- a/system/wget/APKBUILD
+++ b/user/wget/APKBUILD
diff --git a/system/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD
index 7aebbef1f..7aebbef1f 100644
--- a/system/wpa_supplicant/APKBUILD
+++ b/user/wpa_supplicant/APKBUILD
diff --git a/system/wpa_supplicant/config b/user/wpa_supplicant/config
index f35daa0d1..f35daa0d1 100644
--- a/system/wpa_supplicant/config
+++ b/user/wpa_supplicant/config
diff --git a/system/wpa_supplicant/eloop.patch b/user/wpa_supplicant/eloop.patch
index bab2cee4e..bab2cee4e 100644
--- a/system/wpa_supplicant/eloop.patch
+++ b/user/wpa_supplicant/eloop.patch
diff --git a/system/wpa_supplicant/libressl.patch b/user/wpa_supplicant/libressl.patch
index 56146eab5..56146eab5 100644
--- a/system/wpa_supplicant/libressl.patch
+++ b/user/wpa_supplicant/libressl.patch
diff --git a/system/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/user/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
index 727684865..727684865 100644
--- a/system/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
diff --git a/system/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/user/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
index 1802d664a..1802d664a 100644
--- a/system/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
diff --git a/system/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/user/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
index e2937b851..e2937b851 100644
--- a/system/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
diff --git a/system/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/user/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
index 22ee21794..22ee21794 100644
--- a/system/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
diff --git a/system/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/user/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
index c19c4c710..c19c4c710 100644
--- a/system/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
diff --git a/system/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/user/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
index e1bd5a572..e1bd5a572 100644
--- a/system/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
diff --git a/system/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch b/user/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
index 85ea1d62b..85ea1d62b 100644
--- a/system/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
diff --git a/system/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/user/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
index b9678f681..b9678f681 100644
--- a/system/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
+++ b/user/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
diff --git a/system/wpa_supplicant/wpa_cli.sh b/user/wpa_supplicant/wpa_cli.sh
index 0a5a6cc03..0a5a6cc03 100644
--- a/system/wpa_supplicant/wpa_cli.sh
+++ b/user/wpa_supplicant/wpa_cli.sh
diff --git a/system/wpa_supplicant/wpa_supplicant.confd b/user/wpa_supplicant/wpa_supplicant.confd
index 104b9dc5d..104b9dc5d 100644
--- a/system/wpa_supplicant/wpa_supplicant.confd
+++ b/user/wpa_supplicant/wpa_supplicant.confd
diff --git a/system/wpa_supplicant/wpa_supplicant.initd b/user/wpa_supplicant/wpa_supplicant.initd
index 988b267d1..988b267d1 100644
--- a/system/wpa_supplicant/wpa_supplicant.initd
+++ b/user/wpa_supplicant/wpa_supplicant.initd
diff --git a/system/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD
index b5d128d60..b5d128d60 100644
--- a/system/xf86-video-ati/APKBUILD
+++ b/user/xf86-video-ati/APKBUILD