From d8560cb5e52bf1feeb769692004e4b20fad18d9b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Sep 2018 00:06:43 -0700
Subject: umip: Fetch from git.umip.org

* Adjust patches
* Depend on openssl10
* remove spurious dep on rpm

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...IGCLD-with-SIGCHLD-and-include-sys-types.h.patch | 21 +++++----------------
 meta-oe/recipes-connectivity/umip/umip_1.0.bb       |  6 +++---
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch b/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
index 8192056d1..153bced39 100644
--- a/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
+++ b/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
@@ -20,19 +20,11 @@ Upstream-Status: Pending
  src/main.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/src/main.c b/src/main.c
-index 3cf4072..cd34196 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -31,6 +31,7 @@
- #include <sys/ioctl.h>
- #include <sys/wait.h>
- #include <sys/param.h>
-+#include <sys/types.h>
- #include <pthread.h>
- #include <fcntl.h>
- #include <unistd.h>
-@@ -126,9 +127,9 @@ static void daemon_start(int ignsigcld)
+Index: git/src/main.c
+===================================================================
+--- git.orig/src/main.c
++++ git/src/main.c
+@@ -133,9 +133,9 @@ static void daemon_start(int ignsigcld)
  
  	if (ignsigcld) {
  #ifdef SIGTSTP
@@ -44,6 +36,3 @@ index 3cf4072..cd34196 100644
  #endif
  	}
  }
--- 
-2.16.2
-
diff --git a/meta-oe/recipes-connectivity/umip/umip_1.0.bb b/meta-oe/recipes-connectivity/umip/umip_1.0.bb
index 8db252d23..cee44f6c7 100644
--- a/meta-oe/recipes-connectivity/umip/umip_1.0.bb
+++ b/meta-oe/recipes-connectivity/umip/umip_1.0.bb
@@ -7,9 +7,9 @@ HOMEPAGE = "http://umip.org/"
 SECTION = "System Environment/Base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=073dc31ccb2ebed70db54f1e8aeb4c33"
-DEPENDS = "rpm indent-native bison-native"
+DEPENDS = "openssl10 ipsec-tools radvd indent-native bison-native"
 
-SRC_URI = "git://github.com/jlanza/umip \
+SRC_URI = "git://git.umip.org/umip/umip.git \
            file://add-dependency-to-support-parallel-compilation.patch \
            file://mip6d \
            file://mip6d.service \
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/jlanza/umip \
            file://0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch \
            file://0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch \
            "
-SRCREV = "7d67209cd1bba2dd0e183a0fa07eeef07964dd14"
+SRCREV = "cbd441c5db719db554ff2b4fcb02fef88ae2f791"
 
 S = "${WORKDIR}/git"
 
-- 
cgit v1.2.3-54-g00ecf