[oe-commits] [meta-openembedded] branch master-next updated: strongswan: Fix do_patch fuzz

git at git.openembedded.org git at git.openembedded.org
Sat Sep 7 19:54:56 UTC 2019


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

The following commit(s) were added to refs/heads/master-next by this push:
     new 3061ead  strongswan: Fix do_patch fuzz
3061ead is described below

commit 3061ead8cf38c47ff81d7622cbcf2b8602012212
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Sat Sep 7 12:51:59 2019 -0700

    strongswan: Fix do_patch fuzz
    
    Refresh the patch to apply cleanly
    
    Fixes
    
    Applying patch 0001-memory.h-Include-stdint.h-for-uintptr_t.patch
    patching file src/libstrongswan/utils/utils/memory.h
    Hunk #1 succeeded at 26 with fuzz 2 (offset 4 lines).
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch b/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch
index 00178c8..2d17507 100644
--- a/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch
+++ b/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch
@@ -9,13 +9,11 @@ Signed-off-by: Khem Raj <raj.khem at gmail.com>
  src/libstrongswan/utils/utils/memory.h | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/src/libstrongswan/utils/utils/memory.h b/src/libstrongswan/utils/utils/memory.h
-index e840330..8a356a8 100644
 --- a/src/libstrongswan/utils/utils/memory.h
 +++ b/src/libstrongswan/utils/utils/memory.h
-@@ -22,6 +22,8 @@
- #ifndef MEMORY_H_
- #define MEMORY_H_
+@@ -26,6 +26,8 @@
+ #include <string.h>
+ #endif
  
 +#include <stdint.h>
 +

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list