File: 0001-Description-Do-not-read-configure-files-in-the-curre.patch

package info (click to toggle)
imagemagick 8%3A6.6.0.4-3%2Bsqueeze4
  • links: PTS, VCS
  • area: main
  • in suites: squeeze
  • size: 60,836 kB
  • ctags: 41,044
  • sloc: ansic: 273,304; cpp: 18,276; sh: 10,816; xml: 7,125; perl: 4,893; makefile: 2,346; tcl: 459; pascal: 125
file content (44 lines) | stat: -rw-r--r-- 1,325 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
From 1c510786f97d29de601e411ec099166683a22f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Wed, 25 Apr 2012 14:47:16 +0200
Subject: [PATCH] Description: Do not read configure files in the current
 directory for  the "installed" version of ImageMagick. 
 Patch pulled from upstream svn 
 https://www.imagemagick.org/subversion/ImageMagick/trunk 
 revision 3022. Author: Cristy  <quetzlzacatenango@image...>
 Bug-Debian: http://bugs.debian.org/601824 Origin: upstream
 Last-Update: 2010-11-06

---
 magick/configure.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/magick/configure.c b/magick/configure.c
index 823f294..fc8347f 100644
--- a/magick/configure.c
+++ b/magick/configure.c
@@ -749,6 +749,10 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename,
       (void) AppendValueToLinkedList(paths,ConstantString(path));
 #endif
     }
+  /*
+    Search current directory.
+  */
+  (void) AppendValueToLinkedList(paths,ConstantString(""));
 #endif
   {
     char
@@ -803,10 +807,6 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename,
       }
   }
 #endif
-  /*
-    Search current directory.
-  */
-  (void) AppendValueToLinkedList(paths,ConstantString(""));
   return(paths);
 }
 
-- 
1.7.10