pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 396160 from graphics

Browse Source 
- updated to 6.9.4-1:
  * Remove https delegate.
  * Check for buffer overflow in magick/draw.c/DrawStrokePolygon().
  * Replace show delegate title with image filename rather than label.
  * Fix GetNextToken() off by one error.
  * Remove support for internal ephemeral coder.
- refreshed ImageMagick-6.8.8-1-disable-insecure-coders.patch
- believe or not, correct license string is ImageMagick:
  http://spdx.org/licenses/ImageMagick.html

- rework ImageMagick-6.8.8-1-disable-insecure-coders.patch
  * add new policy (TEXT, SHOW, WIN and PLT)
- rebase patches (p0) 
  * ImageMagick-6.6.8.9-doc.patch
  * ImageMagick-6.6.8.9-examples.patch
  * ImageMagick-6.7.6.1-no-dist-lzip.patch
  * ImageMagick-6.8.4.0-dont-build-in-install.patch
  * ImageMagick-6.8.4.0-rpath.patch
  * ImageMagick-6.8.5.7-no-XPMCompliance.patch
  * ImageMagick-6.8.8-1-disable-insecure-coders.patch

OBS-URL: https://build.opensuse.org/request/show/396160
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=126
This commit is contained in:
Dominique Leuenberger 2016-05-24 07:33:41 +00:00 committed by Git OBS Bridge
commit fd242f0374
13 changed files with 80 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ImageMagick-6.6.8.9-doc.patch
View File

@ -2,7 +2,7 @@ Index: configure.ac
=================================================================== ===================================================================
--- configure.ac.orig --- configure.ac.orig
+++ configure.ac +++ configure.ac
@@ -3075,7 +3075,7 @@ AC_SUBST(FILTER_PATH) @@ -2941,7 +2941,7 @@ AC_SUBST(FILTER_PATH)
# #
# Path to ImageMagick documentation files # Path to ImageMagick documentation files

4
ImageMagick-6.6.8.9-examples.patch
View File

@ -1,4 +1,6 @@
--- Magick++/demo/makefile.2 Index: Magick++/demo/makefile.2
===================================================================
--- /dev/null
+++ Magick++/demo/makefile.2 +++ Magick++/demo/makefile.2
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+LDFLAGS= $(shell Magick-config --ldflags) +LDFLAGS= $(shell Magick-config --ldflags)

6
ImageMagick-6.7.6.1-no-dist-lzip.patch
View File

@ -1,8 +1,8 @@
Index: configure.ac Index: configure.ac
=================================================================== ===================================================================
--- configure.ac.orig 2016-04-14 16:11:00.551271813 +0200 --- configure.ac.orig
+++ configure.ac 2016-04-14 16:12:17.951272238 +0200 +++ configure.ac
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@ AC_CONFIG_HEADERS([config/config.h])
AX_PREFIX_CONFIG_H([magick/magick-baseconfig.h],[MagickCore]) AX_PREFIX_CONFIG_H([magick/magick-baseconfig.h],[MagickCore])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AC_CANONICAL_TARGET AC_CANONICAL_TARGET

6
ImageMagick-6.8.4.0-dont-build-in-install.patch
View File

@ -1,8 +1,8 @@
perl Makefile.PL always regenerates Makefile perl Makefile.PL always regenerates Makefile
Index: ImageMagick-6.8.4-0/PerlMagick/Makefile.am Index: PerlMagick/Makefile.am
=================================================================== ===================================================================
--- ImageMagick-6.8.4-0.orig/PerlMagick/Makefile.am --- PerlMagick/Makefile.am.orig
+++ ImageMagick-6.8.4-0/PerlMagick/Makefile.am +++ PerlMagick/Makefile.am
@@ -57,9 +57,8 @@ PERLMAGICK_CHECKSCRPTS = @@ -57,9 +57,8 @@ PERLMAGICK_CHECKSCRPTS =
$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER) $(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)

8
ImageMagick-6.8.4.0-rpath.patch
View File

@ -1,8 +1,8 @@
Index: ImageMagick-6.8.4-0/PerlMagick/Makefile.am Index: PerlMagick/Makefile.am
=================================================================== ===================================================================
--- ImageMagick-6.8.4-0.orig/PerlMagick/Makefile.am --- PerlMagick/Makefile.am.orig
+++ ImageMagick-6.8.4-0/PerlMagick/Makefile.am +++ PerlMagick/Makefile.am
@@ -70,7 +69,7 @@ check-perl: $(PERLMAKEFILE) @@ -70,7 +70,7 @@ check-perl: $(PERLMAKEFILE)
cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test
perl-build: $(PERLMAKEFILE) perl-build: $(PERLMAKEFILE)

8
ImageMagick-6.8.5.7-no-XPMCompliance.patch
View File

@ -1,8 +1,8 @@
Index: ImageMagick-6.8.5-7/coders/xpm.c Index: coders/xpm.c
=================================================================== ===================================================================
--- ImageMagick-6.8.5-7.orig/coders/xpm.c --- coders/xpm.c.orig
+++ ImageMagick-6.8.5-7/coders/xpm.c +++ coders/xpm.c
@@ -386,7 +386,7 @@ static Image *ReadXPMImage(const ImageIn @@ -415,7 +415,7 @@ static Image *ReadXPMImage(const ImageIn
image->storage_class=DirectClass; image->storage_class=DirectClass;
image->matte=MagickTrue; image->matte=MagickTrue;
} }

20
ImageMagick-6.8.8-1-disable-insecure-coders.patch
View File

@ -1,14 +1,10 @@
Index: ImageMagick-6.8.8-1/config/policy.xml Index: ImageMagick-6.9.4-1/config/policy.xml
Disable insecure loaders by default bsc#978061
sflees@suse.de
=================================================================== ===================================================================
--- ImageMagick-6.8.8-1.orig/config/policy.xml --- ImageMagick-6.9.4-1.orig/config/policy.xml 2016-05-09 19:28:58.000000000 +0200
+++ ImageMagick-6.8.8-1/config/policy.xml +++ ImageMagick-6.9.4-1/config/policy.xml 2016-05-17 11:09:37.470928022 +0200
@@ -56,4 +56,11 @@ @@ -64,4 +64,15 @@
<!-- <policy domain="resource" name="time" value="3600"/> --> <!-- <policy domain="coder" rights="none" pattern="HTTPS" /> -->
<!-- <policy domain="system" name="precision" value="6"/> --> <!-- <policy domain="path" rights="none" pattern="@*" /> -->
<policy domain="cache" name="shared-secret" value="passphrase"/> <policy domain="cache" name="shared-secret" value="passphrase"/>
+ <!-- Disable insecure coders by default --> + <!-- Disable insecure coders by default -->
+ <!-- https://bugzilla.suse.com/show_bug.cgi?id=978061 --> + <!-- https://bugzilla.suse.com/show_bug.cgi?id=978061 -->
@ -17,4 +13,8 @@ sflees@suse.de
+ <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="MVG" />
+ <policy domain="coder" rights="none" pattern="MSL" /> + <policy domain="coder" rights="none" pattern="MSL" />
+ <policy domain="coder" rights="none" pattern="TEXT" />
+ <policy domain="coder" rights="none" pattern="SHOW" />
+ <policy domain="coder" rights="none" pattern="WIN" />
+ <policy domain="coder" rights="none" pattern="PLT" />
</policymap> </policymap>

3
ImageMagick-6.9.3-10.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e33f021c879f31703f9e620f578ccf7d221a34941589da4bbe967b16a814336a
size 8784108

17
ImageMagick-6.9.3-10.tar.xz.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJXKf1FAAoJEImrY9SCdzd6rUQP+wQAnK8TATsxTUrGhocQnBrT
vc8l15R1U96Y8fqoOEr6xRzFtrRUt0gaxbdo5VJXMCSIMYGuwWqD7NijsgPo6INL
iuCb+fqkdwD+MdVHXyTnWfmG3xdY+VLTVkEzW7PNdz4I15WCoe8iZNQSpN8EY8Yv
RxrAB9nT5awFSfLg+5AixwxerktjresoQfknzC7uZjcHG6T568teUF5Ap7xMjAOd
w2NPQzEPXZt3cOuW/Sw/PqGNqHnY9yDJ+ciUTaVAyI8T48A5KIJq6OrVeDDsyNnJ
nxfqlo0vAiT8os3ZoSD8CByIeOf5DqlWYin9ymRojqn3MUsTFC92ZH2MlVRK/jVJ
sRjA7pOjqR9Ml5nGP92Ze+9l73RNt840jJEXKyySlVEMSSLloS+MjuUQFH0xhLf9
FEZ2qZKKaTA3QAoiag1LBuaU/mms9Sv2PXbgW3JZWxw7xMWh9EazVJyPfbhaA4mh
//eX1iuZsggoQs9VQTcr5CTJBy9WxUIVglcxFEXyuLZPu+JkYIYUV1JT2yEpypIq
T7onwUyrSXjPSh4KqeeI1U1yUIfPEFLADHo219vNLiH0ceG51d+lEbqAMB/6CMPf
sMFMjzGRrU4Sc5YqSjPoPw65yHnWjMAzTSBNbjUT1oXlEUJ82qfI4nygK0Evdfpm
jr2tioHe8JIfFvnAxPM5
=cE7v
-----END PGP SIGNATURE-----

3
ImageMagick-6.9.4-1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ea0fef839cd5d6f134502b7cf7ee0e57a3f230b19771515d4aa44354f4c6b3b
size 8789688

17
ImageMagick-6.9.4-1.tar.xz.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJXMTreAAoJEImrY9SCdzd6H30P/RG55RDq9x9co7ff6DVcVIqh
6/zgKm1cvhgk3ssaaqXuQMlqITfDEo4vKfYFapJMYlSPY8o3p+6WWwGSVGurZiLR
smhlqPLPIyaRmnwoBpiTb+LgzeLfauxznaXI1uh0T2oFPu3UkFay9ChIh1gI2whk
8HU3fB3EMo8E6Zykb3qsBf4tL59/QJeVyJBa/C1byq1kqZDGaDOhsSalupeIWNSp
FWpRLp7Gw77r4zyrr6TIjEayY+tgm6zvVJPl2ipvGZ/o+1HkOozhUJp3ni+tWDA4
UkhJBZIqwc2BETIIl9u3hXI/m8UJ69198b1X0XMpcH7K81iEpOp9kYAfqZfXJjBp
9Krc0fXLaeaDkSVc70xzXyJwbKJst61gJcCp017+Am+ZLOpxqFuJSOJS6Ua2Fjec
p/6YuIaxNbI+if8E3Yy34DZh0AojPJ0+GoZk8ZChZL8q9X70eX8Vw04MrUKExS3M
IK5at4Fk/HRTvfj9gOG+TxChjWcnfpJDr3g+VTIsTFmBqZ4fBkHyFCMPxFTUkCif
TF6AoGrZxdSOdpDstk6nNDJfzI/n/mipnORRxxivLswrA8gabt04AZJT+fww7Y4x
rRaBglb7W+GgZSo4yS/Ve+wYLQf8Rhwi2JayJicJ2RnaAyRb4v0eHcHrua4yF5eM
o6IQM3HqSMPUrXs3uiSp
=UZ1q
-----END PGP SIGNATURE-----

27
ImageMagick.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue May 17 09:10:23 UTC 2016 - pgajdos@suse.com
- updated to 6.9.4-1:
* Remove https delegate.
* Check for buffer overflow in magick/draw.c/DrawStrokePolygon().
* Replace show delegate title with image filename rather than label.
* Fix GetNextToken() off by one error.
* Remove support for internal ephemeral coder.
- refreshed ImageMagick-6.8.8-1-disable-insecure-coders.patch
- believe or not, correct license string is ImageMagick:
http://spdx.org/licenses/ImageMagick.html
-------------------------------------------------------------------
Wed May 11 11:56:25 UTC 2016 - chris@computersalat.de
- rework ImageMagick-6.8.8-1-disable-insecure-coders.patch
* add new policy (TEXT, SHOW, WIN and PLT)
- rebase patches (p0)
* ImageMagick-6.6.8.9-doc.patch
* ImageMagick-6.6.8.9-examples.patch
* ImageMagick-6.7.6.1-no-dist-lzip.patch
* ImageMagick-6.8.4.0-dont-build-in-install.patch
* ImageMagick-6.8.4.0-rpath.patch
* ImageMagick-6.8.5.7-no-XPMCompliance.patch
* ImageMagick-6.8.8-1-disable-insecure-coders.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 5 13:31:42 UTC 2016 - vcizek@suse.com Thu May 5 13:31:42 UTC 2016 - vcizek@suse.com

10
ImageMagick.spec
View File

@ -62,8 +62,8 @@ BuildRequires: xz
BuildRequires: zip BuildRequires: zip
%define maj 6 %define maj 6
%define mfr_version %{maj}.9.3 %define mfr_version %{maj}.9.4
%define mfr_revision 10 %define mfr_revision 1
%define quantum_depth 16 %define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision} %define source_version %{mfr_version}-%{mfr_revision}
%define clibver 2 %define clibver 2
@ -249,9 +249,9 @@ HTML documentation for ImageMagick library and scene examples.
%patch0 %patch0
%patch1 %patch1
%patch2 %patch2
%patch3 -p1 %patch3
%patch4 -p1 %patch4
%patch11 -p1 %patch11
%patch20 -p1 %patch20 -p1
# remove executeable bits from per demos # remove executeable bits from per demos