← Back to branch summary

~ubuntu-branches/debian/sid/resource-agents/sid

« back to all changes in this revision

Viewing changes to debian/patches/CVE-2010-3389--bug598549.patch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Loschwitz
  • Date: 2011-08-24 09:32:00 UTC
  • Revision ID: james.westby@ubuntu.com-20110824093200-s8b8oxtn5a9xy3gq
Tags: 1:3.9.2-1
* Package rename due to restructuring from upstream
* Added resource-agents-dev package to hold the important header file
* New upstream release from new repository
* Updated to new Policy version, no changes necessary
* Adapt patches to work with the new upstream version

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/CVE-2010-3389--bug598549.patch
 
1
diff -ruN cluster-agents-3.9.2.old//heartbeat/SAPDatabase cluster-agents-3.9.2/heartbeat/SAPDatabase
 
2
--- cluster-agents-3.9.2.old//heartbeat/SAPDatabase     2011-06-29 12:51:48.000000000 +0000
 
3
+++ cluster-agents-3.9.2/heartbeat/SAPDatabase  2011-08-24 09:43:15.215463955 +0000
 
4
@@ -974,8 +974,11 @@
 
5
 fi
 
6
 
 
7
 # as root user we need the library path to the SAP kernel to be able to call executables
 
8
-if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
 
9
-  LD_LIBRARY_PATH=$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
 
10
+if [ "$DIR_EXECUTABLE" ]; then
 
11
+  if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
 
12
+      LD_LIBRARY_PATH="$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 
13
+      export LD_LIBRARY_PATH
 
14
+  fi
 
15
   export LD_LIBRARY_PATH
 
16
 fi
 
17
 sidadm="`echo $SID | tr '[:upper:]' '[:lower:]'`adm"
 
18
diff -ruN cluster-agents-3.9.2.old//heartbeat/SAPInstance cluster-agents-3.9.2/heartbeat/SAPInstance
 
19
--- cluster-agents-3.9.2.old//heartbeat/SAPInstance     2011-06-29 12:51:48.000000000 +0000
 
20
+++ cluster-agents-3.9.2/heartbeat/SAPInstance  2011-08-24 09:43:07.724822028 +0000
 
21
@@ -355,8 +355,11 @@
 
22
   fi
 
23
 
 
24
   # as root user we need the library path to the SAP kernel to be able to call sapcontrol
 
25
-  if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
 
26
-    LD_LIBRARY_PATH=$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
 
27
+  if [ "$DIR_EXECUTABLE" ]; then
 
28
+    if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
 
29
+       LD_LIBRARY_PATH="$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 
30
+       export LD_LIBRARY_PATH
 
31
+    fi
 
32
     export LD_LIBRARY_PATH
 
33
   fi
 
34