From b7189c7a712698c702f412ec1db3e596acc0a635 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 27 Jun 2016 00:51:26 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 1 + ImageMagick-6/delegates.xml | 99 +-- ImageMagick-6/policy.xml | 14 +- ImageMagick-6/type-apple.xml | 1371 ++++++++++++++++++++++++++++++++++ 4 files changed, 1424 insertions(+), 61 deletions(-) create mode 100644 ImageMagick-6/type-apple.xml diff --git a/.etckeeper b/.etckeeper index d1f2041..7d71ef1 100755 --- a/.etckeeper +++ b/.etckeeper @@ -52,6 +52,7 @@ maybe chmod 0644 'ImageMagick-6/mime.xml' maybe chmod 0644 'ImageMagick-6/policy.xml' maybe chmod 0644 'ImageMagick-6/quantization-table.xml' maybe chmod 0644 'ImageMagick-6/thresholds.xml' +maybe chmod 0644 'ImageMagick-6/type-apple.xml' maybe chmod 0644 'ImageMagick-6/type-dejavu.xml' maybe chmod 0644 'ImageMagick-6/type-ghostscript.xml' maybe chmod 0644 'ImageMagick-6/type-windows.xml' diff --git a/ImageMagick-6/delegates.xml b/ImageMagick-6/delegates.xml index 1bc935e..b19da56 100644 --- a/ImageMagick-6/delegates.xml +++ b/ImageMagick-6/delegates.xml @@ -1,4 +1,3 @@ - @@ -17,16 +16,15 @@ decode="in_format" encode="out_format" - specify the rules for converting from in_format to out_format These - rules may be used to translate directly between formats. + specify the rules for converting from in_format to out_format. Use these + rules to translate directly between formats. Commands which specify only decode="in_format" specify the rules for converting from in_format to some format that - ImageMagick will automatically recognize. These rules are used to - decode formats. + ImageMagick automatically recognizes. Use these rules to decode formats. Commands which specify only @@ -34,24 +32,20 @@ specify the rules for an "encoder" which may accept any input format. - For delegates other than ps:*, pcl:*, and mpeg:* the substitution rules are - as follows: + The substitution rules are as follows: - %i input image filename - %o output image filename - %u unique temporary filename - %Z unique temporary filename - %# input image signature - %b image file size - %c input image comment + %a authentication passphrase + %b image file size in bytes %g image geometry %h image rows (height) - %k input image number colors - %l image label + %i input image filename + %# input image signature %m input image format + %o output image filename %p page number %q input image depth %s scene number + %u unique temporary filename %w image columns (width) %x input image x resolution %y input image y resolution @@ -62,77 +56,66 @@ If stealth="True" the delegate is not listed in user requested "-list delegate" listings. These are typically special internal delegates. - If spawn="True" ImageMagick will not way for the delegate to finish, - nor will it read any output image. It will only wait for either the input - file to be removed (See "ephemeral:" coder) indicating that the input file - has been read, or a maximum time limit of 2 seconds. + If spawn="True", ImageMagick does not wait for the delegate to finish, nor + will it read any output image. --> - - - + + - - - + + + + - - + + - + - - - + + + - - - - - - - + + + + + - - - + + - - - - - + + + + - + - + - - - - - + - - - + + - + diff --git a/ImageMagick-6/policy.xml b/ImageMagick-6/policy.xml index 16e2790..c36e4b6 100644 --- a/ImageMagick-6/policy.xml +++ b/ImageMagick-6/policy.xml @@ -35,6 +35,10 @@ + Let's prevent possible exploits by removing the right to use indirect reads. + + + Any large image is cached to disk rather than memory: @@ -48,8 +52,8 @@ - - + + @@ -57,5 +61,9 @@ - + + + + + diff --git a/ImageMagick-6/type-apple.xml b/ImageMagick-6/type-apple.xml new file mode 100644 index 0000000..08fc0c4 --- /dev/null +++ b/ImageMagick-6/type-apple.xml @@ -0,0 +1,1371 @@ + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.5