[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1231/8267] pseudo: Upgrade to 1.8.1

[Emmanuele Bassi <ebassi src gnome org>]

commit 9df3cdf42d8c1216682f497f0b166a43ef9f4184
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Jul 5 13:18:31 2016 +0100

    pseudo: Upgrade to 1.8.1
    
    * Drop patches where the changes exist upstream
    * Fetch from git as no tarball is available for 1.8.1
    * Move common code to pseudo.inc
    * Update patchset in git recipe
    
    (From OE-Core rev: 0c36984d4c501d12fa91cf7371511641585cc256)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../pseudo/files/handle-remove-xattr.patch         |   36 --------
 .../pseudo/files/moreretries.patch                 |   12 ++--
 meta/recipes-devtools/pseudo/pseudo.inc            |   13 +++-
 .../pseudo/pseudo/obey-ldflags.patch               |   50 ------------
 .../pseudo/pseudo-glibc-rtld-next-workaround.patch |   85 --------------------
 meta/recipes-devtools/pseudo/pseudo_1.7.5.bb       |   23 -----
 meta/recipes-devtools/pseudo/pseudo_1.8.1.bb       |   11 +++
 meta/recipes-devtools/pseudo/pseudo_git.bb         |   10 ++-
 8 files changed, 34 insertions(+), 206 deletions(-)
---
diff --git a/meta/recipes-devtools/pseudo/files/moreretries.patch 
b/meta/recipes-devtools/pseudo/files/moreretries.patch
index c1e5552..adea266 100644
--- a/meta/recipes-devtools/pseudo/files/moreretries.patch
+++ b/meta/recipes-devtools/pseudo/files/moreretries.patch
@@ -4,15 +4,15 @@ server shutdowns.
 Upstream-Status: Pending
 RP 2016/2/28
 
-Index: pseudo-1.7.5/pseudo_client.c
+Index: git/pseudo_client.c
 ===================================================================
---- pseudo-1.7.5.orig/pseudo_client.c
-+++ pseudo-1.7.5/pseudo_client.c
-@@ -1214,7 +1214,7 @@ pseudo_client_setup(void) {
-       return 1;
+--- git.orig/pseudo_client.c
++++ git/pseudo_client.c
+@@ -1282,7 +1282,7 @@ pseudo_client_setup(void) {
+       }
  }
  
--#define PSEUDO_RETRIES 50
+-#define PSEUDO_RETRIES 20
 +#define PSEUDO_RETRIES 250
  static pseudo_msg_t *
  pseudo_client_request(pseudo_msg_t *msg, size_t len, const char *path) {
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index 16c57c9..18ce9f9 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -26,6 +26,8 @@ do_configure () {
 NO32LIBS ??= "1"
 NO32LIBS_class-nativesdk = "1"
 
+PSEUDO_EXTRA_OPTS ?= "--enable-force-async --without-passwd-fallback"
+
 # Compile for the local machine arch...
 do_compile () {
        if [ "${SITEINFO_BITS}" = "64" ]; then
@@ -112,10 +114,15 @@ do_install () {
        oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 'LIB=lib/pseudo/lib$(MARK64)' install
 }
 
-# Two below are the same
-# If necessary install for the alternative machine arch.  This is only 
-# necessary in a native build.
 do_install_append_class-native () {
+       install -d ${D}${sysconfdir}
+       # The fallback files should never be modified
+       install -m 444 ${WORKDIR}/fallback-passwd ${D}${sysconfdir}/passwd
+       install -m 444 ${WORKDIR}/fallback-group ${D}${sysconfdir}/group
+
+       # Two native/nativesdk entries below are the same
+       # If necessary install for the alternative machine arch.  This is only
+       # necessary in a native build.
        maybe_make32
        if $make32; then
                mkdir -p ${D}${prefix}/lib/pseudo/lib
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.8.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.8.1.bb
new file mode 100644
index 0000000..3381df0
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo_1.8.1.bb
@@ -0,0 +1,11 @@
+require pseudo.inc
+
+SRC_URI = "http://downloads.yoctoproject.org/releases/pseudo/${BPN}-${PV}.tar.bz2 \
+           file://0001-configure-Prune-PIE-flags.patch \
+           file://fallback-passwd \
+           file://fallback-group \
+           file://moreretries.patch \
+           "
+
+SRC_URI[md5sum] = "ee38e4fb62ff88ad067b1a5a3825bac7"
+SRC_URI[sha256sum] = "dac4ad2d21228053151121320f629d41dd5c0c87695ac4e7aea286c414192ab5"
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index abff1cf..9febf60 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -1,11 +1,15 @@
 require pseudo.inc
 
-SRCREV = "786c6d3813622d18e12d36c4aa722af6a417c8fa"
-PV = "1.7.5+git${SRCPV}"
+SRCREV = "eb47d855a831b6dc0ad34890e84b8f6f483693df"
+PV = "1.8.1+git${SRCPV}"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "git://git.yoctoproject.org/pseudo"
+SRC_URI = "git://git.yoctoproject.org/pseudo \
+           file://0001-configure-Prune-PIE-flags.patch \
+           file://fallback-passwd \
+           file://fallback-group \
+           file://moreretries.patch"
 
 S = "${WORKDIR}/git"