Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos
Commits
73c78229
Commit
73c78229
authored
May 06, 2016
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imagemagick: version 7.0.1-1.
parent
3e6d6759
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
15 deletions
+26
-15
component/imagemagick/buildout.cfg
component/imagemagick/buildout.cfg
+10
-11
component/imagemagick/safe_policy.patch
component/imagemagick/safe_policy.patch
+16
-4
No files found.
component/imagemagick/buildout.cfg
View file @
73c78229
...
@@ -25,10 +25,10 @@ extends =
...
@@ -25,10 +25,10 @@ extends =
[imagemagick]
[imagemagick]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
version =
6.8.9
-1
version =
7.0.1
-1
url = http
://ftp.sunet.se/pub/multimedia/graphics/ImageMagick
/ImageMagick-${:version}.tar.xz
url = http
s://www.imagemagick.org/download/releases
/ImageMagick-${:version}.tar.xz
md5sum =
bde038ae05fb20d29cebf88ab9cbdce5
md5sum =
24673d00fcc8aa00313eeca6aa20fd3c
pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${xz-utils:location}/lib/pkgconfig
pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${
lcms2:location}/lib/pkgconfig:${
xz-utils:location}/lib/pkgconfig
configure-options =
configure-options =
--disable-static
--disable-static
--without-x
--without-x
...
@@ -38,31 +38,30 @@ configure-options =
...
@@ -38,31 +38,30 @@ configure-options =
--without-dps
--without-dps
--without-djvu
--without-djvu
--without-fftw
--without-fftw
--without-flif
--without-fpx
--without-fpx
--with-fontconfig
--with-fontconfig
--without-gslib
--without-gslib
--without-gvc
--without-gvc
--without-lcms
--with-lcms
--with-lcms2
--without-openjp2
--without-openjp2
--without-lqr
--without-lqr
--without-lzma
--without-lzma
--without-openexr
--without-openexr
--without-pango
--without-pango
--without-raqm
--without-rsvg
--without-rsvg
--without-wmf
--without-wmf
--with-bzlib=${bzip2:location}
--with-bzlib=${bzip2:location}
--with-zlib=${zlib:location}
--with-zlib=${zlib:location}
--with-ltdl-include=${libtool:location}/include
--with-ltdl-lib=${libtool:location}/lib
--with-gs-font-dir=${ghostscript-fonts:location}
--with-gs-font-dir=${ghostscript-fonts:location}
--with-frozenpaths
--with-frozenpaths
patch-options = -p1
patch-options = -p1
patches =
patches =
${:_profile_base_location_}/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch#3f28ecd9f6722cf2c3238ce6ec3d7a68
${:_profile_base_location_}/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch#3f28ecd9f6722cf2c3238ce6ec3d7a68
${:_profile_base_location_}/safe_policy.patch#
6c3ed3be347d04f56f70a6266272d845
${:_profile_base_location_}/safe_policy.patch#
70461afd331ca006c9c0d51512c81189
environment =
environment =
PATH=${freetype:location}/bin:${ghostscript:location}/bin:${inkscape:location}/bin:${libxml2:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
PATH=${freetype:location}/bin:${ghostscript:location}/bin:${inkscape:location}/bin:${libxml2:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${:pkg_config_depends}
PKG_CONFIG_PATH=${:pkg_config_depends}
CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${lib
png:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include -I${lcms2
:location}/include
CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${lib
tool:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp
:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${lib
png:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${lcms2:location}/lib -Wl,-rpath=${lcms2
:location}/lib
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${lib
tool:location}/lib -Wl,-rpath=${libtool:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp
:location}/lib
component/imagemagick/safe_policy.patch
View file @
73c78229
--- ImageMagick-
6.8.9-1/config/policy.xml.orig 2013-01-14 14:57:39.000000000 +01
00
--- ImageMagick-
7.0.1-1/config/policy.xml.orig 2016-05-04 00:18:54.000000000 +02
00
+++ ImageMagick-
6.8.9-1/config/policy.xml 2016-05-04 11:20:03.111695907
+0200
+++ ImageMagick-
7.0.1-1/config/policy.xml 2016-05-06 08:22:30.002045742
+0200
@@ -
46,14 +46,1
9 @@
@@ -
50,16 +50,2
9 @@
-->
-->
<policymap>
<policymap>
<!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
<!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
- <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
- <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
- <!-- <policy domain="resource" name="map" value="4GiB"/> -->
- <!-- <policy domain="resource" name="map" value="4GiB"/> -->
- <!-- <policy domain="resource" name="width" value="10MP"/> -->
- <!-- <policy domain="resource" name="height" value="10MP"/> -->
- <!-- <policy domain="resource" name="area" value="1GB"/> -->
- <!-- <policy domain="resource" name="area" value="1GB"/> -->
- <!-- <policy domain="resource" name="disk" value="16EB"/> -->
- <!-- <policy domain="resource" name="disk" value="16EB"/> -->
- <!-- <policy domain="resource" name="file" value="768"/> -->
- <!-- <policy domain="resource" name="file" value="768"/> -->
...
@@ -15,6 +17,8 @@
...
@@ -15,6 +17,8 @@
- <!-- <policy domain="system" name="precision" value="6"/> -->
- <!-- <policy domain="system" name="precision" value="6"/> -->
+ <policy domain="resource" name="memory" value="2GiB"/>
+ <policy domain="resource" name="memory" value="2GiB"/>
+ <policy domain="resource" name="map" value="4GiB"/>
+ <policy domain="resource" name="map" value="4GiB"/>
+ <policy domain="resource" name="width" value="10MP"/>
+ <policy domain="resource" name="height" value="10MP"/>
+ <policy domain="resource" name="area" value="1GB"/>
+ <policy domain="resource" name="area" value="1GB"/>
+ <policy domain="resource" name="disk" value="16EB"/>
+ <policy domain="resource" name="disk" value="16EB"/>
+ <policy domain="resource" name="file" value="768"/>
+ <policy domain="resource" name="file" value="768"/>
...
@@ -24,8 +28,16 @@
...
@@ -24,8 +28,16 @@
+ <policy domain="system" name="precision" value="6"/>
+ <policy domain="system" name="precision" value="6"/>
<policy domain="cache" name="shared-secret" value="passphrase"/>
<policy domain="cache" name="shared-secret" value="passphrase"/>
+ <policy domain="coder" rights="none" pattern="EPHEMERAL" />
+ <policy domain="coder" rights="none" pattern="EPHEMERAL" />
+ <policy domain="coder" rights="none" pattern="FTP" />
+ <policy domain="coder" rights="none" pattern="HTTP" />
+ <policy domain="coder" rights="none" pattern="HTTPS" />
+ <policy domain="coder" rights="none" pattern="HTTPS" />
+ <policy domain="coder" rights="none" pattern="
MVG
" />
+ <policy domain="coder" rights="none" pattern="
LABEL
" />
+ <policy domain="coder" rights="none" pattern="MSL" />
+ <policy domain="coder" rights="none" pattern="MSL" />
+ <policy domain="coder" rights="none" pattern="MVG" />
+ <policy domain="coder" rights="none" pattern="PLT" />
+ <policy domain="coder" rights="none" pattern="SHOW" />
+ <policy domain="coder" rights="none" pattern="TEXT" />
+ <policy domain="coder" rights="none" pattern="URL" />
+ <policy domain="coder" rights="none" pattern="WIN" />
+ <policy domain="path" rights="none" pattern="@*" />
+ <policy domain="path" rights="none" pattern="@*" />
</policymap>
</policymap>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment