[meta-oe][PATCH 0/8] Recipe updates and an addition

[meta-oe][PATCH 0/8] Recipe updates and an addition

[Paul Barker]

All updated and new recipes have been build tested on qemux86, qemux86-64 and
various raspberrypi models as well as very minimally runtime tested on qemux86.

Paul Barker (8):
  toybox: Switch to v0.7.5 release
  mercurial: Update to v4.4
  mercurial: Support building for target
  dash: Update to v0.5.9.1
  ddrescue: Update to v1.22
  htop: Update to v2.0.2
  tmux: Update to v2.6
  dumb-init: New recipe

 .../toybox/{toybox_git.bb => toybox_0.7.5.bb}      |  10 +-
 .../mercurial/files/mercurial-CVE-2017-9462.patch  | 135 ---------------------
 ...{mercurial-native_4.0.1.bb => mercurial_4.4.bb} |  17 +--
 .../dash/{dash_0.5.8.bb => dash_0.5.9.1.bb}        |   4 +-
 .../{ddrescue_1.19.bb => ddrescue_1.22.bb}         |   4 +-
 .../recipes-extended/dumb-init/dumb-init_1.2.0.bb  |  15 +++
 meta-oe/recipes-extended/tmux/tmux_2.1.bb          |  21 ----
 meta-oe/recipes-extended/tmux/tmux_2.6.bb          |  23 ++++
 .../htop/files/0001-Use-pkg-config.patch           |  46 +++++++
 .../htop/{htop_1.0.3.bb => htop_2.0.2.bb}          |   9 +-
 10 files changed, 107 insertions(+), 177 deletions(-)
 rename meta-oe/recipes-core/toybox/{toybox_git.bb => toybox_0.7.5.bb} (90%)
 delete mode 100644 meta-oe/recipes-devtools/mercurial/files/mercurial-CVE-2017-9462.patch
 rename meta-oe/recipes-devtools/mercurial/{mercurial-native_4.0.1.bb => mercurial_4.4.bb} (57%)
 rename meta-oe/recipes-extended/dash/{dash_0.5.8.bb => dash_0.5.9.1.bb} (86%)
 rename meta-oe/recipes-extended/ddrescue/{ddrescue_1.19.bb => ddrescue_1.22.bb} (90%)
 create mode 100644 meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb
 delete mode 100644 meta-oe/recipes-extended/tmux/tmux_2.1.bb
 create mode 100644 meta-oe/recipes-extended/tmux/tmux_2.6.bb
 create mode 100644 meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
 rename meta-oe/recipes-support/htop/{htop_1.0.3.bb => htop_2.0.2.bb} (58%)

-- 
2.7.4

[meta-oe][PATCH 1/8] toybox: Switch to v0.7.5 release

[Paul Barker]

The commit we needed to use has now been incorporated into a release.

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
 meta-oe/recipes-core/toybox/{toybox_git.bb => toybox_0.7.5.bb} | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-core/toybox/{toybox_git.bb => toybox_0.7.5.bb} (90%)

diff --git a/meta-oe/recipes-core/toybox/toybox_git.bb b/meta-oe/recipes-core/toybox/toybox_0.7.5.bb
similarity index 90%
rename from meta-oe/recipes-core/toybox/toybox_git.bb
rename to meta-oe/recipes-core/toybox/toybox_0.7.5.bb
index 08f9715..347c285 100644
--- a/meta-oe/recipes-core/toybox/toybox_git.bb
+++ b/meta-oe/recipes-core/toybox/toybox_0.7.5.bb
@@ -5,13 +5,9 @@ DEPENDS = "attr"
 LICENSE = "BSD-0-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511"
 
-PV = "0.7.4+git${SRCPV}"
-
-SRCREV = "78289203031afc23585035c362beec10db54958d"
-SRC_URI = "git://github.com/landley/toybox;protocol=https \
-"
-
-S = "${WORKDIR}/git"
+SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "a8bb502a1be941f06dd2644fff25f547"
+SRC_URI[sha256sum] = "3ada450ac1eab1dfc352fee915ea6129b9a4349c1885f1394b61bd2d89a46c04"
 
 SECTION = "base"
 
-- 
2.7.4

[meta-oe][PATCH 2/8] mercurial: Update to v4.4

[Paul Barker]

This update addresses the following CVEs:
- CVE-2017-1000116
- CVE-2017-1000115

We can also drop the patch for CVE-2017-9462 as it's incorporated into this
release.

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
 .../mercurial/files/mercurial-CVE-2017-9462.patch  | 135 ---------------------
 ...ial-native_4.0.1.bb => mercurial-native_4.4.bb} |   8 +-
 2 files changed, 3 insertions(+), 140 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/mercurial/files/mercurial-CVE-2017-9462.patch
 rename meta-oe/recipes-devtools/mercurial/{mercurial-native_4.0.1.bb => mercurial-native_4.4.bb} (69%)

diff --git a/meta-oe/recipes-devtools/mercurial/files/mercurial-CVE-2017-9462.patch b/meta-oe/recipes-devtools/mercurial/files/mercurial-CVE-2017-9462.patch
deleted file mode 100644
index 3564661..0000000
--- a/meta-oe/recipes-devtools/mercurial/files/mercurial-CVE-2017-9462.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-# HG changeset patch
-# User Augie Fackler <augie@google.com>
-# Date 1492021435 25200
-#      Wed Apr 12 11:23:55 2017 -0700
-# Branch stable
-# Node ID 77eaf9539499a1b8be259ffe7ada787d07857f80
-# Parent  68f263f52d2e3e2798b4f1e55cb665c6b043f93b
-dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
-
-Some shared-ssh installations assume that 'hg serve --stdio' is a safe
-command to run for minimally trusted users. Unfortunately, the messy
-implementation of argument parsing here meant that trying to access a
-repo named '--debugger' would give the user a pdb prompt, thereby
-sidestepping any hoped-for sandboxing. Serving repositories over HTTP(S)
-is unaffected.
-
-We're not currently hardening any subcommands other than 'serve'. If
-your service exposes other commands to users with arbitrary repository
-names, it is imperative that you defend against repository names of
-'--debugger' and anything starting with '--config'.
-
-The read-only mode of hg-ssh stopped working because it provided its hook
-configuration to "hg serve --stdio" via --config parameter. This is banned for
-security reasons now. This patch switches it to directly call ui.setconfig().
-If your custom hosting infrastructure relies on passing --config to
-"hg serve --stdio", you'll need to find a different way to get that configuration
-into Mercurial, either by using ui.setconfig() as hg-ssh does in this patch,
-or by placing an hgrc file someplace where Mercurial will read it.
-
-mitrandir@fb.com provided some extra fixes for the dispatch code and
-for hg-ssh in places that I overlooked.
-
-CVE: CVE-2017-9462
-
-Upstream-Status: Backport
-
-diff --git a/contrib/hg-ssh b/contrib/hg-ssh
---- a/contrib/hg-ssh
-+++ b/contrib/hg-ssh
-@@ -32,7 +32,7 @@
- # enable importing on demand to reduce startup time
- from mercurial import demandimport; demandimport.enable()
- 
--from mercurial import dispatch
-+from mercurial import dispatch, ui as uimod
- 
- import sys, os, shlex
- 
-@@ -61,14 +61,15 @@
-         repo = os.path.normpath(os.path.join(cwd, os.path.expanduser(path)))
-         if repo in allowed_paths:
-             cmd = ['-R', repo, 'serve', '--stdio']
-+            req = dispatch.request(cmd)
-             if readonly:
--                cmd += [
--                    '--config',
--                    'hooks.pretxnopen.hg-ssh=python:__main__.rejectpush',
--                    '--config',
--                    'hooks.prepushkey.hg-ssh=python:__main__.rejectpush'
--                    ]
--            dispatch.dispatch(dispatch.request(cmd))
-+                if not req.ui:
-+                    req.ui = uimod.ui.load()
-+                req.ui.setconfig('hooks', 'pretxnopen.hg-ssh',
-+                                 'python:__main__.rejectpush', 'hg-ssh')
-+                req.ui.setconfig('hooks', 'prepushkey.hg-ssh',
-+                                 'python:__main__.rejectpush', 'hg-ssh')
-+            dispatch.dispatch(req)
-         else:
-             sys.stderr.write('Illegal repository "%s"\n' % repo)
-             sys.exit(255)
-diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
---- a/mercurial/dispatch.py
-+++ b/mercurial/dispatch.py
-@@ -155,6 +155,37 @@
-         pass # happens if called in a thread
- 
-     def _runcatchfunc():
-+        realcmd = None
-+        try:
-+            cmdargs = fancyopts.fancyopts(req.args[:], commands.globalopts, {})
-+            cmd = cmdargs[0]
-+            aliases, entry = cmdutil.findcmd(cmd, commands.table, False)
-+            realcmd = aliases[0]
-+        except (error.UnknownCommand, error.AmbiguousCommand,
-+                IndexError, getopt.GetoptError):
-+            # Don't handle this here. We know the command is
-+            # invalid, but all we're worried about for now is that
-+            # it's not a command that server operators expect to
-+            # be safe to offer to users in a sandbox.
-+            pass
-+        if realcmd == 'serve' and '--stdio' in cmdargs:
-+            # We want to constrain 'hg serve --stdio' instances pretty
-+            # closely, as many shared-ssh access tools want to grant
-+            # access to run *only* 'hg -R $repo serve --stdio'. We
-+            # restrict to exactly that set of arguments, and prohibit
-+            # any repo name that starts with '--' to prevent
-+            # shenanigans wherein a user does something like pass
-+            # --debugger or --config=ui.debugger=1 as a repo
-+            # name. This used to actually run the debugger.
-+            if (len(req.args) != 4 or
-+                req.args[0] != '-R' or
-+                req.args[1].startswith('--') or
-+                req.args[2] != 'serve' or
-+                req.args[3] != '--stdio'):
-+                raise error.Abort(
-+                    _('potentially unsafe serve --stdio invocation: %r') %
-+                    (req.args,))
-+
-         try:
-             debugger = 'pdb'
-             debugtrace = {
-diff --git a/tests/test-ssh.t b/tests/test-ssh.t
---- a/tests/test-ssh.t
-+++ b/tests/test-ssh.t
-@@ -357,6 +357,19 @@
-   abort: destination 'a repo' is not empty
-   [255]
- 
-+Make sure hg is really paranoid in serve --stdio mode. It used to be
-+possible to get a debugger REPL by specifying a repo named --debugger.
-+  $ hg -R --debugger serve --stdio
-+  abort: potentially unsafe serve --stdio invocation: ['-R', '--debugger', 'serve', '--stdio']
-+  [255]
-+  $ hg -R --config=ui.debugger=yes serve --stdio
-+  abort: potentially unsafe serve --stdio invocation: ['-R', '--config=ui.debugger=yes', 'serve', '--stdio']
-+  [255]
-+Abbreviations of 'serve' also don't work, to avoid shenanigans.
-+  $ hg -R narf serv --stdio
-+  abort: potentially unsafe serve --stdio invocation: ['-R', 'narf', 'serv', '--stdio']
-+  [255]
-+
- Test hg-ssh using a helper script that will restore PYTHONPATH (which might
- have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right
- parameters:
diff --git a/meta-oe/recipes-devtools/mercurial/mercurial-native_4.0.1.bb b/meta-oe/recipes-devtools/mercurial/mercurial-native_4.4.bb
similarity index 69%
rename from meta-oe/recipes-devtools/mercurial/mercurial-native_4.0.1.bb
rename to meta-oe/recipes-devtools/mercurial/mercurial-native_4.4.bb
index a08acd9..693d4e4 100644
--- a/meta-oe/recipes-devtools/mercurial/mercurial-native_4.0.1.bb
+++ b/meta-oe/recipes-devtools/mercurial/mercurial-native_4.4.bb
@@ -5,11 +5,9 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "python-native"
 
-SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz \
-           file://mercurial-CVE-2017-9462.patch \
-"
-SRC_URI[md5sum] = "22a9b1d7c0c06a53f0ae5b386d536d08"
-SRC_URI[sha256sum] = "6aa4ade93c1b5e11937820880a466ebf1c824086d443cd799fc46e2617250d40"
+SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz"
+SRC_URI[md5sum] = "c1d9fad1b7ed7077b0d4ae82e71154db"
+SRC_URI[sha256sum] = "234af4a67565c85923b0a1910c704ab44bcf12f69b85532687208776563d87de"
 
 S = "${WORKDIR}/mercurial-${PV}"
 
-- 
2.7.4

[meta-oe][PATCH 3/8] mercurial: Support building for target

[Paul Barker]

Rather than trying to work out the exact python modules needed, we just add
'python-modules' to the dependencies list. If you can afford to install
mercurial on target then python-modules shouldn't be too much of a burden.

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
 .../mercurial/{mercurial-native_4.4.bb => mercurial_4.4.bb}      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-devtools/mercurial/{mercurial-native_4.4.bb => mercurial_4.4.bb} (78%)

diff --git a/meta-oe/recipes-devtools/mercurial/mercurial-native_4.4.bb b/meta-oe/recipes-devtools/mercurial/mercurial_4.4.bb
similarity index 78%
rename from meta-oe/recipes-devtools/mercurial/mercurial-native_4.4.bb
rename to meta-oe/recipes-devtools/mercurial/mercurial_4.4.bb
index 693d4e4..9052497 100644
--- a/meta-oe/recipes-devtools/mercurial/mercurial-native_4.4.bb
+++ b/meta-oe/recipes-devtools/mercurial/mercurial_4.4.bb
@@ -3,7 +3,11 @@ HOMEPAGE = "http://mercurial.selenic.com/"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "python-native"
+DEPENDS = "python python-native"
+DEPENDS_class-native = "python-native"
+RDEPENDS_${PN} = "python python-modules"
+
+inherit python-dir
 
 SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz"
 SRC_URI[md5sum] = "c1d9fad1b7ed7077b0d4ae82e71154db"
@@ -11,7 +15,7 @@ SRC_URI[sha256sum] = "234af4a67565c85923b0a1910c704ab44bcf12f69b8553268720877656
 
 S = "${WORKDIR}/mercurial-${PV}"
 
-inherit native
+BBCLASSEXTEND = "native"
 
 EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
     PREFIX=${prefix}"
@@ -24,3 +28,4 @@ do_install () {
     oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix}
 }
 
+FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
-- 
2.7.4

[meta-oe][PATCH 4/8] dash: Update to v0.5.9.1

[Paul Barker]

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
 meta-oe/recipes-extended/dash/{dash_0.5.8.bb => dash_0.5.9.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-extended/dash/{dash_0.5.8.bb => dash_0.5.9.1.bb} (86%)

diff --git a/meta-oe/recipes-extended/dash/dash_0.5.8.bb b/meta-oe/recipes-extended/dash/dash_0.5.9.1.bb
similarity index 86%
rename from meta-oe/recipes-extended/dash/dash_0.5.8.bb
rename to meta-oe/recipes-extended/dash/dash_0.5.9.1.bb
index 78ca60d..6dee66f 100644
--- a/meta-oe/recipes-extended/dash/dash_0.5.8.bb
+++ b/meta-oe/recipes-extended/dash/dash_0.5.9.1.bb
@@ -10,8 +10,8 @@ inherit autotools update-alternatives
 SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz \
            file://0001-Fix-printf-format-errors-with-clang.patch \
            "
-SRC_URI[md5sum] = "5c152209680dab3c319e8923f6c51378"
-SRC_URI[sha256sum] = "c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f"
+SRC_URI[md5sum] = "6472702a8d9760d166ef8333dcb527a6"
+SRC_URI[sha256sum] = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659"
 
 EXTRA_OECONF += "--bindir=${base_bindir}"
 
-- 
2.7.4

[meta-oe][PATCH 5/8] ddrescue: Update to v1.22

[Paul Barker]

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
 .../recipes-extended/ddrescue/{ddrescue_1.19.bb => ddrescue_1.22.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-extended/ddrescue/{ddrescue_1.19.bb => ddrescue_1.22.bb} (90%)

diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb
similarity index 90%
rename from meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
rename to meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb
index 27e00a5..2df7db9 100644
--- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
+++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
                     file://main_common.cc;beginline=5;endline=16;md5=3ec288b2676528cd2b069364e313016f"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz"
-SRC_URI[md5sum] = "ed6b5b82d74cbd925db2b829350e74b1"
-SRC_URI[sha256sum] = "ed8d0c9d9aac80a9110e9cb0d0a91a7390d3bf9f816b67a62ca4eb140f4747b8"
+SRC_URI[md5sum] = "49c845ed89d25b534842e40366154cb4"
+SRC_URI[sha256sum] = "09857b2e8074813ac19da5d262890f722e5f7900e521a4c60354cef95eea10a7"
 
 # This isn't already added by base.bbclass
 do_unpack[depends] += "lzip-native:do_populate_sysroot"
-- 
2.7.4

[meta-oe][PATCH 6/8] htop: Update to v2.0.2

[Paul Barker]

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
 .../htop/files/0001-Use-pkg-config.patch           | 46 ++++++++++++++++++++++
 .../htop/{htop_1.0.3.bb => htop_2.0.2.bb}          |  9 +++--
 2 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
 rename meta-oe/recipes-support/htop/{htop_1.0.3.bb => htop_2.0.2.bb} (58%)

diff --git a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
new file mode 100644
index 0000000..ff5cd49
--- /dev/null
+++ b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
@@ -0,0 +1,46 @@
+From 7ebcbf17ad9483c7109e4a83b66966bc02f09bd4 Mon Sep 17 00:00:00 2001
+From: Paul Barker <pbarker@toganlabs.com>
+Date: Sun, 5 Nov 2017 20:10:10 +0000
+Subject: [PATCH] Use pkg-config
+
+We need to use pkg-config to find the ncurses library instead of the
+ncurses*-config applications.
+
+Signed-off-by: Paul Barker <pbarker@toganlabs.com>
+Upstream-status: Inappropriate
+    (`ncurses*-config` can be used outside of OpenEmbedded)
+---
+ configure.ac | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7e0edd1..c5a8365 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -185,9 +185,9 @@ m4_define([HTOP_CHECK_LIB],
+ 
+ AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
+ if test "x$enable_unicode" = xyes; then
+-   HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
+-    HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
+-     HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
++   HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6",
++    HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5",
++     HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5",
+       HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
+        HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
+         HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
+@@ -200,8 +200,8 @@ if test "x$enable_unicode" = xyes; then
+          [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+             [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+ else
+-   HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
+-    HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
++   HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6",
++    HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5",
+      HTOP_CHECK_LIB([ncurses6],  [refresh], [HAVE_LIBNCURSES],
+       HTOP_CHECK_LIB([ncurses],  [refresh], [HAVE_LIBNCURSES],
+       missing_libraries="$missing_libraries libncurses"
+-- 
+2.7.4
+
diff --git a/meta-oe/recipes-support/htop/htop_1.0.3.bb b/meta-oe/recipes-support/htop/htop_2.0.2.bb
similarity index 58%
rename from meta-oe/recipes-support/htop/htop_1.0.3.bb
rename to meta-oe/recipes-support/htop/htop_2.0.2.bb
index 181661a..395b83f 100644
--- a/meta-oe/recipes-support/htop/htop_1.0.3.bb
+++ b/meta-oe/recipes-support/htop/htop_2.0.2.bb
@@ -8,10 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3"
 DEPENDS = "ncurses"
 RDEPENDS_${PN} = "ncurses-terminfo"
 
-SRC_URI = "http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz"
+SRC_URI = " \
+    http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz \
+    file://0001-Use-pkg-config.patch \
+    "
 
-SRC_URI[md5sum] = "e768b9b55c033d9c1dffda72db3a6ac7"
-SRC_URI[sha256sum] = "055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829"
+SRC_URI[md5sum] = "7d354d904bad591a931ad57e99fea84a"
+SRC_URI[sha256sum] = "179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487"
 
 LDFLAGS_append_libc-uclibc = " -lubacktrace"
 
-- 
2.7.4

[meta-oe][PATCH 7/8] tmux: Update to v2.6

[Paul Barker]

We can also switch to using a release archive.

The license checksum change is due to a change in the author's email address.

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
 meta-oe/recipes-extended/tmux/tmux_2.1.bb | 21 ---------------------
 meta-oe/recipes-extended/tmux/tmux_2.6.bb | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 21 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/tmux/tmux_2.1.bb
 create mode 100644 meta-oe/recipes-extended/tmux/tmux_2.6.bb

diff --git a/meta-oe/recipes-extended/tmux/tmux_2.1.bb b/meta-oe/recipes-extended/tmux/tmux_2.1.bb
deleted file mode 100644
index bf21de5..0000000
--- a/meta-oe/recipes-extended/tmux/tmux_2.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "Terminal multiplexer"
-HOMEPAGE = "http://tmux.sourceforge.net"
-SECTION = "console/utils"
-
-LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=8685b4455330a940fab1ff451aa941a0"
-
-DEPENDS = "ncurses libevent"
-
-
-SRC_URI = "git://github.com/tmux/tmux.git;branch=master"
-SRCREV ?= "310f0a960ca64fa3809545badc629c0c166c6cd2"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-inherit autotools pkgconfig
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter,"
-
diff --git a/meta-oe/recipes-extended/tmux/tmux_2.6.bb b/meta-oe/recipes-extended/tmux/tmux_2.6.bb
new file mode 100644
index 0000000..7610766
--- /dev/null
+++ b/meta-oe/recipes-extended/tmux/tmux_2.6.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Terminal multiplexer"
+HOMEPAGE = "http://tmux.sourceforge.net"
+SECTION = "console/utils"
+
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf19144bdaca107"
+
+DEPENDS = "ncurses libevent"
+
+SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz"
+SRC_URI[md5sum] = "d541ff392249f94c4f3635793556f827"
+SRC_URI[sha256sum] = "b17cd170a94d7b58c0698752e1f4f263ab6dc47425230df7e53a6435cc7cd7e8"
+
+inherit autotools pkgconfig
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter,"
+
+do_configure_prepend() {
+    # The 'compat' directory is needed for output during the build but it's
+    # not automatically created when building outside the source directory.
+    mkdir ${B}/compat
+}
-- 
2.7.4

[meta-oe][PATCH 8/8] dumb-init: New recipe

[Paul Barker]

This is a really simple init replacement for lightweight container images.

See https://engineeringblog.yelp.com/2016/01/dumb-init-an-init-for-docker.html
for more info.

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
 meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb

diff --git a/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb b/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb
new file mode 100644
index 0000000..e1a6d95
--- /dev/null
+++ b/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Simple wrapper script which proxies signals to a child"
+HOMEPAGE = "https://github.com/Yelp/dumb-init/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c"
+
+SRC_URI = "https://github.com/Yelp/dumb-init/archive/v${PV}.tar.gz"
+SRC_URI[md5sum] = "4eb7f43d7823686723ff7ac1bad097cb"
+SRC_URI[sha256sum] = "74486997321bd939cad2ee6af030f481d39751bc9aa0ece84ed55f864e309a3f"
+
+EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'"
+
+do_install() {
+    install -d ${D}${base_sbindir}
+    install ${S}/dumb-init ${D}${base_sbindir}/
+}
-- 
2.7.4