mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-08-11 09:13:57 -04:00
Update version of imagemagick in the windows build to fix secunia reporting a phantom? security vulnerability in the ImageMagick DLLs. Fixes #999496 (Used ImageMagick DLL is insecure)
This commit is contained in:
parent
4f2f8e2540
commit
5b4f6b1b52
@ -18,7 +18,7 @@ QT_DIR = 'Q:\\Qt\\4.8.1'
|
|||||||
QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns']
|
QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns']
|
||||||
LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll'
|
LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll'
|
||||||
SW = r'C:\cygwin\home\kovid\sw'
|
SW = r'C:\cygwin\home\kovid\sw'
|
||||||
IMAGEMAGICK = os.path.join(SW, 'build', 'ImageMagick-6.6.6',
|
IMAGEMAGICK = os.path.join(SW, 'build', 'ImageMagick-6.7.6',
|
||||||
'VisualMagick', 'bin')
|
'VisualMagick', 'bin')
|
||||||
CRT = r'C:\Microsoft.VC90.CRT'
|
CRT = r'C:\Microsoft.VC90.CRT'
|
||||||
|
|
||||||
|
@ -336,6 +336,8 @@ Index: src/PdfFiltersPrivate.cpp
|
|||||||
ImageMagick
|
ImageMagick
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
|
Get the source from: http://www.imagemagick.org/download/windows/ImageMagick-windows.zip
|
||||||
|
|
||||||
Edit VisualMagick/configure/configure.cpp to set
|
Edit VisualMagick/configure/configure.cpp to set
|
||||||
|
|
||||||
int projectType = MULTITHREADEDDLL;
|
int projectType = MULTITHREADEDDLL;
|
||||||
@ -349,7 +351,10 @@ Edit magick/magick-config.h
|
|||||||
Undefine ProvideDllMain and MAGICKCORE_X11_DELEGATE
|
Undefine ProvideDllMain and MAGICKCORE_X11_DELEGATE
|
||||||
|
|
||||||
Now open VisualMagick/VisualDynamicMT.sln set to Release
|
Now open VisualMagick/VisualDynamicMT.sln set to Release
|
||||||
Remove the CORE_xlib and UTIL_Imdisplay project CORE_Magick++
|
Remove the CORE_xlib, UTIL_Imdisplay and CORE_Magick++ projects.
|
||||||
|
|
||||||
|
F7 for build project, you will get one error due to the removal of xlib, ignore
|
||||||
|
it.
|
||||||
|
|
||||||
calibre
|
calibre
|
||||||
---------
|
---------
|
||||||
|
Loading…
x
Reference in New Issue
Block a user