Merge "weston-init: Ensure setting of the user"

diff --git a/meta-security/recipes-security/xmlsec1/xmlsec1/remove-4-in-verify3.patch b/meta-security/recipes-security/xmlsec1/xmlsec1/remove-4-in-verify3.patch
deleted file mode 100644 (file)
index 185ed8f..0000000
--- a/meta-security/recipes-security/xmlsec1/xmlsec1/remove-4-in-verify3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/examples/verify3.c b/examples/verify3.c
-index 2d26ae7..d36552d 100644
---- a/examples/verify3.c
-+++ b/examples/verify3.c
-@@ -1,4 +1,4 @@
--4/** 
-+/** 
-  * XML Security Library example: Verifying a file signed with X509 certificate
-  *
-  * Verifies a file signed with X509 certificate. 
-

diff --git a/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bbappend b/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bbappend
deleted file mode 100644 (file)
index 047ab40..0000000
--- a/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-SRC_URI += "file://remove-4-in-verify3.patch"
-