Upgrade to thud

[AGL/meta-agl.git] / meta-security / recipes-security / cynara / cynara / cynara-db-migration-abort-on-errors.patch

diff --git a/meta-security/recipes-security/cynara/cynara/cynara-db-migration-abort-on-errors.patch b/meta-security/recipes-security/cynara/cynara/cynara-db-migration-abort-on-errors.patch
index cbf372a..c144189 100644 (file)
--- a/meta-security/recipes-security/cynara/cynara/cynara-db-migration-abort-on-errors.patch
+++ b/meta-security/recipes-security/cynara/cynara/cynara-db-migration-abort-on-errors.patch
@@ -1,7 +1,7 @@
-From 297774fa4d01156c0327d6e6380a7ecae30bf875 Mon Sep 17 00:00:00 2001
+From 3605e9f8a3ea1252d1cf221398431e0d7a3ea34d Mon Sep 17 00:00:00 2001
 From: Patrick Ohly <patrick.ohly@intel.com>
 Date: Mon, 23 Mar 2015 15:01:39 -0700
-Subject: [PATCH 1/2] cynara-db-migration.in: abort on errors
+Subject: [PATCH] cynara-db-migration.in: abort on errors
 
 "set -e" enables error checking for all commands invoked by the script.
 Previously, errors were silently ignored.
@@ -9,12 +9,13 @@ Previously, errors were silently ignored.
 Upstream-status: Submitted [https://github.com/Samsung/cynara/pull/8]
 
 Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
+
 ---
- migration/cynara-db-migration | 2 ++
+ migration/cynara-db-migration.in | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/migration/cynara-db-migration.in b/migration/cynara-db-migration.in
-index ff9bd61..f6e7f94 100644
+index 7b666d4..0682df6 100644
 --- a/migration/cynara-db-migration.in
 +++ b/migration/cynara-db-migration.in
 @@ -19,6 +19,8 @@
@@ -25,7 +26,4 @@ index ff9bd61..f6e7f94 100644
 +
  ##### Constants (these must not be modified by shell)
  
- STATE_PATH='@LOCAL_STATE_DIR@/@PROJECT_NAME@'
--- 
-1.8.4.5
-
+ PATH=/bin:/usr/bin:/sbin:/usr/sbin