gnu: graphicsmagick: Update to 1.3.25-1-56c8cae [security fixes].
Fixes CVE-2016-7800, CVE-2016-7996, CVE-2016-7997, and several other flaws. * gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.25-1-56c8cae. [source]: Change method from 'url-fetch' to 'hg-fetch'. Add 'file-name'.
This commit is contained in:
		
							parent
							
								
									e98e9f4e85
								
							
						
					
					
						commit
						1cc213850a
					
				
					 1 changed files with 52 additions and 43 deletions
				
			
		| 
						 | 
				
			
			@ -3,6 +3,7 @@
 | 
			
		|||
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 | 
			
		||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 | 
			
		||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 | 
			
		||||
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
 | 
			
		||||
;;;
 | 
			
		||||
;;; This file is part of GNU Guix.
 | 
			
		||||
;;;
 | 
			
		||||
| 
						 | 
				
			
			@ -24,6 +25,7 @@
 | 
			
		|||
  #:use-module (guix build-system gnu)
 | 
			
		||||
  #:use-module (guix build-system perl)
 | 
			
		||||
  #:use-module (guix download)
 | 
			
		||||
  #:use-module (guix hg-download)
 | 
			
		||||
  #:use-module (guix utils)
 | 
			
		||||
  #:use-module ((guix licenses) #:prefix license:)
 | 
			
		||||
  #:use-module (gnu packages)
 | 
			
		||||
| 
						 | 
				
			
			@ -157,48 +159,55 @@ script.")
 | 
			
		|||
    (license (package-license imagemagick))))
 | 
			
		||||
 | 
			
		||||
(define-public graphicsmagick
 | 
			
		||||
  (package
 | 
			
		||||
    (name "graphicsmagick")
 | 
			
		||||
    (version "1.3.25")
 | 
			
		||||
    (source (origin
 | 
			
		||||
             (method url-fetch)
 | 
			
		||||
             (uri (string-append "ftp://ftp.graphicsmagick.org/pub/"
 | 
			
		||||
                                 "GraphicsMagick/" (version-major+minor version)
 | 
			
		||||
                                 "/GraphicsMagick-" version ".tar.xz"))
 | 
			
		||||
             (sha256
 | 
			
		||||
              (base32
 | 
			
		||||
               "17xcc7pfcmiwpfr1g8ys5a7bdnvqzka53vg3kkzhwwz0s99gljyn"))))
 | 
			
		||||
    (build-system gnu-build-system)
 | 
			
		||||
    (arguments
 | 
			
		||||
     `(#:configure-flags
 | 
			
		||||
       (list "--with-frozenpaths"
 | 
			
		||||
             "--enable-shared=yes"
 | 
			
		||||
             "--with-x=yes"
 | 
			
		||||
             (string-append "--with-gs-font-dir="
 | 
			
		||||
                            (assoc-ref %build-inputs "gs-fonts")
 | 
			
		||||
                            "/share/fonts/type1/ghostscript"))))
 | 
			
		||||
    (inputs
 | 
			
		||||
     `(("graphviz" ,graphviz)
 | 
			
		||||
       ("ghostscript" ,ghostscript)
 | 
			
		||||
       ("gs-fonts" ,gs-fonts)
 | 
			
		||||
       ("lcms" ,lcms)
 | 
			
		||||
       ("libx11" ,libx11)
 | 
			
		||||
       ("libxml2" ,libxml2)
 | 
			
		||||
       ("libtiff" ,libtiff)
 | 
			
		||||
       ("libpng" ,libpng)
 | 
			
		||||
       ("libjpeg" ,libjpeg)
 | 
			
		||||
       ("freetype" ,freetype)
 | 
			
		||||
       ("bzip2" ,bzip2)
 | 
			
		||||
       ("xz" ,xz)
 | 
			
		||||
       ("zlib" ,zlib)))
 | 
			
		||||
    (native-inputs
 | 
			
		||||
     `(("pkg-config" ,pkg-config)))
 | 
			
		||||
    (outputs '("out"   ; 13 MiB
 | 
			
		||||
               "doc")) ; ~7 MiB
 | 
			
		||||
    (home-page "http://www.graphicsmagick.org")
 | 
			
		||||
    (synopsis "Create, edit, compose, or convert bitmap images")
 | 
			
		||||
    (description
 | 
			
		||||
     "GraphicsMagick provides a comprehensive collection of utilities,
 | 
			
		||||
  (let ((changeset "56c8cae")  ; 3e01b
 | 
			
		||||
        (revision "1"))
 | 
			
		||||
    (package
 | 
			
		||||
      (name "graphicsmagick")
 | 
			
		||||
      (version (string-append "1.3.25-" revision "." changeset))
 | 
			
		||||
      (source (origin
 | 
			
		||||
                (method hg-fetch)
 | 
			
		||||
                (uri (hg-reference
 | 
			
		||||
                      (url "http://hg.code.sf.net/p/graphicsmagick/code")
 | 
			
		||||
                      (changeset changeset)))
 | 
			
		||||
                (file-name (string-append name "-" version "-checkout"))
 | 
			
		||||
                ;;(method url-fetch)
 | 
			
		||||
                ;;(uri (string-append "ftp://ftp.graphicsmagick.org/pub/"
 | 
			
		||||
                ;;                    "GraphicsMagick/" (version-major+minor version)
 | 
			
		||||
                ;;                    "/GraphicsMagick-" version ".tar.xz"))
 | 
			
		||||
                (sha256
 | 
			
		||||
                 (base32
 | 
			
		||||
                  "1s9apvkn0kxr6i4i5wlkfw1prja02rgk689n3cf822zc0dkycxdh"))))
 | 
			
		||||
      (build-system gnu-build-system)
 | 
			
		||||
      (arguments
 | 
			
		||||
       `(#:configure-flags
 | 
			
		||||
         (list "--with-frozenpaths"
 | 
			
		||||
               "--enable-shared=yes"
 | 
			
		||||
               "--with-x=yes"
 | 
			
		||||
               (string-append "--with-gs-font-dir="
 | 
			
		||||
                              (assoc-ref %build-inputs "gs-fonts")
 | 
			
		||||
                              "/share/fonts/type1/ghostscript"))))
 | 
			
		||||
      (inputs
 | 
			
		||||
       `(("graphviz" ,graphviz)
 | 
			
		||||
         ("ghostscript" ,ghostscript)
 | 
			
		||||
         ("gs-fonts" ,gs-fonts)
 | 
			
		||||
         ("lcms" ,lcms)
 | 
			
		||||
         ("libx11" ,libx11)
 | 
			
		||||
         ("libxml2" ,libxml2)
 | 
			
		||||
         ("libtiff" ,libtiff)
 | 
			
		||||
         ("libpng" ,libpng)
 | 
			
		||||
         ("libjpeg" ,libjpeg)
 | 
			
		||||
         ("freetype" ,freetype)
 | 
			
		||||
         ("bzip2" ,bzip2)
 | 
			
		||||
         ("xz" ,xz)
 | 
			
		||||
         ("zlib" ,zlib)))
 | 
			
		||||
      (native-inputs
 | 
			
		||||
       `(("pkg-config" ,pkg-config)))
 | 
			
		||||
      (outputs '("out"                  ; 13 MiB
 | 
			
		||||
                 "doc"))                ; ~7 MiB
 | 
			
		||||
      (home-page "http://www.graphicsmagick.org")
 | 
			
		||||
      (synopsis "Create, edit, compose, or convert bitmap images")
 | 
			
		||||
      (description
 | 
			
		||||
       "GraphicsMagick provides a comprehensive collection of utilities,
 | 
			
		||||
programming interfaces, and GUIs, to support file format conversion, image
 | 
			
		||||
processing, and 2D vector rendering.")
 | 
			
		||||
    (license license:expat)))
 | 
			
		||||
      (license license:expat))))
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue