1 files changed, 17 insertions, 16 deletions

diff --git a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
index d648538b89..a2f61bfdd3 100644
--- a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -1,7 +1,8 @@
-From b98b9dbda902225cdd972b5bff6a641c36cc7e90 Mon Sep 17 00:00:00 2001
+From 7d2fea61a95e9498b5a19c8cffcb2ab5631d5685 Mon Sep 17 00:00:00 2001
 From: Tom Hochstein <tom.hochstein@nxp.com>
 Date: Wed, 22 Feb 2017 15:53:30 +0200
-Subject: [PATCH] weston-launch: Provide a default version that doesn't require PAM
+Subject: [PATCH] weston-launch: Provide a default version that doesn't require
+ PAM
 
 weston-launch requires PAM for starting weston as a non-root user.
 
@@ -21,10 +22,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
  2 files changed, 27 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index dc9c802..48cf5cb 100644
+index 6da6e04..681f7c8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -451,13 +451,17 @@ AC_ARG_ENABLE(resize-optimization,
+@@ -515,13 +515,17 @@ AC_ARG_ENABLE(resize-optimization,
  AS_IF([test "x$enable_resize_optimization" = "xyes"],
        [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
  
@@ -44,7 +45,7 @@ index dc9c802..48cf5cb 100644
  fi
  
  AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
-@@ -702,6 +706,7 @@ AC_MSG_RESULT([
+@@ -767,6 +771,7 @@ AC_MSG_RESULT([
         Enable developer documentation  ${enable_devdocs}
  
         weston-launch utility           ${enable_weston_launch}
@@ -53,7 +54,7 @@ index dc9c802..48cf5cb 100644
         systemd notify support          ${enable_systemd_notify}
  
 diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index 166bf3b..6fb9232 100644
+index 9064439..c6abe92 100644
 --- a/libweston/weston-launch.c
 +++ b/libweston/weston-launch.c
 @@ -51,7 +51,9 @@
@@ -77,7 +78,7 @@ index 166bf3b..6fb9232 100644
         int tty;
         int ttynr;
         int sock[2];
-@@ -189,6 +193,7 @@ weston_launch_allowed(struct weston_launch *wl)
+@@ -191,6 +195,7 @@ weston_launch_allowed(struct weston_launch *wl)
         return false;
  }
  
@@ -85,7 +86,7 @@ index 166bf3b..6fb9232 100644
  static int
  pam_conversation_fn(int msg_count,
                     const struct pam_message **messages,
-@@ -229,6 +234,7 @@ setup_pam(struct weston_launch *wl)
+@@ -231,6 +236,7 @@ setup_pam(struct weston_launch *wl)
  
         return 0;
  }
@@ -93,7 +94,7 @@ index 166bf3b..6fb9232 100644
  
  static int
  setup_launcher_socket(struct weston_launch *wl)
-@@ -422,6 +428,7 @@ quit(struct weston_launch *wl, int status)
+@@ -424,6 +430,7 @@ quit(struct weston_launch *wl, int status)
         close(wl->signalfd);
         close(wl->sock[0]);
  
@@ -101,7 +102,7 @@ index 166bf3b..6fb9232 100644
         if (wl->new_user) {
                 err = pam_close_session(wl->ph, 0);
                 if (err)
-@@ -429,6 +436,7 @@ quit(struct weston_launch *wl, int status)
+@@ -431,6 +438,7 @@ quit(struct weston_launch *wl, int status)
                                 err, pam_strerror(wl->ph, err));
                 pam_end(wl->ph, err);
         }
@@ -109,7 +110,7 @@ index 166bf3b..6fb9232 100644
  
         if (ioctl(wl->tty, KDSKBMUTE, 0) &&
             ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -608,6 +616,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+@@ -610,6 +618,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
         setenv("HOME", wl->pw->pw_dir, 1);
         setenv("SHELL", wl->pw->pw_shell, 1);
  
@@ -117,7 +118,7 @@ index 166bf3b..6fb9232 100644
         env = pam_getenvlist(wl->ph);
         if (env) {
                 for (i = 0; env[i]; ++i) {
-@@ -616,6 +625,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+@@ -618,6 +627,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
                 }
                 free(env);
         }
@@ -125,7 +126,7 @@ index 166bf3b..6fb9232 100644
  
         /*
          * We open a new session, so it makes sense
-@@ -683,8 +693,10 @@ static void
+@@ -685,8 +695,10 @@ static void
  help(const char *name)
  {
         fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
@@ -136,7 +137,7 @@ index 166bf3b..6fb9232 100644
         fprintf(stderr, "  -t, --tty       Start session on alternative tty,\n"
                         "                  e.g. -t /dev/tty4, requires -u option.\n");
         fprintf(stderr, "  -v, --verbose   Be verbose\n");
-@@ -698,7 +710,9 @@ main(int argc, char *argv[])
+@@ -700,7 +712,9 @@ main(int argc, char *argv[])
         int i, c;
         char *tty = NULL;
         struct option opts[] = {
@@ -146,7 +147,7 @@ index 166bf3b..6fb9232 100644
                 { "tty",     required_argument, NULL, 't' },
                 { "verbose", no_argument,       NULL, 'v' },
                 { "help",    no_argument,       NULL, 'h' },
-@@ -710,9 +724,13 @@ main(int argc, char *argv[])
+@@ -712,9 +726,13 @@ main(int argc, char *argv[])
         while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
                 switch (c) {
                 case 'u':
@@ -160,7 +161,7 @@ index 166bf3b..6fb9232 100644
                         break;
                 case 't':
                         tty = optarg;
-@@ -753,8 +771,10 @@ main(int argc, char *argv[])
+@@ -755,8 +773,10 @@ main(int argc, char *argv[])
         if (setup_tty(&wl, tty) < 0)
                 exit(EXIT_FAILURE);