Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23749970 Upgrade ImageMagick to 6.9.5 s11u3-sru
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 14 Jul 2016 13:57:27 -0700
branchs11u3-sru
changeset 6443 54dc57734e1c
parent 6440 cbff81e6409f
child 6444 bf62eba2612a
23749970 Upgrade ImageMagick to 6.9.5 23749988 problem in UTILITY/IMAGEMAGICK
components/imagemagick/Makefile file | annotate | diff | comparison | revisions
components/imagemagick/imagemagick.p5m file | annotate | diff | comparison | revisions 
--- a/components/imagemagick/Makefile	Wed Jul 20 13:49:39 2016 -0700
+++ b/components/imagemagick/Makefile	Thu Jul 14 13:57:27 2016 -0700
@@ -27,19 +27,19 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=			ImageMagick
-COMPONENT_VERSION=		6.9.4
+COMPONENT_VERSION=		6.9.5
 COMPONENT_MAJOR_VERSION=	$(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\([0-9]\+\)\.[0-9]\+\.[0-9]\+/\1/')
-COMPONENT_SUBVERSION=		9
+COMPONENT_SUBVERSION=		0
 HUMAN_VERSION=			$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
 COMPONENT_PROJECT_URL=		http://www.imagemagick.org/
 COMPONENT_SRC=			$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=		$(COMPONENT_SRC)-$(COMPONENT_SUBVERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:328fba877c15dece7ced2e36662230944d0fd7c9990cd994ae848b43e9d51414
+    sha256:4b84a3236d24278966140bb5d641c45d3dab47244db79b51e5066518c5cf65c4
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/download/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/imagemagick
 
-TPNO=			28569
+TPNO=			29915
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
--- a/components/imagemagick/imagemagick.p5m	Wed Jul 20 13:49:39 2016 -0700
+++ b/components/imagemagick/imagemagick.p5m	Thu Jul 14 13:57:27 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -1531,6 +1531,7 @@
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/quantize.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/resources.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/search.html
+file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/security-policy.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/sitemap.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/source/analyze.c
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/source/coder.xml
upstream/oracle/userland-gate