[PATCH 0/5] More recipe version upgrades

[PATCH 0/5] More recipe version upgrades

[Jussi Kukkonen]

The screen upgrade is worth a good look: First of all the new GPLv3
version required quite a bit of build system patching. Also as far
as I can tell the existing recipe contains a debian patch which itself
contains 40 patches that are never applied to the actual sources.
My patch removes this unnecessary download and does not try to apply
the 40 patches (with the logic that 19000 lines of patch should be
done in separate commits _if_ they are necessary): the functionality
of screen 4.0.3 should not change with this commit.

Suggestions for other solutions are welcome as well.


Cheers,
 Jussi

The following changes since commit a8b723498c9a7106210db140452886894494b4d6:

  bitbake: cooker: Resolve file monitoring race issues when using memres bitbake (2015-08-03 07:36:25 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/more-upgrades
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/more-upgrades

Jussi Kukkonen (5):
  texinfo: Upgrade 5.2 -> 6.0
  screen: Add version 4.3.1
  resolvconf: Upgrade 1.76 -> 1.77
  qmmp: Upgrade 0.8.5 -> 0.8.6
  libepoxy: Upgrade 1.2 -> 1.3.1

 .../{resolvconf_1.76.bb => resolvconf_1.77.bb}     |   6 +-
 meta/recipes-extended/screen/screen.inc            |  39 ++++++
 .../Avoid-mis-identifying-systems-as-SVR4.patch    |  57 ++++++++
 ...cross-compile-alternatives-for-AC_TRY_RUN.patch | 137 ++++++++++++++++++
 .../Remove-redundant-compiler-sanity-checks.patch  |  65 +++++++++
 ...t-file-system-checks-when-cross-compiling.patch | 135 ++++++++++++++++++
 .../fix-parallel-make.patch                        |   0
 .../screen/{screen-4.0.3 => screen}/screen.pam     |   0
 meta/recipes-extended/screen/screen_4.0.3.bb       |  55 +-------
 meta/recipes-extended/screen/screen_4.3.1.bb       |  13 ++
 .../texinfo/texinfo/dont-depend-on-help2man.patch  |  47 ++++---
 .../texinfo/texinfo/texinfo-4.12-zlib.patch        | 156 +++++++++++++--------
 .../texinfo/texinfo/texinfo-4.13a-powerpc.patch    |  14 --
 .../texinfo/{texinfo_5.2.bb => texinfo_6.0.bb}     |   5 +-
 meta/recipes-graphics/libepoxy/libepoxy_git.bb     |   4 +-
 .../qt-apps/{qmmp_0.8.5.bb => qmmp_0.8.6.bb}       |   7 +-
 16 files changed, 595 insertions(+), 145 deletions(-)
 rename meta/recipes-connectivity/resolvconf/{resolvconf_1.76.bb => resolvconf_1.77.bb} (89%)
 create mode 100644 meta/recipes-extended/screen/screen.inc
 create mode 100644 meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
 create mode 100644 meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
 create mode 100644 meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
 create mode 100644 meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
 rename meta/recipes-extended/screen/{screen-4.0.3 => screen}/fix-parallel-make.patch (100%)
 rename meta/recipes-extended/screen/{screen-4.0.3 => screen}/screen.pam (100%)
 create mode 100644 meta/recipes-extended/screen/screen_4.3.1.bb
 delete mode 100644 meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch
 rename meta/recipes-extended/texinfo/{texinfo_5.2.bb => texinfo_6.0.bb} (93%)
 rename meta/recipes-qt/qt-apps/{qmmp_0.8.5.bb => qmmp_0.8.6.bb} (93%)

-- 
2.1.4

[PATCH 1/5] texinfo: Upgrade 5.2 -> 6.0

[Jussi Kukkonen]

* Remove texinfo-4.13a-powerpc.patch (already in upstream)
* Rebase texinfo-4.12-zlib.patch, dont-depend-on-help2man.patch

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../texinfo/texinfo/dont-depend-on-help2man.patch  |  47 ++++---
 .../texinfo/texinfo/texinfo-4.12-zlib.patch        | 156 +++++++++++++--------
 .../texinfo/texinfo/texinfo-4.13a-powerpc.patch    |  14 --
 .../texinfo/{texinfo_5.2.bb => texinfo_6.0.bb}     |   5 +-
 4 files changed, 134 insertions(+), 88 deletions(-)
 delete mode 100644 meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch
 rename meta/recipes-extended/texinfo/{texinfo_5.2.bb => texinfo_6.0.bb} (93%)

diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
index 876e0d0..0ce47ec 100644
--- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
+++ b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
@@ -1,10 +1,21 @@
+From 6f1f3912fcb900b3a3e6cbe3360306fade333497 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Thu, 6 Aug 2015 14:55:08 +0300
+Subject: [PATCH] dont-depend-on-help2man
+
 Upstream-Status: Inappropriate
 
 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am
---- texinfo-5.1/doc/Makefile.am	2013-02-23 02:11:25.000000000 +0200
-+++ texinfo-5.1/doc/Makefile.am	2013-08-20 01:43:55.622376198 +0300
-@@ -40,7 +40,7 @@
+---
+ doc/Makefile.am |  2 +-
+ man/Makefile.am | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 7198a6b..4bba550 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -40,7 +40,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \
  # Include our texinfo.tex, not Automake's.
  EXTRA_DIST = epsf.tex texinfo.tex \
               fdl.texi \
@@ -13,37 +24,41 @@ diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am
  	     $(refcard_files)
  
  if INSTALL_WARNINGS
-diff -Nurd texinfo-5.1/man/Makefile.am texinfo-5.1/man/Makefile.am
---- texinfo-5.1/man/Makefile.am	2013-02-23 02:11:25.000000000 +0200
-+++ texinfo-5.1/man/Makefile.am	2013-08-20 01:53:40.542395884 +0300
+diff --git a/man/Makefile.am b/man/Makefile.am
+index a08d603..bdfc9a4 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
 @@ -13,24 +13,24 @@
  # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
+ 
  # These are generated using help2man.
 -man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
 +#man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
-
+ 
  # These require the build in info/, thus can't do if we failed to find a
  # terminal library.
  if HAVE_TERMLIBS
--man_MANS += info.1 infokey.1
-+#man_MANS += info.1 infokey.1
+-man_MANS += info.1
++#man_MANS += info.1
  endif
-
+ 
  # These are hand-written.
 -man_MANS += info.5 texinfo.5
 +#man_MANS += info.5 texinfo.5
-
+ 
  # This is generated by pod2man, but let's just run it by hand.
 -man_MANS += pod2texi.1
 +#man_MANS += pod2texi.1
-
+ 
  # These are just .so's to the common program.
 -man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
 +#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
-
+ 
 -EXTRA_DIST = $(man_MANS) ginfo.h2m
 +EXTRA_DIST = ginfo.h2m
-
+ 
  # Maintainers should be able to regenerate.
  MAINTAINERCLEANFILES = $(man_MANS)
+-- 
+2.1.4
+
diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
index bebcbdf..41bd220 100644
--- a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
+++ b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
@@ -1,10 +1,19 @@
+From 20e1d8a9481dc13dd1d4d168b90e0ed2ff097b98 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Thu, 6 Aug 2015 14:29:57 +0300
+Subject: [PATCH] texinfo-4.12-zlib
+
 Upstream-Status: Pending
+---
+ install-info/Makefile.in    |  2 +-
+ install-info/install-info.c | 67 +++++++++++++++++++++++++++------------------
+ 2 files changed, 42 insertions(+), 27 deletions(-)
 
-Index: texinfo-5.1/install-info/Makefile.in
-===================================================================
---- texinfo-5.1.orig/install-info/Makefile.in
-+++ texinfo-5.1/install-info/Makefile.in
-@@ -171,7 +171,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
+diff --git a/install-info/Makefile.in b/install-info/Makefile.in
+index ad73abb..eaa2153 100644
+--- a/install-info/Makefile.in
++++ b/install-info/Makefile.in
+@@ -241,7 +241,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
  PROGRAMS = $(bin_PROGRAMS)
  am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
  ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
@@ -13,10 +22,10 @@ Index: texinfo-5.1/install-info/Makefile.in
  am__DEPENDENCIES_1 =
  ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
  	$(am__DEPENDENCIES_1)
-Index: texinfo-5.1/install-info/install-info.c
-===================================================================
---- texinfo-5.1.orig/install-info/install-info.c
-+++ texinfo-5.1/install-info/install-info.c
+diff --git a/install-info/install-info.c b/install-info/install-info.c
+index b454c15..4e39122 100644
+--- a/install-info/install-info.c
++++ b/install-info/install-info.c
 @@ -22,6 +22,7 @@
  #include <getopt.h>
  #include <regex.h>
@@ -25,16 +34,17 @@ Index: texinfo-5.1/install-info/install-info.c
  
  #define TAB_WIDTH 8
  
-@@ -670,7 +671,7 @@ The first time you invoke Info you start
+@@ -684,15 +685,15 @@ The first time you invoke Info you start off looking at this node.\n\
     
-    MAGIC number, not the filename.  */
- 
+    Return either stdin reading the file, or a non-stdin pipe reading
+    the output of the compression program.  */
 -FILE *
 +void *
  open_possibly_compressed_file (char *filename,
      void (*create_callback) (char *),
-     char **opened_filename, char **compression_program, int *is_pipe) 
-@@ -678,7 +679,7 @@ open_possibly_compressed_file (char *fil
+-    char **opened_filename, char **compression_program) 
++    char **opened_filename, char **compression_program, int *is_pipe) 
+ {
    char *local_opened_filename, *local_compression_program;
    int nread;
    char data[13];
@@ -43,7 +53,7 @@ Index: texinfo-5.1/install-info/install-info.c
  
    /* We let them pass NULL if they don't want this info, but it's easier
       to always determine it.  */
-@@ -686,48 +687,48 @@ open_possibly_compressed_file (char *fil
+@@ -700,48 +701,48 @@ open_possibly_compressed_file (char *filename,
      opened_filename = &local_opened_filename;
  
    *opened_filename = filename;
@@ -99,17 +109,17 @@ Index: texinfo-5.1/install-info/install-info.c
 +      f = gzopen (*opened_filename, FOPEN_RBIN);
      }
  #endif /* __MSDOS__ */
-    if (!f)
-@@ -739,7 +740,7 @@ open_possibly_compressed_file (char *fil
-            /* And try opening it again.  */
-            free (*opened_filename);
-            *opened_filename = filename;
--           f = fopen (*opened_filename, FOPEN_RBIN);
-+           f = gzopen (*opened_filename, FOPEN_RBIN);
-            if (!f)
-              pfatal_with_name (filename);
-          }
-@@ -749,12 +750,12 @@ open_possibly_compressed_file (char *fil
+   if (!f)
+@@ -757,7 +758,7 @@ open_possibly_compressed_file (char *filename,
+           (*create_callback) (filename);
+ 
+           /* And try opening it again.  */
+-          f = fopen (*opened_filename, FOPEN_RBIN);
++          f = gzopen (*opened_filename, FOPEN_RBIN);
+           if (!f)
+             return 0;
+         }
+@@ -767,12 +768,12 @@ open_possibly_compressed_file (char *filename,
  
    /* Read first few bytes of file rather than relying on the filename.
       If the file is shorter than this it can't be usable anyway.  */
@@ -118,70 +128,106 @@ Index: texinfo-5.1/install-info/install-info.c
 +  nread = gzread (f, data, sizeof (data));
 +  if (nread != sizeof (data))
      {
-       /* Empty files don't set errno, so we get something like
-          "install-info: No error for foo", which is confusing.  */
+       /* Empty files don't set errno.  Calling code can check for
+          this, so make sure errno == 0 just in case it isn't already. */
 -      if (nread == 0)
 +      if (nread >= 0)
-         fatal (_("%s: empty file"), *opened_filename);
-       pfatal_with_name (*opened_filename);
+         errno = 0;
+       return 0;
      }
-@@ -821,20 +822,22 @@ open_possibly_compressed_file (char *fil
+@@ -838,35 +839,40 @@ open_possibly_compressed_file (char *filename,
+     *compression_program = NULL;
+ 
+   /* Seek back over the magic bytes.  */
+-  if (fseek (f, 0, 0) < 0)
++  if (gzseek (f, 0, SEEK_SET) == -1)
+     return 0;
  
    if (*compression_program)
-     { /* It's compressed, so fclose the file and then open a pipe.  */
+     { /* It's compressed, so open a pipe.  */
 +      FILE *p;
-       char *command = concat (*compression_program," -cd <", *opened_filename);
+       char *command = concat (*compression_program, " -d", "");
+ 
 -      if (fclose (f) < 0)
 +      if (gzclose (f) < 0)
-         pfatal_with_name (*opened_filename);
+         return 0;
+-      f = freopen (*opened_filename, FOPEN_RBIN, stdin);
+-      if (!f)
++      p = freopen (*opened_filename, FOPEN_RBIN, stdin);
++      if (!p)
+         return 0;
 -      f = popen (command, "r");
--      if (f)
+-      if (!f)
 +      p = popen (command, "r");
-+      if (p)
-         *is_pipe = 1;
-       else
-         pfatal_with_name (command);
++      if (!p)
+         {
+           /* Used for error message in calling code. */
+           *opened_filename = command;
+           return 0;
+         }
++      else
++        *is_pipe = 1;
 +      return p;
      }
    else
-     { /* It's a plain file, seek back over the magic bytes.  */
--      if (fseek (f, 0, 0) < 0)
-+      if (gzseek (f, 0, SEEK_SET) < 0)
-         pfatal_with_name (*opened_filename);
+     {
 -#if O_BINARY
 +#if 0 && O_BINARY
        /* Since this is a text file, and we opened it in binary mode,
           switch back to text mode.  */
        f = freopen (*opened_filename, "r", f);
-@@ -859,7 +862,7 @@ readfile (char *filename, int *sizep,
+       if (! f)
+ 	return 0;
+ #endif
++      *is_pipe = 0;
+     }
+ 
+   return f;
+@@ -885,7 +891,8 @@ readfile (char *filename, int *sizep,
+     void (*create_callback) (char *), char **opened_filename,
      char **compression_program)
  {
-   char *real_name;
 -  FILE *f;
 +  void *f;
-   int pipe_p;
++  int pipe_p;
    int filled = 0;
    int data_size = 8192;
-@@ -873,7 +876,12 @@ readfile (char *filename, int *sizep,
+   char *data = xmalloc (data_size);
+@@ -893,14 +900,20 @@ readfile (char *filename, int *sizep,
+   /* If they passed the space for the file name to return, use it.  */
+   f = open_possibly_compressed_file (filename, create_callback,
+                                      opened_filename,
+-                                     compression_program);
++                                     compression_program,
++                                     &pipe_p);
+ 
+   if (!f)
+     return 0;
  
    for (;;)
      {
 -      int nread = fread (data + filled, 1, data_size - filled, f);
 +      int nread;
-+      
++
 +      if (pipe_p)
-+       nread = fread (data + filled, 1, data_size - filled, f);
++        nread = fread (data + filled, 1, data_size - filled, f);
 +      else
-+       nread = gzread (f, data + filled, data_size - filled);
++        nread = gzread (f, data + filled, data_size - filled);
        if (nread < 0)
-         pfatal_with_name (real_name);
+         return 0;
        if (nread == 0)
-@@ -895,7 +903,7 @@ readfile (char *filename, int *sizep,
-   if (pipe_p)
+@@ -919,8 +932,10 @@ readfile (char *filename, int *sizep,
+   /* We need to close the stream, since on some systems the pipe created
+      by popen is simulated by a temporary file which only gets removed
+      inside pclose.  */
+-  if (f != stdin)
++  if (pipe_p)
      pclose (f);
-   else
--    fclose (f);
++  else
 +    gzclose (f);
  
    *sizep = filled;
    return data;
+-- 
+2.1.4
+
diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch b/meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch
deleted file mode 100644
index 312430f..0000000
--- a/meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Pending
-
-diff -up texinfo-4.13/install-info/install-info.c.patch texinfo-4.13/install-info/install-info.c
---- texinfo-4.13/install-info/install-info.c.patch	2010-01-11 14:46:32.000000000 +0100
-+++ texinfo-4.13/install-info/install-info.c	2010-01-11 14:48:47.162152695 +0100
-@@ -772,7 +772,7 @@ open_possibly_compressed_file (char *fil
-     }
-   else
-     { /* It's a plain file, seek back over the magic bytes.  */
--      if (gzseek (f, 0, SEEK_SET) < 0)
-+      if (gzseek (f, 0, SEEK_SET) == -1)
-         pfatal_with_name (*opened_filename);
- #if 0 && O_BINARY
-       /* Since this is a text file, and we opened it in binary mode,
diff --git a/meta/recipes-extended/texinfo/texinfo_5.2.bb b/meta/recipes-extended/texinfo/texinfo_6.0.bb
similarity index 93%
rename from meta/recipes-extended/texinfo/texinfo_5.2.bb
rename to meta/recipes-extended/texinfo/texinfo_6.0.bb
index aa644e1..8fb715a 100644
--- a/meta/recipes-extended/texinfo/texinfo_5.2.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.0.bb
@@ -30,7 +30,6 @@ TARGET_PATCH_class-native = ""
 
 SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
            file://texinfo-4.12-zlib.patch \
-           file://texinfo-4.13a-powerpc.patch \
            file://disable-native-tools.patch \
            file://link-zip.patch \
            file://dont-depend-on-help2man.patch \
@@ -38,8 +37,8 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
            ${TARGET_PATCH} \
           "
 
-SRC_URI[md5sum] = "1b8f98b80a8e6c50422125e07522e8db"
-SRC_URI[sha256sum] = "6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74"
+SRC_URI[md5sum] = "e1a2ef5dce5018b53f0f6eed45b247a7"
+SRC_URI[sha256sum] = "83d3183290f34e7f958d209d0b20022c6fe9e921eb6fe94c27d988827d4878d2"
 
 tex_texinfo = "texmf/tex/texinfo"
 
-- 
2.1.4

[PATCH 2/5] screen: Add version 4.3.1

[Jussi Kukkonen]

The Debian diff in SRC_URI only added a debian/-directory in to the
source tree and did not modify upstream source: So it does nothing.
This commit removes the diff and does _not_ try to apply the 19000
lines of patches in debian/patches. Any useful patches should be
added separately.

* Preserve the old 4.0.3 version (GPLv2+) and add new 4.3.1 (GPLv3+)
* Remove unused debian patch from SRC_URI of 4.0.3, increase PR
* Add a patchset to enable cross-compiling 4.3.1 (modified from
  http://savannah.gnu.org/bugs/?43223)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-extended/screen/screen.inc            |  39 ++++++
 .../Avoid-mis-identifying-systems-as-SVR4.patch    |  57 +++++++++
 ...cross-compile-alternatives-for-AC_TRY_RUN.patch | 137 +++++++++++++++++++++
 .../Remove-redundant-compiler-sanity-checks.patch  |  65 ++++++++++
 ...t-file-system-checks-when-cross-compiling.patch | 135 ++++++++++++++++++++
 .../fix-parallel-make.patch                        |   0
 .../screen/{screen-4.0.3 => screen}/screen.pam     |   0
 meta/recipes-extended/screen/screen_4.0.3.bb       |  55 ++-------
 meta/recipes-extended/screen/screen_4.3.1.bb       |  13 ++
 9 files changed, 453 insertions(+), 48 deletions(-)
 create mode 100644 meta/recipes-extended/screen/screen.inc
 create mode 100644 meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
 create mode 100644 meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
 create mode 100644 meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
 create mode 100644 meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
 rename meta/recipes-extended/screen/{screen-4.0.3 => screen}/fix-parallel-make.patch (100%)
 rename meta/recipes-extended/screen/{screen-4.0.3 => screen}/screen.pam (100%)
 create mode 100644 meta/recipes-extended/screen/screen_4.3.1.bb

diff --git a/meta/recipes-extended/screen/screen.inc b/meta/recipes-extended/screen/screen.inc
new file mode 100644
index 0000000..1ae321d
--- /dev/null
+++ b/meta/recipes-extended/screen/screen.inc
@@ -0,0 +1,39 @@
+SUMMARY = "Multiplexing terminal manager"
+DESCRIPTION = "Screen is a full-screen window manager \
+that multiplexes a physical terminal between several \
+processes, typically interactive shells."
+HOMEPAGE = "http://www.gnu.org/software/screen/"
+BUGTRACKER = "https://savannah.gnu.org/bugs/?func=additem&group=screen"
+
+SECTION = "console/utils"
+DEPENDS = "ncurses \
+          ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+RDEPENDS_${PN} = "base-files"
+
+SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
+           file://fix-parallel-make.patch \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+
+PAM_SRC_URI = "file://screen.pam"
+
+inherit autotools texinfo
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter,"
+
+EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \
+               ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
+
+do_install_append () {
+	if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
+		install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen
+	fi
+}
+
+pkg_postinst_${PN} () {
+	grep -q "^${bindir}/screen$" $D${sysconfdir}/shells || echo ${bindir}/screen >> $D${sysconfdir}/shells
+}
+
+pkg_postrm_${PN} () {
+	printf "$(grep -v "^${bindir}/screen$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells
+}
diff --git a/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch b/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
new file mode 100644
index 0000000..e184aa1
--- /dev/null
+++ b/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
@@ -0,0 +1,57 @@
+From 79afb676904653403145fda9e1a6a9d3ea1cb22a Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Fri, 7 Aug 2015 11:10:32 +0300
+Subject: [PATCH 4/4] Avoid mis-identifying systems as SVR4
+
+Linux can be misdetected as SVR4 because it has
+libelf installed. This leads to linking with libelf, even though no
+symbols from that library were actually used, and to a workaround for
+a buggy getlogin() being enabled.
+
+It is not documented which exact SVR4 system had the bug that the
+workaround was added for, so all I could do is make an educated guess
+at the #defines its compiler would be likely to set.
+
+Modified from patch by Maarten ter Huurne.
+
+Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223]
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dc928ae..65439ce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,14 +179,24 @@ AC_EGREP_CPP(yes,
+ #endif
+ ], LIBS="$LIBS -lsocket -linet";seqptx=1)
+ 
++AC_CHECKING(SVR4)
++AC_EGREP_CPP(yes,
++[main () {
++#if defined(SVR4) || defined(__SVR4)
++  yes;
++#endif
++], AC_NOTE(- you have a SVR4 system) AC_DEFINE(SVR4) svr4=1)
++if test -n "$svr4" ; then
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lelf"
+ AC_CHECKING(SVR4)
+ AC_TRY_LINK([#include <utmpx.h>
+ ],,
+-[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN),
+-[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])]
++[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(BUGGYGETLOGIN),
++[AC_CHECK_HEADER(elf.h, AC_DEFINE(BUGGYGETLOGIN))])]
+ ,LIBS="$oldlibs")
++fi
++
+ AC_CHECK_HEADERS([stropts.h string.h strings.h])
+ 
+ AC_CHECKING(for Solaris 2.x)
+-- 
+2.1.4
+
diff --git a/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch b/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
new file mode 100644
index 0000000..248bf08
--- /dev/null
+++ b/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
@@ -0,0 +1,137 @@
+From cd0f7f10a3fffbc60fe55eb200474d13fe1da65b Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Fri, 7 Aug 2015 10:34:29 +0300
+Subject: [PATCH 2/4] Provide cross compile alternatives for AC_TRY_RUN
+
+Modified from patch by Maarten ter Huurne.
+
+Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223]
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 32 ++++++++++++++++++++------------
+ 1 file changed, 20 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 27690a6..ce89f56 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -348,7 +348,8 @@ main()
+   exit(0);
+ }
+ ], AC_NOTE(- your fifos are usable) fifo=1,
+-AC_NOTE(- your fifos are not usable))
++AC_NOTE(- your fifos are not usable),
++AC_NOTE(- skipping check because we are cross compiling; assuming fifos are usable) fifo=1)
+ rm -f /tmp/conftest*
+ 
+ if test -n "$fifo"; then
+@@ -396,7 +397,8 @@ main()
+   exit(0);
+ }
+ ], AC_NOTE(- your implementation is ok), 
+-AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1)
++AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1,
++AC_NOTE(- skipping check because we are cross compiling; assuming fifo implementation is ok))
+ rm -f /tmp/conftest*
+ fi
+ 
+@@ -458,7 +460,8 @@ main()
+   exit(0);
+ }
+ ], AC_NOTE(- your sockets are usable) sock=1,
+-AC_NOTE(- your sockets are not usable))
++AC_NOTE(- your sockets are not usable),
++AC_NOTE(- skipping check because we are cross compiling; assuming sockets are usable) sock=1)
+ rm -f /tmp/conftest*
+ 
+ if test -n "$sock"; then
+@@ -497,7 +500,8 @@ main()
+ }
+ ],AC_NOTE(- you are normal),
+ AC_NOTE(- unix domain sockets are not kept in the filesystem)
+-AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1)
++AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1,
++AC_NOTE(- skipping check because we are cross compiling; assuming sockets are normal))
+ rm -f /tmp/conftest*
+ fi
+ 
+@@ -624,7 +628,8 @@ main()
+   exit(0);
+ }
+ ],AC_NOTE(- select is ok),
+-AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN))
++AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN),
++AC_NOTE(- skipping check because we are cross compiling; assuming select is ok))
+ 
+ dnl
+ dnl    ****  termcap or terminfo  ****
+@@ -666,7 +671,8 @@ main()
+ {
+  exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
+ }], AC_NOTE(- you use the termcap database),
+-AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO))
++AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO),
++AC_NOTE(- skipping check because we are cross compiling; assuming terminfo database is used) AC_DEFINE(TERMINFO))
+ AC_CHECKING(ospeed)
+ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
+ 
+@@ -801,7 +807,8 @@ main()
+     else
+       AC_NOTE(- can't determine - assume ptys are world accessable)
+     fi
+-  ]
++  ],
++  AC_NOTE(- skipping check because we are cross compiling; assuming ptys are world accessable)
+ )
+ rm -f conftest_grp
+ fi
+@@ -885,7 +892,7 @@ AC_EGREP_CPP(yes,
+ #endif
+ ], load=1)
+ fi
+-if test -z "$load" ; then
++if test -z "$load" && test "$cross_compiling" = no ; then
+ AC_CHECKING(for kernelfile)
+ for core in /unix /vmunix /dynix /hp-ux /xelos /dev/ksyms /kernel/unix /kernel/genunix /unicos /mach /netbsd /386bsd /dgux /bsd /stand/vmunix; do
+   if test -f $core || test -c $core; then
+@@ -1078,7 +1085,7 @@ main()
+ #endif
+   exit(0);
+ }
+-],,AC_DEFINE(SYSVSIGS))
++],,AC_DEFINE(SYSVSIGS),:)
+ 
+ fi
+ 
+@@ -1158,7 +1165,7 @@ main() {
+   if (strncmp(buf, "cdedef", 6))
+     exit(1);
+   exit(0); /* libc version works properly.  */
+-}], AC_DEFINE(USEBCOPY))
++}], AC_DEFINE(USEBCOPY),,:)
+ 
+ AC_TRY_RUN([
+ #define bcopy(s,d,l) memmove(d,s,l)
+@@ -1173,7 +1180,8 @@ main() {
+   if (strncmp(buf, "cdedef", 6))
+     exit(1);
+   exit(0); /* libc version works properly.  */
+-}], AC_DEFINE(USEMEMMOVE))
++}], AC_DEFINE(USEMEMMOVE),,
++  AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE))
+ 
+ 
+ AC_TRY_RUN([
+@@ -1189,7 +1197,7 @@ main() {
+   if (strncmp(buf, "cdedef", 6))
+     exit(1);
+   exit(0); /* libc version works properly.  */
+-}], AC_DEFINE(USEMEMCPY))
++}], AC_DEFINE(USEMEMCPY),,:)
+ 
+ AC_SYS_LONG_FILE_NAMES
+ 
+-- 
+2.1.4
+
diff --git a/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch b/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
new file mode 100644
index 0000000..cc62c12
--- /dev/null
+++ b/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
@@ -0,0 +1,65 @@
+From 73b726c25f94c1b15514ed9249b927afdfbbfb94 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Fri, 7 Aug 2015 10:30:40 +0300
+Subject: [PATCH 1/4] Remove redundant compiler sanity checks
+
+AC_PROG_CC already performs sanity checks. And unlike the removed
+checks, it does so in a way that supports cross compilation.
+
+Modified from patch by Maarten ter Huurne.
+
+Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223]
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 27 ---------------------------
+ 1 file changed, 27 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ffe2e37..27690a6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,31 +48,6 @@ AC_PROG_GCC_TRADITIONAL
+ AC_ISC_POSIX
+ AC_USE_SYSTEM_EXTENSIONS
+ 
+-AC_TRY_RUN(main(){exit(0);},,[
+-if test $CC != cc ; then
+-AC_NOTE(Your $CC failed - restarting with CC=cc)
+-AC_NOTE()
+-CC=cc
+-export CC
+-exec $0 $configure_args
+-fi
+-])
+-
+-AC_TRY_RUN(main(){exit(0);},,
+-exec 5>&2
+-eval $ac_link
+-AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;)
+-AC_NOTE($ac_compile)
+-AC_MSG_ERROR(Can't run the compiler - sorry))
+-
+-AC_TRY_RUN([
+-main()
+-{
+-  int __something_strange_();
+-  __something_strange_(0);
+-}
+-],AC_MSG_ERROR(Your compiler does not set the exit status - sorry))
+-
+ AC_PROG_AWK
+ 
+ AC_PROG_INSTALL
+@@ -1300,8 +1275,6 @@ fi
+ dnl Ptx bug workaround -- insert -lc after -ltermcap
+ test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq"
+ 
+-AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.))
+-
+ ETCSCREENRC=
+ AC_MSG_CHECKING(for the global screenrc file)
+ AC_ARG_WITH(sys-screenrc, [  --with-sys-screenrc=path to the global screenrc file], [ ETCSCREENRC="${withval}" ])
+-- 
+2.1.4
+
diff --git a/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch b/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
new file mode 100644
index 0000000..d7e55a4
--- /dev/null
+++ b/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
@@ -0,0 +1,135 @@
+From d0b20e4cacc60ad62a2150ce07388cb5a25c2040 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Fri, 7 Aug 2015 11:09:01 +0300
+Subject: [PATCH 3/4] Skip host file system checks when cross-compiling
+
+Modified from patch by Maarten ter Huurne.
+
+Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223]
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 23 +++++++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ce89f56..dc928ae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,7 +85,7 @@ AC_ARG_ENABLE(socket-dir,
+ dnl
+ dnl    ****  special unix variants  ****
+ dnl
+-if test -n "$ISC"; then
++if test "$cross_compiling" = no && test -n "$ISC" ; then
+   AC_DEFINE(ISC) LIBS="$LIBS -linet"
+ fi
+ 
+@@ -96,10 +96,11 @@ dnl AC_DEFINE(OSF1)	# this disables MIPS again....
+ dnl fi
+ dnl fi
+ 
+-if test -f /sysV68 ; then
++if test "$cross_compiling" = no && test -f /sysV68 ; then
+ AC_DEFINE(sysV68)
+ fi
+ 
++if test "$cross_compiling" = no ; then
+ AC_CHECKING(for MIPS)
+ if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then
+ oldlibs="$LIBS"
+@@ -123,6 +124,7 @@ AC_DEFINE(USE_WAIT2) LIBS="$LIBS -lbsd" ; CC="$CC -I/usr/include/bsd"
+ ))
+ fi
+ fi
++fi
+ 
+ 
+ AC_CHECKING(for Ultrix)
+@@ -132,7 +134,7 @@ AC_EGREP_CPP(yes,
+ #endif
+ ], ULTRIX=1)
+ 
+-if test -f /usr/lib/libpyr.a ; then
++if test "$cross_compiling" = no && test -f /usr/lib/libpyr.a ; then
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lpyr"
+ AC_CHECKING(Pyramid OSX)
+@@ -679,17 +681,21 @@ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
+ dnl
+ dnl    ****  PTY specific things  ****
+ dnl
++if test "$cross_compiling" = no ; then
+ AC_CHECKING(for /dev/ptc)
+ if test -r /dev/ptc; then
+ AC_DEFINE(HAVE_DEV_PTC)
+ fi
++fi
+ 
++if test "$cross_compiling" = no ; then
+ AC_CHECKING(for SVR4 ptys)
+ sysvr4ptys=
+ if test -c /dev/ptmx ; then
+ AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS)
+ sysvr4ptys=1])
+ fi
++fi
+ 
+ AC_CHECK_FUNCS(getpt)
+ 
+@@ -699,6 +705,7 @@ AC_CHECK_FUNCS(openpty,,
+ [AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"])])
+ fi
+ 
++if test "$cross_compiling" = no ; then
+ AC_CHECKING(for ptyranges)
+ if test -d /dev/ptym ; then
+ pdir='/dev/ptym'
+@@ -722,6 +729,7 @@ p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g'  | sort -u | tr -d '\
+ AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0")
+ AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1")
+ fi
++fi
+ 
+ dnl    ****  pty mode/group handling ****
+ dnl
+@@ -869,14 +877,16 @@ fi
+ dnl
+ dnl    ****  loadav  ****
+ dnl
++if test "$cross_compiling" = no ; then
+ AC_CHECKING(for libutil(s))
+ test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
+ test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
++fi
+ 
+ AC_CHECKING(getloadavg)
+ AC_TRY_LINK(,[getloadavg((double *)0, 0);],
+ AC_DEFINE(LOADAV_GETLOADAVG) load=1,
+-if test -f /usr/lib/libkvm.a ; then
++if test "$cross_compiling" = no && test -f /usr/lib/libkvm.a ; then
+ olibs="$LIBS"
+ LIBS="$LIBS -lkvm"
+ AC_CHECKING(getloadavg with -lkvm)
+@@ -1094,13 +1104,18 @@ dnl    ****  libraries  ****
+ dnl
+ 
+ AC_CHECKING(for crypt and sec libraries)
++if test "$cross_compiling" = no ; then
+ test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d"
++fi
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lcrypt"
+ AC_CHECKING(crypt)
+ AC_TRY_LINK(,,,LIBS="$oldlibs")
++if test "$cross_compiling" = no ; then
+ test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
+ test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
++fi
++
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lsun"
+ AC_CHECKING(IRIX sun library)
+-- 
+2.1.4
+
diff --git a/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch b/meta/recipes-extended/screen/screen/fix-parallel-make.patch
similarity index 100%
rename from meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch
rename to meta/recipes-extended/screen/screen/fix-parallel-make.patch
diff --git a/meta/recipes-extended/screen/screen-4.0.3/screen.pam b/meta/recipes-extended/screen/screen/screen.pam
similarity index 100%
rename from meta/recipes-extended/screen/screen-4.0.3/screen.pam
rename to meta/recipes-extended/screen/screen/screen.pam
diff --git a/meta/recipes-extended/screen/screen_4.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb
index 962a499..0ae08de 100644
--- a/meta/recipes-extended/screen/screen_4.0.3.bb
+++ b/meta/recipes-extended/screen/screen_4.0.3.bb
@@ -1,55 +1,14 @@
-SUMMARY = "Multiplexing terminal manager"
-DESCRIPTION = "Screen is a full-screen window manager \
-that multiplexes a physical terminal between several \
-processes, typically interactive shells."
-HOMEPAGE = "http://www.gnu.org/software/screen/"
-BUGTRACKER = "https://savannah.gnu.org/bugs/?func=additem&group=screen"
+include screen.inc
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0774d66808b0f602e94448108f59448b \
                     file://screen.h;endline=23;md5=9a7ae69a2aafed891bf7c38ddf9f6b7d"
 
-SECTION = "console/utils"
-DEPENDS = "ncurses \
-          ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-RDEPENDS_${PN} = "base-files"
+PR = "r5"
 
-PR = "r4"
+SRC_URI += "file://configure.patch \
+            file://screen-4.0.3-CVE-2009-1214.patch \
+            file://screen-4.0.2-CVE-2009-1215.patch"
 
-SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz;name=tarball \
-           ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-14.diff.gz;name=patch \
-           file://configure.patch \
-           file://fix-parallel-make.patch \
-           file://screen-4.0.3-CVE-2009-1214.patch \
-           file://screen-4.0.2-CVE-2009-1215.patch \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
-
-PAM_SRC_URI = "file://screen.pam"
-
-SRC_URI[tarball.md5sum] = "8506fd205028a96c741e4037de6e3c42"
-SRC_URI[tarball.sha256sum] = "78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77"
-
-SRC_URI[patch.md5sum] = "5960bdae6782ee9356b7e0e0a1fa7c19"
-SRC_URI[patch.sha256sum] = "10acb274b2fb0bb7137a0d66e52fa0f18125bc5198c7a8d5af381b4b30636316"
-
-inherit autotools texinfo
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter,"
-
-EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \
-               ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
-
-do_install_append () {
-	if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
-		install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen
-	fi
-}
-
-pkg_postinst_${PN} () {
-	grep -q "^${bindir}/screen$" $D${sysconfdir}/shells || echo ${bindir}/screen >> $D${sysconfdir}/shells
-}
-
-pkg_postrm_${PN} () {
-	printf "$(grep -v "^${bindir}/screen$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells
-}
+SRC_URI[md5sum] = "8506fd205028a96c741e4037de6e3c42"
+SRC_URI[sha256sum] = "78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77"
diff --git a/meta/recipes-extended/screen/screen_4.3.1.bb b/meta/recipes-extended/screen/screen_4.3.1.bb
new file mode 100644
index 0000000..4777df6
--- /dev/null
+++ b/meta/recipes-extended/screen/screen_4.3.1.bb
@@ -0,0 +1,13 @@
+include screen.inc
+
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://screen.h;endline=26;md5=3971142989289a8198a544220703c2bf"
+
+SRC_URI += "file://Remove-redundant-compiler-sanity-checks.patch \
+            file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \
+            file://Skip-host-file-system-checks-when-cross-compiling.patch \
+            file://Avoid-mis-identifying-systems-as-SVR4.patch"
+
+SRC_URI[md5sum] = "5bb3b0ff2674e29378c31ad3411170ad"
+SRC_URI[sha256sum] = "fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63"
-- 
2.1.4

[PATCH 3/5] resolvconf: Upgrade 1.76 -> 1.77

[Jussi Kukkonen]

Improve the recipe by using ${DEBIAN_MIRROR} and ${PV} instead of hard
coded values.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../resolvconf/{resolvconf_1.76.bb => resolvconf_1.77.bb}           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-connectivity/resolvconf/{resolvconf_1.76.bb => resolvconf_1.77.bb} (89%)

diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb
similarity index 89%
rename from meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb
rename to meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb
index 797e9b0..45862ff 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb
@@ -11,13 +11,13 @@ AUTHOR = "Thomas Hood"
 HOMEPAGE = "http://packages.debian.org/resolvconf"
 RDEPENDS_${PN} = "bash"
 
-SRC_URI = "http://snapshot.debian.org/archive/debian/20141013T184415Z/pool/main/r/${BPN}/${BPN}_1.76.tar.xz \
+SRC_URI = "${DEBIAN_MIRROR}/main/r/${BPN}/${BPN}_${PV}.tar.xz \
            file://fix-path-for-busybox.patch \
            file://99_resolvconf \
           "
 
-SRC_URI[md5sum] = "d78ce30ea068999cd3e0523300b27255"
-SRC_URI[sha256sum] = "c9f40f7405b37399ddbf29ca4205b4911ee35cb9ffd9be7671faa2385b1fa573"
+SRC_URI[md5sum] = "7362d766e47bfc253500f42b30330d9f"
+SRC_URI[sha256sum] = "5a6e21e8ba6822a5f93075c8c8fe7977e34780ba551af51930d0b31fdd99ab56"
 
 inherit allarch
 
-- 
2.1.4

[PATCH 4/5] qmmp: Upgrade 0.8.5 -> 0.8.6

[Jussi Kukkonen]

Add a missing runtime dependency.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-qt/qt-apps/{qmmp_0.8.5.bb => qmmp_0.8.6.bb} | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-qt/qt-apps/{qmmp_0.8.5.bb => qmmp_0.8.6.bb} (93%)

diff --git a/meta/recipes-qt/qt-apps/qmmp_0.8.5.bb b/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb
similarity index 93%
rename from meta/recipes-qt/qt-apps/qmmp_0.8.5.bb
rename to meta/recipes-qt/qt-apps/qmmp_0.8.6.bb
index aa84c46..e68ad0f 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.8.5.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb
@@ -12,9 +12,8 @@ SRC_URI = "http://qmmp.ylsoftware.com/files/${BP}.tar.bz2 \
            file://no-host-paths.patch \
           "
 
-SRC_URI[md5sum] = "c9347ad18913058e8a37b1e88b9c6ce2"
-SRC_URI[sha256sum] = "7fe9347ad6c66e8013b73f2c5cf628037c58151e0cfcb926a8f27b93ad2d7c0d"
-
+SRC_URI[md5sum] = "67e96e89c61b7432e5a12f555db702b1"
+SRC_URI[sha256sum] = "0daea3f0a0df7b34089513c2c57413c82816ab8892bddabf49c18a7956255449"
 inherit cmake qt4x11
 
 QMMP_PLUGIN_OPTIONS ??= "\
@@ -74,4 +73,4 @@ FILES_${PN}-dbg += "\
                 ${libdir}/qmmp/*/.debug/* \
                "
 
-RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
+RDEPENDS_${PN} += "taglib alsa-lib libmad curl libicui18n"
-- 
2.1.4

[PATCH 5/5] libepoxy: Upgrade 1.2 -> 1.3.1

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-graphics/libepoxy/libepoxy_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/libepoxy/libepoxy_git.bb b/meta/recipes-graphics/libepoxy/libepoxy_git.bb
index 535af5d..ad17293 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_git.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_git.bb
@@ -12,8 +12,8 @@ SRC_URI = " \
     file://0002-add-an-option-to-disable-glx-support.patch \
     file://no-need-for-python3.patch \
 "
-SRCREV="20062c25e7612cab023cdef44d3277ba1bd0b2de"
-PV = "1.2+git${SRCPV}"
+SRCREV="e2c33af5bfcfc9d168f9e776156dd47c33f428b3"
+PV = "1.3.1"
 
 S = "${WORKDIR}/git"
 
-- 
2.1.4

Re: [PATCH 2/5] screen: Add version 4.3.1

[Mikko.Rapeli]

On Mon, Aug 10, 2015 at 03:08:21PM +0300, Jussi Kukkonen wrote:
> The Debian diff in SRC_URI only added a debian/-directory in to the
> source tree and did not modify upstream source: So it does nothing.
> This commit removes the diff and does _not_ try to apply the 19000
> lines of patches in debian/patches. Any useful patches should be
> added separately.
> 
> * Preserve the old 4.0.3 version (GPLv2+) and add new 4.3.1 (GPLv3+)
> * Remove unused debian patch from SRC_URI of 4.0.3, increase PR
> * Add a patchset to enable cross-compiling 4.3.1 (modified from
>   http://savannah.gnu.org/bugs/?43223)

FWIW, Debian and Fedora have just a few patches on top of 4.3.1:

https://pkgs.fedoraproject.org/cgit/screen.git/tree/
https://sources.debian.net/src/screen/4.3.1-1/debian/patches/

-Mikko

Re: [PATCH 2/5] screen: Add version 4.3.1

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

On 10 August 2015 at 13:08, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
> * Preserve the old 4.0.3 version (GPLv2+) and add new 4.3.1 (GPLv3+)

Is screen considered sufficiently core that we should maintain both GPLv2
and v3 recipes?  I'm not convinced it is.

> * Remove unused debian patch from SRC_URI of 4.0.3, increase PR

No need to increase PR.

Ross

[-- Attachment #2: Type: text/html, Size: 564 bytes --]

Re: [PATCH 2/5] screen: Add version 4.3.1

[Andre McCurdy]

On Tue, Aug 11, 2015 at 12:32 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 10 August 2015 at 13:08, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
>> * Preserve the old 4.0.3 version (GPLv2+) and add new 4.3.1 (GPLv3+)
>
> Is screen considered sufficiently core that we should maintain both GPLv2
> and v3 recipes?  I'm not convinced it is.

Is it sufficiently "core" to be in oe-core at all?

Or maybe it's time to replace screen with tmux?

>> * Remove unused debian patch from SRC_URI of 4.0.3, increase PR
>
> No need to increase PR.
>
> Ross
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

Re: [PATCH 2/5] screen: Add version 4.3.1

[Philip Balister]

On 08/11/2015 09:54 PM, Andre McCurdy wrote:
> On Tue, Aug 11, 2015 at 12:32 PM, Burton, Ross <ross.burton@intel.com> wrote:
>> On 10 August 2015 at 13:08, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
>>> * Preserve the old 4.0.3 version (GPLv2+) and add new 4.3.1 (GPLv3+)
>>
>> Is screen considered sufficiently core that we should maintain both GPLv2
>> and v3 recipes?  I'm not convinced it is.
> 
> Is it sufficiently "core" to be in oe-core at all?
> 
> Or maybe it's time to replace screen with tmux?

I use screen a lot. The question is, should the Yocto Project work
towards converting screen users to tmux so we can drop it from or-core.

Philip

> 
>>> * Remove unused debian patch from SRC_URI of 4.0.3, increase PR
>>
>> No need to increase PR.
>>
>> Ross
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>

Re: [PATCH 2/5] screen: Add version 4.3.1

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

On 11 August 2015 at 20:54, Andre McCurdy <armccurdy@gmail.com> wrote:

> > Is screen considered sufficiently core that we should maintain both GPLv2
> > and v3 recipes?  I'm not convinced it is.
>
> Is it sufficiently "core" to be in oe-core at all?
>
> Or maybe it's time to replace screen with tmux?


screen or tmux is a separate debate, but I believe that something like this
is good for oe-core as it's so useful when all you have is a serial line to
your board.

I don't believe that's enough to keep two versions of screen in oe-core
though.

Ross

[-- Attachment #2: Type: text/html, Size: 1050 bytes --]

Re: [PATCH 2/5] screen: Add version 4.3.1

[Otavio Salvador]

On Tue, Aug 11, 2015 at 5:28 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 11 August 2015 at 20:54, Andre McCurdy <armccurdy@gmail.com> wrote:
>>
>> > Is screen considered sufficiently core that we should maintain both
>> > GPLv2
>> > and v3 recipes?  I'm not convinced it is.
>>
>> Is it sufficiently "core" to be in oe-core at all?
>>
>> Or maybe it's time to replace screen with tmux?
>
>
> screen or tmux is a separate debate, but I believe that something like this
> is good for oe-core as it's so useful when all you have is a serial line to
> your board.
>
> I don't believe that's enough to keep two versions of screen in oe-core
> though.

I vote it to go for meta-oe. If it was core, it would have been sent
long time ago so lets add it for meta-oe and see how many people will
ask for it to be promted.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 2/5] screen: Add version 4.3.1

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]


> On Aug 11, 2015, at 1:37 PM, Otavio Salvador <otavio.salvador@ossystems.com.br> wrote:
> 
> On Tue, Aug 11, 2015 at 5:28 PM, Burton, Ross <ross.burton@intel.com> wrote:
>> 
>> On 11 August 2015 at 20:54, Andre McCurdy <armccurdy@gmail.com> wrote:
>>> 
>>>> Is screen considered sufficiently core that we should maintain both
>>>> GPLv2
>>>> and v3 recipes?  I'm not convinced it is.
>>> 
>>> Is it sufficiently "core" to be in oe-core at all?
>>> 
>>> Or maybe it's time to replace screen with tmux?
>> 
>> 
>> screen or tmux is a separate debate, but I believe that something like this
>> is good for oe-core as it's so useful when all you have is a serial line to
>> your board.
>> 
>> I don't believe that's enough to keep two versions of screen in oe-core
>> though.
> 
> I vote it to go for meta-oe. If it was core, it would have been sent
> long time ago so lets add it for meta-oe and see how many people will
> ask for it to be promted.

yes this seems sensible to me.

[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [PATCH 2/5] screen: Add version 4.3.1

[Jussi Kukkonen]

On 11 August 2015 at 23:37, Otavio Salvador
<otavio.salvador@ossystems.com.br> wrote:
> On Tue, Aug 11, 2015 at 5:28 PM, Burton, Ross <ross.burton@intel.com> wrote:
>>
>> On 11 August 2015 at 20:54, Andre McCurdy <armccurdy@gmail.com> wrote:
>>>
>>> > Is screen considered sufficiently core that we should maintain both
>>> > GPLv2
>>> > and v3 recipes?  I'm not convinced it is.
>>>
>>> Is it sufficiently "core" to be in oe-core at all?
>>>
>>> Or maybe it's time to replace screen with tmux?
>>
>>
>> screen or tmux is a separate debate, but I believe that something like this
>> is good for oe-core as it's so useful when all you have is a serial line to
>> your board.
>>
>> I don't believe that's enough to keep two versions of screen in oe-core
>> though.
>
> I vote it to go for meta-oe. If it was core, it would have been sent
> long time ago so lets add it for meta-oe and see how many people will
> ask for it to be promted.

I'm not totally sure what _exactly_ is being said here... so paraphrasing:
* Ross prefers dropping screen 4.0.3 but keeping 4.3.1 in oe-core, correct?
* Otavio/Khem, are you saying we should remove screen from oe-core and
put 4.3.1 into meta-oe, or did I misunderstand?


For what it's worth, I'm happy to remove 4.0.3 at least: if Debian
thought it required 19k lines of patching (in oldoldstable days!),
there could well be dragons there and I wasn't planning on spending
much time finding them.

Cheers,
Jussi