reset upstream subtrees to yocto 2.6

Reset the following subtrees on thud HEAD:

  poky: 87e3a9739d
  meta-openembedded: 6094ae18c8
  meta-security: 31dc4e7532
  meta-raspberrypi: a48743dc36
  meta-xilinx: c42016e2e6

Also re-apply backports that didn't make it into thud:
  poky:
    17726d0 systemd-systemctl-native: handle Install wildcards

  meta-openembedded:
    4321a5d libtinyxml2: update to 7.0.1
    042f0a3 libcereal: Add native and nativesdk classes
    e23284f libcereal: Allow empty package
    030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
    179a1b9 gtest: update to 1.8.1

Squashed OpenBMC subtree compatibility updates:
  meta-aspeed:
    Brad Bishop (1):
          aspeed: add yocto 2.6 compatibility

  meta-ibm:
    Brad Bishop (1):
          ibm: prepare for yocto 2.6

  meta-ingrasys:
    Brad Bishop (1):
          ingrasys: set layer compatibility to yocto 2.6

  meta-openpower:
    Brad Bishop (1):
          openpower: set layer compatibility to yocto 2.6

  meta-phosphor:
    Brad Bishop (3):
          phosphor: set layer compatibility to thud
          phosphor: libgpg-error: drop patches
          phosphor: react to fitimage artifact rename

    Ed Tanous (4):
          Dropbear: upgrade options for latest upgrade
          yocto2.6: update openssl options
          busybox: remove upstream watchdog patch
          systemd: Rebase CONFIG_CGROUP_BPF patch

Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

1 files changed, 110 insertions, 0 deletions

diff --git a/poky/meta/recipes-core/systemd/systemd/0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch b/poky/meta/recipes-core/systemd/systemd/0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch
new file mode 100644
index 000000000..ba08e3455
--- /dev/null
+++ b/poky/meta/recipes-core/systemd/systemd/0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch
@@ -0,0 +1,110 @@
+From 86d18f3b09ec984ef3732567af992adb2dc77a8a Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 9 Jul 2018 14:05:20 +0900
+Subject: [PATCH] login: use parse_uid() when unmounting user runtime directory
+
+When unmounting user runtime directory, only UID is necessary,
+and the corresponding user may not exist anymore.
+This makes first try to parse the input by parse_uid(), and only if it
+fails, prase the input by get_user_creds().
+
+Fixes #9541.
+
+Upstream-Status: Backport
+---
+ src/login/user-runtime-dir.c | 57 ++++++++++++++++++++++++++++----------------
+ 1 file changed, 36 insertions(+), 21 deletions(-)
+
+diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
+index 1bb26c99e..de4061c75 100644
+--- a/src/login/user-runtime-dir.c
++++ b/src/login/user-runtime-dir.c
+@@ -111,8 +111,22 @@ static int user_remove_runtime_path(const char *runtime_path) {
+         return r;
+ }
+ 
+-static int do_mount(const char *runtime_path, uid_t uid, gid_t gid) {
++static int do_mount(const char *user) {
++        char runtime_path[sizeof("/run/user") + DECIMAL_STR_MAX(uid_t)];
+         size_t runtime_dir_size;
++        uid_t uid;
++        gid_t gid;
++        int r;
++
++        r = get_user_creds(&user, &uid, &gid, NULL, NULL);
++        if (r < 0)
++                return log_error_errno(r,
++                                       r == -ESRCH ? "No such user \"%s\"" :
++                                       r == -ENOMSG ? "UID \"%s\" is invalid or has an invalid main group"
++                                                    : "Failed to look up user \"%s\": %m",
++                                       user);
++
++        xsprintf(runtime_path, "/run/user/" UID_FMT, uid);
+ 
+         assert_se(gather_configuration(&runtime_dir_size) == 0);
+ 
+@@ -120,16 +134,30 @@ static int do_mount(const char *runtime_path, uid_t uid, gid_t gid) {
+         return user_mkdir_runtime_path(runtime_path, uid, gid, runtime_dir_size);
+ }
+ 
+-static int do_umount(const char *runtime_path) {
++static int do_umount(const char *user) {
++        char runtime_path[sizeof("/run/user") + DECIMAL_STR_MAX(uid_t)];
++        uid_t uid;
++        int r;
++
++        /* The user may be already removed. So, first try to parse the string by parse_uid(),
++         * and if it fails, fallback to get_user_creds().*/
++        if (parse_uid(user, &uid) < 0) {
++                r = get_user_creds(&user, &uid, NULL, NULL, NULL);
++                if (r < 0)
++                        return log_error_errno(r,
++                                               r == -ESRCH ? "No such user \"%s\"" :
++                                               r == -ENOMSG ? "UID \"%s\" is invalid or has an invalid main group"
++                                                            : "Failed to look up user \"%s\": %m",
++                                               user);
++        }
++
++        xsprintf(runtime_path, "/run/user/" UID_FMT, uid);
++
+         log_debug("Will remove %s", runtime_path);
+         return user_remove_runtime_path(runtime_path);
+ }
+ 
+ int main(int argc, char *argv[]) {
+-        const char *user;
+-        uid_t uid;
+-        gid_t gid;
+-        char runtime_path[sizeof("/run/user") + DECIMAL_STR_MAX(uid_t)];
+         int r;
+ 
+         log_parse_environment();
+@@ -146,23 +174,10 @@ int main(int argc, char *argv[]) {
+ 
+         umask(0022);
+ 
+-        user = argv[2];
+-        r = get_user_creds(&user, &uid, &gid, NULL, NULL);
+-        if (r < 0) {
+-                log_error_errno(r,
+-                                r == -ESRCH ? "No such user \"%s\"" :
+-                                r == -ENOMSG ? "UID \"%s\" is invalid or has an invalid main group"
+-                                             : "Failed to look up user \"%s\": %m",
+-                                user);
+-                return EXIT_FAILURE;
+-        }
+-
+-        xsprintf(runtime_path, "/run/user/" UID_FMT, uid);
+-
+         if (streq(argv[1], "start"))
+-                r = do_mount(runtime_path, uid, gid);
++                r = do_mount(argv[2]);
+         else if (streq(argv[1], "stop"))
+-                r = do_umount(runtime_path);
++                r = do_umount(argv[2]);
+         else
+                 assert_not_reached("Unknown verb!");
+ 
+-- 
+2.11.0
+