From 3dcbb75f63be519f5ce723117844c2f6c6639d89 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 18 Oct 2015 15:40:06 -0400 Subject: gnu: bash: Install more headers in "include" output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bash.com (bash): Include contents of include directory in "include" output. Signed-off-by: Ludovic Courtès --- gnu/packages/bash.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 180c64e872..714fa8c596 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2015 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -143,10 +144,17 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." ;; guile-bash expect. (let ((include (string-append (assoc-ref outputs "include") "/include/bash")) + (includes "^\\./include/[^/]+\\.h$") (headers "^\\./(builtins/|lib/glob/|lib/tilde/|)[^/]+\\.h$")) (mkdir-p include) (for-each (lambda (file) - (when ((@ (ice-9 regex) string-match) headers file) + (when (string-match includes file) + (let ((directory (string-append include))) + (mkdir-p directory) + (copy-file file + (string-append directory "/" + (basename file))))) + (when (string-match headers file) (let ((directory (string-append include "/" (dirname file)))) (mkdir-p directory) @@ -154,6 +162,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." (string-append directory "/" (basename file)))))) (find-files "." "\\.h$")) + (delete-file (string-append include "/" "y.tab.h")) #t))) (version "4.3")) (package @@ -199,6 +208,10 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." ;; for now. #:tests? #f + #:modules ((ice-9 regex) + (guix build utils) + (guix build gnu-build-system)) + #:phases (modify-phases %standard-phases (add-after 'install 'post-install ,post-install-phase) (add-after 'install 'install-headers -- cgit v1.2.3 From c30f65237b647dfe2d836ae3ceba3af970e3d8c7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 18 Oct 2015 15:40:07 -0400 Subject: gnu: bash: Use 'install-file' instead of 'mkdir-p' and 'copy-file'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bash.scm (bash): Use 'install-file' instead of 'mkdir-p' and 'copy-file'. Signed-off-by: Ludovic Courtès --- gnu/packages/bash.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 714fa8c596..b2f23a8442 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -149,18 +149,11 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." (mkdir-p include) (for-each (lambda (file) (when (string-match includes file) - (let ((directory (string-append include))) - (mkdir-p directory) - (copy-file file - (string-append directory "/" - (basename file))))) + (install-file file include)) (when (string-match headers file) - (let ((directory (string-append include "/" - (dirname file)))) - (mkdir-p directory) - (copy-file file - (string-append directory "/" - (basename file)))))) + (install-file file + (string-append include "/" + (dirname file))))) (find-files "." "\\.h$")) (delete-file (string-append include "/" "y.tab.h")) #t))) -- cgit v1.2.3 From b747a9db1ebcd6383a2555f5acb933fcd204a81c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 18 Oct 2015 15:40:08 -0400 Subject: gnu: recutils: Build the Bash builtin, readrec. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (recutils)[native-inputs]: Add bash:include. [arguments]: Add configure-flag with path to headers provided by bash:include. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a17424196a..7e669d633e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Sou Bunnbu +;;; Copyright © 2015 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages databases) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages perl) #:use-module (gnu packages language) #:use-module (gnu packages linux) @@ -286,16 +288,18 @@ pictures, sounds, or video.") ;; Running tests in parallel leads to test failures and crashes in ;; torture/utils. - (arguments '(#:parallel-tests? #f)) + (arguments '(#:parallel-tests? #f + #:configure-flags + (list (string-append "--with-bash-headers=" + (assoc-ref %build-inputs "bash:include") + "/include/bash")))) (native-inputs `(("emacs" ,emacs-no-x) ("bc" ,bc) + ("bash:include" ,bash "include") ("libuuid", util-linux))) ;; TODO: Add more optional inputs. - ;; FIXME: Our Bash doesn't have development headers (need for the 'readrec' - ;; built-in command), but it's not clear how to get them installed. - ;; See . (inputs `(("curl" ,curl) ("libgcrypt" ,libgcrypt) ("check" ,check))) -- cgit v1.2.3 From 71eb843837c7ad2f8dfff8b07092e379ab547bb8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 22 Oct 2015 14:54:43 -0400 Subject: gnu: unzip: Reorganize security fixes for improved clarity. * gnu/packages/patches/unzip-fix-overflows-and-infloop.patch: Delete file. Its contents are now split into the following new files: * gnu/packages/patches/unzip-CVE-2015-7696.patch, gnu/packages/patches/unzip-CVE-2015-7697.patch, gnu/packages/patches/unzip-overflow-on-invalid-input.patch: New files. * gnu-system.am (dist_patch_DATA): Adjust accordingly. * gnu/packages/zip.scm (unzip)[source]: Adjust patches accordingly. --- gnu-system.am | 4 +- gnu/packages/patches/unzip-CVE-2015-7696.patch | 35 +++++++ gnu/packages/patches/unzip-CVE-2015-7697.patch | 28 ++++++ .../patches/unzip-fix-overflows-and-infloop.patch | 108 --------------------- .../patches/unzip-overflow-on-invalid-input.patch | 40 ++++++++ gnu/packages/zip.scm | 4 +- 6 files changed, 109 insertions(+), 110 deletions(-) create mode 100644 gnu/packages/patches/unzip-CVE-2015-7696.patch create mode 100644 gnu/packages/patches/unzip-CVE-2015-7697.patch delete mode 100644 gnu/packages/patches/unzip-fix-overflows-and-infloop.patch create mode 100644 gnu/packages/patches/unzip-overflow-on-invalid-input.patch diff --git a/gnu-system.am b/gnu-system.am index e62fe18c97..c4810661a2 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -647,9 +647,11 @@ dist_patch_DATA = \ gnu/packages/patches/unzip-CVE-2014-8140.patch \ gnu/packages/patches/unzip-CVE-2014-8141.patch \ gnu/packages/patches/unzip-CVE-2014-9636.patch \ + gnu/packages/patches/unzip-CVE-2015-7696.patch \ + gnu/packages/patches/unzip-CVE-2015-7697.patch \ gnu/packages/patches/unzip-allow-greater-hostver-values.patch \ gnu/packages/patches/unzip-attribs-overflow.patch \ - gnu/packages/patches/unzip-fix-overflows-and-infloop.patch \ + gnu/packages/patches/unzip-overflow-on-invalid-input.patch \ gnu/packages/patches/unzip-format-secure.patch \ gnu/packages/patches/unzip-initialize-symlink-flag.patch \ gnu/packages/patches/unzip-overflow-long-fsize.patch \ diff --git a/gnu/packages/patches/unzip-CVE-2015-7696.patch b/gnu/packages/patches/unzip-CVE-2015-7696.patch new file mode 100644 index 0000000000..d6a4072673 --- /dev/null +++ b/gnu/packages/patches/unzip-CVE-2015-7696.patch @@ -0,0 +1,35 @@ +Copied from Debian. + +From: Petr Stodulka +Date: Mon, 14 Sep 2015 18:23:17 +0200 +Subject: Upstream fix for heap overflow +Bug-Debian: https://bugs.debian.org/802162 +Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944 +Origin: https://bugzilla.redhat.com/attachment.cgi?id=1073002 +Forwarded: yes + +--- + crypt.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +--- a/crypt.c ++++ b/crypt.c +@@ -465,7 +465,17 @@ + GLOBAL(pInfo->encrypted) = FALSE; + defer_leftover_input(__G); + for (n = 0; n < RAND_HEAD_LEN; n++) { +- b = NEXTBYTE; ++ /* 2012-11-23 SMS. (OUSPG report.) ++ * Quit early if compressed size < HEAD_LEN. The resulting ++ * error message ("unable to get password") could be improved, ++ * but it's better than trying to read nonexistent data, and ++ * then continuing with a negative G.csize. (See ++ * fileio.c:readbyte()). ++ */ ++ if ((b = NEXTBYTE) == (ush)EOF) ++ { ++ return PK_ERR; ++ } + h[n] = (uch)b; + Trace((stdout, " (%02x)", h[n])); + } diff --git a/gnu/packages/patches/unzip-CVE-2015-7697.patch b/gnu/packages/patches/unzip-CVE-2015-7697.patch new file mode 100644 index 0000000000..d688b42495 --- /dev/null +++ b/gnu/packages/patches/unzip-CVE-2015-7697.patch @@ -0,0 +1,28 @@ +Copied from Debian. + +From: Kamil Dudka +Date: Mon, 14 Sep 2015 18:24:56 +0200 +Subject: fix infinite loop when extracting empty bzip2 data +Bug-Debian: https://bugs.debian.org/802160 +Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944 +Origin: other, https://bugzilla.redhat.com/attachment.cgi?id=1073339 + +--- + extract.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/extract.c ++++ b/extract.c +@@ -2728,6 +2728,12 @@ + int repeated_buf_err; + bz_stream bstrm; + ++ if (G.incnt <= 0 && G.csize <= 0L) { ++ /* avoid an infinite loop */ ++ Trace((stderr, "UZbunzip2() got empty input\n")); ++ return 2; ++ } ++ + #if (defined(DLL) && !defined(NO_SLIDE_REDIR)) + if (G.redirect_slide) + wsize = G.redirect_size, redirSlide = G.redirect_buffer; diff --git a/gnu/packages/patches/unzip-fix-overflows-and-infloop.patch b/gnu/packages/patches/unzip-fix-overflows-and-infloop.patch deleted file mode 100644 index 33498db95e..0000000000 --- a/gnu/packages/patches/unzip-fix-overflows-and-infloop.patch +++ /dev/null @@ -1,108 +0,0 @@ -Copied from Fedora. - -http://pkgs.fedoraproject.org/cgit/unzip.git/tree/unzip-6.0-heap-overflow-infloop.patch?id=d18f821e - -From bdd4a0cecd745cb4825e4508b5bdf2579731086a Mon Sep 17 00:00:00 2001 -From: Petr Stodulka -Date: Mon, 14 Sep 2015 18:23:17 +0200 -Subject: [PATCH 1/3] upstream fix for heap overflow - -https://bugzilla.redhat.com/attachment.cgi?id=1073002 ---- - crypt.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/crypt.c b/crypt.c -index 784e411..a8975f2 100644 ---- a/crypt.c -+++ b/crypt.c -@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd) - GLOBAL(pInfo->encrypted) = FALSE; - defer_leftover_input(__G); - for (n = 0; n < RAND_HEAD_LEN; n++) { -- b = NEXTBYTE; -+ /* 2012-11-23 SMS. (OUSPG report.) -+ * Quit early if compressed size < HEAD_LEN. The resulting -+ * error message ("unable to get password") could be improved, -+ * but it's better than trying to read nonexistent data, and -+ * then continuing with a negative G.csize. (See -+ * fileio.c:readbyte()). -+ */ -+ if ((b = NEXTBYTE) == (ush)EOF) -+ { -+ return PK_ERR; -+ } - h[n] = (uch)b; - Trace((stdout, " (%02x)", h[n])); - } --- -2.4.6 - - -From 4b48844661ff9569f2ecf582a387d46a5775b5d8 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Mon, 14 Sep 2015 18:24:56 +0200 -Subject: [PATCH 2/3] fix infinite loop when extracting empty bzip2 data - -Bug: https://sourceforge.net/p/infozip/patches/23/ ---- - extract.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/extract.c b/extract.c -index 7134bfe..29db027 100644 ---- a/extract.c -+++ b/extract.c -@@ -2733,6 +2733,12 @@ __GDEF - int repeated_buf_err; - bz_stream bstrm; - -+ if (G.incnt <= 0 && G.csize <= 0L) { -+ /* avoid an infinite loop */ -+ Trace((stderr, "UZbunzip2() got empty input\n")); -+ return 2; -+ } -+ - #if (defined(DLL) && !defined(NO_SLIDE_REDIR)) - if (G.redirect_slide) - wsize = G.redirect_size, redirSlide = G.redirect_buffer; --- -2.4.6 - - -From bd150334fb4084f5555a6be26b015a0671cb5b74 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Tue, 22 Sep 2015 18:52:23 +0200 -Subject: [PATCH 3/3] extract: prevent unsigned overflow on invalid input - -Suggested-by: Stefan Cornelius ---- - extract.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/extract.c b/extract.c -index 29db027..b9ae667 100644 ---- a/extract.c -+++ b/extract.c -@@ -1257,8 +1257,17 @@ static int extract_or_test_entrylist(__G__ numchunk, - if (G.lrec.compression_method == STORED) { - zusz_t csiz_decrypted = G.lrec.csize; - -- if (G.pInfo->encrypted) -+ if (G.pInfo->encrypted) { -+ if (csiz_decrypted <= 12) { -+ /* handle the error now to prevent unsigned overflow */ -+ Info(slide, 0x401, ((char *)slide, -+ LoadFarStringSmall(ErrUnzipNoFile), -+ LoadFarString(InvalidComprData), -+ LoadFarStringSmall2(Inflate))); -+ return PK_ERR; -+ } - csiz_decrypted -= 12; -+ } - if (G.lrec.ucsize != csiz_decrypted) { - Info(slide, 0x401, ((char *)slide, - LoadFarStringSmall2(WrnStorUCSizCSizDiff), --- -2.5.2 - diff --git a/gnu/packages/patches/unzip-overflow-on-invalid-input.patch b/gnu/packages/patches/unzip-overflow-on-invalid-input.patch new file mode 100644 index 0000000000..013002a88c --- /dev/null +++ b/gnu/packages/patches/unzip-overflow-on-invalid-input.patch @@ -0,0 +1,40 @@ +Extracted from a patch in Fedora. + +http://pkgs.fedoraproject.org/cgit/unzip.git/tree/unzip-6.0-heap-overflow-infloop.patch?id=d18f821e + +From bd150334fb4084f5555a6be26b015a0671cb5b74 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Tue, 22 Sep 2015 18:52:23 +0200 +Subject: [PATCH 3/3] extract: prevent unsigned overflow on invalid input + +Suggested-by: Stefan Cornelius +--- + extract.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/extract.c b/extract.c +index 29db027..b9ae667 100644 +--- a/extract.c ++++ b/extract.c +@@ -1257,8 +1257,17 @@ static int extract_or_test_entrylist(__G__ numchunk, + if (G.lrec.compression_method == STORED) { + zusz_t csiz_decrypted = G.lrec.csize; + +- if (G.pInfo->encrypted) ++ if (G.pInfo->encrypted) { ++ if (csiz_decrypted <= 12) { ++ /* handle the error now to prevent unsigned overflow */ ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarStringSmall(ErrUnzipNoFile), ++ LoadFarString(InvalidComprData), ++ LoadFarStringSmall2(Inflate))); ++ return PK_ERR; ++ } + csiz_decrypted -= 12; ++ } + if (G.lrec.ucsize != csiz_decrypted) { + Info(slide, 0x401, ((char *)slide, + LoadFarStringSmall2(WrnStorUCSizCSizDiff), +-- +2.5.2 + diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm index 83c452778c..b7bed0e86d 100644 --- a/gnu/packages/zip.scm +++ b/gnu/packages/zip.scm @@ -85,11 +85,13 @@ Compression ratios of 2:1 to 3:1 are common for text files.") "unzip-CVE-2014-8140.patch" "unzip-CVE-2014-8141.patch" "unzip-CVE-2014-9636.patch" + "unzip-CVE-2015-7696.patch" + "unzip-CVE-2015-7697.patch" "unzip-allow-greater-hostver-values.patch" "unzip-initialize-symlink-flag.patch" "unzip-remove-build-date.patch" "unzip-attribs-overflow.patch" - "unzip-fix-overflows-and-infloop.patch" + "unzip-overflow-on-invalid-input.patch" "unzip-format-secure.patch" "unzip-overflow-long-fsize.patch"))))) (build-system gnu-build-system) -- cgit v1.2.3 From c6e030b2e3965222e6bb27306311aaec9c7ae93c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 5 Oct 2015 21:38:19 -0500 Subject: utils: Have search-path-as-list pattern search for directories. * guix/build/utils.scm (search-path-as-list)[pattern]: Check requested file type. Check pattern against directory names. * guix/search-paths.scm (evaluate-search-paths)[pattern]: Remove symlink hack. --- guix/build/utils.scm | 9 ++++++--- guix/search-paths.scm | 6 ------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index e3f9edc5b5..2988193fce 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -385,10 +385,13 @@ for under the directories designated by FILES. For example: (append-map (lambda (input) (append-map (lambda (file) (let ((file (string-append input "/" file))) - ;; XXX: By using 'find-files', we implicitly - ;; assume #:type 'regular. (if pattern - (find-files file pattern) + (find-files file (lambda (file stat) + (and stat + (eq? type (stat:type stat)) + ((file-name-predicate pattern) file stat))) + #:stat stat + #:directories? #t) (let ((stat (stat file #f))) (if (and stat (eq? type (stat:type stat))) (list file) diff --git a/guix/search-paths.scm b/guix/search-paths.scm index 7fd15d440c..7a6fe67959 100644 --- a/guix/search-paths.scm +++ b/guix/search-paths.scm @@ -139,12 +139,6 @@ report only settings not already effective." (let* ((values (or (and=> (getenv variable) (cut string-tokenize* <> separator)) '())) - ;; Add a trailing slash to force symlinks to be treated as - ;; directories when 'find-files' traverses them. - (files (if pattern - (map (cut string-append <> "/") files) - files)) - ;; XXX: Silence 'find-files' when it stumbles upon non-existent ;; directories (see ;; .) -- cgit v1.2.3 From e17d513381296b7dd93e09b52529d670ae1c5c9d Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 5 Oct 2015 21:49:24 -0500 Subject: gnu: ghc: Add GHC_PACKAGE_PATH native search path. Benefits include: 'guix environment' more useful for ghc libraries, more useful 'guix package --search-paths' for installed ghc libraries, cleaner package recipes: no longer need to propagate runtime package dependencies. * guix/build/haskell-build-system.scm (configure): Unset GHC_PACKAGE_PATH around cabal configure. (make-ghc-package-database): Use pattern directory search. (register): Install complete package database for the current package. * gnu/packages/haskell.scm (ghc): Add native-search-paths field. --- gnu/packages/haskell.scm | 6 +++ guix/build/haskell-build-system.scm | 96 +++++++++++++++++++++++++++++-------- 2 files changed, 83 insertions(+), 19 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 34cad87b4b..652409b963 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -234,6 +234,12 @@ (string-append ghc-bootstrap-path "/" ,name "-" ,version) (zero? (system* "make" "install")))) %standard-phases))))))) + (native-search-paths (list (search-path-specification + (variable "GHC_PACKAGE_PATH") + (files (list + (string-append "lib/ghc-" version))) + (file-pattern ".*\\.conf\\.d$") + (file-type 'directory)))) (home-page "https://www.haskell.org/ghc") (synopsis "The Glasgow Haskell Compiler") (description diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index c0cb789581..34e5247e07 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa +;;; Copyright © 2015 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) #:use-module (ice-9 match) + #:use-module (ice-9 vlist) #:export (%standard-phases haskell-build)) @@ -77,6 +79,7 @@ and parameters ~s~%" (((_ . dir) ...) dir) (_ '()))) + (ghc-path (getenv "GHC_PACKAGE_PATH")) (params (append `(,(string-append "--prefix=" out)) `(,(string-append "--libdir=" (or lib out) "/lib")) `(,(string-append "--bindir=" (or bin out) "/bin")) @@ -96,7 +99,11 @@ and parameters ~s~%" '("--enable-tests") '()) configure-flags))) - (run-setuphs "configure" params))) + ;; Cabal errors if GHC_PACKAGE_PATH is set during 'configure', so unset + ;; and restore it. + (unsetenv "GHC_PACKAGE_PATH") + (run-setuphs "configure" params) + (setenv "GHC_PACKAGE_PATH" ghc-path))) (define* (build #:rest empty) "Build a given Haskell package." @@ -134,6 +141,12 @@ first match and return the content of the group." (format #t "Compiler ~a not supported~%" name-version))))) +;;; TODO: Move this to (guix build utils)? +(define-syntax-rule (with-null-error-port exp) + "Evaluate EXP with the error port pointing to the bit bucket." + (with-error-to-port (%make-void-port "w") + (lambda () exp))) + (define (make-ghc-package-database system inputs outputs) "Generate the GHC package database." (let* ((haskell (assoc-ref inputs "haskell")) @@ -141,44 +154,89 @@ first match and return the content of the group." (((_ . dir) ...) dir) (_ '()))) - (conf-dirs (search-path-as-list - `(,(string-append "lib/" - (package-name-version haskell) - "/package.conf.d")) - input-dirs)) + ;; Silence 'find-files' (see 'evaluate-search-paths') + (conf-dirs (with-null-error-port + (search-path-as-list + `(,(string-append "lib/" (package-name-version haskell))) + input-dirs #:pattern ".*\\.conf.d$"))) (conf-files (append-map (cut find-files <> "\\.conf$") conf-dirs))) (mkdir-p %tmp-db-dir) (for-each (lambda (file) - (copy-file file - (string-append %tmp-db-dir "/" (basename file)))) + (let ((dest (string-append %tmp-db-dir "/" (basename file)))) + (unless (file-exists? dest) + (copy-file file dest)))) conf-files) (zero? (system* "ghc-pkg" (string-append "--package-db=" %tmp-db-dir) "recache")))) (define* (register #:key name system inputs outputs #:allow-other-keys) - "Generate the compiler registration file for a given Haskell package. Don't -generate the cache as it would clash in user profiles." + "Generate the compiler registration and binary package database files for a +given Haskell package." + + (define (conf-depends conf-file) + ;; Return a list of pkg-ids from the "depends" field in CONF-FILE + (let ((port (open-input-file conf-file)) + (field-rx (make-regexp "^(.*):"))) + (let loop ((collecting #f) + (deps '())) + (let* ((line (read-line port)) + (field (and=> (regexp-exec field-rx line) + (cut match:substring <> 1)))) + (cond + ((and=> field (cut string=? <> "depends")) + ;; The first dependency is listed on the same line as "depends:", + ;; so drop those characters. A line may list more than one .conf. + (let ((d (string-tokenize (string-drop line 8)))) + (loop #t (append d deps)))) + ((and collecting field) + (begin + (close-port port) + (reverse! deps))) + (collecting + (loop #t (append (string-tokenize line) deps))) + (else (loop #f deps))))))) + + (define (install-transitive-deps conf-file src dest) + ;; Copy .conf files from SRC to DEST for dependencies in CONF-FILE, and + ;; their dependencies, etc. + (let loop ((seen vlist-null) + (lst (conf-depends conf-file))) + (match lst + (() #t) ;done + ((id . tail) + (if (not (vhash-assoc id seen)) + (let ((dep-conf (string-append src "/" id ".conf")) + (dep-conf* (string-append dest "/" id ".conf"))) + (copy-file dep-conf dep-conf*) ;XXX: maybe symlink instead? + (loop (vhash-cons id #t seen) + (append lst (conf-depends dep-conf)))) + (loop seen tail)))))) + (let* ((out (assoc-ref outputs "out")) (haskell (assoc-ref inputs "haskell")) (lib (string-append out "/lib")) (config-dir (string-append lib "/" (package-name-version haskell) - "/package.conf.d")) + "/" name ".conf.d")) (id-rx (make-regexp "^id: *(.*)$")) (config-file (string-append out "/" name ".conf")) (params (list (string-append "--gen-pkg-config=" config-file)))) (run-setuphs "register" params) ;; The conf file is created only when there is a library to register. - (when (file-exists? config-file) - (mkdir-p config-dir) - (let ((config-file-name+id - (call-with-ascii-input-file config-file (cut grep id-rx <>)))) - (rename-file config-file - (string-append config-dir "/" config-file-name+id - ".conf")))) - #t)) + (or (not (file-exists? config-file)) + (begin + (mkdir-p config-dir) + (let* ((config-file-name+id + (call-with-ascii-input-file config-file (cut grep id-rx <>)))) + (install-transitive-deps config-file %tmp-db-dir config-dir) + (rename-file config-file + (string-append config-dir "/" + config-file-name+id ".conf")) + (zero? (system* "ghc-pkg" + (string-append "--package-db=" config-dir) + "recache"))))))) (define* (check #:key tests? test-target #:allow-other-keys) "Run the test suite of a given Haskell package." -- cgit v1.2.3 From 9eb681a02dc7bc675576cce00c4ad56615ef71f0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 7 Nov 2015 22:01:04 +0100 Subject: gnu: grep: Update to 2.22. * gnu/packages/base.scm (grep): Upgrade to 2.22. Remove 'grep-CVE-2015-1345.patch'. * gnu/packages/patches/grep-CVE-2015-1345.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. --- gnu-system.am | 1 - gnu/packages/base.scm | 5 ++--- gnu/packages/patches/grep-CVE-2015-1345.patch | 17 ----------------- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/grep-CVE-2015-1345.patch diff --git a/gnu-system.am b/gnu-system.am index c4810661a2..d43358df86 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -482,7 +482,6 @@ dist_patch_DATA = \ gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \ gnu/packages/patches/gobject-introspection-cc.patch \ gnu/packages/patches/gobject-introspection-girepository.patch \ - gnu/packages/patches/grep-CVE-2015-1345.patch \ gnu/packages/patches/grub-gets-undeclared.patch \ gnu/packages/patches/grub-freetype.patch \ gnu/packages/patches/gsl-poly-test-fix-pt1.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f951e28b3b..179d535f20 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -73,15 +73,14 @@ command-line arguments, multiple languages, and so on.") (define-public grep (package (name "grep") - (version "2.21") + (version "2.22") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grep/grep-" version ".tar.xz")) (sha256 (base32 - "1pp5n15qwxrw1pibwjhhgsibyv5cafhamf8lwzjygs6y00fa2i2j")) - (patches (list (search-patch "grep-CVE-2015-1345.patch"))))) + "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa")))) (build-system gnu-build-system) (synopsis "Print lines matching a pattern") (description diff --git a/gnu/packages/patches/grep-CVE-2015-1345.patch b/gnu/packages/patches/grep-CVE-2015-1345.patch deleted file mode 100644 index b0d0c8e5dc..0000000000 --- a/gnu/packages/patches/grep-CVE-2015-1345.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix CVE-2015-1345. From upstream commit -83a95bd8c8561875b948cadd417c653dbe7ef2e2 -by Yuliy Pisetsky . - -diff --git a/src/kwset.c b/src/kwset.c -index 4003c8d..376f7c3 100644 ---- a/src/kwset.c -+++ b/src/kwset.c -@@ -643,6 +643,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size) - if (! tp) - return -1; - tp++; -+ if (ep <= tp) -+ break; - } - } - } -- cgit v1.2.3 From 4655f515dc88dc0d76f29a6ff831a6c577563c3f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 7 Nov 2015 22:02:04 +0100 Subject: gnu: xz: Update to 5.2.2. * gnu/packages/compression.scm (xz): Update to 5.2.2. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 941844b870..b561d4cf6d 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -228,14 +228,14 @@ decompression.") (define-public xz (package (name "xz") - (version "5.0.4") + (version "5.2.2") (source (origin (method url-fetch) (uri (string-append "http://tukaani.org/xz/xz-" version ".tar.gz")) (sha256 (base32 - "1dl35ca8fdss9z2d6y234gxh24ixq904xksizrjmjr5dimwhax6n")))) + "18h2k4jndhzjs8ln3a54qdnfv59y6spxiwh9gpaqniph6iflvpvk")))) (build-system gnu-build-system) (synopsis "General-purpose data compression") (description -- cgit v1.2.3 From f7dbeb376b42e95bc66dcf4cfa283e912f5e7aa4 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sat, 14 Nov 2015 14:04:43 +0300 Subject: build-system/gnu: Set 'SOURCE_DATE_EPOCH'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested by Ludovic Courtès . * guix/build/gnu-build-system.scm (gnu-build): Set SOURCE_DATE_EPOCH for deterministic builds. --- guix/build/gnu-build-system.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index ff7646b22c..92e15d131e 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -576,6 +576,9 @@ in order. Return #t if all the PHASES succeeded, #f otherwise." ;; Encoding/decoding errors shouldn't be silent. (fluid-set! %default-port-conversion-strategy 'error) + ;; Avoid non-determinism related to generated timestamps. + (setenv "SOURCE_DATE_EPOCH" "1") + ;; The trick is to #:allow-other-keys everywhere, so that each procedure in ;; PHASES can pick the keyword arguments it's interested in. (every (match-lambda -- cgit v1.2.3 From 6f4b23e674cefebf0ccefc301974e50db04ce5db Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 21 Oct 2015 15:59:23 +0300 Subject: gnu: emacs: Honor 'SOURCE_DATE_EPOCH'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested by Ludovic Courtès . * gnu/packages/patches/emacs-source-date-epoch.patch: New patch. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/emacs.scm (emacs)[source]: Use it. --- gnu-system.am | 1 + gnu/packages/emacs.scm | 3 ++- gnu/packages/patches/emacs-source-date-epoch.patch | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-source-date-epoch.patch diff --git a/gnu-system.am b/gnu-system.am index d43358df86..92370a2517 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -437,6 +437,7 @@ dist_patch_DATA = \ gnu/packages/patches/duplicity-test_selection-tmp.patch \ gnu/packages/patches/elfutils-tests-ptrace.patch \ gnu/packages/patches/emacs-exec-path.patch \ + gnu/packages/patches/emacs-source-date-epoch.patch \ gnu/packages/patches/eudev-rules-directory.patch \ gnu/packages/patches/expat-CVE-2015-1283.patch \ gnu/packages/patches/fastcap-mulGlobal.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6416b00ee0..9751125113 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -70,7 +70,8 @@ (sha256 (base32 "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx")) - (patches (list (search-patch "emacs-exec-path.patch"))))) + (patches (list (search-patch "emacs-exec-path.patch") + (search-patch "emacs-source-date-epoch.patch"))))) (build-system glib-or-gtk-build-system) (arguments '(#:phases (alist-cons-before diff --git a/gnu/packages/patches/emacs-source-date-epoch.patch b/gnu/packages/patches/emacs-source-date-epoch.patch new file mode 100644 index 0000000000..41c03ef514 --- /dev/null +++ b/gnu/packages/patches/emacs-source-date-epoch.patch @@ -0,0 +1,20 @@ +Honor SOURCE_DATE_EPOCH variable to avoid non-determinism in generated +"autoloads" files. + +--- a/lisp/emacs-lisp/autoload.el ++++ b/lisp/emacs-lisp/autoload.el +@@ -378,8 +378,12 @@ + "Insert the section-header line, + which lists the file name and which functions are in it, etc." + (insert generate-autoload-section-header) +- (prin1 `(autoloads ,autoloads ,load-name ,file ,time) +- outbuf) ++ (let* ((env (getenv "SOURCE_DATE_EPOCH")) ++ (time (if env ++ (seconds-to-time (string-to-number env)) ++ time))) ++ (prin1 `(autoloads ,autoloads ,load-name ,file ,time) ++ outbuf)) + (terpri outbuf) + ;; Break that line at spaces, to avoid very long lines. + ;; Make each sub-line into a comment. -- cgit v1.2.3 From b85d0984105ccbc4842e57788be769deb23bbc1a Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Mon, 16 Nov 2015 15:47:29 +0800 Subject: gnu: file: Update to 5.25. * gnu/packages/file.scm (file): Update to 5.25. --- gnu/packages/file.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 161df544de..90e9a70626 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -27,14 +27,14 @@ (define-public file (package (name "file") - (version "5.22") + (version "5.25") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.astron.com/pub/file/file-" version ".tar.gz")) (sha256 (base32 - "02zw14hw3gqlw91w2f2snbirvyrp7r83irvnnkjcb25q9kjaiqy4")))) + "1jhfi5mivdnqvry5la5q919l503ahwdwbf3hjhiv97znccakhd9p")))) (build-system gnu-build-system) ;; When cross-compiling, this package depends upon a native install of -- cgit v1.2.3 From 0cc2284819468701dec93559bda7ef9939edaf19 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 16 Sep 2015 21:17:43 +0800 Subject: gnu: procps: Update to 3.3.11. procps-ng is the new upstream. * gnu/packages/procps.scm (procps): Update to 3.3.11. [source]: Adjust formatting. Remove patches. [home-page]: Update URL. * gnu/packages/patches/procps-make-3.82.patch: Remove file. * gnu-system.am (dist_patch_DATA): Remove it. --- gnu-system.am | 1 - gnu/packages/linux.scm | 70 +++++++++-------------------- gnu/packages/patches/procps-make-3.82.patch | 14 ------ 3 files changed, 21 insertions(+), 64 deletions(-) delete mode 100644 gnu/packages/patches/procps-make-3.82.patch diff --git a/gnu-system.am b/gnu-system.am index 92370a2517..4363e615b0 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -603,7 +603,6 @@ dist_patch_DATA = \ gnu/packages/patches/portaudio-audacity-compat.patch \ gnu/packages/patches/preseq-1.0.2-install-to-PREFIX.patch \ gnu/packages/patches/preseq-1.0.2-link-with-libbam.patch \ - gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/pt-scotch-build-parallelism.patch \ gnu/packages/patches/pulseaudio-fix-mult-test.patch \ gnu/packages/patches/pulseaudio-longer-test-timeout.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4ee42349f8..77cf865c54 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -457,62 +457,34 @@ providing the system administrator with some help in common tasks.") (define-public procps (package (name "procps") - (version "3.2.8") + (version "3.3.11") (source (origin - (method url-fetch) - ;; A mirror://sourceforge URI doesn't work, presumably becuase - ;; the SourceForge project is misconfigured. - (uri (string-append "http://procps.sourceforge.net/procps-" - version ".tar.gz")) - (sha256 - (base32 - "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i")) - (patches (list (search-patch "procps-make-3.82.patch"))))) + (method url-fetch) + (uri (string-append "mirror://sourceforge/procps-ng/Production/" + "procps-ng-" version ".tar.xz")) + (sha256 + (base32 + "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses))) (arguments '(#:modules ((guix build utils) (guix build gnu-build-system) (srfi srfi-1) (srfi srfi-26)) - #:phases (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; No `configure', just a single Makefile. - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("/usr/") "/") - (("--(owner|group) 0") "") - (("ldconfig") "true") - (("^LDFLAGS[[:blank:]]*:=(.*)$" _ value) - ;; Add libproc to the RPATH. - (string-append "LDFLAGS := -Wl,-rpath=" - out "/lib" value)))) - (setenv "CC" "gcc")) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (and (zero? - (system* "make" "install" - (string-append "DESTDIR=" out))) - - ;; Remove commands and man pages redundant with - ;; Coreutils. - (let ((dup (append-map (cut find-files out <>) - '("^kill" "^uptime")))) - (for-each delete-file dup) - #t) - - ;; Sanity check. - (zero? - (system* (string-append out "/bin/ps") - "--version"))))) - %standard-phases)) - - ;; What did you expect? Tests? - #:tests? #f)) - (home-page "http://procps.sourceforge.net/") + #:phases + (modify-phases %standard-phases + (add-after + 'install 'post-install + ;; Remove commands and man pages redudant with + ;; Coreutils. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dup (append-map (cut find-files out <>) + '("^kill" "^uptime")))) + (for-each delete-file dup) + #t)))))) + (inputs `(("ncurses" ,ncurses))) + (home-page "https://gitlab.com/procps-ng/procps/") (synopsis "Utilities that give information about processes") (description "Procps is the package that has a bunch of small useful utilities diff --git a/gnu/packages/patches/procps-make-3.82.patch b/gnu/packages/patches/procps-make-3.82.patch deleted file mode 100644 index 7bf53e2ccc..0000000000 --- a/gnu/packages/patches/procps-make-3.82.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix compilation with GNU Make 3.82 (patch from Nixpkgs). - -diff --git a/Makefile b/Makefile -index 09fb3ed..59eba16 100644 ---- a/Makefile -+++ b/Makefile -@@ -174,7 +174,7 @@ INSTALL := $(BINFILES) $(MANFILES) - # want this rule first, use := on ALL, and ALL not filled in yet - all: do_all - ---include */module.mk -+-include proc/module.mk ps/module.mk - - do_all: $(ALL) -- cgit v1.2.3 From 90c59e970e01d7de00f22b89c54c0b72cfa76f29 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 25 Nov 2015 04:20:56 +0100 Subject: gnu: gmp: Update to 6.1.0. * gnu/packages/multiprecision.scm (gmp): Update to 6.1.0. --- gnu/packages/multiprecision.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index ee74c03700..77f69f7b33 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -30,7 +30,7 @@ (define-public gmp (package (name "gmp") - (version "6.0.0a") + (version "6.1.0") (source (origin (method url-fetch) (uri @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "0r5pp27cy7ch3dg5v0rsny8bib1zfvrza6027g2mp5f6v8pd6mli")) + "12b9s4jn48gbar6dbs5qrlmljdmnq43xy3ji9yjzic0mwp6dmnk8")) (patches (map search-patch '("gmp-arm-asm-nothumb.patch" "gmp-faulty-test.patch"))))) -- cgit v1.2.3 From e946b609b2455e2b38ba2d2b86448bddea0a28ce Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 28 Nov 2015 22:06:31 +0100 Subject: ld-wrapper: Compute the library search path globally. Fixes . * gnu/packages/ld-wrapper.in (library-search-path): New procedure. (library-files-linked): Add 'library-path' parameter. Use it. Do not thread it in 'fold'. (ld-wrapper): Add call to 'library-search-path' and pass the result to 'library-files-linked'. When debugging, print the value of PATH. --- gnu/packages/ld-wrapper.in | 66 +++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/gnu/packages/ld-wrapper.in b/gnu/packages/ld-wrapper.in index c3d6fa1005..c92ed1dcc7 100644 --- a/gnu/packages/ld-wrapper.in +++ b/gnu/packages/ld-wrapper.in @@ -137,52 +137,61 @@ exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line)) (string-every (char-set-union (char-set #\.) char-set:digit) (string-drop file (+ index 3))))))) -(define (library-files-linked args) - ;; Return the file names of shared libraries explicitly linked against via - ;; `-l' or with an absolute file name in ARGS. - (define path+files+args +(define (library-search-path args) + ;; Return the library search path as a list of directory names. The GNU ld + ;; manual notes that "[a]ll `-L' options apply to all `-l' options, + ;; regardless of the order in which the options appear", so we must compute + ;; the search path independently of the -l options. + (let loop ((args args) + (path '())) + (match args + (() + (reverse path)) + (("-L" directory . rest) + (loop rest (cons directory path))) + ((argument . rest) + (if (string-prefix? "-L" argument) ;augment the search path + (loop rest + (cons (string-drop argument 2) path)) + (loop rest path)))))) + +(define (library-files-linked args library-path) + ;; Return the absolute file names of shared libraries explicitly linked + ;; against via `-l' or with an absolute file name in ARGS, looking them up + ;; in LIBRARY-PATH. + (define files+args (fold (lambda (argument result) (match result - ((library-path library-files - ((and flag - (or "-dynamic-linker" "-plugin")) - . rest)) + ((library-files ((and flag + (or "-dynamic-linker" "-plugin")) + . rest)) ;; When passed '-dynamic-linker ld.so', ignore 'ld.so'; when ;; passed '-plugin liblto_plugin.so', ignore ;; 'liblto_plugin.so'. See . - (list library-path - library-files + (list library-files (cons* argument flag rest))) - ((library-path library-files previous-args) - (cond ((string-prefix? "-L" argument) ;augment the search path - (list (append library-path - (list (string-drop argument 2))) - library-files - (cons argument previous-args))) - ((string-prefix? "-l" argument) ;add library + ((library-files previous-args) + (cond ((string-prefix? "-l" argument) ;add library (let* ((lib (string-append "lib" (string-drop argument 2) ".so")) (full (search-path library-path lib))) - (list library-path - (if full + (list (if full (cons full library-files) library-files) (cons argument previous-args)))) ((and (string-prefix? %store-directory argument) (shared-library? argument)) ;add library - (list library-path - (cons argument library-files) + (list (cons argument library-files) (cons argument previous-args))) (else - (list library-path - library-files + (list library-files (cons argument previous-args))))))) - (list '() '() '()) + (list '() '()) args)) - (match path+files+args - ((path files arguments) + (match files+args + ((files arguments) (reverse files)))) (define (rpath-arguments library-files) @@ -211,9 +220,12 @@ impure library ~s~%" (define (ld-wrapper . args) ;; Invoke the real `ld' with ARGS, augmented with `-rpath' switches. - (let* ((libs (library-files-linked args)) + (let* ((path (library-search-path args)) + (libs (library-files-linked args path)) (args (append args (rpath-arguments libs)))) (when %debug? + (format (current-error-port) + "ld-wrapper: library search path: ~s~%" path) (format (current-error-port) "ld-wrapper: libraries linked: ~s~%" libs) (format (current-error-port) -- cgit v1.2.3 From e414a7dec365233ad505595bbebaff5d30e72f19 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 2 Dec 2015 20:03:51 +0100 Subject: gnu: gmp: Drop patch included in release 6.1.0. * gnu/packages/multiprecision.scm (gmp)[source]: Drop patch. * gnu/packages/patches/gmp-arm-asm-nothumb.patch: Remove patch. * gnu-system.am (dist_patch_DATA): Unregister patch. --- gnu-system.am | 1 - gnu/packages/multiprecision.scm | 3 +-- gnu/packages/patches/gmp-arm-asm-nothumb.patch | 21 --------------------- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 gnu/packages/patches/gmp-arm-asm-nothumb.patch diff --git a/gnu-system.am b/gnu-system.am index 4363e615b0..0eb2f28739 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -476,7 +476,6 @@ dist_patch_DATA = \ gnu/packages/patches/glibc-locale-incompatibility.patch \ gnu/packages/patches/glibc-o-largefile.patch \ gnu/packages/patches/glibc-versioned-locpath.patch \ - gnu/packages/patches/gmp-arm-asm-nothumb.patch \ gnu/packages/patches/gmp-faulty-test.patch \ gnu/packages/patches/gnucash-price-quotes-perl.patch \ gnu/packages/patches/gnutls-doc-fix.patch \ diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 77f69f7b33..008d8c074f 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -40,8 +40,7 @@ (base32 "12b9s4jn48gbar6dbs5qrlmljdmnq43xy3ji9yjzic0mwp6dmnk8")) (patches (map search-patch - '("gmp-arm-asm-nothumb.patch" - "gmp-faulty-test.patch"))))) + '("gmp-faulty-test.patch"))))) (build-system gnu-build-system) (native-inputs `(("m4" ,m4))) (outputs '("out" "debug")) diff --git a/gnu/packages/patches/gmp-arm-asm-nothumb.patch b/gnu/packages/patches/gmp-arm-asm-nothumb.patch deleted file mode 100644 index 666cf58cf6..0000000000 --- a/gnu/packages/patches/gmp-arm-asm-nothumb.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# HG changeset patch -# User Torbjorn Granlund -# Date 1396602422 -7200 -# Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40 -# Parent 0194a75b56b21a9196626430af86c5bd9110c42d -Conditionalise ARM asm on !__thumb__. - -diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c ---- a/mpn/generic/div_qr_1n_pi1.c Thu Apr 03 23:58:51 2014 +0200 -+++ b/mpn/generic/div_qr_1n_pi1.c Fri Apr 04 11:07:02 2014 +0200 -@@ -130,7 +130,7 @@ - "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC) - #endif - --#if defined (__arm__) && W_TYPE_SIZE == 32 -+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32 - #define add_mssaaaa(m, sh, sl, ah, al, bh, bl) \ - __asm__ ( "adds %2, %5, %6\n\t" \ - "adcs %1, %3, %4\n\t" \ - -- cgit v1.2.3 From d7e92b8752f6bc9e2c61c9999834392c7fe67e7e Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sun, 6 Dec 2015 17:12:14 +0100 Subject: gnu: Move pkg-config to native inputs. * gnu/packages/glib.scm (gobject-introspection)[native-inputs]: Move pkg-config from inputs. * gnu/packages/pulseaudio.scm (libsndfile, libsamplerate) (pulseaudio)[native-inputs]: Likewise. --- gnu/packages/glib.scm | 4 ++-- gnu/packages/pulseaudio.scm | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2e8797560b..46a568631a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -227,10 +227,10 @@ dynamic loading, and an object system.") ("cairo" ,cairo) ("flex" ,flex) ("glib" ,glib) - ("pkg-config" ,pkg-config) ("python-2" ,python-2))) (native-inputs - `(("glib" ,glib "bin"))) + `(("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) (propagated-inputs `(;; In practice, GIR users will need libffi when using ;; gobject-introspection. diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index d832228278..93055ecad3 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -55,8 +55,9 @@ (inputs `(("libvorbis" ,libvorbis) ("libogg" ,libogg) - ("flac" ,flac) - ("pkg-config" ,pkg-config))) + ("flac" ,flac))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "http://www.mega-nerd.com/libsndfile/") (synopsis "Reading and writing files containing sampled sound") (description @@ -84,7 +85,8 @@ for reading and writing new sound file formats.") (base32 "01hw5xjbjavh412y63brcslj5hi9wdgkjd3h9csx5rnm8vglpdck")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (native-inputs + `(("pkg-config" ,pkg-config))) (propagated-inputs `(("libsndfile" ,libsndfile) ("fftw" ,fftw))) @@ -159,13 +161,14 @@ rates.") ("dbus" ,dbus) ("glib" ,glib) ("intltool" ,intltool) - ("pkg-config" ,pkg-config) ("m4" ,m4) ("libltdl" ,libltdl) ("fftwf" ,fftwf) ("avahi" ,avahi) ("eudev" ,eudev) ;for the detection of hardware audio devices ("check" ,check))) + (native-inputs + `(("pkg-config" ,pkg-config))) (propagated-inputs ;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them. `(("libcap" ,libcap) -- cgit v1.2.3 From 6a4db3f3612d0c0b0b425d01ff5b311f9b485f8c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 9 Dec 2015 23:10:10 +0100 Subject: gnu: libarchive: Fix test failure on SELinux systems. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by Jan Synáček at . * gnu/packages/patches/libarchive-bsdtar-test.patch: New file. * gnu/packages/backup.scm (libarchive)[source]: Use it. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/backup.scm | 3 +- gnu/packages/patches/libarchive-bsdtar-test.patch | 74 +++++++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libarchive-bsdtar-test.patch diff --git a/gnu-system.am b/gnu-system.am index 0eb2f28739..463f98c0e9 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -514,6 +514,7 @@ dist_patch_DATA = \ gnu/packages/patches/liba52-link-with-libm.patch \ gnu/packages/patches/liba52-set-soname.patch \ gnu/packages/patches/liba52-use-mtune-not-mcpu.patch \ + gnu/packages/patches/libarchive-bsdtar-test.patch \ gnu/packages/patches/libarchive-CVE-2013-0211.patch \ gnu/packages/patches/libarchive-fix-lzo-test-case.patch \ gnu/packages/patches/libarchive-mtree-filename-length-fix.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 84d27c08a6..287438e035 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -145,7 +145,8 @@ backups (called chunks) to allow easy burning to CD/DVD.") (patches (list (search-patch "libarchive-mtree-filename-length-fix.patch") (search-patch "libarchive-fix-lzo-test-case.patch") - (search-patch "libarchive-CVE-2013-0211.patch"))))) + (search-patch "libarchive-CVE-2013-0211.patch") + (search-patch "libarchive-bsdtar-test.patch"))))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) diff --git a/gnu/packages/patches/libarchive-bsdtar-test.patch b/gnu/packages/patches/libarchive-bsdtar-test.patch new file mode 100644 index 0000000000..6a533a9a07 --- /dev/null +++ b/gnu/packages/patches/libarchive-bsdtar-test.patch @@ -0,0 +1,74 @@ +commit b539b2e597b566fe3c4b49cb61c9eef83e5e052d +Author: Pavel Raiskup +Date: Thu Jun 27 16:01:30 2013 +0200 + + Use ustar format in the test_option_b test + + .. because the ustar archive does not store SELinux context. As the default + format for bsdtar is "restricted pax" (trying to store xattrs and other + things by default), the test failed on Fedora because our files have by + default SELinux context set. This results in additional data in tested + archive ~> and the test failed because the archive was unexpectedly big: + + tar/test/test_option_b.c:41: File archive1.tar has size 3072, expected 2048 + + Reviewed by Konrad Kleine + +diff --git a/tar/test/test_option_b.c b/tar/test/test_option_b.c +index be2ae65..6fea474 100644 +--- a/tar/test/test_option_b.c ++++ b/tar/test/test_option_b.c +@@ -25,8 +25,14 @@ + #include "test.h" + __FBSDID("$FreeBSD$"); + ++#define USTAR_OPT " --format=ustar" ++ + DEFINE_TEST(test_option_b) + { ++ char *testprog_ustar = malloc(strlen(testprog) + sizeof(USTAR_OPT) + 1); ++ strcpy(testprog_ustar, testprog); ++ strcat(testprog_ustar, USTAR_OPT); ++ + assertMakeFile("file1", 0644, "file1"); + if (systemf("cat file1 > test_cat.out 2> test_cat.err") != 0) { + skipping("Platform doesn't have cat"); +@@ -36,7 +42,7 @@ DEFINE_TEST(test_option_b) + /* + * Bsdtar does not pad if the output is going directly to a disk file. + */ +- assertEqualInt(0, systemf("%s -cf archive1.tar file1 >test1.out 2>test1.err", testprog)); ++ assertEqualInt(0, systemf("%s -cf archive1.tar file1 >test1.out 2>test1.err", testprog_ustar)); + failure("bsdtar does not pad archives written directly to regular files"); + assertFileSize("archive1.tar", 2048); + assertEmptyFile("test1.out"); +@@ -46,24 +52,24 @@ DEFINE_TEST(test_option_b) + * Bsdtar does pad to the block size if the output is going to a socket. + */ + /* Default is -b 20 */ +- assertEqualInt(0, systemf("%s -cf - file1 2>test2.err | cat >archive2.tar ", testprog)); ++ assertEqualInt(0, systemf("%s -cf - file1 2>test2.err | cat >archive2.tar ", testprog_ustar)); + failure("bsdtar does pad archives written to pipes"); + assertFileSize("archive2.tar", 10240); + assertEmptyFile("test2.err"); + +- assertEqualInt(0, systemf("%s -cf - -b 20 file1 2>test3.err | cat >archive3.tar ", testprog)); ++ assertEqualInt(0, systemf("%s -cf - -b 20 file1 2>test3.err | cat >archive3.tar ", testprog_ustar)); + assertFileSize("archive3.tar", 10240); + assertEmptyFile("test3.err"); + +- assertEqualInt(0, systemf("%s -cf - -b 10 file1 2>test4.err | cat >archive4.tar ", testprog)); ++ assertEqualInt(0, systemf("%s -cf - -b 10 file1 2>test4.err | cat >archive4.tar ", testprog_ustar)); + assertFileSize("archive4.tar", 5120); + assertEmptyFile("test4.err"); + +- assertEqualInt(0, systemf("%s -cf - -b 1 file1 2>test5.err | cat >archive5.tar ", testprog)); ++ assertEqualInt(0, systemf("%s -cf - -b 1 file1 2>test5.err | cat >archive5.tar ", testprog_ustar)); + assertFileSize("archive5.tar", 2048); + assertEmptyFile("test5.err"); + +- assertEqualInt(0, systemf("%s -cf - -b 8192 file1 2>test6.err | cat >archive6.tar ", testprog)); ++ assertEqualInt(0, systemf("%s -cf - -b 8192 file1 2>test6.err | cat >archive6.tar ", testprog_ustar)); + assertFileSize("archive6.tar", 4194304); + assertEmptyFile("test6.err"); + -- cgit v1.2.3 From 135065853f0b35431a6e7b6b1cf63608863fea9b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 10 Dec 2015 11:02:09 +0100 Subject: gnu: texinfo: Remove unneeded dependency on xz. The impetus for this is that XZ 5.2.2 requires pthreads. However, when using the bootstrap GCC, using '-pthread' doesn't work because it tries to refer to /nix/store/eeeeee-glibc-2.18. XZ eventually fails to build with undefined references to pthread symbols. * gnu/packages/texinfo.scm (texinfo)[inputs]: Remove XZ, which was unneeded. --- gnu/packages/texinfo.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 591fb1f298..cc53293221 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -43,7 +43,6 @@ (build-system gnu-build-system) (native-inputs `(("procps" ,procps))) ;one of the tests needs pgrep (inputs `(("ncurses" ,ncurses) - ("xz" ,xz) ("perl" ,perl))) (native-search-paths -- cgit v1.2.3 From 557b5557d83d29b1616b6e19dabe4d4d1ef7fcc1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 10 Dec 2015 11:54:57 +0100 Subject: gnu: commencement: Restrict allowed references for libstdc++. * gnu/packages/commencement.scm (libstdc++)[arguments]: Add #:allowed-references. --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 73b0ce4364..102f2aee0f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -526,7 +526,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (arguments `(#:guile ,%bootstrap-guile #:implicit-inputs? #f - + #:allowed-references ("out") #:out-of-source? #t #:phases (alist-cons-before 'configure 'chdir -- cgit v1.2.3 From 52cfd8cb54e011f3446bf6697a69783b60ef835d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 11 Dec 2015 23:42:39 +0100 Subject: gnu: gcc-final: Remove unnecessary CPPFLAGS. * gnu/packages/commencement.scm (gcc-final)[arguments]: Remove unnecessary CPPFLAGS from #:make-flags. --- gnu/packages/commencement.scm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 102f2aee0f..b958544e25 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -582,18 +582,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ((_ rest ...) (loop rest))))) ((#:make-flags flags) - ;; Since $LIBRARY_PATH and $CPATH are not honored, add the - ;; relevant flags. - `(cons (string-append "CPPFLAGS=-I" - (assoc-ref %build-inputs "libstdc++") - "/include") - (map (lambda (flag) - (if (string-prefix? "LDFLAGS=" flag) - (string-append flag " -L" - (assoc-ref %build-inputs "libstdc++") - "/lib") - flag)) - ,flags))) + ;; Since $LIBRARY_PATH is not honored, add the relevant flags. + `(map (lambda (flag) + (if (string-prefix? "LDFLAGS=" flag) + (string-append flag " -L" + (assoc-ref %build-inputs "libstdc++") + "/lib") + flag)) + ,flags)) ((#:phases phases) `(alist-delete 'symlink-libgcc_eh ,phases))))) -- cgit v1.2.3 From 98bd851ee891ca4a84e061fe1e78ba78c292b096 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 11 Dec 2015 23:45:29 +0100 Subject: gnu: gcc: Use the system zlib. * gnu/packages/gcc.scm (gcc-4.7) : Pass '--with-system-zlib'. * gnu/packages/commencement.scm (gcc-boot0)[arguments]: Remove '--with-system-zlib' from the configure flags. * gnu/packages/commencement.scm (zlib-final): New variable. (gcc-final)[arguments]: Add ZLIB-FINAL to #:allowed-references. Pass -L and -Wl,-rpath for zlib in LDFLAGS, as a configure flag. [inputs]: Add LD-WRAPPER-BOOT3 and ZLIB-FINAL. --- gnu/packages/commencement.scm | 49 +++++++++++++++++++++++++++++-------------- gnu/packages/gcc.scm | 1 + 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b958544e25..1b0497227f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -204,7 +204,8 @@ "--disable-libssp" "--disable-libquadmath" "--disable-decimal-float") - (remove (cut string-match "--enable-languages.*" <>) + (remove (cut string-match + "--(with-system-zlib|enable-languages.*)" <>) ,flags))) ((#:phases phases) `(alist-cons-after @@ -548,6 +549,25 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (propagated-inputs '()) (synopsis "GNU C++ standard library (intermediate)")))) +(define zlib-final + ;; Zlib used by GCC-FINAL. + (package-with-bootstrap-guile + (package + (inherit zlib) + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + #:allowed-references ("out" ,glibc-final) + ,@(package-arguments zlib))) + (inputs %boot2-inputs)))) + +(define ld-wrapper-boot3 + ;; A linker wrapper that uses the bootstrap Guile. + (make-ld-wrapper "ld-wrapper-boot3" + #:binutils binutils-final + #:guile %bootstrap-guile + #:bash (car (assoc-ref %boot2-inputs "bash")))) + (define gcc-final ;; The final GCC. (package (inherit gcc-boot0) @@ -562,7 +582,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" `(#:guile ,%bootstrap-guile #:implicit-inputs? #f - #:allowed-references ("out" "lib" + #:allowed-references ("out" "lib" ,zlib-final ,glibc-final ,static-bash-for-glibc) ;; Things like libasan.so and libstdc++.so NEED ld.so for some @@ -583,13 +603,15 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (loop rest))))) ((#:make-flags flags) ;; Since $LIBRARY_PATH is not honored, add the relevant flags. - `(map (lambda (flag) - (if (string-prefix? "LDFLAGS=" flag) - (string-append flag " -L" - (assoc-ref %build-inputs "libstdc++") - "/lib") - flag)) - ,flags)) + `(let ((zlib (assoc-ref %build-inputs "zlib"))) + (map (lambda (flag) + (if (string-prefix? "LDFLAGS=" flag) + (string-append flag " -L" + (assoc-ref %build-inputs "libstdc++") + "/lib -L" zlib "/lib -Wl,-rpath=" + zlib "/lib") + flag)) + ,flags))) ((#:phases phases) `(alist-delete 'symlink-libgcc_eh ,phases))))) @@ -604,17 +626,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp))) ("mpfr-source" ,(package-source mpfr)) ("mpc-source" ,(package-source mpc)) + ("ld-wrapper" ,ld-wrapper-boot3) ("binutils" ,binutils-final) ("libstdc++" ,libstdc++) + ("zlib" ,zlib-final) ,@%boot2-inputs)))) -(define ld-wrapper-boot3 - ;; A linker wrapper that uses the bootstrap Guile. - (make-ld-wrapper "ld-wrapper-boot3" - #:binutils binutils-final - #:guile %bootstrap-guile - #:bash (car (assoc-ref %boot2-inputs "bash")))) - (define %boot3-inputs ;; 4th stage inputs. `(("gcc" ,gcc-final) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 7e4f18b887..d7ffc5c40f 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -97,6 +97,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC '("--enable-plugin" "--enable-languages=c,c++" "--disable-multilib" + "--with-system-zlib" ;; No pre-compiled libstdc++ headers, to save space. "--disable-libstdcxx-pch" -- cgit v1.2.3 From 7dda44a6b965b2349e3b27b588fac72a02eae487 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 12 Dec 2015 11:50:59 +0100 Subject: build: Add missing patches to the distribution. * gnu-system.am (dist_patch_DATA): Add glibc-hurd-extern-inline.patch and plink-1.07-unclobber-i.patch. --- gnu-system.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu-system.am b/gnu-system.am index ef4db3c302..14b8fdf501 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -485,6 +485,7 @@ dist_patch_DATA = \ gnu/packages/patches/glib-tests-timer.patch \ gnu/packages/patches/glib-tests-gapplication.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ + gnu/packages/patches/glibc-hurd-extern-inline.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ gnu/packages/patches/glibc-locales.patch \ gnu/packages/patches/glibc-locale-incompatibility.patch \ @@ -623,6 +624,7 @@ dist_patch_DATA = \ gnu/packages/patches/perl-tk-x11-discover.patch \ gnu/packages/patches/pidgin-add-search-path.patch \ gnu/packages/patches/pingus-sdl-libs-config.patch \ + gnu/packages/patches/plink-1.07-unclobber-i.patch \ gnu/packages/patches/plotutils-libpng-jmpbuf.patch \ gnu/packages/patches/polkit-drop-test.patch \ gnu/packages/patches/portaudio-audacity-compat.patch \ -- cgit v1.2.3 From 4165fda29dcab7ae0a4cdb11d88dfe80a21c9c1d Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 12 Dec 2015 14:40:37 +0100 Subject: gnu: gmp: Disable parallel tests. * gnu/packages/multiprecision.scm (gmp)[arguments]: Disable parallel tests. --- gnu/packages/multiprecision.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 008d8c074f..3be612ae62 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -44,7 +44,8 @@ (build-system gnu-build-system) (native-inputs `(("m4" ,m4))) (outputs '("out" "debug")) - (arguments `(#:configure-flags + (arguments `(#:parallel-tests? #f ; mpz/reuse fails otherwise + #:configure-flags '(;; Build a "fat binary", with routines for several ;; sub-architectures. "--enable-fat" -- cgit v1.2.3 From 4de35074833742e45237464bb1727ce1a55f3336 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 12 Dec 2015 22:14:57 +0100 Subject: gnu: perl: Update to 5.22.0. * gnu/packages/perl.scm (perl)[source]: Update to 5.22.0. Remove "perl-module-pluggable-search.patch" since Module::Pluggable appears to be gone. [arguments] : Adjust Cwd.pm file name. Replace -std=c89 with -std=gnu89. * gnu/packages/commencement.scm (perl-boot0): Add 'disable-pthreads' phase. * gnu/packages/patches/perl-no-sys-dirs.patch: Update. * gnu/packages/patches/perl-module-pluggable-search.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. --- gnu-system.am | 1 - gnu/packages/commencement.scm | 23 +++- .../patches/perl-module-pluggable-search.patch | 25 ---- gnu/packages/patches/perl-no-sys-dirs.patch | 152 +++++++++++++++++---- gnu/packages/perl.scm | 17 ++- 5 files changed, 154 insertions(+), 64 deletions(-) delete mode 100644 gnu/packages/patches/perl-module-pluggable-search.patch diff --git a/gnu-system.am b/gnu-system.am index 14b8fdf501..1db9d51ca2 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -617,7 +617,6 @@ dist_patch_DATA = \ gnu/packages/patches/perl-autosplit-default-time.patch \ gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch \ - gnu/packages/patches/perl-module-pluggable-search.patch \ gnu/packages/patches/perl-net-amazon-s3-moose-warning.patch \ gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch \ gnu/packages/patches/perl-no-sys-dirs.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1b0497227f..3ddaa98c2f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -260,11 +260,24 @@ (package-native-inputs gcc)))))) (define perl-boot0 - (package-with-bootstrap-guile - (package-with-explicit-inputs perl - %boot0-inputs - (current-source-location) - #:guile %bootstrap-guile))) + (let ((perl (package + (inherit perl) + (arguments + (substitute-keyword-arguments (package-arguments perl) + ((#:phases phases) + `(modify-phases ,phases + ;; Pthread support is missing in the bootstrap compiler + ;; (broken spec file), so disable it. + (add-before 'configure 'disable-pthreads + (lambda _ + (substitute* "Configure" + (("^libswanted=(.*)pthread" _ before) + (string-append "libswanted=" before)))))))))))) + (package-with-bootstrap-guile + (package-with-explicit-inputs perl + %boot0-inputs + (current-source-location) + #:guile %bootstrap-guile)))) (define (linux-libre-headers-boot0) "Return Linux-Libre header files for the bootstrap environment." diff --git a/gnu/packages/patches/perl-module-pluggable-search.patch b/gnu/packages/patches/perl-module-pluggable-search.patch deleted file mode 100644 index bb2a57f7e5..0000000000 --- a/gnu/packages/patches/perl-module-pluggable-search.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix core Perl module Module::Pluggable such that it can find plugins that live -in symlinked directories. - -Patch borrowed/adapted from Nixpkgs. - ---- perl-5.16.1/cpan/Module-Pluggable/lib/Module/Pluggable/Object.pm 2015-04-08 23:28:48.120164135 -0500 -+++ perl-5.16.1/cpan/Module-Pluggable/lib/Module/Pluggable/Object.pm 2015-04-08 23:30:27.032166704 -0500 -@@ -164,7 +164,7 @@ - my $sp = catdir($dir, (split /::/, $searchpath)); - - # if it doesn't exist or it's not a dir then skip it -- next unless ( -e $sp && -d _ ); # Use the cached stat the second time -+ next unless ( -e $sp ); - - my @files = $self->find_files($sp); - -@@ -279,7 +279,7 @@ - (my $path = $File::Find::name) =~ s#^\\./##; - push @files, $path; - } -- }, $search_path ); -+ }, "$search_path/." ); - } - #chdir $cwd; - return @files; diff --git a/gnu/packages/patches/perl-no-sys-dirs.patch b/gnu/packages/patches/perl-no-sys-dirs.patch index 3aba4d7529..da91fef3b4 100644 --- a/gnu/packages/patches/perl-no-sys-dirs.patch +++ b/gnu/packages/patches/perl-no-sys-dirs.patch @@ -1,10 +1,10 @@ -Don't long for headers and libraries in "traditional" locations. +Don't look for headers and libraries in "traditional" locations. Patch from Nixpkgs by Eelco Dolstra . -diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure ---- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 -+++ perl-5.14.2/Configure 2012-01-20 17:05:23.089223129 +0100 +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure +--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 ++++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 @@ -106,15 +106,7 @@ fi @@ -22,7 +22,7 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure for p in $paths do -@@ -1311,8 +1303,7 @@ +@@ -1337,8 +1329,7 @@ archname='' : Possible local include directories to search. : Set locincpth to "" in a hint file to defeat local include searches. @@ -32,8 +32,8 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure : : no include file wanted by default inclwanted='' -@@ -1328,17 +1319,12 @@ - archobjs='' +@@ -1349,17 +1340,12 @@ + libnames='' : change the next line if compiling for Xenix/286 on Xenix/386 -xlibpth='/usr/lib/386 /lib/386' @@ -53,7 +53,7 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure : Private path used by Configure to find libraries. Its value : is prepended to libpth. This variable takes care of special -@@ -1371,8 +1357,6 @@ +@@ -1391,8 +1377,6 @@ libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" : We probably want to search /usr/shlib before most other libraries. : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. @@ -62,27 +62,27 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure : Do not use vfork unless overridden by a hint file. usevfork=false -@@ -2380,7 +2364,6 @@ +@@ -2446,7 +2430,6 @@ zip " pth=`echo $PATH | sed -e "s/$p_/ /g"` --pth="$pth /lib /usr/lib" +-pth="$pth $sysroot/lib $sysroot/usr/lib" for file in $loclist; do eval xxx=\$$file case "$xxx" in -@@ -4785,7 +4768,7 @@ +@@ -4936,7 +4919,7 @@ : Set private lib path case "$plibpth" in '') if ./mips; then -- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib" -+ plibpth="$incpath/usr/lib" - fi;; +- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; esac case "$libpth" in -@@ -8390,13 +8373,8 @@ +@@ -8600,13 +8583,8 @@ echo " " case "$sysman" in - '') + '') - syspath='/usr/share/man/man1 /usr/man/man1' - syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" - syspath="$syspath /usr/man/u_man/man1" @@ -95,7 +95,7 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure ;; esac if $test -d "$sysman"; then -@@ -19721,9 +19699,10 @@ +@@ -19900,9 +19878,10 @@ case "$full_ar" in '') full_ar=$ar ;; esac @@ -107,10 +107,11 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure : see what type gids are declared as in the kernel echo " " -diff -ru -x '*~' perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Errno_pm.PL ---- perl-5.14.2-orig/ext/Errno/Errno_pm.PL 2011-09-26 11:44:34.000000000 +0200 -+++ perl-5.14.2/ext/Errno/Errno_pm.PL 2012-01-20 17:02:07.938138311 +0100 -@@ -137,11 +137,7 @@ +Only in perl-5.20.0/: Configure.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL +--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 +@@ -126,11 +126,7 @@ if ($dep =~ /(\S+errno\.h)/) { $file{$1} = 1; } @@ -120,13 +121,14 @@ diff -ru -x '*~' perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Er - # might be using, say, Intel's icc - ) { + } elsif (0) { + # When cross-compiling we may store a path for gcc's "sysroot" option: + my $sysroot = $Config{sysroot} || ''; # Some Linuxes have weird errno.hs which generate - # no #file or #line directives - my $linux_errno_h = -e '/usr/include/errno.h' ? -diff -ru -x '*~' perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh ---- perl-5.14.2-orig/hints/freebsd.sh 2011-09-19 15:18:22.000000000 +0200 -+++ perl-5.14.2/hints/freebsd.sh 2012-01-20 17:10:37.267924044 +0100 -@@ -118,21 +118,21 @@ +Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh +--- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 ++++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 +@@ -119,21 +119,21 @@ objformat=`/usr/bin/objformat` if [ x$objformat = xaout ]; then if [ -e /usr/lib/aout ]; then @@ -154,3 +156,99 @@ diff -ru -x '*~' perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh ldflags="-Wl,-E " lddlflags="-shared " cccdlflags='-DPIC -fPIC' +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh +--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 +@@ -150,25 +150,6 @@ + ;; + esac + +-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries +-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us +-# where to look. We don't want gcc's own libraries, however, so we +-# filter those out. +-# This could be conditional on Unbuntu, but other distributions may +-# follow suit, and this scheme seems to work even on rather old gcc's. +-# This unconditionally uses gcc because even if the user is using another +-# compiler, we still need to find the math library and friends, and I don't +-# know how other compilers will cope with that situation. +-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, +-# we don't want its libraries. So we try to prefer the system gcc +-# Still, as an escape hatch, allow Configure command line overrides to +-# plibpth to bypass this check. +-if [ -x /usr/bin/gcc ] ; then +- gcc=/usr/bin/gcc +-else +- gcc=gcc +-fi +- + case "$plibpth" in + '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | + cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` +@@ -178,32 +159,6 @@ + ;; + esac + +-case "$libc" in +-'') +-# If you have glibc, then report the version for ./myconfig bug reporting. +-# (Configure doesn't need to know the specific version since it just uses +-# gcc to load the library for all tests.) +-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they +-# are insufficiently precise to distinguish things like +-# libc-2.0.6 and libc-2.0.7. +- for p in $plibpth +- do +- for trylib in libc.so.6 libc.so +- do +- if $test -e $p/$trylib; then +- libc=`ls -l $p/$trylib | awk '{print $NF}'` +- if $test "X$libc" != X; then +- break +- fi +- fi +- done +- if $test "X$libc" != X; then +- break +- fi +- done +- ;; +-esac +- + # Are we using ELF? Thanks to Kenneth Albanowski + # for this test. + cat >try.c <<'EOM' +@@ -367,33 +322,6 @@ + ;; + esac + +-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than +-# true libraries. The scripts cause binding against static +-# version of -lgdbm which is a bad idea. So if we have 'nm' +-# make sure it can read the file +-# NI-S 2003/08/07 +-case "$nm" in +- '') ;; +- *) +- for p in $plibpth +- do +- if $test -r $p/libndbm.so; then +- if $nm $p/libndbm.so >/dev/null 2>&1 ; then +- echo 'Your shared -lndbm seems to be a real library.' +- _libndbm_real=1 +- break +- fi +- fi +- done +- if $test "X$_libndbm_real" = X; then +- echo 'Your shared -lndbm is not a real library.' +- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` +- shift +- libswanted="$*" +- fi +- ;; +-esac +- + # Linux on Synology. + if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then + # Tested on Synology DS213 and DS413 diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 95aa596cf5..8fec270b61 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Eric Bavier @@ -37,18 +37,17 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.16.1") + (version "5.22.0") (source (origin (method url-fetch) (uri (string-append "http://www.cpan.org/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "15qxzba3a50c9nik5ydgyfp62x7h9vxxn12yd1jgl93hb1wj96km")) + "0g5bl8sdpzx9gx2g5jq3py4bj07z2ylk7s1qn0fvsss2yl3hhs8c")) (patches (map search-patch '("perl-no-sys-dirs.patch" - "perl-autosplit-default-time.patch" - "perl-module-pluggable-search.patch"))))) + "perl-autosplit-default-time.patch"))))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -60,10 +59,16 @@ (let ((out (assoc-ref outputs "out")) (libc (assoc-ref inputs "libc"))) ;; Use the right path for `pwd'. - (substitute* "dist/Cwd/Cwd.pm" + (substitute* "dist/PathTools/Cwd.pm" (("/bin/pwd") (which "pwd"))) + ;; Build in GNU89 mode to tolerate C++-style comment in libc's + ;; . + (substitute* "cflags.SH" + (("-std=c89") + "-std=gnu89")) + (zero? (system* "./Configure" (string-append "-Dprefix=" out) -- cgit v1.2.3 From 4187fe750f128f934bd6030912133d13d19baafd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 13 Dec 2015 11:25:24 +0100 Subject: gnu: perl: Build deterministically, and make byproducts deterministic. With this, a --rounds=2 build passes, and timestamps in POD files can be controlled with 'SOURCE_DATE_EPOCH'. * gnu/packages/patches/perl-deterministic-ordering.patch, gnu/packages/patches/perl-no-build-time.patch, gnu/packages/patches/perl-source-date-epoch.patch: New files. * gnu/packages/perl.scm (perl)[source]: Use them. * gnu-system.am (dist_patch_DATA): Add them. --- gnu-system.am | 3 +++ .../patches/perl-deterministic-ordering.patch | 29 ++++++++++++++++++++++ gnu/packages/patches/perl-no-build-time.patch | 26 +++++++++++++++++++ gnu/packages/patches/perl-source-date-epoch.patch | 19 ++++++++++++++ gnu/packages/perl.scm | 5 +++- 5 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/perl-deterministic-ordering.patch create mode 100644 gnu/packages/patches/perl-no-build-time.patch create mode 100644 gnu/packages/patches/perl-source-date-epoch.patch diff --git a/gnu-system.am b/gnu-system.am index 1db9d51ca2..0fff8def1d 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -615,11 +615,14 @@ dist_patch_DATA = \ gnu/packages/patches/patchutils-xfail-gendiff-tests.patch \ gnu/packages/patches/patch-hurd-path-max.patch \ gnu/packages/patches/perl-autosplit-default-time.patch \ + gnu/packages/patches/perl-deterministic-ordering.patch \ gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch \ gnu/packages/patches/perl-net-amazon-s3-moose-warning.patch \ gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch \ + gnu/packages/patches/perl-no-build-time.patch \ gnu/packages/patches/perl-no-sys-dirs.patch \ + gnu/packages/patches/perl-source-date-epoch.patch \ gnu/packages/patches/perl-tk-x11-discover.patch \ gnu/packages/patches/pidgin-add-search-path.patch \ gnu/packages/patches/pingus-sdl-libs-config.patch \ diff --git a/gnu/packages/patches/perl-deterministic-ordering.patch b/gnu/packages/patches/perl-deterministic-ordering.patch new file mode 100644 index 0000000000..92e33ef135 --- /dev/null +++ b/gnu/packages/patches/perl-deterministic-ordering.patch @@ -0,0 +1,29 @@ +From . + +From c01f602d1926b0671fd2c8d91f7e52c4e4c9fb24 Mon Sep 17 00:00:00 2001 +From: Niko Tyni +Date: Sun, 11 Oct 2015 19:27:56 +0300 +Subject: [PATCH] Sort the list of XS code files when generating RealPPPort.xs + +all_files_in_dir() uses readdir() ordering to make the list of +input files. This can vary between build systems, breaking build +reproducibility. +--- + cpan/Devel-PPPort/PPPort_xs.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cpan/Devel-PPPort/PPPort_xs.PL b/cpan/Devel-PPPort/PPPort_xs.PL +index 5f18940..149f2fe 100644 +--- a/cpan/Devel-PPPort/PPPort_xs.PL ++++ b/cpan/Devel-PPPort/PPPort_xs.PL +@@ -38,7 +38,7 @@ END + my $file; + my $sec; + +-for $file (all_files_in_dir('parts/inc')) { ++for $file (sort(all_files_in_dir('parts/inc'))) { + my $spec = parse_partspec($file); + + my $msg = 0; +-- +2.5.1 diff --git a/gnu/packages/patches/perl-no-build-time.patch b/gnu/packages/patches/perl-no-build-time.patch new file mode 100644 index 0000000000..5d78e8f462 --- /dev/null +++ b/gnu/packages/patches/perl-no-build-time.patch @@ -0,0 +1,26 @@ +Do not record the configuration and build time so that builds can be +reproduced bit-for-bit. + +--- perl-5.22.0/Configure 1970-01-01 01:00:00.000000000 +0100 ++++ perl-5.22.0/Configure 2015-12-13 00:14:43.148165080 +0100 +@@ -3834,6 +3817,7 @@ esac + + : who configured the system + cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` ++cf_time='Thu Jan 1 00:00:01 UTC 1970' + case "$cf_by" in + "") + cf_by=`(logname) 2>/dev/null` + +--- perl-5.22.0/perl.c 2015-12-13 00:25:30.269156627 +0100 ++++ perl-5.22.0/perl.c 2015-12-13 00:25:38.265218175 +0100 +@@ -1795,7 +1795,7 @@ S_Internals_V(pTHX_ CV *cv) + PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options, + sizeof(non_bincompat_options) - 1, SVs_TEMP)); + +-#ifdef __DATE__ ++#if 0 + # ifdef __TIME__ + PUSHs(Perl_newSVpvn_flags(aTHX_ + STR_WITH_LEN("Compiled at " __DATE__ " " __TIME__), + diff --git a/gnu/packages/patches/perl-source-date-epoch.patch b/gnu/packages/patches/perl-source-date-epoch.patch new file mode 100644 index 0000000000..37330c9537 --- /dev/null +++ b/gnu/packages/patches/perl-source-date-epoch.patch @@ -0,0 +1,19 @@ +Adapted from . +Make Pod::Man honor the SOURCE_DATE_EPOCH environment variable. + +--- perl-5.22.0/cpan/podlators/lib/Pod/Man.pm 2015-12-12 22:33:03.321787590 +0100 ++++ perl-5.22.0/cpan/podlators/lib/Pod/Man.pm 2015-12-12 22:36:33.367361338 +0100 +@@ -884,7 +884,12 @@ sub devise_date { + my ($self) = @_; + my $input = $self->source_filename; + my $time; +- if ($input) { ++ ++ if (defined($ENV{SOURCE_DATE_EPOCH}) && ++ $ENV{SOURCE_DATE_EPOCH} !~ /\D/) { ++ $time = $ENV{SOURCE_DATE_EPOCH}; ++ } ++ elsif ($input) { + $time = (stat $input)[9] || time; + } else { + $time = time; diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8fec270b61..6afe0b73ec 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -47,7 +47,10 @@ "0g5bl8sdpzx9gx2g5jq3py4bj07z2ylk7s1qn0fvsss2yl3hhs8c")) (patches (map search-patch '("perl-no-sys-dirs.patch" - "perl-autosplit-default-time.patch"))))) + "perl-autosplit-default-time.patch" + "perl-source-date-epoch.patch" + "perl-deterministic-ordering.patch" + "perl-no-build-time.patch"))))) (build-system gnu-build-system) (arguments '(#:tests? #f -- cgit v1.2.3 From 775e6fe456106298e5b2cb0e3564e2147928f0ba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 13 Dec 2015 11:35:53 +0100 Subject: gnu: commencement: Initial Texinfo uses initial Perl. * gnu/packages/commencement.scm (texinfo-boot0)[inputs]: Use PERL-BOOT0. --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3ddaa98c2f..116ca7c647 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -299,7 +299,7 @@ ;; Also, use %BOOT0-INPUTS to avoid building Perl once more. (let ((texinfo (package (inherit texinfo) (native-inputs '()) - (inputs (alist-delete "ncurses" (package-inputs texinfo)))))) + (inputs `(("perl" ,perl-boot0)))))) (package-with-bootstrap-guile (package-with-explicit-inputs texinfo %boot0-inputs (current-source-location) -- cgit v1.2.3 From a2a9bba43cbc32efe6a654455d1789c6964dfbc5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Dec 2015 17:59:49 +0100 Subject: gnu: bash: Update to patch level 42. * gnu/packages/bash.scm (%patch-series-4.3): Add patches 40 to 42. --- gnu/packages/bash.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index a2d76b9673..9d544dbb9e 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -93,7 +93,11 @@ (36 "0z6jbyy70lfdm6d3x0sbazbqdxb3xnpn9bmz7madpvrnbd284pxc") (37 "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k") (38 "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd") - (39 "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b"))) + (39 "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b") + (40 "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4") + (41 "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f") + (42 "06a90k0p6bqc4wk2dsmapna69124an76xvlnlj3xm497vci968dc"))) + (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of number/base32-hash tuples, directly usable in the 'patch-series' form." -- cgit v1.2.3 From 304e4f513580ed0f141f5ea6ae8289b4476e2ab0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Dec 2015 18:03:29 +0100 Subject: gnu: grep: Add missing dependency on Perl. * gnu/packages/base.scm (grep)[native-inputs]: New field. * gnu/packages/commencement.scm (grep-final): Likewise. --- gnu/packages/base.scm | 1 + gnu/packages/commencement.scm | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index fb3cbb4bc2..75f00a6f5b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -82,6 +82,7 @@ command-line arguments, multiple languages, and so on.") (base32 "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa")))) (build-system gnu-build-system) + (native-inputs `(("perl" ,perl))) ;some of the tests require it (synopsis "Print lines matching a pattern") (description "grep is a tool for finding text inside files. Text is found by diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 116ca7c647..8aa32e859d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -728,7 +728,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; The final grep. Gzip holds a reference to it (via zgrep), so it must be ;; built before gzip. (package-with-bootstrap-guile - (package-with-explicit-inputs grep + (package-with-explicit-inputs (package + (inherit grep) + (native-inputs `(("perl" ,perl-boot0)))) %boot5-inputs (current-source-location) #:guile guile-final))) -- cgit v1.2.3 From 4d28b97c46e9d9ff201df7cdc8f28b78155eea82 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Dec 2015 22:22:59 +0100 Subject: gnu: bash: Add "doc" output. * gnu/packages/bash.scm (bash)[outputs]: Add "doc" output. --- gnu/packages/bash.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 9d544dbb9e..15909c7e88 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -183,8 +183,9 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." (build-system gnu-build-system) (outputs '("out" - "include")) ;headers used by extensions - (native-inputs `(("bison" ,bison))) ;to rebuild the parser + "doc" ;1.7 MiB of HTML and extra files + "include")) ;headers used by extensions + (native-inputs `(("bison" ,bison))) ;to rebuild the parser (inputs `(("readline" ,readline) ("ncurses" ,ncurses))) ;TODO: add texinfo (arguments @@ -212,7 +213,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." #:phases (modify-phases %standard-phases (add-after 'install 'post-install ,post-install-phase) (add-after 'install 'install-headers - ,install-headers-phase)))) + ,install-headers-phase)))) (synopsis "The GNU Bourne-Again SHell") (description "Bash is the shell, or command-line interpreter, of the GNU system. It -- cgit v1.2.3 From de6d9f45535749814d6f2c40b1b6fedcdb216f00 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Dec 2015 22:27:31 +0100 Subject: gnu: ncurses: Add 'TERMINFO_DIRS' search path variable. * gnu/packages/ncurses.scm (ncurses)[native-search-paths]: New field. --- gnu/packages/ncurses.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index b7fbfc982d..ae3788c896 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -102,6 +102,10 @@ (add-after 'unpack 'remove-unneeded-shebang ,remove-shebang-phase)))) (self-native-input? #t) ; for `tic' + (native-search-paths + (list (search-path-specification + (variable "TERMINFO_DIRS") + (files '("share/terminfo"))))) (synopsis "Terminal emulation (termcap, terminfo) library") (description "GNU Ncurses is a library which provides capabilities to write text to -- cgit v1.2.3 From 27ec9624ca6a6ba64704bc1f976d8bf818fea05d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Dec 2015 23:02:51 +0100 Subject: gnu: ncurses: Add "doc" output. * gnu/packages/ncurses.scm (ncurses)[outputs]: New field. [arguments] : Replace standard 'configure' phase. : Remove "mandir=" line from 'ncursesw6-config'. --- gnu/packages/ncurses.scm | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index ae3788c896..147033a7e5 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -29,16 +29,35 @@ '(lambda _ (for-each patch-makefile-SHELL (find-files "." "Makefile.in")))) + (configure-phase + ;; The 'configure' script does not understand '--docdir', so we must + ;; override that and use '--mandir' instead. + '(lambda* (#:key build target outputs configure-flags + #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (zero? (apply system* "./configure" + (string-append "SHELL=" (which "sh")) + (string-append "--build=" build) + (string-append "--prefix=" out) + (string-append "--mandir=" doc "/share/man") + (if target + (cons (string-append "--host=" target) + configure-flags) + configure-flags)))))) (remove-shebang-phase '(lambda _ ;; To avoid retaining a reference to the bootstrap Bash via the - ;; shebang of the 'ncursesw5-config' script, simply remove that - ;; shebang: it'll work just as well without it. + ;; shebang of the 'ncursesw6-config' script, simply remove that + ;; shebang: it'll work just as well without it. Likewise, do not + ;; retain a reference to the "doc" output. (substitute* "misc/ncurses-config.in" (("#!@SHELL@") "# No shebang here, use /bin/sh!\n") (("@SHELL@ \\$0") - "$0")) + "$0") + (("mandir=.*$") + "mandir=share/man")) #t)) (post-install-phase '(lambda* (#:key outputs #:allow-other-keys) @@ -79,6 +98,8 @@ (base32 "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm")))) (build-system gnu-build-system) + (outputs '("out" + "doc")) ;1 MiB of man pages (arguments `(#:configure-flags `("--with-shared" "--without-debug" "--enable-widec" @@ -95,12 +116,13 @@ "/lib")) #:tests? #f ; no "check" target #:phases (modify-phases %standard-phases + (replace 'configure ,configure-phase) (add-after 'install 'post-install - ,post-install-phase) + ,post-install-phase) (add-before 'configure 'patch-makefile-SHELL - ,patch-makefile-phase) + ,patch-makefile-phase) (add-after 'unpack 'remove-unneeded-shebang - ,remove-shebang-phase)))) + ,remove-shebang-phase)))) (self-native-input? #t) ; for `tic' (native-search-paths (list (search-path-specification -- cgit v1.2.3 From d7170f449cdddffeeb9a8aa9c72cf40240278ebf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Dec 2015 23:12:20 +0100 Subject: gnu: gettext: Add "doc" output. * gnu/packages/gettext.scm (gnu-gettext)[outputs]: New field. --- gnu/packages/gettext.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 14dedc51b5..3c006e1edb 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -49,6 +49,8 @@ (base32 "0pb9vp4ifymvdmc31ks3xxcnfqgzj8shll39czmk8c1splclqjzd")))) (build-system gnu-build-system) + (outputs '("out" + "doc")) ;8 MiB of HTML (inputs `(("expat" ,expat))) (arguments -- cgit v1.2.3 From 0573bb5e61ed0351d4e11a8dbafc6d7cc46e4f8c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Dec 2015 23:28:29 +0100 Subject: gnu: util-linux: Do not build static libraries. * gnu/packages/linux.scm (util-linux)[arguments]: Pass --disable-static. --- gnu/packages/linux.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 08533742ff..c018956125 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -417,6 +417,9 @@ providing the system administrator with some help in common tasks.") (arguments `(#:configure-flags (list "--disable-use-tty-group" + ;; Do not build .a files to save 2 MiB. + "--disable-static" + ;; Install completions where our ;; bash-completion package expects them. (string-append "--with-bashcompletiondir=" -- cgit v1.2.3 From 6042f40bfa0a78bfa850a0ff469a785b2da68a61 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Dec 2015 23:35:09 +0100 Subject: gnu: pcre: Add "doc" output. * gnu/packages/pcre.scm (pcre)[outputs]: New field. --- gnu/packages/pcre.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 5d6618a9ec..d2933bbe38 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -42,6 +42,8 @@ (base32 "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r")))) (build-system gnu-build-system) + (outputs '("out" + "doc")) ;1.8 MiB of HTML (inputs `(("bzip2" ,bzip2) ("readline" ,readline) ("zlib" ,zlib))) -- cgit v1.2.3 From c5b65f7e2bd907a5b7061a42959c485d69ba1ac6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 16 Dec 2015 22:05:30 +0100 Subject: gnu: glibc: Remove timestamp from 'nscd' binary. This makes libc bit-for-bit reproducible per '--rounds=2'. * gnu/packages/base.scm (glibc)[arguments] : Remove __DATE__ and __TIME__ from nscd_stat.c. --- gnu/packages/base.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 75f00a6f5b..ce7d1cdd77 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -595,6 +595,15 @@ store.") (string-append "#define _PATH_BSHELL \"" bash "/bin/bash\"\n"))) + ;; Nscd uses __DATE__ and __TIME__ to create a string to + ;; make sure the client and server come from the same + ;; libc. Use something deterministic instead. + (substitute* "nscd/nscd_stat.c" + (("static const char compilation\\[21\\] =.*$") + (string-append + "static const char compilation[21] = \"" + (string-take (basename out) 20) "\";\n"))) + ;; Make sure we don't retain a reference to the ;; bootstrap Perl. (substitute* "malloc/mtrace.pl" -- cgit v1.2.3 From 8309c3899aee9429df51eba4566c67d0cc27f68c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 18 Dec 2015 16:58:09 +0100 Subject: gnu: commencement: Use GMP 6.0.0a for bootstrapping. * gnu/packages/multiprecision.scm (gmp-6.0): New variable. * gnu/packages/commencement.scm (gcc-boot0, gcc-final): Use it. * gnu/packages/patches/gmp-arm-asm-nothumb.patch: New file, reinstated from before e414a7d. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/commencement.scm | 6 +++--- gnu/packages/multiprecision.scm | 18 ++++++++++++++++++ gnu/packages/patches/gmp-arm-asm-nothumb.patch | 21 +++++++++++++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/gmp-arm-asm-nothumb.patch diff --git a/gnu-system.am b/gnu-system.am index 0fff8def1d..0e53ce229b 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -491,6 +491,7 @@ dist_patch_DATA = \ gnu/packages/patches/glibc-locale-incompatibility.patch \ gnu/packages/patches/glibc-o-largefile.patch \ gnu/packages/patches/glibc-versioned-locpath.patch \ + gnu/packages/patches/gmp-arm-asm-nothumb.patch \ gnu/packages/patches/gmp-faulty-test.patch \ gnu/packages/patches/gnucash-price-quotes-perl.patch \ gnu/packages/patches/gnutls-doc-fix.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8aa32e859d..eda04325f0 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -231,7 +231,7 @@ (package-full-name lib) char-set:letter) ,(package-name lib))) - (list gmp mpfr mpc)))) + (list gmp-6.0 mpfr mpc)))) (alist-cons-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) @@ -245,7 +245,7 @@ (symlink "libgcc.a" "libgcc_eh.a")))) ,phases)))))) - (inputs `(("gmp-source" ,(package-source gmp)) + (inputs `(("gmp-source" ,(package-source gmp-6.0)) ("mpfr-source" ,(package-source mpfr)) ("mpc-source" ,(package-source mpc)) ("binutils-cross" ,binutils-boot0) @@ -636,7 +636,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("static-bash" ,static-bash-for-glibc) ,@(package-native-inputs gcc-boot0))) - (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp))) + (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0))) ("mpfr-source" ,(package-source mpfr)) ("mpc-source" ,(package-source mpc)) ("ld-wrapper" ,ld-wrapper-boot3) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 3be612ae62..ad507706db 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -60,6 +60,24 @@ cryptography and computational algebra.") (license lgpl3+) (home-page "http://gmplib.org/"))) +(define-public gmp-6.0 + ;; We keep this one around to bootstrap GCC, to work around a compilation + ;; issue on ARM. See + ;; . + (package + (inherit gmp) + (version "6.0.0a") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gmp/gmp-" + version ".tar.xz")) + (sha256 + (base32 + "0r5pp27cy7ch3dg5v0rsny8bib1zfvrza6027g2mp5f6v8pd6mli")) + (patches (map search-patch + '("gmp-arm-asm-nothumb.patch" + "gmp-faulty-test.patch"))))))) + (define-public mpfr (package (name "mpfr") diff --git a/gnu/packages/patches/gmp-arm-asm-nothumb.patch b/gnu/packages/patches/gmp-arm-asm-nothumb.patch new file mode 100644 index 0000000000..666cf58cf6 --- /dev/null +++ b/gnu/packages/patches/gmp-arm-asm-nothumb.patch @@ -0,0 +1,21 @@ + +# HG changeset patch +# User Torbjorn Granlund +# Date 1396602422 -7200 +# Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40 +# Parent 0194a75b56b21a9196626430af86c5bd9110c42d +Conditionalise ARM asm on !__thumb__. + +diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c +--- a/mpn/generic/div_qr_1n_pi1.c Thu Apr 03 23:58:51 2014 +0200 ++++ b/mpn/generic/div_qr_1n_pi1.c Fri Apr 04 11:07:02 2014 +0200 +@@ -130,7 +130,7 @@ + "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC) + #endif + +-#if defined (__arm__) && W_TYPE_SIZE == 32 ++#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32 + #define add_mssaaaa(m, sh, sl, ah, al, bh, bl) \ + __asm__ ( "adds %2, %5, %6\n\t" \ + "adcs %1, %3, %4\n\t" \ + -- cgit v1.2.3 From 009b53fd1ce162dce35249babfd63b26aa7ad580 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 18 Dec 2015 21:38:49 +0100 Subject: gnu: gcc: Prefer language-specific variables over 'CPATH'. Suggested by Andy Wingo . Fixes . * gnu/packages/gcc.scm (gcc-4.7)[native-search-paths]: Remove 'CPATH'; add 'C_INCLUDE_PATH' and 'CPLUS_INCLUDE_PATH' instead. * gnu/packages/gcc.scm (custom-gcc): Add 'search-paths' parameter and honor it. (%generic-search-paths): New variable. (gfortran-4.8, gfortran-4.9, gfortran, gfortran-5, gccgo-4.8): Pass %GENERIC-SEARCH-PATHS to 'custom-gcc'. (gcj)[native-search-paths]: New field. (gcc-objc-4.8, gcc-objc++-4.8): Use 'OBJC_INCLUDE_PATH' and 'OBJCPLUS_INCLUDE_PATH', respectively. --- gnu/packages/gcc.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 178ea20420..ed7bb5d682 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -293,8 +293,16 @@ where the OS part is overloaded to denote a specific ABI---into GCC %standard-phases)))) (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. (list (search-path-specification - (variable "CPATH") + (variable "C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") (files '("include"))) (search-path-specification (variable "LIBRARY_PATH") @@ -408,13 +416,18 @@ using compilers other than GCC." (define-public libiberty (make-libiberty gcc)) -(define* (custom-gcc gcc name languages #:key (separate-lib-output? #t)) - "Return a custom version of GCC that supports LANGUAGES." +(define* (custom-gcc gcc name languages + #:optional + (search-paths (package-native-search-paths gcc)) + #:key (separate-lib-output? #t)) + "Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS +as the 'native-search-paths' field." (package (inherit gcc) (name name) (outputs (if separate-lib-output? (package-outputs gcc) (delete "lib" (package-outputs gcc)))) + (native-search-paths search-paths) (arguments (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) (guix build utils) @@ -428,20 +441,37 @@ using compilers other than GCC." (remove (cut string-match "--enable-languages.*" <>) ,flags))))))) +(define %generic-search-paths + ;; This is the language-neutral search path for GCC. Entries in $CPATH are + ;; not considered "system headers", which means GCC can raise warnings for + ;; issues in those headers. 'CPATH' is the only one that works for + ;; front-ends not in the C family. + (list (search-path-specification + (variable "CPATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + (define-public gfortran-4.8 - (custom-gcc gcc-4.8 "gfortran" '("fortran"))) + (custom-gcc gcc-4.8 "gfortran" '("fortran") + %generic-search-paths)) (define-public gfortran-4.9 - (custom-gcc gcc-4.9 "gfortran" '("fortran"))) + (custom-gcc gcc-4.9 "gfortran" '("fortran") + %generic-search-paths)) (define-public gfortran - (custom-gcc gcc "gfortran" '("fortran"))) + (custom-gcc gcc "gfortran" '("fortran") + %generic-search-paths)) (define-public gfortran-5 - (custom-gcc gcc-5 "gfortran" '("fortran"))) + (custom-gcc gcc-5 "gfortran" '("fortran") + %generic-search-paths)) (define-public gccgo-4.8 (custom-gcc gcc-4.8 "gccgo" '("go") + %generic-search-paths ;; Suppress the separate "lib" output, because otherwise the ;; "lib" and "out" outputs would refer to each other, creating ;; a cyclic dependency. @@ -468,6 +498,8 @@ using compilers other than GCC." (native-inputs `(("dejagnu" ,dejagnu) ,@(package-native-inputs gcc))) + (native-search-paths %generic-search-paths) + ;; Suppress the separate "lib" output, because otherwise the ;; "lib" and "out" outputs would refer to each other, creating ;; a cyclic dependency. @@ -551,10 +583,22 @@ using compilers other than GCC." "1k9lgm3qamf6zy534pa2zwskr8mpiqrngbv1vw9j4y1ghrdyf1lm")))) (define-public gcc-objc-4.8 - (custom-gcc gcc-4.8 "gcc-objc" '("objc"))) + (custom-gcc gcc-4.8 "gcc-objc" '("objc") + (list (search-path-specification + (variable "OBJC_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64")))))) (define-public gcc-objc++-4.8 - (custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++"))) + (custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++") + (list (search-path-specification + (variable "OBJCPLUS_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64")))))) (define (make-libstdc++-doc gcc) "Return a package with the libstdc++ documentation for GCC." -- cgit v1.2.3 From 09964b4fc612c55f7a2e519429d318469830c921 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 18 Dec 2015 22:17:47 +0100 Subject: gnu: commencement: Add "-boot0" to early packages. * gnu/packages/commencement.scm (diffutils-boot0)[name]: New field. * gnu/packages/commencement.scm (findutils-boot0, file-boot0, perl-boot0): Change 'name' field to include "-boot0". --- gnu/packages/commencement.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index eda04325f0..578ded215f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -92,12 +92,15 @@ ,@%bootstrap-inputs) #:guile %bootstrap-guile))) (package (inherit p) + (name "diffutils-boot0") (arguments `(#:tests? #f ; the test suite needs diffutils ,@(package-arguments p))))))) (define findutils-boot0 (package-with-bootstrap-guile - (package-with-explicit-inputs findutils + (package-with-explicit-inputs (package + (inherit findutils) + (name "findutils-boot0")) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ; for tests ,@%bootstrap-inputs) @@ -106,7 +109,9 @@ (define file-boot0 (package-with-bootstrap-guile - (package-with-explicit-inputs file + (package-with-explicit-inputs (package + (inherit file) + (name "file-boot0")) `(("make" ,gnu-make-boot0) ,@%bootstrap-inputs) (current-source-location) @@ -262,6 +267,7 @@ (define perl-boot0 (let ((perl (package (inherit perl) + (name "perl-boot0") (arguments (substitute-keyword-arguments (package-arguments perl) ((#:phases phases) -- cgit v1.2.3 From 32243bfb57aa5d280b4949954af2df9c93b327e1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 18 Dec 2015 23:50:15 +0100 Subject: gnu: commencement: Avoid redundant Perl rebuild. This removes a redundant (yet different) "perl-boot0" node from the early derivation graph. * gnu/packages/commencement.scm (bison-boot1): Move 'native-inputs' field to the final package. Previously PERL-BOOT0 got rebuilt with %BOOT0-INPUTS, leading to a different derivation. (static-bash-for-glibc): Likewise. --- gnu/packages/commencement.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 578ded215f..7c13ecf598 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -429,14 +429,15 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (current-source-location) #:guile %bootstrap-guile))) (bison (package (inherit bison) - (native-inputs `(("perl" ,perl-boot0))) (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... (arguments '(#:tests? #f))))) ;... and thus disable tests - (package-with-bootstrap-guile - (package-with-explicit-inputs bison %boot0-inputs - (current-source-location) - #:guile %bootstrap-guile)))) + (package + (inherit (package-with-bootstrap-guile + (package-with-explicit-inputs bison %boot0-inputs + (current-source-location) + #:guile %bootstrap-guile))) + (native-inputs `(("perl" ,perl-boot0)))))) (define static-bash-for-glibc ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. @@ -444,17 +445,18 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" glibc-final-with-bootstrap-bash (car (assoc-ref %boot1-inputs "bash")))) (bash (package (inherit static-bash) - (native-inputs `(("bison" ,bison-boot1))) (arguments `(#:guile ,%bootstrap-guile - ,@(package-arguments static-bash)))))) - (package-with-bootstrap-guile - (package-with-explicit-inputs bash - `(("gcc" ,gcc) - ("libc" ,glibc-final-with-bootstrap-bash) - ,@(fold alist-delete %boot1-inputs - '("gcc" "libc"))) - (current-source-location))))) + ,@(package-arguments static-bash))))) + (inputs `(("gcc" ,gcc) + ("libc" ,glibc-final-with-bootstrap-bash) + ,@(fold alist-delete %boot1-inputs + '("gcc" "libc"))))) + (package + (inherit (package-with-bootstrap-guile + (package-with-explicit-inputs bash inputs + (current-source-location)))) + (native-inputs `(("bison" ,bison-boot1)))))) (define gettext-boot0 ;; A minimal gettext used during bootstrap. -- cgit v1.2.3 From f1e0c85ad23071ea5b1dbcee1474ec34a5de7422 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 18 Dec 2015 23:57:11 +0100 Subject: gnu: commencement: Build the final Bash with "bison-boot1". This removes a round of Bison + Flex + M4 + Perl rebuild. * gnu/packages/commencement.scm (bash-final): Add 'native-inputs' field pointing to BISON-BOOT1. --- gnu/packages/commencement.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7c13ecf598..32facf2f47 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -662,11 +662,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define bash-final ;; Link with `-static-libgcc' to make sure we don't retain a reference ;; to the bootstrap GCC. - (package-with-bootstrap-guile - (package-with-explicit-inputs (static-libgcc-package bash) - %boot3-inputs - (current-source-location) - #:guile %bootstrap-guile))) + (package + (inherit (package-with-bootstrap-guile + (package-with-explicit-inputs (static-libgcc-package bash) + %boot3-inputs + (current-source-location) + #:guile %bootstrap-guile))) + (native-inputs `(("bison" ,bison-boot1))))) (define %boot4-inputs ;; Now use the final Bash. -- cgit v1.2.3 From 3eb34c631a143d77bf11bff2363a76959e45aa50 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 18 Dec 2015 23:58:51 +0100 Subject: build-system/gnu: Always pass "-D" to strip/objcopy. * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Add "-D" to #:strip-flags. * guix/build/gnu-build-system.scm (strip): Likewise. Also pass "-D" to OBJCOPY-COMMAND. --- guix/build-system/gnu.scm | 4 ++-- guix/build/gnu-build-system.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index c83c50b76e..9fd25d7db9 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -282,7 +282,7 @@ standard packages used as implicit inputs of the GNU build system." (parallel-tests? #t) (patch-shebangs? #t) (strip-binaries? #t) - (strip-flags ''("--strip-debug")) + (strip-flags ''("--strip-debug" "-D")) (strip-directories ''("lib" "lib64" "libexec" "bin" "sbin")) (validate-runpath? #t) @@ -417,7 +417,7 @@ is one of `host' or `target'." (parallel-build? #t) (parallel-tests? #t) (patch-shebangs? #t) (strip-binaries? #t) - (strip-flags ''("--strip-debug")) + (strip-flags ''("--strip-debug" "-D")) (strip-directories ''("lib" "lib64" "libexec" "bin" "sbin")) (validate-runpath? #t) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 92e15d131e..13f925e61b 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -329,7 +329,7 @@ makefiles." (objcopy-command (if target (string-append target "-objcopy") "objcopy")) - (strip-flags '("--strip-debug")) + (strip-flags '("--strip-debug" "-D")) (strip-directories '("lib" "lib64" "libexec" "bin" "sbin")) #:allow-other-keys) @@ -367,7 +367,7 @@ makefiles." ;; `bfd_fill_in_gnu_debuglink_section' function.) No reference to ;; DEBUG-OUTPUT is kept because bfd keeps only the basename of the debug ;; file. - (zero? (system* objcopy-command + (zero? (system* objcopy-command "-D" (string-append "--add-gnu-debuglink=" (debug-file file)) file))) -- cgit v1.2.3 From 53088d0045a04b382a18a8fd171bc3e6560c6a06 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 19 Dec 2015 00:00:46 +0100 Subject: gnu: commencement: Build Bison deterministically. Before that entries in liby.a would contain the build time. * gnu/packages/commencement.scm (bison-boot1): Add #:make-flags. --- gnu/packages/commencement.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 32facf2f47..d758913859 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -431,7 +431,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (bison (package (inherit bison) (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... - (arguments '(#:tests? #f))))) ;... and thus disable tests + (arguments + '(#:tests? #f ;... and thus disable tests + + ;; Zero timestamps in liby.a; this must be done + ;; explicitly here because the bootstrap Binutils don't + ;; do that (default is "cru".) + #:make-flags '("ARFLAGS=crD" "RANLIB=ranlib -D" + "V=1")))))) (package (inherit (package-with-bootstrap-guile (package-with-explicit-inputs bison %boot0-inputs -- cgit v1.2.3 From 64cb064c0c55f13b53d2d9fa8fc3e8e82888e563 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 22 Dec 2015 22:24:41 +0100 Subject: gnu: python-wrapper: Append "-wrapper" to the underlying package name. Reported by Federico Beffa . * gnu/packages/python.scm (wrap-python3): Change the default value of 'name' to include the name of PYTHON. This disambiguates between 'python-minimal-wrapper' and 'python-wrapper'. --- gnu/packages/python.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5880cac099..72a3507d1f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -307,7 +307,9 @@ data types.") (inputs `(("openssl" ,openssl) ("zlib" ,zlib))))) -(define* (wrap-python3 python #:optional (name "python-wrapper")) +(define* (wrap-python3 python + #:optional + (name (string-append (package-name python) "-wrapper"))) (package (inherit python) (name name) (source #f) -- cgit v1.2.3 From 05f1e956382213a0c8436c2333fb4b65e58efecc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 22 Dec 2015 22:29:34 +0100 Subject: gnu: guile-2.0: Add "lib/guile/2.0/ccache" to the search path. * gnu/packages/guile.scm (guile-2.0)[native-search-paths]: Add "lib/guile/2.0/ccache" to GUILE_LOAD_COMPILED_PATH. --- gnu/packages/guile.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a4203f0f3b..8208a2ce78 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -174,7 +174,8 @@ without requiring the source code to be rewritten.") (files '("share/guile/site/2.0"))) (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") - (files '("share/guile/site/2.0"))))) + (files '("lib/guile/2.0/ccache" + "share/guile/site/2.0"))))) (synopsis "Scheme implementation intended especially for extensions") (description -- cgit v1.2.3 From 7165a91c7dc59561d4c4f338102f32fdab1486a6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 1 Jan 2016 00:49:05 +0100 Subject: build-system/gnu: Use the long option name for deterministic archives. This is a followup to 3eb34c6. * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Use "--enable-deterministic-archives" instead of "-D" to work around Binutils bug . * guix/build/gnu-build-system.scm (strip): Likewise. --- guix/build-system/gnu.scm | 8 +++++--- guix/build/gnu-build-system.scm | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 9fd25d7db9..c77348bd88 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -282,7 +282,8 @@ standard packages used as implicit inputs of the GNU build system." (parallel-tests? #t) (patch-shebangs? #t) (strip-binaries? #t) - (strip-flags ''("--strip-debug" "-D")) + (strip-flags ''("--strip-debug" + "--enable-deterministic-archives")) (strip-directories ''("lib" "lib64" "libexec" "bin" "sbin")) (validate-runpath? #t) @@ -417,7 +418,8 @@ is one of `host' or `target'." (parallel-build? #t) (parallel-tests? #t) (patch-shebangs? #t) (strip-binaries? #t) - (strip-flags ''("--strip-debug" "-D")) + (strip-flags ''("--strip-debug" + "--enable-deterministic-archives")) (strip-directories ''("lib" "lib64" "libexec" "bin" "sbin")) (validate-runpath? #t) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 13f925e61b..e168b6c7e9 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -329,7 +329,8 @@ makefiles." (objcopy-command (if target (string-append target "-objcopy") "objcopy")) - (strip-flags '("--strip-debug" "-D")) + (strip-flags '("--strip-debug" + "--enable-deterministic-archives")) (strip-directories '("lib" "lib64" "libexec" "bin" "sbin")) #:allow-other-keys) @@ -367,7 +368,7 @@ makefiles." ;; `bfd_fill_in_gnu_debuglink_section' function.) No reference to ;; DEBUG-OUTPUT is kept because bfd keeps only the basename of the debug ;; file. - (zero? (system* objcopy-command "-D" + (zero? (system* objcopy-command "--enable-deterministic-archives" (string-append "--add-gnu-debuglink=" (debug-file file)) file))) -- cgit v1.2.3 From e80d2555f5dfa89cd44b261ead2c5fd397a51f56 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 1 Jan 2016 00:55:24 +0100 Subject: gnu: findutils: Update to 4.6.0. * gnu/packages/patches/findutils-absolute-paths.patch: Remove. * gnu/packages/patches/findutils-test-xargs.patch: New file. * gnu-system.am (dist_patch_DATA): Adjust accordingly. * gnu/packages/base.scm (findutils): Update to 4.6.0. Remove 'findutils-absolute-paths.patch' and add 'findutils-test-xargs.patch'. --- gnu-system.am | 2 +- gnu/packages/base.scm | 10 ++++---- .../patches/findutils-absolute-paths.patch | 29 ---------------------- gnu/packages/patches/findutils-test-xargs.patch | 22 ++++++++++++++++ 4 files changed, 28 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/findutils-absolute-paths.patch create mode 100644 gnu/packages/patches/findutils-test-xargs.patch diff --git a/gnu-system.am b/gnu-system.am index 0e53ce229b..b8a3e2b06b 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -461,8 +461,8 @@ dist_patch_DATA = \ gnu/packages/patches/fasthenry-spUtils.patch \ gnu/packages/patches/fasthenry-spSolve.patch \ gnu/packages/patches/fasthenry-spFactor.patch \ - gnu/packages/patches/findutils-absolute-paths.patch \ gnu/packages/patches/findutils-localstatedir.patch \ + gnu/packages/patches/findutils-test-xargs.patch \ gnu/packages/patches/flashrom-use-libftdi1.patch \ gnu/packages/patches/flex-bison-tests.patch \ gnu/packages/patches/flint-ldconfig.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index ce7d1cdd77..a55711e9ea 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015 Mark H Weaver @@ -206,17 +206,17 @@ interactive means to merge two files.") (define-public findutils (package (name "findutils") - (version "4.4.2") + (version "4.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/findutils/findutils-" version ".tar.gz")) (sha256 (base32 - "0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3")) + "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y")) (patches (map search-patch - '("findutils-absolute-paths.patch" - "findutils-localstatedir.patch"))))) + '("findutils-localstatedir.patch" + "findutils-test-xargs.patch"))))) (build-system gnu-build-system) (arguments `(#:configure-flags (list diff --git a/gnu/packages/patches/findutils-absolute-paths.patch b/gnu/packages/patches/findutils-absolute-paths.patch deleted file mode 100644 index 96341e281f..0000000000 --- a/gnu/packages/patches/findutils-absolute-paths.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix use of LFS-style absolute paths. - -Patches from Nixpkgs by Armijn Hemel -and Wouter den Breejen . - -diff -ruN findutils-4.2.20/locate/updatedb.sh findutils-4.2.20.new/locate/updatedb.sh ---- findutils-4.2.20/locate/updatedb.sh 2005-01-24 17:12:35.000000000 +0100 -+++ findutils-4.2.20.new/locate/updatedb.sh 2005-08-23 14:37:10.000000000 +0200 -@@ -141,7 +141,7 @@ - : ${code:=${LIBEXECDIR}/@code@} - - --PATH=/bin:/usr/bin:${BINDIR}; export PATH -+PATH=/bin:/usr/bin:${BINDIR}:${PATH}; export PATH - - : ${PRUNEFS="nfs NFS proc afs proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs"} - -diff -Naur findutils-4.2.30/xargs/xargs.c findutils-4.2.30_new/xargs/xargs.c ---- findutils-4.2.30/xargs/xargs.c 2007-02-27 11:21:08.000000000 +0100 -+++ findutils-4.2.30_new/xargs/xargs.c 2007-07-17 19:02:05.000000000 +0200 -@@ -402,7 +402,7 @@ - int show_limits = 0; /* --show-limits */ - int always_run_command = 1; - char *input_file = "-"; /* "-" is stdin */ -- char *default_cmd = "/bin/echo"; -+ char *default_cmd = "echo"; - int (*read_args) PARAMS ((void)) = read_line; - void (*act_on_init_result)(void) = noop; - int env_too_big = 0; diff --git a/gnu/packages/patches/findutils-test-xargs.patch b/gnu/packages/patches/findutils-test-xargs.patch new file mode 100644 index 0000000000..10c7bed28d --- /dev/null +++ b/gnu/packages/patches/findutils-test-xargs.patch @@ -0,0 +1,22 @@ +This test relies on 'xargs' being available in $PATH, which is not +the case when we build the initial Findutils doing bootstrapping. +Reported at . + +--- findutils-4.6.0/find/testsuite/sv-34976-execdir-fd-leak.sh 2015-12-31 19:37:59.401526288 +0100 ++++ findutils-4.6.0/find/testsuite/sv-34976-execdir-fd-leak.sh 2015-12-31 19:38:36.061770693 +0100 +@@ -50,13 +50,14 @@ die() { + # Create test files, each 98 in the directories ".", "one" and "two". + make_test_data() { + d="$1" ++ xargs="`cd ../../xargs; pwd -P`/xargs" + ( + cd "$1" || exit 1 + mkdir one two || exit 1 + for i in ${three_to_hundred} ; do + printf "./%03d one/%03d two/%03d " $i $i $i + done \ +- | xargs touch || exit 1 ++ | "$xargs" touch || exit 1 + ) \ + || die "failed to set up the test in ${outdir}" + } -- cgit v1.2.3 From 8d0801ab235a6083c17235cefc214eb0537ffc1e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 20 Dec 2015 16:23:25 -0600 Subject: gnu: libgc: Enable C++ support. * gnu/packages/bdw-gc.scm (libgc-7.2, libgc)[arguments]: Add --enable-cplusplus to #:configure-flags. --- gnu/packages/bdw-gc.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 66158912d7..0a483ef864 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -39,7 +39,9 @@ (arguments ;; Make it so that we don't rely on /proc. This is especially useful in ;; an initrd run before /proc is mounted. - '(#:configure-flags '("CPPFLAGS=-DUSE_LIBC_PRIVATES"))) + '(#:configure-flags '("CPPFLAGS=-DUSE_LIBC_PRIVATES" + ;; Install gc_cpp.h et al. + "--enable-cplusplus"))) (outputs '("out" "debug")) (synopsis "The Boehm-Demers-Weiser conservative garbage collector for C and C++") @@ -103,4 +105,4 @@ lock-free code, experiment with thread programming paradigms, etc.") (inputs `(("libatomic-ops" ,libatomic-ops))) ;; 'USE_LIBC_PRIVATES' is now the default. - (arguments '()))) + (arguments '(#:configure-flags '("--enable-cplusplus"))))) -- cgit v1.2.3 From dd1937d75dd0fb21402515ca56e06cca2ee095a7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 3 Jan 2016 14:44:22 +0100 Subject: gnu: pkg-config: Update to 0.29. * gnu/packages/pkg-config.scm (%pkg-config): Update to 0.29. --- gnu/packages/pkg-config.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index dd5120c474..5923395dec 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +30,7 @@ (define-public %pkg-config (package (name "pkg-config") - (version "0.28") + (version "0.29") (source (origin (method url-fetch) (uri (string-append @@ -38,7 +38,7 @@ version ".tar.gz")) (sha256 (base32 - "0igqq5m204w71m11y0nipbdf5apx87hwfll6axs12hn4dqfb6vkb")))) + "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-internal-glib"))) (native-search-paths -- cgit v1.2.3 From 1575dcd134f4fae7255787293f4988bbd043de95 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 3 Jan 2016 14:49:55 +0100 Subject: gnu: grep: Skip timing-sensitive test. This avoids failures on loaded machines as seen at . * gnu/packages/patches/grep-timing-sensitive-test.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/base.scm (grep): Use it. --- gnu-system.am | 3 ++- gnu/packages/base.scm | 4 +++- gnu/packages/patches/grep-timing-sensitive-test.patch | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/grep-timing-sensitive-test.patch diff --git a/gnu-system.am b/gnu-system.am index b8a3e2b06b..ce7b908b0a 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès # Copyright © 2013, 2014, 2015 Andreas Enge # Copyright © 2013, 2014, 2015 Mark H Weaver # @@ -498,6 +498,7 @@ dist_patch_DATA = \ gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \ gnu/packages/patches/gobject-introspection-cc.patch \ gnu/packages/patches/gobject-introspection-girepository.patch \ + gnu/packages/patches/grep-timing-sensitive-test.patch \ gnu/packages/patches/grub-gets-undeclared.patch \ gnu/packages/patches/grub-freetype.patch \ gnu/packages/patches/guile-1.8-cpp-4.5.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a55711e9ea..a7b74cfb93 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -80,7 +80,9 @@ command-line arguments, multiple languages, and so on.") version ".tar.xz")) (sha256 (base32 - "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa")))) + "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa")) + (patches + (list (search-patch "grep-timing-sensitive-test.patch"))))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ;some of the tests require it (synopsis "Print lines matching a pattern") diff --git a/gnu/packages/patches/grep-timing-sensitive-test.patch b/gnu/packages/patches/grep-timing-sensitive-test.patch new file mode 100644 index 0000000000..8cfcc848bc --- /dev/null +++ b/gnu/packages/patches/grep-timing-sensitive-test.patch @@ -0,0 +1,15 @@ +Skip this performance regression test. + +The test measures things on the order of 20ms. On a loaded machine, we +have seen enough variation that the test would fail. + +--- grep-2.22/tests/long-pattern-perf 2016-01-03 12:52:38.491575007 +0100 ++++ grep-2.22/tests/long-pattern-perf 2016-01-03 12:53:39.768464687 +0100 +@@ -16,6 +16,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + ++exit 77 + . "${srcdir=.}/init.sh"; path_prepend_ ../src + + fail=0 -- cgit v1.2.3 From 82cb8519bc1096a1106d197318643e26bd677cae Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Jan 2016 16:59:13 +0200 Subject: gnu: tzdata: Update to 2015g. * gnu/packages/base.scm (tzdata): Update to 2015g. --- gnu/packages/base.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a7b74cfb93..f8ea80b5e7 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -873,7 +874,7 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2015c") + (version "2015g") (source (origin (method url-fetch) (uri (string-append @@ -881,7 +882,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "0nin48g5dmkfgckp25bngxchn3sw3yyjss5sq7gs5xspbxgsq3w6")))) + "0qb1awqrn3215zd2jikpqnmkzrxwfjf0d3dw2xmnk4c40yzws8xr")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -928,7 +929,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "0bplibiy70dvlrhwqzkzxgmg81j6d2kklvjgi2f1g2zz1nkb3vkz")))))) + "1i3y1kzjiz2j62c7vd4wf85983sqk9x9lg3473njvbdz4kph5r0q")))))) (home-page "http://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) -- cgit v1.2.3 From 4478dbd58cb7b0ef80a098fbba7061d7f3a8eba6 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Mon, 4 Jan 2016 13:44:36 +0200 Subject: gnu: libgpg-error: Update to 1.21. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.21. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index aeee440b7e..b6b12e83d4 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -45,7 +45,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.19") + (version "1.21") (source (origin (method url-fetch) @@ -53,7 +53,7 @@ version ".tar.bz2")) (sha256 (base32 - "12wpqhjlsw4iaanifbqm2kich6c7x7lm8a7zhy6x5ifm6c9hw4jk")))) + "0kdq2cbnk84fr4jqcv689rlxpbyl6bda2cn6y3ll19v3mlydpnxp")))) (build-system gnu-build-system) (home-page "http://gnupg.org") (synopsis "Library of error values for GnuPG components") -- cgit v1.2.3 From 4f2ca234934983544de73758b6badb61c047f805 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Jan 2016 22:29:08 +0200 Subject: gnu: libgcrypt: Update to 1.6.4. * gnu/packages/gnupg.scm (libgcrypt): Update to 1.6.4. --- gnu/packages/gnupg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index b6b12e83d4..2042327d3d 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015 Efraim Flashner +;;; Copyright © 2015, 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,14 +67,14 @@ Daemon and possibly more in the future.") (define-public libgcrypt (package (name "libgcrypt") - (version "1.6.3") + (version "1.6.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" version ".tar.bz2")) (sha256 (base32 - "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21")))) + "09k06gs27gxfha07sa9rpf4xh6mvphj9sky7n09ymx75w9zjrg69")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error-host" ,libgpg-error))) -- cgit v1.2.3 From a2ab82db9ab5d6db86762924d3016aed7c26c315 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 5 Jan 2016 12:35:30 +0100 Subject: gnu: python: Honor 'C_INCLUDE_PATH'. This is a followup to 009b53fd. * gnu/packages/patches/python-3-search-paths.patch: Check 'C_INCLUDE_PATH' instead of 'CPATH'. * gnu/packages/patches/python-2.7-search-paths.patch: Likewise. --- gnu/packages/patches/python-2.7-search-paths.patch | 6 +++--- gnu/packages/patches/python-3-search-paths.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/patches/python-2.7-search-paths.patch b/gnu/packages/patches/python-2.7-search-paths.patch index 6e5339f3a6..ba7235df27 100644 --- a/gnu/packages/patches/python-2.7-search-paths.patch +++ b/gnu/packages/patches/python-2.7-search-paths.patch @@ -1,5 +1,5 @@ -Make sure the build system honors CPATH and LIBRARY_PATH when looking for -headers and libraries. +Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when +looking for headers and libraries. --- Python-2.7.10/setup.py 2015-10-07 18:33:18.125153186 +0200 +++ Python-2.7.10/setup.py 2015-10-07 18:33:47.497347552 +0200 @@ -9,7 +9,7 @@ headers and libraries. + # Always honor these variables. + lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('CPATH', '').split(os.pathsep) ++ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if host_platform in ['osf1', 'unixware7', 'openunix8']: diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index 547feae1b9..7feddb8e30 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -1,5 +1,5 @@ -Make sure the build system honors CPATH and LIBRARY_PATH when looking for -headers and libraries. +Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when +looking for headers and libraries. --- setup.py 2015-10-07 23:32:58.891329173 +0200 +++ setup.py 2015-10-07 23:46:29.653349924 +0200 @@ -13,7 +13,7 @@ headers and libraries. - ] - inc_dirs = self.compiler.include_dirs + ['/usr/include'] + lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs = os.getenv('CPATH', '').split(os.pathsep) ++ inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) else: lib_dirs = self.compiler.library_dirs[:] inc_dirs = self.compiler.include_dirs[:] -- cgit v1.2.3 From e8e2e18b84eb8842a59be9bf7d49bb672260ae3a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 5 Jan 2016 13:58:36 +0100 Subject: gnu: Read 'C_INCLUDE_PATH' instead of 'CPATH'. This is a followup to 009b53fd. * gnu/packages/cmake.scm (cmake)[arguments]: Use (getenv "C_INCLUDE_PATH") instead of (getenv "CPATH"). * gnu/packages/package-management.scm (rpm)[arguments]: Likewise. * gnu/packages/video.scm (avidemux)[arguments]: Likewise. * gnu/packages/webkit.scm (webkitgtk)[arguments]: Likewise. * gnu/packages/cross-base.scm (cross-gcc-arguments): Likewise, and unset 'C_INCLUDE_PATH' and 'CPLUS_INCLUDE_PATH'. --- gnu/packages/cmake.scm | 2 +- gnu/packages/cross-base.scm | 6 ++++-- gnu/packages/package-management.scm | 4 ++-- gnu/packages/video.scm | 2 +- gnu/packages/webkit.scm | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 2efce6fd87..d75b9f62ef 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -77,7 +77,7 @@ archive_write_set_format_shar.c" ;; Help cmake's bootstrap process to find system libraries (begin (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (setenv "CMAKE_INCLUDE_PATH" (getenv "CPATH")) + (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) ;; Get verbose output from failed tests (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE"))) (alist-replace diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index d64cdd1272..cefe2f947f 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -181,12 +181,14 @@ may be either a libc package or #f.)" (string-append libc "/lib")) (let ((cpath (search-path-as-string->list - (getenv "CPATH"))) + (getenv "C_INCLUDE_PATH"))) (libpath (search-path-as-string->list (getenv "LIBRARY_PATH")))) (setenv "CPATH" (list->search-path-as-string (remove cross? cpath) ":")) + (for-each unsetenv + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) (setenv "LIBRARY_PATH" (list->search-path-as-string (remove cross? libpath) ":")) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 917464543c..b8d0c9c2ac 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -340,7 +340,7 @@ symlinks to the files in a common directory such as /usr/local.") (let ((nspr (assoc-ref inputs "nspr")) (nss (assoc-ref inputs "nss"))) (setenv "CPATH" - (string-append (getenv "CPATH") ":" + (string-append (getenv "C_INCLUDE_PATH") ":" nspr "/include/nspr:" nss "/include/nss")) (setenv "LIBRARY_PATH" diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f1089f76ca..63a623d05e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1057,7 +1057,7 @@ for use with HTML5 video.") (lambda _ ;; Copy-paste settings from the cmake build system. (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (setenv "CMAKE_INCLUDE_PATH" (getenv "CPATH"))) + (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))) (alist-replace 'build (lambda* (#:key inputs outputs #:allow-other-keys) (let* diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index bb041b1935..d22aacd12f 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -80,7 +80,7 @@ ;; that it will be in the same directory as gstreamer's header ;; files. (setenv "CPATH" - (string-append (getenv "CPATH") + (string-append (getenv "C_INCLUDE_PATH") ":" (assoc-ref inputs "gst-plugins-base") "/include/gstreamer-1.0"))))))) -- cgit v1.2.3 From 0beb65b45063ccd47b85ed79cc4782f3a3ffa299 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 5 Jan 2016 15:49:48 +0100 Subject: build-system/gnu: Add 'set-SOURCE-DATE-EPOCH' phase. This phase is inherited by other build systems, which ensures 'SOURCE_DATE_EPOCH' is always set in practice. * guix/build/python-build-system.scm (set-SOURCE-DATE-EPOCH): Remove. (%standard-phases): Don't add it. * guix/build/gnu-build-system.scm (set-SOURCE-DATE-EPOCH): New procedure. (%standard-phases): Add it. (gnu-build): Remove 'setenv' call for "SOURCE_DATE_EPOCH". --- guix/build/gnu-build-system.scm | 12 ++++++++---- guix/build/python-build-system.scm | 9 +-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index e168b6c7e9..2abaa6efdc 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -39,6 +39,13 @@ ;; ;; Code: +(define* (set-SOURCE-DATE-EPOCH #:rest _) + "Set the 'SOURCE_DATE_EPOCH' environment variable. This is used by tools +that incorporate timestamps as a way to tell them to use a fixed timestamp. +See https://reproducible-builds.org/specs/source-date-epoch/." + (setenv "SOURCE_DATE_EPOCH" "1") + #t) + (define (first-subdirectory dir) "Return the path of the first sub-directory of DIR." (file-system-fold (lambda (path stat result) @@ -549,7 +556,7 @@ DOCUMENTATION-COMPRESSOR-FLAGS." ;; Standard build phases, as a list of symbol/procedure pairs. (let-syntax ((phases (syntax-rules () ((_ p ...) `((p . ,p) ...))))) - (phases set-paths install-locale unpack + (phases set-SOURCE-DATE-EPOCH set-paths install-locale unpack patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install @@ -577,9 +584,6 @@ in order. Return #t if all the PHASES succeeded, #f otherwise." ;; Encoding/decoding errors shouldn't be silent. (fluid-set! %default-port-conversion-strategy 'error) - ;; Avoid non-determinism related to generated timestamps. - (setenv "SOURCE_DATE_EPOCH" "1") - ;; The trick is to #:allow-other-keys everywhere, so that each procedure in ;; PHASES can pick the keyword arguments it's interested in. (every (match-lambda diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 8025b7fec6..9109fb4ac7 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2015 Ludovic Courtès +;;; Copyright © 2013, 2015, 2016 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2015 Mark H Weaver @@ -136,18 +136,11 @@ installed with setuptools." #t)) #t)) -(define* (set-SOURCE-DATE-EPOCH #:rest _) - "Set the 'SOURCE_DATE_EPOCH' environment variable." - ;; Use zero as the timestamp in .pyc files so that builds are deterministic. - ;; TODO: Remove it when this variable is set in GNU:%STANDARD-PHASES. - (setenv "SOURCE_DATE_EPOCH" "1")) - (define %standard-phases ;; 'configure' and 'build' phases are not needed. Everything is done during ;; 'install'. (modify-phases gnu:%standard-phases (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980) - (add-after 'unpack 'set-SOURCE-DATE-EPOCH set-SOURCE-DATE-EPOCH) (delete 'configure) (replace 'install install) (replace 'check check) -- cgit v1.2.3 From 3ea110b704fb6ffcb512b9ff708948c06d594598 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 5 Jan 2016 16:12:13 +0200 Subject: gnu: libtasn1: Update to 4.7. * gnu/packages/tls.scm (libtan1): Update to 4.7. [native-inputs]: Remove texinfo. --- gnu/packages/tls.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 578953403e..494128eeae 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015 Leo Famulari +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,7 +46,7 @@ (define-public libtasn1 (package (name "libtasn1") - (version "4.5") + (version "4.7") (source (origin (method url-fetch) @@ -53,13 +54,9 @@ version ".tar.gz")) (sha256 (base32 - "1nhvnznhg2aqfrfjxc8v008hjlzkh5831jsfahqk89qrw7fbbcw9")))) + "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4")))) (build-system gnu-build-system) - (native-inputs `(("perl" ,perl) - - ;; XXX: For some reason, libtasn1.info wants to be - ;; rebuilt, so we must provide 'makeinfo'. - ("texinfo" ,texinfo))) + (native-inputs `(("perl" ,perl))) (home-page "http://www.gnu.org/software/libtasn1/") (synopsis "ASN.1 library") (description -- cgit v1.2.3 From 5a75865f9d6ae08251d789251aa1ea4eac23ab0f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 5 Jan 2016 18:10:38 +0200 Subject: gnu: gnutls: Update to 3.4.7. * gnu/packages/tls.scm (gnutls): Update to 3.4.7. [source]: Remove gnutls-doc-fix.patch. [arguments]: Remove delete-prebuilt-unfixed-info-file phase. [native-inputs]: Remove texinfo. * gnu-system.am (dist_patch_DATA): Remove gnutls-doc-fix.patch --- gnu-system.am | 1 - gnu/packages/patches/gnutls-doc-fix.patch | 546 ------------------------------ gnu/packages/tls.scm | 13 +- 3 files changed, 2 insertions(+), 558 deletions(-) delete mode 100644 gnu/packages/patches/gnutls-doc-fix.patch diff --git a/gnu-system.am b/gnu-system.am index 8bace7d423..7fb1089c66 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -492,7 +492,6 @@ dist_patch_DATA = \ gnu/packages/patches/gmp-arm-asm-nothumb.patch \ gnu/packages/patches/gmp-faulty-test.patch \ gnu/packages/patches/gnucash-price-quotes-perl.patch \ - gnu/packages/patches/gnutls-doc-fix.patch \ gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \ gnu/packages/patches/gobject-introspection-cc.patch \ gnu/packages/patches/gobject-introspection-girepository.patch \ diff --git a/gnu/packages/patches/gnutls-doc-fix.patch b/gnu/packages/patches/gnutls-doc-fix.patch deleted file mode 100644 index 170d2468bc..0000000000 --- a/gnu/packages/patches/gnutls-doc-fix.patch +++ /dev/null @@ -1,546 +0,0 @@ -diff -ru gnutls-3.4.4/doc/invoke-certtool.texi gnutls-3.4.4.1/doc/invoke-certtool.texi ---- gnutls-3.4.4.1/doc/invoke-certtool.texi 2015-08-10 13:43:52.000000000 -0400 -+++ gnutls-3.4.4/doc/invoke-certtool.texi 2015-07-31 15:44:21.000000000 -0400 -@@ -41,7 +41,97 @@ - - @exampleindent 0 - @example --certtool is unavailable - no --help -+certtool - GnuTLS certificate tool -+Usage: certtool [ - [] | --[@{=| @}] ]... -+ -+ -d, --debug=num Enable debugging -+ - it must be in the range: -+ 0 to 9999 -+ -V, --verbose More verbose output -+ - may appear multiple times -+ --infile=file Input file -+ - file must pre-exist -+ --outfile=str Output file -+ -s, --generate-self-signed Generate a self-signed certificate -+ -c, --generate-certificate Generate a signed certificate -+ --generate-proxy Generates a proxy certificate -+ --generate-crl Generate a CRL -+ -u, --update-certificate Update a signed certificate -+ -p, --generate-privkey Generate a private key -+ -q, --generate-request Generate a PKCS #10 certificate request -+ - prohibits the option 'infile' -+ -e, --verify-chain Verify a PEM encoded certificate chain -+ --verify Verify a PEM encoded certificate chain using a trusted list -+ --verify-crl Verify a CRL using a trusted list -+ - requires the option 'load-ca-certificate' -+ --generate-dh-params Generate PKCS #3 encoded Diffie-Hellman parameters -+ --get-dh-params Get the included PKCS #3 encoded Diffie-Hellman parameters -+ --dh-info Print information PKCS #3 encoded Diffie-Hellman parameters -+ --load-privkey=str Loads a private key file -+ --load-pubkey=str Loads a public key file -+ --load-request=str Loads a certificate request file -+ --load-certificate=str Loads a certificate file -+ --load-ca-privkey=str Loads the certificate authority's private key file -+ --load-ca-certificate=str Loads the certificate authority's certificate file -+ --password=str Password to use -+ --null-password Enforce a NULL password -+ --empty-password Enforce an empty password -+ --hex-numbers Print big number in an easier format to parse -+ --cprint In certain operations it prints the information in C-friendly format -+ -i, --certificate-info Print information on the given certificate -+ --certificate-pubkey Print certificate's public key -+ --pgp-certificate-info Print information on the given OpenPGP certificate -+ --pgp-ring-info Print information on the given OpenPGP keyring structure -+ -l, --crl-info Print information on the given CRL structure -+ --crq-info Print information on the given certificate request -+ --no-crq-extensions Do not use extensions in certificate requests -+ --p12-info Print information on a PKCS #12 structure -+ --p12-name=str The PKCS #12 friendly name to use -+ --p7-info Print information on a PKCS #7 structure -+ --smime-to-p7 Convert S/MIME to PKCS #7 structure -+ -k, --key-info Print information on a private key -+ --pgp-key-info Print information on an OpenPGP private key -+ --pubkey-info Print information on a public key -+ --v1 Generate an X.509 version 1 certificate (with no extensions) -+ -!, --to-p12 Generate a PKCS #12 structure -+ - requires the option 'load-certificate' -+ -", --to-p8 Generate a PKCS #8 structure -+ -8, --pkcs8 Use PKCS #8 format for private keys -+ -#, --rsa Generate RSA key -+ -$, --dsa Generate DSA key -+ -%, --ecc Generate ECC (ECDSA) key -+ -&, --ecdsa an alias for the 'ecc' option -+ -', --hash=str Hash algorithm to use for signing -+ -(, --inder Use DER format for input certificates, private keys, and DH parameters -+ - disabled as '--no-inder' -+ -), --inraw an alias for the 'inder' option -+ -*, --outder Use DER format for output certificates, private keys, and DH parameters -+ - disabled as '--no-outder' -+ -+, --outraw an alias for the 'outder' option -+ -,, --bits=num Specify the number of bits for key generate -+ --, --curve=str Specify the curve used for EC key generation -+ -., --sec-param=str Specify the security level [low, legacy, medium, high, ultra] -+ -/, --disable-quick-random No effect -+ -0, --template=str Template file to use for non-interactive operation -+ -1, --stdout-info Print information to stdout instead of stderr -+ -2, --ask-pass Enable interaction for entering password when in batch mode. -+ -3, --pkcs-cipher=str Cipher to use for PKCS #8 and #12 operations -+ -4, --provider=str Specify the PKCS #11 provider library -+ -v, --version[=arg] output version information and exit -+ -h, --help display extended usage information and exit -+ -!, --more-help extended usage information passed thru pager -+ -+Options are specified by doubled hyphens and their name or by a single -+hyphen and the flag character. -+ -+Tool to parse and generate X.509 certificates, requests and private keys. -+It can be used interactively or non interactively by specifying the -+template command line option. -+ -+The tool accepts files or URLs supported by GnuTLS. In case PIN is -+required for the URL access you can provide it using the environment -+variables GNUTLS_PIN and GNUTLS_SO_PIN. -+ - @end example - @exampleindent 4 - -diff -ru gnutls-3.4.4/doc/invoke-gnutls-cli-debug.texi gnutls-3.4.4.1/doc/invoke-gnutls-cli-debug.texi ---- gnutls-3.4.4.1/doc/invoke-gnutls-cli-debug.texi 2015-08-10 13:43:50.000000000 -0400 -+++ gnutls-3.4.4/doc/invoke-gnutls-cli-debug.texi 2015-07-31 15:44:18.000000000 -0400 -@@ -40,7 +40,34 @@ - - @exampleindent 0 - @example --gnutls-cli-debug is unavailable - no --help -+gnutls-cli-debug - GnuTLS debug client -+Usage: gnutls-cli-debug [ - [] | --[@{=| @}] ]... -+ -+ -d, --debug=num Enable debugging -+ - it must be in the range: -+ 0 to 9999 -+ -V, --verbose More verbose output -+ - may appear multiple times -+ -p, --port=num The port to connect to -+ - it must be in the range: -+ 0 to 65536 -+ --app-proto=str The application protocol to be used to obtain the server's certificate -+(https, ftp, smtp, imap) -+ -v, --version[=arg] output version information and exit -+ -h, --help display extended usage information and exit -+ -!, --more-help extended usage information passed thru pager -+ -+Options are specified by doubled hyphens and their name or by a single -+hyphen and the flag character. -+Operands and options may be intermixed. They will be reordered. -+ -+TLS debug client. It sets up multiple TLS connections to a server and -+queries its capabilities. It was created to assist in debugging GnuTLS, -+but it might be useful to extract a TLS server's capabilities. It connects -+to a TLS server, performs tests and print the server's capabilities. If -+called with the `-v' parameter more checks will be performed. Can be used -+to check for servers with special needs or bugs. -+ - @end example - @exampleindent 4 - -diff -ru gnutls-3.4.4/doc/invoke-gnutls-cli.texi gnutls-3.4.4.1/doc/invoke-gnutls-cli.texi ---- gnutls-3.4.4.1/doc/invoke-gnutls-cli.texi 2015-08-10 13:43:49.000000000 -0400 -+++ gnutls-3.4.4/doc/invoke-gnutls-cli.texi 2015-07-31 15:44:17.000000000 -0400 -@@ -36,7 +36,95 @@ - - @exampleindent 0 - @example --gnutls-cli is unavailable - no --help -+gnutls-cli - GnuTLS client -+Usage: gnutls-cli [ - [] | --[@{=| @}] ]... [hostname] -+ -+ -d, --debug=num Enable debugging -+ - it must be in the range: -+ 0 to 9999 -+ -V, --verbose More verbose output -+ - may appear multiple times -+ --tofu Enable trust on first use authentication -+ - disabled as '--no-tofu' -+ --strict-tofu Fail to connect if a known certificate has changed -+ - disabled as '--no-strict-tofu' -+ --dane Enable DANE certificate verification (DNSSEC) -+ - disabled as '--no-dane' -+ --local-dns Use the local DNS server for DNSSEC resolving -+ - disabled as '--no-local-dns' -+ --ca-verification Disable CA certificate verification -+ - disabled as '--no-ca-verification' -+ - enabled by default -+ --ocsp Enable OCSP certificate verification -+ - disabled as '--no-ocsp' -+ -r, --resume Establish a session and resume -+ -e, --rehandshake Establish a session and rehandshake -+ -s, --starttls Connect, establish a plain session and start TLS -+ --app-proto=str an alias for the 'starttls-proto' option -+ --starttls-proto=str The application protocol to be used to obtain the server's certificate -+(https, ftp, smtp, imap) -+ - prohibits the option 'starttls' -+ -u, --udp Use DTLS (datagram TLS) over UDP -+ --mtu=num Set MTU for datagram TLS -+ - it must be in the range: -+ 0 to 17000 -+ --crlf Send CR LF instead of LF -+ --x509fmtder Use DER format for certificates to read from -+ -f, --fingerprint Send the openpgp fingerprint, instead of the key -+ --print-cert Print peer's certificate in PEM format -+ --dh-bits=num The minimum number of bits allowed for DH -+ --priority=str Priorities string -+ --x509cafile=str Certificate file or PKCS #11 URL to use -+ --x509crlfile=file CRL file to use -+ - file must pre-exist -+ --pgpkeyfile=file PGP Key file to use -+ - file must pre-exist -+ --pgpkeyring=file PGP Key ring file to use -+ - file must pre-exist -+ --pgpcertfile=file PGP Public Key (certificate) file to use -+ - file must pre-exist -+ --x509keyfile=str X.509 key file or PKCS #11 URL to use -+ --x509certfile=str X.509 Certificate file or PKCS #11 URL to use -+ --pgpsubkey=str PGP subkey to use (hex or auto) -+ --srpusername=str SRP username to use -+ --srppasswd=str SRP password to use -+ --pskusername=str PSK username to use -+ --pskkey=str PSK key (in hex) to use -+ -p, --port=str The port or service to connect to -+ --insecure Don't abort program if server certificate can't be validated -+ --ranges Use length-hiding padding to prevent traffic analysis -+ --benchmark-ciphers Benchmark individual ciphers -+ --benchmark-tls-kx Benchmark TLS key exchange methods -+ --benchmark-tls-ciphers Benchmark TLS ciphers -+ -l, --list Print a list of the supported algorithms and modes -+ - prohibits the option 'port' -+ --noticket Don't allow session tickets -+ -!, --srtp-profiles=str Offer SRTP profiles -+ -", --alpn=str Application layer protocol -+ - may appear multiple times -+ -b, --heartbeat Activate heartbeat support -+ -#, --recordsize=num The maximum record size to advertize -+ - it must be in the range: -+ 0 to 4096 -+ -$, --disable-sni Do not send a Server Name Indication (SNI) -+ -%, --disable-extensions Disable all the TLS extensions -+ -&, --inline-commands Inline commands of the form ^^ -+ -', --inline-commands-prefix=str Change the default delimiter for inline commands. -+ -(, --provider=file Specify the PKCS #11 provider library -+ - file must pre-exist -+ -), --fips140-mode Reports the status of the FIPS140-2 mode in gnutls library -+ -v, --version[=arg] output version information and exit -+ -h, --help display extended usage information and exit -+ -!, --more-help extended usage information passed thru pager -+ -+Options are specified by doubled hyphens and their name or by a single -+hyphen and the flag character. -+Operands and options may be intermixed. They will be reordered. -+ -+Simple client program to set up a TLS connection to some other computer. It -+sets up a TLS connection and forwards data from the standard input to the -+secured socket and vice versa. -+ - @end example - @exampleindent 4 - -diff -ru gnutls-3.4.4/doc/invoke-gnutls-serv.texi gnutls-3.4.4.1/doc/invoke-gnutls-serv.texi ---- gnutls-3.4.4.1/doc/invoke-gnutls-serv.texi 2015-08-10 13:43:51.000000000 -0400 -+++ gnutls-3.4.4/doc/invoke-gnutls-serv.texi 2015-07-31 15:44:20.000000000 -0400 -@@ -35,7 +35,69 @@ - - @exampleindent 0 - @example --gnutls-serv is unavailable - no --help -+gnutls-serv - GnuTLS server -+Usage: gnutls-serv [ - [] | --[@{=| @}] ]... -+ -+ -d, --debug=num Enable debugging -+ - it must be in the range: -+ 0 to 9999 -+ --noticket Don't accept session tickets -+ -g, --generate Generate Diffie-Hellman and RSA-export parameters -+ -q, --quiet Suppress some messages -+ --nodb Do not use a resumption database -+ --http Act as an HTTP server -+ --echo Act as an Echo server -+ -u, --udp Use DTLS (datagram TLS) over UDP -+ --mtu=num Set MTU for datagram TLS -+ - it must be in the range: -+ 0 to 17000 -+ --srtp-profiles=str Offer SRTP profiles -+ -a, --disable-client-cert Do not request a client certificate -+ -r, --require-client-cert Require a client certificate -+ --verify-client-cert If a client certificate is sent then verify it. -+ -b, --heartbeat Activate heartbeat support -+ --x509fmtder Use DER format for certificates to read from -+ --priority=str Priorities string -+ --dhparams=file DH params file to use -+ - file must pre-exist -+ --x509cafile=str Certificate file or PKCS #11 URL to use -+ --x509crlfile=file CRL file to use -+ - file must pre-exist -+ --pgpkeyfile=file PGP Key file to use -+ - file must pre-exist -+ --pgpkeyring=file PGP Key ring file to use -+ - file must pre-exist -+ --pgpcertfile=file PGP Public Key (certificate) file to use -+ - file must pre-exist -+ --x509keyfile=str X.509 key file or PKCS #11 URL to use -+ --x509certfile=str X.509 Certificate file or PKCS #11 URL to use -+ --x509dsakeyfile=str Alternative X.509 key file or PKCS #11 URL to use -+ --x509dsacertfile=str Alternative X.509 Certificate file or PKCS #11 URL to use -+ --x509ecckeyfile=str Alternative X.509 key file or PKCS #11 URL to use -+ --x509ecccertfile=str Alternative X.509 Certificate file or PKCS #11 URL to use -+ --pgpsubkey=str PGP subkey to use (hex or auto) -+ --srppasswd=file SRP password file to use -+ - file must pre-exist -+ --srppasswdconf=file SRP password configuration file to use -+ - file must pre-exist -+ --pskpasswd=file PSK password file to use -+ - file must pre-exist -+ --pskhint=str PSK identity hint to use -+ --ocsp-response=file The OCSP response to send to client -+ - file must pre-exist -+ -p, --port=num The port to connect to -+ -l, --list Print a list of the supported algorithms and modes -+ --provider=file Specify the PKCS #11 provider library -+ - file must pre-exist -+ -v, --version[=arg] output version information and exit -+ -h, --help display extended usage information and exit -+ -!, --more-help extended usage information passed thru pager -+ -+Options are specified by doubled hyphens and their name or by a single -+hyphen and the flag character. -+ -+Server program that listens to incoming TLS connections. -+ - @end example - @exampleindent 4 - -diff -ru gnutls-3.4.4/doc/invoke-ocsptool.texi gnutls-3.4.4.1/doc/invoke-ocsptool.texi ---- gnutls-3.4.4.1/doc/invoke-ocsptool.texi 2015-08-10 13:43:53.000000000 -0400 -+++ gnutls-3.4.4/doc/invoke-ocsptool.texi 2015-07-31 15:44:22.000000000 -0400 -@@ -37,7 +37,53 @@ - - @exampleindent 0 - @example --ocsptool is unavailable - no --help -+ocsptool - GnuTLS OCSP tool -+Usage: ocsptool [ - [] | --[@{=| @}] ]... -+ -+ -d, --debug=num Enable debugging -+ - it must be in the range: -+ 0 to 9999 -+ -V, --verbose More verbose output -+ - may appear multiple times -+ --infile=file Input file -+ - file must pre-exist -+ --outfile=str Output file -+ --ask[=arg] Ask an OCSP/HTTP server on a certificate validity -+ - requires these options: -+ load-cert -+ load-issuer -+ -e, --verify-response Verify response -+ -i, --request-info Print information on a OCSP request -+ -j, --response-info Print information on a OCSP response -+ -q, --generate-request Generate an OCSP request -+ --nonce Use (or not) a nonce to OCSP request -+ - disabled as '--no-nonce' -+ --load-issuer=file Read issuer certificate from file -+ - file must pre-exist -+ --load-cert=file Read certificate to check from file -+ - file must pre-exist -+ --load-trust=file Read OCSP trust anchors from file -+ - prohibits the option 'load-signer' -+ - file must pre-exist -+ --load-signer=file Read OCSP response signer from file -+ - prohibits the option 'load-trust' -+ - file must pre-exist -+ --inder Use DER format for input certificates and private keys -+ - disabled as '--no-inder' -+ -Q, --load-request=file Read DER encoded OCSP request from file -+ - file must pre-exist -+ -S, --load-response=file Read DER encoded OCSP response from file -+ - file must pre-exist -+ -v, --version[=arg] output version information and exit -+ -h, --help display extended usage information and exit -+ -!, --more-help extended usage information passed thru pager -+ -+Options are specified by doubled hyphens and their name or by a single -+hyphen and the flag character. -+ -+Ocsptool is a program that can parse and print information about OCSP -+requests/responses, generate requests and verify responses. -+ - @end example - @exampleindent 4 - -diff -ru gnutls-3.4.4/doc/invoke-p11tool.texi gnutls-3.4.4.1/doc/invoke-p11tool.texi ---- gnutls-3.4.4.1/doc/invoke-p11tool.texi 2015-08-10 13:43:58.000000000 -0400 -+++ gnutls-3.4.4/doc/invoke-p11tool.texi 2015-07-31 15:44:26.000000000 -0400 -@@ -45,7 +45,97 @@ - - @exampleindent 0 - @example --p11tool is unavailable - no --help -+p11tool - GnuTLS PKCS #11 tool -+Usage: p11tool [ - [] | --[@{=| @}] ]... [url] -+ -+ -d, --debug=num Enable debugging -+ - it must be in the range: -+ 0 to 9999 -+ --outfile=str Output file -+ --list-tokens List all available tokens -+ --export Export the object specified by the URL -+ --export-chain Export the certificate specified by the URL and its chain of trust -+ --list-mechanisms List all available mechanisms in a token -+ --info List information on an available object in a token -+ --list-all List all available objects in a token -+ --list-all-certs List all available certificates in a token -+ --list-certs List all certificates that have an associated private key -+ --list-all-privkeys List all available private keys in a token -+ --list-privkeys an alias for the 'list-all-privkeys' option -+ --list-keys an alias for the 'list-all-privkeys' option -+ --list-all-trusted List all available certificates marked as trusted -+ --write Writes the loaded objects to a PKCS #11 token -+ --delete Deletes the objects matching the PKCS #11 URL -+ --generate-random=num Generate random data -+ --generate-rsa Generate an RSA private-public key pair -+ --generate-dsa Generate an RSA private-public key pair -+ --generate-ecc Generate an RSA private-public key pair -+ --export-pubkey Export the public key for a private key -+ --label=str Sets a label for the write operation -+ --mark-wrap Marks the generated key to be a wrapping key -+ - disabled as '--no-mark-wrap' -+ --mark-trusted Marks the object to be written as trusted -+ - disabled as '--no-mark-trusted' -+ --mark-ca Marks the object to be written as a CA -+ - disabled as '--no-mark-ca' -+ --mark-private Marks the object to be written as private -+ - disabled as '--no-mark-private' -+ - enabled by default -+ --trusted an alias for the 'mark-trusted' option -+ --ca an alias for the 'mark-ca' option -+ --private an alias for the 'mark-private' option -+ - enabled by default -+ --login Force (user) login to token -+ - disabled as '--no-login' -+ --so-login Force security officer login to token -+ - disabled as '--no-so-login' -+ --admin-login an alias for the 'so-login' option -+ --detailed-url Print detailed URLs -+ - disabled as '--no-detailed-url' -+ -!, --secret-key=str Provide a hex encoded secret key -+ -", --load-privkey=file Private key file to use -+ - file must pre-exist -+ -#, --load-pubkey=file Public key file to use -+ - file must pre-exist -+ -$, --load-certificate=file Certificate file to use -+ - file must pre-exist -+ -8, --pkcs8 Use PKCS #8 format for private keys -+ -%, --bits=num Specify the number of bits for key generate -+ -&, --curve=str Specify the curve used for EC key generation -+ -', --sec-param=str Specify the security level -+ -(, --inder Use DER/RAW format for input -+ - disabled as '--no-inder' -+ -), --inraw an alias for the 'inder' option -+ -*, --outder Use DER format for output certificates, private keys, and DH parameters -+ - disabled as '--no-outder' -+ -+, --outraw an alias for the 'outder' option -+ -,, --initialize Initializes a PKCS #11 token -+ --, --set-pin=str Specify the PIN to use on token initialization -+ -., --set-so-pin=str Specify the Security Officer's PIN to use on token initialization -+ -/, --provider=file Specify the PKCS #11 provider library -+ - file must pre-exist -+ -0, --batch Disable all interaction with the tool. All parameters need to be -+specified on command line. -+ -v, --version[=arg] output version information and exit -+ -h, --help display extended usage information and exit -+ -!, --more-help extended usage information passed thru pager -+ -+Options are specified by doubled hyphens and their name or by a single -+hyphen and the flag character. -+Operands and options may be intermixed. They will be reordered. -+ -+Program that allows operations on PKCS #11 smart cards and security -+modules. -+ -+To use PKCS #11 tokens with GnuTLS the p11-kit configuration files need to -+be setup. That is create a .module file in /etc/pkcs11/modules with the -+contents 'module: /path/to/pkcs11.so'. Alternatively the configuration -+file /etc/gnutls/pkcs11.conf has to exist and contain a number of lines of -+the form 'load=/usr/lib/opensc-pkcs11.so'. -+ -+You can provide the PIN to be used for the PKCS #11 operations with the -+environment variables GNUTLS_PIN and GNUTLS_SO_PIN. -+ - @end example - @exampleindent 4 - -diff -ru gnutls-3.4.4/doc/invoke-psktool.texi gnutls-3.4.4.1/doc/invoke-psktool.texi ---- gnutls-3.4.4.1/doc/invoke-psktool.texi 2015-08-10 13:43:57.000000000 -0400 -+++ gnutls-3.4.4/doc/invoke-psktool.texi 2015-07-31 15:44:25.000000000 -0400 -@@ -36,7 +36,27 @@ - - @exampleindent 0 - @example --psktool is unavailable - no --help -+psktool - GnuTLS PSK tool -+Usage: psktool [ - [] | --[@{=| @}] ]... -+ -+ -d, --debug=num Enable debugging -+ - it must be in the range: -+ 0 to 9999 -+ -s, --keysize=num specify the key size in bytes -+ - it must be in the range: -+ 0 to 512 -+ -u, --username=str specify a username -+ -p, --passwd=str specify a password file -+ -v, --version[=arg] output version information and exit -+ -h, --help display extended usage information and exit -+ -!, --more-help extended usage information passed thru pager -+ -+Options are specified by doubled hyphens and their name or by a single -+hyphen and the flag character. -+ -+Program that generates random keys for use with TLS-PSK. The keys are -+stored in hexadecimal format in a key file. -+ - @end example - @exampleindent 4 - -diff -ru gnutls-3.4.4/doc/invoke-srptool.texi gnutls-3.4.4.1/doc/invoke-srptool.texi ---- gnutls-3.4.4.1/doc/invoke-srptool.texi 2015-08-10 13:43:56.000000000 -0400 -+++ gnutls-3.4.4/doc/invoke-srptool.texi 2015-07-31 15:44:24.000000000 -0400 -@@ -41,7 +41,34 @@ - - @exampleindent 0 - @example --srptool is unavailable - no --help -+srptool - GnuTLS SRP tool -+Usage: srptool [ - [] | --[@{=| @}] ]... -+ -+ -d, --debug=num Enable debugging -+ - it must be in the range: -+ 0 to 9999 -+ -i, --index=num specify the index of the group parameters in tpasswd.conf to use -+ -u, --username=str specify a username -+ -p, --passwd=str specify a password file -+ -s, --salt=num specify salt size -+ --verify just verify the password. -+ -v, --passwd-conf=str specify a password conf file. -+ --create-conf=str Generate a password configuration file. -+ -v, --version[=arg] output version information and exit -+ -h, --help display extended usage information and exit -+ -!, --more-help extended usage information passed thru pager -+ -+Options are specified by doubled hyphens and their name or by a single -+hyphen and the flag character. -+ -+Simple program that emulates the programs in the Stanford SRP (Secure -+Remote Password) libraries using GnuTLS. It is intended for use in places -+where you don't expect SRP authentication to be the used for system users. -+ -+In brief, to use SRP you need to create two files. These are the password -+file that holds the users and the verifiers associated with them and the -+configuration file to hold the group parameters (called tpasswd.conf). -+ - @end example - @exampleindent 4 - diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 494128eeae..c10d1cbfc7 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -107,7 +107,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.4.5") + (version "3.4.7") (source (origin (method url-fetch) (uri @@ -118,8 +118,7 @@ living in the same process.") "/gnutls-" version ".tar.xz")) (sha256 (base32 - "1bks1zpmhmnkz2v32dd9b44pz6x0a5w4yi9zzwsd0a078vhbi25g")) - (patches (list (search-patch "gnutls-doc-fix.patch"))))) + "0nifi3mr5jhz608pidkp8cjs4vwfj1m2qczsjrgpnp99615rxgn1")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -142,13 +141,6 @@ living in the same process.") "--without-p11-kit") #:phases (modify-phases %standard-phases - (add-after - 'unpack 'delete-prebuilt-unfixed-info-file - (lambda _ - ;; XXX Delete the prebuilt info file, so that it will be - ;; rebuilt with the fixes in gnutls-doc-fix.patch. - (delete-file "doc/gnutls.info") - #t)) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) @@ -166,7 +158,6 @@ living in the same process.") "doc")) ;4.1 MiB of man pages (native-inputs `(("pkg-config" ,pkg-config) - ("texinfo" ,texinfo) ; XXX needed only to replace prebuilt, unfixed docs. ("which" ,which))) (inputs `(("guile" ,guile-2.0) -- cgit v1.2.3 From d99861d39d19260659a509e22b053709b853451a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 5 Jan 2016 21:01:27 +0200 Subject: gnu: gettext: Update to 0.19.7. * gnu/packages/gettext.scm (gettext): Update to 0.19.7. --- gnu/packages/gettext.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 3c006e1edb..3dc3b2f8bc 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,14 +41,14 @@ (define-public gnu-gettext (package (name "gettext") - (version "0.19.6") + (version "0.19.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gettext/gettext-" version ".tar.gz")) (sha256 (base32 - "0pb9vp4ifymvdmc31ks3xxcnfqgzj8shll39czmk8c1splclqjzd")))) + "0gy2b2aydj8r0sapadnjw8cmb8j2rynj28d5qs1mfa800njd51jk")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of HTML -- cgit v1.2.3 From e5f037624e42e9b388d1a68a24b77bc2283c58f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 5 Jan 2016 21:13:57 +0200 Subject: gnu: gettext: Use "modify-phases" syntax. * gnu/packages/gettext.scm (gettext)[arguments]: Use "modify-phases" syntax. --- gnu/packages/gettext.scm | 59 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 3dc3b2f8bc..7cd1ab73e7 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -55,38 +55,37 @@ (inputs `(("expat" ,expat))) (arguments - `(#:phases (alist-cons-before - 'check 'patch-tests - (lambda* (#:key inputs #:allow-other-keys) - (let* ((bash (which "sh"))) - ;; Some of the files we're patching are - ;; ISO-8859-1-encoded, so choose it as the default - ;; encoding so the byte encoding is preserved. - (with-fluids ((%default-port-encoding #f)) - (substitute* - (find-files "gettext-tools/tests" - "^(lang-sh|msg(exec|filter)-[0-9])") - (("#![[:blank:]]/bin/sh") - (format #f "#!~a" bash))) + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let* ((bash (which "sh"))) + ;; Some of the files we're patching are + ;; ISO-8859-1-encoded, so choose it as the default + ;; encoding so the byte encoding is preserved. + (with-fluids ((%default-port-encoding #f)) + (substitute* + (find-files "gettext-tools/tests" + "^(lang-sh|msg(exec|filter)-[0-9])") + (("#![[:blank:]]/bin/sh") + (format #f "#!~a" bash))) - (substitute* (cons "gettext-tools/src/msginit.c" - (find-files "gettext-tools/gnulib-tests" - "posix_spawn")) - (("/bin/sh") - bash)) + (substitute* (cons "gettext-tools/src/msginit.c" + (find-files "gettext-tools/gnulib-tests" + "posix_spawn")) + (("/bin/sh") + bash)) - (substitute* "gettext-tools/src/project-id" - (("/bin/pwd") - "pwd"))))) - (alist-cons-before - 'configure 'link-expat - (lambda _ - ;; Gettext defaults to opening expat via dlopen on - ;; "Linux". Change to link directly. - (substitute* "gettext-tools/configure" - (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"") - (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\""))) - %standard-phases)) + (substitute* "gettext-tools/src/project-id" + (("/bin/pwd") + "pwd")))))) + (add-before 'configure 'link-expat + (lambda _ + ;; Gettext defaults to opening expat via dlopen on + ;; "Linux". Change to link directly. + (substitute* "gettext-tools/configure" + (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"") + (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\""))))) ;; When tests fail, we want to know the details. #:make-flags '("VERBOSE=yes"))) -- cgit v1.2.3 From bfcb7bcb739c6c0cc5c564b5f2bc94e0aa33a556 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Jan 2016 20:28:57 +0200 Subject: gnu: libffi: Update to 3.2.1. * gnu/packages/libffi.scm (libffi): Update to 3.2.1. --- gnu/packages/libffi.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 33e10d6fc2..83af7fde68 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,11 +30,11 @@ ;; available in $includedir where some users expect them. '(lambda* (#:key outputs #:allow-other-keys) (define out (assoc-ref outputs "out")) - (symlink (string-append out "/lib/libffi-3.1/include") + (symlink (string-append out "/lib/libffi-3.2.1/include") (string-append out "/include"))))) (package (name "libffi") - (version "3.1") + (version "3.2.1") (source (origin (method url-fetch) (uri @@ -41,7 +42,7 @@ name "-" version ".tar.gz")) (sha256 (base32 - "1sznmrhcswwbyqla9y2ximlkzbxks59wjfs3lh7qf8ayranyxzlp")))) + "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh")))) (build-system gnu-build-system) (arguments `(#:phases (alist-cons-after 'install 'post-install ,post-install-phase -- cgit v1.2.3 From 93b3a8b0eeabeca960a178754589c6461b38baf5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 7 Jan 2016 08:42:15 +0200 Subject: gnu: flex: Update to 2.6.0. * gnu/packages/flex.scm (flex): Update to 2.6.0. [source]: Remove flex-bison-tests.patch. * gnu-system.am (dist_patch_DATA): Remove flex-bison-tests.patch. * gnu/packages/patches/flex-bison-tests.patch: Remove it. --- gnu-system.am | 1 - gnu/packages/flex.scm | 6 +++--- gnu/packages/patches/flex-bison-tests.patch | 24 ------------------------ 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/flex-bison-tests.patch diff --git a/gnu-system.am b/gnu-system.am index 7fb1089c66..0f0fabc302 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -463,7 +463,6 @@ dist_patch_DATA = \ gnu/packages/patches/findutils-localstatedir.patch \ gnu/packages/patches/findutils-test-xargs.patch \ gnu/packages/patches/flashrom-use-libftdi1.patch \ - gnu/packages/patches/flex-bison-tests.patch \ gnu/packages/patches/flint-ldconfig.patch \ gnu/packages/patches/fltk-shared-lib-defines.patch \ gnu/packages/patches/freeimage-CVE-2015-0852.patch \ diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 7988e930e7..f8d5ccd032 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,15 +32,14 @@ (define flex (package (name "flex") - (version "2.5.37") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/flex/flex-" version ".tar.bz2")) (sha256 (base32 - "0ah5mi4j62b85a9rllv1004mzjb5cd0mn4glvz13p88rpx77pahp")) - (patches (list (search-patch "flex-bison-tests.patch"))))) + "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4")))) (build-system gnu-build-system) (inputs (let ((bison-for-tests diff --git a/gnu/packages/patches/flex-bison-tests.patch b/gnu/packages/patches/flex-bison-tests.patch deleted file mode 100644 index 0f372f83bf..0000000000 --- a/gnu/packages/patches/flex-bison-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -The `test-bison-yyl{loc,val}' tests fail with "conflicting types for -'testparse'" because `YYPARSE_PARAM' is undefined; work around that. - ---- flex-2.5.37/tests/test-bison-yylloc/main.c 2012-11-22 18:17:01.000000000 +0100 -+++ flex-2.5.37/tests/test-bison-yylloc/main.c 2012-11-22 18:17:07.000000000 +0100 -@@ -21,6 +21,7 @@ - * PURPOSE. - */ - -+#define YYPARSE_PARAM scanner - #include "parser.h" - #include "scanner.h" - - ---- flex-2.5.37/tests/test-bison-yylval/main.c 2012-11-22 18:17:42.000000000 +0100 -+++ flex-2.5.37/tests/test-bison-yylval/main.c 2012-11-22 18:17:49.000000000 +0100 -@@ -21,6 +21,7 @@ - * PURPOSE. - */ - -+#define YYPARSE_PARAM scanner - #include "parser.h" - #include "scanner.h" - -- cgit v1.2.3 From b24765139c8940541b23f84592d3580d53f71d71 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 7 Jan 2016 12:37:37 +0200 Subject: gnu: sqlite: Update to 3.10.0. * gnu/packages/databases.scm (sqlite): Update to 3.10.0. --- gnu/packages/databases.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b0f973b6aa..4bb3b4d1e2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015 Leo Famulari +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -338,7 +339,7 @@ types are supported, as is encryption.") (define-public sqlite (package (name "sqlite") - (version "3.8.11.1") + (version "3.10.0") (source (origin (method url-fetch) ;; TODO: Download from sqlite.org once this bug : @@ -369,7 +370,7 @@ types are supported, as is encryption.") )) (sha256 (base32 - "1dnkl4qr1dgaprbyf3jddfiynkhxnin86qabni47wjlc0fnb16gv")))) + "0hhhv6si0pyf5i8bv7a71953m0b4gk6s3j2h09caf7vif0njkk23")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 209e09fa10acc5b21ed1155d8ac5d1a689f1c85e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 8 Jan 2016 06:39:12 +0200 Subject: gnu: zlib: Update to 1.2.8. * gnu/packages/compression.scm (zlib): Update to 1.2.8. --- gnu/packages/compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 41d9b0d8d7..7d22095df1 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2015 Jeff Mickey -;;; Copyright © 2015 Efraim Flashner +;;; Copyright © 2015, 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +40,7 @@ (define-public zlib (package (name "zlib") - (version "1.2.7") + (version "1.2.8") (source (origin (method url-fetch) @@ -50,7 +50,7 @@ version ".tar.gz"))) (sha256 (base32 - "1i96gsdvxqb6skp9a58bacf1wxamwi9m9pg4yn7cpf7g7239r77s")))) + "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n")))) (build-system gnu-build-system) (arguments `(#:phases (alist-replace -- cgit v1.2.3 From 20c620d0a4cd4146262df3195856f2d9ce40de23 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 8 Jan 2016 10:58:05 +0100 Subject: gnu: attr: Use 'modify-phases'. * gnu/packages/attr.scm (attr)[arguments]: Use 'modify-phases'. --- gnu/packages/attr.scm | 65 ++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/gnu/packages/attr.scm b/gnu/packages/attr.scm index f4f6c46642..2b55ccd278 100644 --- a/gnu/packages/attr.scm +++ b/gnu/packages/attr.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2012, 2013, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,45 +29,40 @@ (package (name "attr") (version "2.4.46") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://savannah/attr/attr-" - version ".src.tar.gz")) - (sha256 - (base32 - "07qf6kb2zk512az481bbnsk9jycn477xpva1a726n5pzlzf9pmnw")))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/attr/attr-" + version ".src.tar.gz")) + (sha256 + (base32 + "07qf6kb2zk512az481bbnsk9jycn477xpva1a726n5pzlzf9pmnw")))) (build-system gnu-build-system) (arguments `(#:phases - (alist-cons-after - 'configure 'patch-makefile-SHELL - (lambda _ - (patch-makefile-SHELL "include/buildmacros")) - (alist-replace - 'install - (lambda _ - (zero? (system* "make" - "install" - "install-lib" - "install-dev"))) + (modify-phases %standard-phases + (add-after 'configure 'patch-makefile-SHELL + (lambda _ + (patch-makefile-SHELL "include/buildmacros"))) + (replace 'install + (lambda _ + (zero? (system* "make" + "install" + "install-lib" + "install-dev")))) + (replace 'check + (lambda* (#:key target #:allow-other-keys) + ;; Use the right shell. + (substitute* "test/run" + (("/bin/sh") + (which "bash"))) - ;; When building natively, adjust the test cases. - ,(if (%current-target-system) - '%standard-phases - '(alist-replace 'check - (lambda _ - ;; Use the right shell. - (substitute* "test/run" - (("/bin/sh") - (which "bash"))) + ;; When building natively, run the tests. + (unless target + (system* "make" "tests" "-C" "test")) - (system* "make" "tests" "-C" "test") - - ;; XXX: Ignore the test result since this is - ;; dependent on the underlying file system. - #t) - %standard-phases)))))) + ;; XXX: Ignore the test result since this is + ;; dependent on the underlying file system. + #t))))) (inputs ;; Perl is needed to run tests; remove it from cross builds. (if (%current-target-system) -- cgit v1.2.3 From 195f557ed54a23c45db0cf70ab8198ac69fb46e7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 8 Jan 2016 11:45:37 +0100 Subject: gnu: attr: Update to 2.4.47. * gnu/packages/attr.scm (attr): Update to 2.4.47. --- gnu/packages/attr.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/attr.scm b/gnu/packages/attr.scm index 2b55ccd278..53766af06f 100644 --- a/gnu/packages/attr.scm +++ b/gnu/packages/attr.scm @@ -28,14 +28,14 @@ (define-public attr (package (name "attr") - (version "2.4.46") + (version "2.4.47") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/attr/attr-" version ".src.tar.gz")) (sha256 (base32 - "07qf6kb2zk512az481bbnsk9jycn477xpva1a726n5pzlzf9pmnw")))) + "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3918146b6179f211fb7ef955f74561f9b1460a8b Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Wed, 6 Jan 2016 21:23:15 +1000 Subject: gnu: ruby-power-assert: Update to 0.2.7. * gnu/packages/ruby.scm (ruby-power-assert): Update to 0.2.7. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 47ac392aa6..d3e6dbcfa2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2015 David Thompson ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2015 Ben Woodcroft +;;; Copyright © 2015, 2016 Ben Woodcroft ;;; ;;; This file is part of GNU Guix. ;;; @@ -1059,13 +1059,13 @@ using Net::HTTP, supporting reconnection and retry according to RFC 2616.") (define-public ruby-power-assert (package (name "ruby-power-assert") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) (uri (rubygems-uri "power_assert" version)) (sha256 (base32 - "0gbj379jhnff8rbb6m3kzdm282szjz1a021xzxa38d1bnswj2jx3")))) + "0ka6w71lcan4wgf111xi3pcn9ma9lhakv31jg8w007nwzi0xfjbi")))) (build-system ruby-build-system) (native-inputs `(("bundler" ,bundler))) -- cgit v1.2.3 From 048036aee522d6a03436bf530d139ec26d8a438e Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Wed, 6 Jan 2016 21:57:44 +1000 Subject: gnu: ruby-yard: Disable failing test. * gnu/packages/ruby.scm (ruby-yard)[arguments]: Disable test which fails on Ruby 2.3.0. --- gnu/packages/ruby.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d3e6dbcfa2..61c6c3cdc7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2776,9 +2776,17 @@ features such as filtering and fine grained logging.") `(#:test-target "specs" #:phases (modify-phases %standard-phases - (add-before 'check 'set-HOME - ;; $HOME needs to be set to somewhere writeable for tests to run - (lambda _ (setenv "HOME" "/tmp") #t))))) + (add-before 'check 'set-HOME-and-disable-failing-test + (lambda _ + ;; $HOME needs to be set to somewhere writeable for tests to run + (setenv "HOME" "/tmp") + ;; Disable tests which fails on Ruby 2.3. See + ;; https://github.com/lsegal/yard/issues/927 + (substitute* "spec/parser/ruby/ruby_parser_spec.rb" + (("comment.type.should == :comment") "") + (("comment.docstring_hash_flag.should be_true") "") + (("comment.docstring.strip.should == .*") "")) + #t))))) (native-inputs `(("ruby-rspec" ,ruby-rspec-2) ("ruby-rack" ,ruby-rack))) -- cgit v1.2.3 From 761e7042f633b05bee988aeb941d7c7bf20b9b3c Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 8 Jan 2016 17:29:39 +1000 Subject: ruby: Abstract out path to GEM_HOME. Previously paths to the GEM_HOME of certain Ruby packages were hard-coded, so packages failed to build when Ruby was updated to 2.3.0. * guix/build/ruby-build-system.scm (gem-home): New procedure. * gnu/packages/ruby.scm (ruby-metaclass, ruby-instantiator, ruby-introspection, ruby-mocha, ruby-minitest-tu-shim): Use it. --- gnu/packages/ruby.scm | 94 +++++++++++++++++++++++----------------- guix/build/ruby-build-system.scm | 13 +++++- 2 files changed, 67 insertions(+), 40 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 61c6c3cdc7..1d00835cd7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1212,15 +1212,18 @@ It allows writing tests, checking results and automated testing in Ruby.") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'add-test-unit-to-search-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Rakefile" - (("t\\.libs << \"test\"" line) - (string-append line "; t.libs << \"" - (assoc-ref inputs "ruby-test-unit") - "/lib/ruby/gems/2.2.0/gems/test-unit-" - ,(package-version ruby-test-unit) - "/lib\""))) - #t))))) + (lambda* (#:key inputs #:allow-other-keys) + (let* ((test-unit (assoc-ref inputs "ruby-test-unit")) + (test-unit-home (gem-home test-unit + ,(package-version ruby)))) + (substitute* "Rakefile" + (("t\\.libs << \"test\"" line) + (string-append line "; t.libs << \"" + test-unit-home + "/gems/test-unit-" + ,(package-version ruby-test-unit) + "/lib\"")))) + #t))))) (native-inputs `(("bundler" ,bundler) ("ruby-test-unit" ,ruby-test-unit))) @@ -1274,15 +1277,18 @@ as a base class when writing classes that depend upon `(#:phases (modify-phases %standard-phases (add-after 'unpack 'add-test-unit-to-search-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Rakefile" - (("t\\.libs << \"test\"" line) - (string-append line "; t.libs << \"" - (assoc-ref inputs "ruby-test-unit") - "/lib/ruby/gems/2.2.0/gems/test-unit-" - ,(package-version ruby-test-unit) - "/lib\""))) - #t))))) + (lambda* (#:key inputs #:allow-other-keys) + (let* ((test-unit (assoc-ref inputs "ruby-test-unit")) + (test-unit-home (gem-home test-unit ,(package-version + ruby)))) + (substitute* "Rakefile" + (("t\\.libs << \"test\"" line) + (string-append line "; t.libs << \"" + test-unit-home + "/gems/test-unit-" + ,(package-version ruby-test-unit) + "/lib\"")))) + #t))))) (propagated-inputs `(("ruby-blankslate" ,ruby-blankslate))) (native-inputs @@ -1311,13 +1317,16 @@ knowing anything about the constructor.") (modify-phases %standard-phases (add-after 'unpack 'add-test-unit-to-search-path (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Rakefile" - (("t\\.libs << \"test\"" line) - (string-append line "; t.libs << \"" - (assoc-ref inputs "ruby-test-unit") - "/lib/ruby/gems/2.2.0/gems/test-unit-" - ,(package-version ruby-test-unit) - "/lib\""))) + (let* ((test-unit (assoc-ref inputs "ruby-test-unit")) + (test-unit-home (gem-home test-unit ,(package-version + ruby)))) + (substitute* "Rakefile" + (("t\\.libs << \"test\"" line) + (string-append line "; t.libs << \"" + test-unit-home + "/gems/test-unit-" + ,(package-version ruby-test-unit) + "/lib\"")))) #t))))) (propagated-inputs `(("ruby-instantiator" ,ruby-instantiator) @@ -1381,13 +1390,16 @@ conversion to (X)HTML.") (modify-phases %standard-phases (add-after 'unpack 'add-test-unit-to-search-path (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Rakefile" - (("t\\.libs << 'test'" line) - (string-append line "; t.libs << \"" - (assoc-ref inputs "ruby-test-unit") - "/lib/ruby/gems/2.2.0/gems/test-unit-" - ,(package-version ruby-test-unit) - "/lib\""))) + (let* ((test-unit (assoc-ref inputs "ruby-test-unit")) + (test-unit-home (gem-home test-unit + ,(package-version ruby)))) + (substitute* "Rakefile" + (("t\\.libs << 'test'" line) + (string-append line "; t.libs << \"" + test-unit-home + "/gems/test-unit-" + ,(package-version ruby-test-unit) + "/lib\"")))) #t)) (add-before 'check 'use-latest-redcarpet (lambda _ @@ -2047,13 +2059,17 @@ development of Ruby gems.") (modify-phases %standard-phases (add-after 'unpack 'fix-test-include-path (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Rakefile" - (("Hoe\\.add_include_dirs .*") - (string-append "Hoe.add_include_dirs \"" - (assoc-ref inputs "ruby-minitest-4") - "/lib/ruby/gems/2.2.0/gems/minitest-" - ,(package-version ruby-minitest-4) - "/lib" "\""))))) + (let* ((minitest (assoc-ref inputs "ruby-minitest-4")) + (minitest-home (gem-home minitest + ,(package-version ruby)))) + (substitute* "Rakefile" + (("Hoe\\.add_include_dirs .*") + (string-append "Hoe.add_include_dirs \"" + minitest-home + "/gems/minitest-" + ,(package-version ruby-minitest-4) + "/lib" "\"")))) + #t)) (add-before 'check 'fix-test-assumptions (lambda _ ;; The test output includes the file name, so a couple of tests diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm index 2685da1a72..18da43866d 100644 --- a/guix/build/ruby-build-system.scm +++ b/guix/build/ruby-build-system.scm @@ -26,7 +26,8 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases - ruby-build)) + ruby-build + gem-home)) ;; Commentary: ;; @@ -136,3 +137,13 @@ GEM-FLAGS are passed to the 'gem' invokation, if present." (define* (ruby-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) (apply gnu:gnu-build #:inputs inputs #:phases phases args)) + +(define (gem-home store-path ruby-version) + "Return a string to the gem home directory in the store given a STORE-PATH +and the RUBY-VERSION used to build that ruby package" + (string-append + store-path + "/lib/ruby/gems/" + (regexp-substitute #f + (string-match "^[0-9]+\\.[0-9]+" ruby-version) + 0 ".0"))) -- cgit v1.2.3 From 9656b8bec5730b5da2b4633564b26ff3a1e92d8b Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sun, 10 Jan 2016 22:25:45 +1000 Subject: gnu: ruby: Use modify-phases. * gnu/packages/ruby.scm (ruby)[arguments]: Use modify-phases. --- gnu/packages/ruby.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1d00835cd7..2fac187fd9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -61,22 +61,22 @@ `(#:test-target "test" #:parallel-tests? #f #:phases - (alist-cons-before - 'configure 'replace-bin-sh - (lambda _ - (substitute* '("Makefile.in" - "ext/pty/pty.c" - "io.c" - "lib/mkmf.rb" - "process.c" - "test/rubygems/test_gem_ext_configure_builder.rb" - "test/rdoc/test_rdoc_parser.rb" - "test/ruby/test_rubyoptions.rb" - "test/ruby/test_process.rb" - "test/ruby/test_system.rb" - "tool/rbinstall.rb") - (("/bin/sh") (which "sh")))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'replace-bin-sh + (lambda _ + (substitute* '("Makefile.in" + "ext/pty/pty.c" + "io.c" + "lib/mkmf.rb" + "process.c" + "test/rubygems/test_gem_ext_configure_builder.rb" + "test/rdoc/test_rdoc_parser.rb" + "test/ruby/test_rubyoptions.rb" + "test/ruby/test_process.rb" + "test/ruby/test_system.rb" + "tool/rbinstall.rb") + (("/bin/sh") (which "sh"))) + #t))))) (inputs `(("readline" ,readline) ("openssl" ,openssl) -- cgit v1.2.3 From 65e84e317633ce3126d87d4dc731a119aaaebf70 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 4 Jan 2016 09:38:42 +1000 Subject: gnu: ruby: Update to 2.3.0. * gnu/packages/ruby.scm (ruby): Update to 2.3.0. [source]: Remove bundled libffi. [arguments]: Use parallel tests. (ruby-2.2): New variable. --- gnu/packages/ruby.scm | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2fac187fd9..2977f94660 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -46,7 +46,7 @@ (define-public ruby (package (name "ruby") - (version "2.2.4") + (version "2.3.0") (source (origin (method url-fetch) @@ -55,14 +55,19 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "0g3ps4q3iz7wj9m45n8xyxzw8nh29ljdqb87b0f6i0p3853gz2yj")))) + "15s0dsb5ynf3d2w5gzawnszq5594fqvapv2y7a0qw16przq5l4kh")) + (modules '((guix build utils))) + (snippet `(begin + ;; Remove bundled libffi + (delete-file-recursively + (string-append "ext/fiddle/libffi-3.2.1")) + #t)))) (build-system gnu-build-system) (arguments `(#:test-target "test" - #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-before 'configure 'replace-bin-sh + (add-before 'configure 'replace-bin-sh-and-remove-libffi (lambda _ (substitute* '("Makefile.in" "ext/pty/pty.c" @@ -95,6 +100,25 @@ a focus on simplicity and productivity.") (home-page "https://ruby-lang.org") (license license:ruby))) +(define-public ruby-2.2 + (package (inherit ruby) + (version "2.2.4") + (source + (origin + (method url-fetch) + (uri (string-append "http://cache.ruby-lang.org/pub/ruby/" + (version-major+minor version) + "/ruby-" version ".tar.xz")) + (sha256 + (base32 + "0g3ps4q3iz7wj9m45n8xyxzw8nh29ljdqb87b0f6i0p3853gz2yj")) + (modules '((guix build utils))) + (snippet `(begin + ;; Remove bundled libffi + (delete-file-recursively + (string-append "ext/fiddle/libffi-3.2.1")) + #t)))))) + (define-public ruby-2.1 (package (inherit ruby) (version "2.1.6") -- cgit v1.2.3 From ce3ac6670c211779127ca4995a6c7e9511df1156 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 12 Jan 2016 13:10:05 -0500 Subject: gnu: perl: Update to 5.22.1. * gnu/packages/perl.scm (perl): Update to 5.22.1. --- gnu/packages/perl.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index df0a3152a9..86a979f9fc 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Eric Dvorsak +;;; Copyright © 2016 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,14 +38,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.22.0") + (version "5.22.1") (source (origin (method url-fetch) (uri (string-append "http://www.cpan.org/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "0g5bl8sdpzx9gx2g5jq3py4bj07z2ylk7s1qn0fvsss2yl3hhs8c")) + "09wg24w5syyafyv87l6z8pxwz4bjgcdj996bx5844k6m9445sirb")) (patches (map search-patch '("perl-no-sys-dirs.patch" "perl-autosplit-default-time.patch" -- cgit v1.2.3 From 203795aceaabec0e0e5818e1650ad407d825d1b3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 12 Jan 2016 13:12:07 -0500 Subject: gnu: perl: Add fix for CVE-2015-8607. * gnu/packages/patches/perl-CVE-2015-8607.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/perl.scm (perl)[source]: Add patch. --- gnu-system.am | 3 +- gnu/packages/patches/perl-CVE-2015-8607.patch | 68 +++++++++++++++++++++++++++ gnu/packages/perl.scm | 3 +- 3 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/perl-CVE-2015-8607.patch diff --git a/gnu-system.am b/gnu-system.am index 0f0fabc302..112e404ffb 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -1,7 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès # Copyright © 2013, 2014, 2015 Andreas Enge -# Copyright © 2013, 2014, 2015 Mark H Weaver +# Copyright © 2013, 2014, 2015, 2016 Mark H Weaver # # This file is part of GNU Guix. # @@ -612,6 +612,7 @@ dist_patch_DATA = \ gnu/packages/patches/patchelf-rework-for-arm.patch \ gnu/packages/patches/patchutils-xfail-gendiff-tests.patch \ gnu/packages/patches/patch-hurd-path-max.patch \ + gnu/packages/patches/perl-CVE-2015-8607.patch \ gnu/packages/patches/perl-autosplit-default-time.patch \ gnu/packages/patches/perl-deterministic-ordering.patch \ gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ diff --git a/gnu/packages/patches/perl-CVE-2015-8607.patch b/gnu/packages/patches/perl-CVE-2015-8607.patch new file mode 100644 index 0000000000..4c25d41740 --- /dev/null +++ b/gnu/packages/patches/perl-CVE-2015-8607.patch @@ -0,0 +1,68 @@ +From 3a629609084d147838368262171b923f0770e564 Mon Sep 17 00:00:00 2001 +From: Tony Cook +Date: Tue, 15 Dec 2015 10:56:54 +1100 +Subject: ensure File::Spec::canonpath() preserves taint + +Previously the unix specific XS implementation of canonpath() would +return an untainted path when supplied a tainted path. + +For the empty string case, newSVpvs() already sets taint as needed on +its result. + +This issue was assigned CVE-2015-8607. + +Bug: https://rt.perl.org/Ticket/Display.html?id=126862 +Bug-Debian: https://bugs.debian.org/810719 +Origin: upstream +Patch-Name: fixes/CVE-2015-8607_file_spec_taint_fix.diff +--- + dist/PathTools/Cwd.xs | 1 + + dist/PathTools/t/taint.t | 19 ++++++++++++++++++- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/dist/PathTools/Cwd.xs b/dist/PathTools/Cwd.xs +index 9d4dcf0..3d018dc 100644 +--- a/dist/PathTools/Cwd.xs ++++ b/dist/PathTools/Cwd.xs +@@ -535,6 +535,7 @@ THX_unix_canonpath(pTHX_ SV *path) + *o = 0; + SvPOK_on(retval); + SvCUR_set(retval, o - SvPVX(retval)); ++ SvTAINT(retval); + return retval; + } + +diff --git a/dist/PathTools/t/taint.t b/dist/PathTools/t/taint.t +index 309b3e5..48f8c5b 100644 +--- a/dist/PathTools/t/taint.t ++++ b/dist/PathTools/t/taint.t +@@ -12,7 +12,7 @@ use Test::More; + BEGIN { + plan( + ${^TAINT} +- ? (tests => 17) ++ ? (tests => 21) + : (skip_all => "A perl without taint support") + ); + } +@@ -34,3 +34,20 @@ foreach my $func (@Functions) { + + # Previous versions of Cwd tainted $^O + is !tainted($^O), 1, "\$^O should not be tainted"; ++ ++{ ++ # [perl #126862] canonpath() loses taint ++ my $tainted = substr($ENV{PATH}, 0, 0); ++ # yes, getcwd()'s result should be tainted, and is tested above ++ # but be sure ++ ok tainted(File::Spec->canonpath($tainted . Cwd::getcwd)), ++ "canonpath() keeps taint on non-empty string"; ++ ok tainted(File::Spec->canonpath($tainted)), ++ "canonpath() keeps taint on empty string"; ++ ++ (Cwd::getcwd() =~ /^(.*)/); ++ my $untainted = $1; ++ ok !tainted($untainted), "make sure our untainted value is untainted"; ++ ok !tainted(File::Spec->canonpath($untainted)), ++ "canonpath() doesn't add taint to untainted string"; ++} diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 86a979f9fc..162fc9b8f3 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -51,7 +51,8 @@ "perl-autosplit-default-time.patch" "perl-source-date-epoch.patch" "perl-deterministic-ordering.patch" - "perl-no-build-time.patch"))))) + "perl-no-build-time.patch" + "perl-CVE-2015-8607.patch"))))) (build-system gnu-build-system) (arguments '(#:tests? #f -- cgit v1.2.3 From 724eaef1b2b9aef206c35361fc6ec2ed149cf26c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 13 Jan 2016 18:19:01 +0100 Subject: tests: Use sed instead of grep as a package with no dependencies. * tests/graph.scm ("node-edges"): Choose SED instead of GREP as the example. --- tests/graph.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/graph.scm b/tests/graph.scm index 4f85432d2f..43f7b733f9 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -232,7 +232,7 @@ edges." (run-with-store %store (let ((packages (fold-packages cons '()))) (mlet %store-monad ((edges (node-edges %package-node-type packages))) - (return (and (null? (edges grep)) + (return (and (null? (edges sed)) (lset= eq? (edges guile-2.0) (match (package-direct-inputs guile-2.0) -- cgit v1.2.3 From ca7ef4d41854218c6e6910e1b7d9224382252c58 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Jan 2016 19:43:25 +0100 Subject: gnu: cross-gcc-arguments: Enable C++, disable building of libstdc++-v3. * gnu/packages/cross-base.scm (cross-gcc-arguments)[arguments]: Disable building libstdc++-v3 and enable building C++ compiler. --- gnu/packages/cross-base.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index cefe2f947f..8bd599c25a 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -105,11 +105,12 @@ may be either a libc package or #f.)" "--disable-libcilkrts") `( ;; Disable features not needed at this stage. "--disable-shared" "--enable-static" + "--enable-languages=c,c++" - ;; Disable C++ because libstdc++'s configure - ;; script otherwise fails with "Link tests are not - ;; allowed after GCC_NO_EXECUTABLES." - "--enable-languages=c" + ;; libstdc++ cannot be built at this stage + ;; ("Link tests are not allowed after + ;; GCC_NO_EXECUTABLES."). + "--disable-libstdc++-v3" "--disable-threads" ;libgcc, would need libc "--disable-libatomic" -- cgit v1.2.3 From 76002e54f2280f5a6416438c513aab14ecddb138 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 14 Jan 2016 10:42:08 +0100 Subject: gnu: gawk: Protect against random failures of the 'fts' test. * gnu/packages/patches/gawk-fts-test.patch: New file. * gnu/packages/gawk.scm (gawk)[source]: Use it. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/gawk.scm | 6 ++-- gnu/packages/patches/gawk-fts-test.patch | 51 ++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/gawk-fts-test.patch diff --git a/gnu-system.am b/gnu-system.am index 0ce1a3f015..3eb01c3b1c 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -467,6 +467,7 @@ dist_patch_DATA = \ gnu/packages/patches/flint-ldconfig.patch \ gnu/packages/patches/fltk-shared-lib-defines.patch \ gnu/packages/patches/freeimage-CVE-2015-0852.patch \ + gnu/packages/patches/gawk-fts-test.patch \ gnu/packages/patches/gawk-shell.patch \ gnu/packages/patches/gcc-arm-link-spec-fix.patch \ gnu/packages/patches/gcc-cross-environment-variables.patch \ diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 6bfea34667..8f2805cd4b 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -19,6 +19,7 @@ (define-module (gnu packages gawk) #:use-module (guix licenses) + #:use-module (gnu packages) #:use-module (gnu packages bash) #:use-module (gnu packages libsigsegv) #:use-module (guix packages) @@ -34,7 +35,8 @@ (uri (string-append "mirror://gnu/gawk/gawk-" version ".tar.xz")) (sha256 - (base32 "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3")))) + (base32 "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3")) + (patches (list (search-patch "gawk-fts-test.patch"))))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f ; test suite fails in parallel diff --git a/gnu/packages/patches/gawk-fts-test.patch b/gnu/packages/patches/gawk-fts-test.patch new file mode 100644 index 0000000000..de1f5c431c --- /dev/null +++ b/gnu/packages/patches/gawk-fts-test.patch @@ -0,0 +1,51 @@ +This is upstream commit c9a018c. We have observed random failures of +this test on i686 that seem related to load. + +2015-05-21 Arnold D. Robbins + + * fts.awk: Really remove atime from the output. + This avoids spurious failures on heavily loaded systems. + +diff --git a/test/fts.awk b/test/fts.awk +index b1df060..dea5b68 100644 +--- a/test/fts.awk ++++ b/test/fts.awk +@@ -50,6 +50,11 @@ function sort_traverse(data, sorted, i) + { + asorti(data, sorted) + for (i = 1; i in sorted; i++) { ++ # 5/2015: skip for atime, since there can ++ # occasionally be small differences. ++ if (sorted[i] == "atime") ++ continue ++ + indent() + printf("%s --> %s\n", sorted[i], data[sorted[i]]) > output + } +@@ -63,17 +68,20 @@ function traverse(data, i) + printf("%s:\n", i) > output + + Level++ +- if (("mtime" in data[i]) && ! isarray(data[i][mtime])) { ++ if (("mtime" in data[i]) && ! isarray(data[i]["mtime"])) { + sort_traverse(data[i]) + } else { + traverse(data[i]) + } + Level-- +- } else if (data[i] != "atime") { +- # 4/2015: skip for atime, since there can +- # occasionally be small differences. +- indent() +- printf("%s --> %s\n", i, data[i]) > output ++# } else { ++# JUNK = 1 ++# if (i != "atime") { ++# # 4/2015: skip for atime, since there can ++# # occasionally be small differences. ++# indent() ++# printf("%s --> %s\n", i, data[i]) > output ++# } + } + } + } -- cgit v1.2.3 From 89b48232f80d58e100ec7b73ee27ee513a58cfcc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 Jan 2016 13:07:37 +0100 Subject: gnu: automake: Adjust to deal with Perl 5.22. Fixes . * gnu/packages/patches/automake-regexp-syntax.patch: New file. * gnu/packages/autotools.scm (automake)[source]: Use it. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/autotools.scm | 6 ++-- gnu/packages/patches/automake-regexp-syntax.patch | 34 +++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/automake-regexp-syntax.patch diff --git a/gnu-system.am b/gnu-system.am index 3eb01c3b1c..0550e79f87 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -412,6 +412,7 @@ dist_patch_DATA = \ gnu/packages/patches/ath9k-htc-firmware-objcopy.patch \ gnu/packages/patches/audacity-fix-ffmpeg-binding.patch \ gnu/packages/patches/automake-skip-amhello-tests.patch \ + gnu/packages/patches/automake-regexp-syntax.patch \ gnu/packages/patches/avahi-localstatedir.patch \ gnu/packages/patches/avidemux-install-to-lib.patch \ gnu/packages/patches/avrdude-fix-libusb.patch \ diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 0d9a5b5873..598624ccdc 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis ;;; Copyright © 2015 Mark H Weaver @@ -195,7 +195,9 @@ output is indexed in many ways to simplify browsing.") (base32 "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r")) (patches - (list (search-patch "automake-skip-amhello-tests.patch"))))) + (map search-patch + '("automake-regexp-syntax.patch" + "automake-skip-amhello-tests.patch"))))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,(autoconf-wrapper)) diff --git a/gnu/packages/patches/automake-regexp-syntax.patch b/gnu/packages/patches/automake-regexp-syntax.patch new file mode 100644 index 0000000000..2e965c8c50 --- /dev/null +++ b/gnu/packages/patches/automake-regexp-syntax.patch @@ -0,0 +1,34 @@ +From . +See also . + +From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup +Date: Tue, 7 Jul 2015 10:54:24 +0200 +Subject: [PATCH] bin/automake: escape '{' in regexp pattern + +Based on perlre(1) documentation: +.. in Perl v5.26, literal uses of a curly bracket will be required +to be escaped, say by preceding them with a backslash ("\{" ) or +enclosing them within square brackets ("[{]") .. + +References: +https://bugzilla.redhat.com/1239379 + +* bin/automake.in (substitute_ac_subst_variables): Escape the +occurrence of '{' character. +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index 0c29184..c294ced 100644 +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker + sub substitute_ac_subst_variables + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } -- cgit v1.2.3 From 8d9bae4ed7cb2bccf80037b5adb77a608deb4bbf Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Jan 2016 17:53:58 -0500 Subject: gnu: librsvg: Update to 2.40.13 [fixes CVE-2015-7558]. * gnu/packages/patches/librsvg-tests.patch: Delete file. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/gnome.scm (librsvg): Update to 2.40.13. [source]: Remove patch. --- gnu-system.am | 1 - gnu/packages/gnome.scm | 8 +++----- gnu/packages/patches/librsvg-tests.patch | 27 --------------------------- 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/librsvg-tests.patch diff --git a/gnu-system.am b/gnu-system.am index 0550e79f87..a40576583f 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -546,7 +546,6 @@ dist_patch_DATA = \ gnu/packages/patches/libmad-armv7-thumb-pt2.patch \ gnu/packages/patches/libmad-frame-length.patch \ gnu/packages/patches/libmad-mips-newgcc.patch \ - gnu/packages/patches/librsvg-tests.patch \ gnu/packages/patches/libtheora-config-guess.patch \ gnu/packages/patches/libtool-skip-tests2.patch \ gnu/packages/patches/libsndfile-CVE-2014-9496.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e88ee8d904..5d14550e8a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2015, 2016 Mark H Weaver ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015 Efraim Flashner ;;; @@ -841,7 +841,7 @@ dealing with different structured file formats.") (define-public librsvg (package (name "librsvg") - (version "2.40.11") + (version "2.40.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -849,9 +849,7 @@ dealing with different structured file formats.") name "-" version ".tar.xz")) (sha256 (base32 - "00ifd9wjjjsw0ybk5j6qs4yyh66jj34hjmggy6dhrgfy8ksw06k1")) - (patches - (list (search-patch "librsvg-tests.patch"))))) + "014q7gz6mgfa7pfn0lr13qqv568ad8j1sw9d4vksnpazq0zajvjd")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/librsvg-tests.patch b/gnu/packages/patches/librsvg-tests.patch deleted file mode 100644 index dc5b94e185..0000000000 --- a/gnu/packages/patches/librsvg-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e06fc71a57156123e4e50a39957100a651ab632b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= -Date: Sat, 17 Oct 2015 10:20:33 +0800 -Subject: [PATCH] tests/styles: Don't duplicate test names. - ---- - tests/styles.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/styles.c b/tests/styles.c -index d09b1f2..a938835 100644 ---- a/tests/styles.c -+++ b/tests/styles.c -@@ -97,8 +97,8 @@ static const FixtureData fixtures[] = - {"/styles/selectors/2 or more selectors (stroke)", "592207", "styles/bug592207.svg", "#target", "stroke", .expected.color = 0xff0000ff}, - {"/styles/svg-element-style", "615701", "styles/svg-class.svg", "#svg", "fill", .expected.color = 0xff0000ff}, - {"/styles/presentation attribute in svg element", "620693", "styles/bug620693.svg", "#svg", "stroke", .expected.color = 0xffff0000}, -- {"/styles/!important", "379629", "styles/bug379629.svg", "#base_shadow", "stroke", .expected.color = 0xffffc0cb /* pink */}, -- {"/styles/!important", "379629", "styles/bug379629.svg", "#base_shadow", "stroke-width", .expected.length = {POINTS_LENGTH(5.), 'i'}}, -+ {"/styles/!important/1", "379629", "styles/bug379629.svg", "#base_shadow", "stroke", .expected.color = 0xffffc0cb /* pink */}, -+ {"/styles/!important/2", "379629", "styles/bug379629.svg", "#base_shadow", "stroke-width", .expected.length = {POINTS_LENGTH(5.), 'i'}}, - {"/styles/!important/class", "614606", "styles/bug614606.svg", "#path6306", "fill", .expected.color = 0xffff0000 /* red */ }, - {"/styles/!important/element", "614606", "styles/bug614606.svg", "#path6308", "fill", .expected.color = 0xff000000}, - {"/styles/!important/#id prior than class", NULL, "styles/important.svg", "#red", "fill", .expected.color = 0xffff0000 }, --- -2.5.0 - -- cgit v1.2.3 From ca3f9952d7090dbc894f715a5ecbb26309cffb44 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Jan 2016 18:13:13 -0500 Subject: gnu: ffmpeg: Update to 2.8.5. * gnu/packages/video.scm (ffmpeg): Update to 2.8.5. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 340027e849..b3ee98092c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2014, 2015 David Thompson -;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Efraim Flashner ;;; Copyright © 2015 Andy Patterson @@ -374,14 +374,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "2.8.4") + (version "2.8.5") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "07wmvp05zanmg3rm539dd0j7h1fi2fk0mcvmv01hjbpy92kq0qwb")))) + "1iqa5w96l8ic3axm2pqnb1wsyn4bmlldznj24wrwplfjcyi87yvn")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3 From bb8afbf5a1fbc85f700c0e07ce5581637e3674dc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 17 Jan 2016 18:41:20 +0100 Subject: gnu: Add dependency on Perl's 'Module::Build' as needed. 'Module::Build' was deprecated in Perl 5.20 and removed in 5.22. Some packages need to explicitly depend on it now. * gnu/packages/perl.scm (perl-class-factory-util): (perl-date-manip, perl-devel-checkbin): Add 'native-inputs' field. (perl-module-build)[description]: Mention that it used to be in Perl. * gnu/packages/web.scm (perl-cgi-simple)[native-inputs]: Add PERL-MODULE-BUILD. --- gnu/packages/perl.scm | 16 ++++++++++------ gnu/packages/web.scm | 5 +++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 162fc9b8f3..51fb96516a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Eric Bavier @@ -663,6 +663,7 @@ type for perl.") (base32 "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Class-Factory-Util") (synopsis "Utility methods for factory classes") (description "This module exports methods useful for factory classes.") @@ -1356,6 +1357,7 @@ Date::Calc.") (base32 "0zd0wbf91i49753rnf7m1lw197hdl5r97mxy0n43zdmcmhvkb3qq")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (arguments ;; Tests would require tzdata for timezone information, but tzdata is in ;; (gnu packages base) which would create a circular dependency. TODO: @@ -1717,6 +1719,7 @@ edges (mainly concerning timezone detection and selection).") (base32 "0g71sma9jy0fjm619hcrcsb9spg2y03vjxx36y8k1xpa2553sr7m")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Devel-CheckBin") (synopsis "Check that a command is available") (description "Devel::CheckBin is a perl module that checks whether a @@ -6159,12 +6162,13 @@ MYMETA.yml.") `(("perl-cpan-meta" ,perl-cpan-meta))) (home-page "http://search.cpan.org/dist/Module-Build") (synopsis "Build and install Perl modules") - (description "\"Module::Build\" is a system for building, testing, and -installing Perl modules. It is meant to be an alternative to -\"ExtUtils::MakeMaker\". Developers may alter the behavior of the module + (description "@code{Module::Build} is a system for building, testing, and +installing Perl modules; it used to be part of Perl itself until version 5.22, +which dropped it. It is meant to be an alternative to +@code{ExtUtils::MakeMaker}. Developers may alter the behavior of the module through subclassing in a much more straightforward way than with -\"MakeMaker\". It also does not require a \"make\" on your system - most of -the \"Module::Build\" code is pure-perl and written in a cross-platform way.") +@code{MakeMaker}. It also does not require a @command{make} on your +system---most of the @code{Module::Build} code is pure-Perl.") (license (package-license perl)))) (define-public perl-parse-cpan-meta diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 52c5740388..7f95d82844 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Aljosha Papsch -;;; Copyright © 2014, 2015 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer @@ -1558,7 +1558,8 @@ development server with Starman.") "1nkyb1m1g5r47xykflf68dplanih5p15njv82frbgbsms34kp1sg")))) (build-system perl-build-system) (native-inputs - `(("perl-io-stringy" ,perl-io-stringy))) ;for IO::Scalar + `(("perl-module-build" ,perl-module-build) + ("perl-io-stringy" ,perl-io-stringy))) ;for IO::Scalar (home-page "http://search.cpan.org/dist/CGI-Simple") (synopsis "CGI interface that is CGI.pm compliant") (description "CGI::Simple provides a relatively lightweight drop in -- cgit v1.2.3 From 252ddedd4b3af9a1b947258994e0ae1aa4fa81d3 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 19 Jan 2016 18:01:07 -0600 Subject: build-system/haskell: Fix package.conf parsing. * guix/build/haskell-build-system.scm (register)[conf-depends]: Properly react to EOF while reading GHC package conf files. --- guix/build/haskell-build-system.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 8e2aee381d..3afc37e16d 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -192,7 +192,8 @@ given Haskell package." (let loop ((collecting #f) (deps '())) (let* ((line (read-line port)) - (field (and=> (regexp-exec field-rx line) + (field (and=> (and (not (eof-object? line)) + (regexp-exec field-rx line)) (cut match:substring <> 1)))) (cond ((and=> field (cut string=? <> "depends")) @@ -200,7 +201,7 @@ given Haskell package." ;; so drop those characters. A line may list more than one .conf. (let ((d (string-tokenize (string-drop line 8)))) (loop #t (append d deps)))) - ((and collecting field) + ((or (eof-object? line) (and collecting field)) (begin (close-port port) (reverse! deps))) -- cgit v1.2.3 From 7c853c02b85f166ef9870e92ab656863f4aa2196 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 20 Jan 2016 13:09:53 +0100 Subject: gnu: doxygen: Update to 1.8.11. * gnu/packages/doxygen.scm (doxygen)[source]: Update to 1.8.11. Drop one patch. [build-system]: Switch to cmake-build-system, since gnu-build-system is not supported any more. [arguments]: Adapt. [native-inputs]: Drop unused perl. * gnu/packages/patches/doxygen-tmake.patch: Remove file. * gnu/packages/patches/doxygen-test.patch: Adapt. * gnu-system.am (dist_patch_DATA): Unregister patch. --- gnu-system.am | 1 - gnu/packages/doxygen.scm | 27 +++++++-------------------- gnu/packages/patches/doxygen-test.patch | 4 ++-- gnu/packages/patches/doxygen-tmake.patch | 24 ------------------------ 4 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 gnu/packages/patches/doxygen-tmake.patch diff --git a/gnu-system.am b/gnu-system.am index 9c87ac89da..e2c12520b2 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -447,7 +447,6 @@ dist_patch_DATA = \ gnu/packages/patches/diffutils-gets-undeclared.patch \ gnu/packages/patches/dfu-programmer-fix-libusb.patch \ gnu/packages/patches/doxygen-test.patch \ - gnu/packages/patches/doxygen-tmake.patch \ gnu/packages/patches/duplicity-piped-password.patch \ gnu/packages/patches/duplicity-test_selection-tmp.patch \ gnu/packages/patches/elfutils-tests-ptrace.patch \ diff --git a/gnu/packages/doxygen.scm b/gnu/packages/doxygen.scm index 8b1a057724..ffbaab16ee 100644 --- a/gnu/packages/doxygen.scm +++ b/gnu/packages/doxygen.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Andreas Enge +;;; Copyright © 2014, 2016 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +20,7 @@ #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages bison) #:use-module (gnu packages flex) @@ -32,38 +32,25 @@ (define-public doxygen (package (name "doxygen") - (version "1.8.7") + (version "1.8.11") (source (origin (method url-fetch) (uri (string-append "http://ftp.stack.nl/pub/users/dimitri/" name "-" version ".src.tar.gz")) (sha256 (base32 - "1ng3dv5fninhfi2fj75ghkr5jwsl653fxv2sxhaswj11x2vcdsn6")) - (patches (list (search-patch "doxygen-tmake.patch") - (search-patch "doxygen-test.patch"))))) - (build-system gnu-build-system) + "0ja02pm3fpfhc5dkry00kq8mn141cqvdqqpmms373ncbwi38pl35")) + (patches (list (search-patch "doxygen-test.patch"))))) + (build-system cmake-build-system) (native-inputs `(("bison" ,bison) ("flex" ,flex) ("libxml2" ,libxml2) ; provides xmllint for the tests - ("perl" ,perl) ; for the tests ("python" ,python-2))) ; for creating the documentation (propagated-inputs `(("graphviz" ,graphviz))) (arguments - `(#:test-target "test" - #:phases - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; do not pass "--enable-fast-install", which makes the - ;; configure process fail - (zero? (system* - "./configure" - "--prefix" out)))) - %standard-phases))) + `(#:test-target "tests")) (home-page "http://www.stack.nl/~dimitri/doxygen/") (synopsis "Generate documentation from annotated sources") (description "Doxygen is the de facto standard tool for generating diff --git a/gnu/packages/patches/doxygen-test.patch b/gnu/packages/patches/doxygen-test.patch index 7a7f4e963f..5ac063adbf 100644 --- a/gnu/packages/patches/doxygen-test.patch +++ b/gnu/packages/patches/doxygen-test.patch @@ -31,8 +31,8 @@ diff -u -r doxygen-1.8.7.orig/testing/012/indexpage.xml doxygen-1.8.7/testing/01 My Project - See [1] for more info. -+ See knuth79 for more info. ++ See knuth79 for more info. -Nur in doxygen-1.8.7/testing: test_output_012. + diff --git a/gnu/packages/patches/doxygen-tmake.patch b/gnu/packages/patches/doxygen-tmake.patch deleted file mode 100644 index 3579243702..0000000000 --- a/gnu/packages/patches/doxygen-tmake.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix the `check_unix' function, which looks for `/bin/uname' to determine -whether we're on a Unix-like system. -Taken from nixpkgs. - ---- doxygen-1.5.8/tmake/bin/tmake 2008-12-06 14:16:20.000000000 +0100 -+++ doxygen-1.5.8/tmake/bin/tmake 2009-03-05 11:29:55.000000000 +0100 -@@ -234,17 +234,7 @@ sub tmake_verb { - # - - sub check_unix { -- my($r); -- $r = 0; -- if ( -f "/bin/uname" ) { -- $r = 1; -- (-f "\\bin\\uname") && ($r = 0); -- } -- if ( -f "/usr/bin/uname" ) { -- $r = 1; -- (-f "\\usr\\bin\\uname") && ($r = 0); -- } -- return $r; -+ return 1; - } - -- cgit v1.2.3 From 05944b3aa6ebc5f2f252ec5564f26e817ff26547 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 20 Jan 2016 13:23:25 +0100 Subject: gnu: doxygen: Drop propagated input graphviz. * gnu/packages/doxygen.scm (doxygen)[propagated-inputs]: Drop graphviz. --- gnu/packages/doxygen.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/doxygen.scm b/gnu/packages/doxygen.scm index ffbaab16ee..8245a65c86 100644 --- a/gnu/packages/doxygen.scm +++ b/gnu/packages/doxygen.scm @@ -47,8 +47,6 @@ ("flex" ,flex) ("libxml2" ,libxml2) ; provides xmllint for the tests ("python" ,python-2))) ; for creating the documentation - (propagated-inputs - `(("graphviz" ,graphviz))) (arguments `(#:test-target "tests")) (home-page "http://www.stack.nl/~dimitri/doxygen/") -- cgit v1.2.3 From 7b158c4ee2d4b5cf6a2cd9bf0246465c3c8a06ca Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 20 Jan 2016 17:11:09 -0600 Subject: gnu: Add perl-cgi. The CGI module was removed from Perl core in v5.21.0. * gnu/packages/web.scm (perl-cgi): New variable. --- gnu/packages/web.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7f95d82844..33db3639de 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015 Eric Bavier +;;; Copyright © 2015, 2016 Eric Bavier ;;; Copyright © 2015 Eric Dvorsak ;;; ;;; This file is part of GNU Guix. @@ -1544,6 +1544,34 @@ application classes.") development server with Starman.") (license (package-license perl)))) +(define-public perl-cgi + (package + (name "perl-cgi") + (version "4.25") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/L/LE/LEEJO/" + "CGI-" version ".tar.gz")) + (sha256 + (base32 + "06hk9zzvlix1yi95wlkb1ykdxgl6lscm7452gkwr2snsb8iybczg")))) + (build-system perl-build-system) + (native-inputs + `(("perl-test-deep" ,perl-test-deep) + ("perl-test-nowarnings" ,perl-test-nowarnings) + ("perl-test-warn" ,perl-test-warn))) + (propagated-inputs + `(("perl-html-parser" ,perl-html-parser))) + (home-page "http://search.cpan.org/dist/CGI") + (synopsis "Handle Common Gateway Interface requests and responses") + (description "CGI.pm is a stable, complete and mature solution for +processing and preparing HTTP requests and responses. Major features include +processing form submissions, file uploads, reading and writing cookies, query +string generation and manipulation, and processing and preparing HTTP +headers.") + (license (package-license perl)))) + (define-public perl-cgi-simple (package (name "perl-cgi-simple") -- cgit v1.2.3 From 97b07aaa419bfa069bb217fca2f158f6ea0804a1 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 20 Jan 2016 17:12:53 -0600 Subject: gnu: Add perl-module-pluggable. This Perl module was moved out of Perl core in v5.19.0. * gnu/packages/perl.scm (perl-module-pluggable): New variable. * gnu/packages/patches/perl-module-pluggable-search.patch: New patch. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + .../patches/perl-module-pluggable-search.patch | 25 ++++++++++++++++++++++ gnu/packages/perl.scm | 22 ++++++++++++++++++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100755 gnu/packages/patches/perl-module-pluggable-search.patch diff --git a/gnu-system.am b/gnu-system.am index e2c12520b2..fe421a9569 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -627,6 +627,7 @@ dist_patch_DATA = \ gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch \ gnu/packages/patches/perl-no-build-time.patch \ gnu/packages/patches/perl-no-sys-dirs.patch \ + gnu/packages/patches/perl-module-pluggable-search.patch \ gnu/packages/patches/perl-source-date-epoch.patch \ gnu/packages/patches/perl-tk-x11-discover.patch \ gnu/packages/patches/pidgin-add-search-path.patch \ diff --git a/gnu/packages/patches/perl-module-pluggable-search.patch b/gnu/packages/patches/perl-module-pluggable-search.patch new file mode 100755 index 0000000000..ec51abc35d --- /dev/null +++ b/gnu/packages/patches/perl-module-pluggable-search.patch @@ -0,0 +1,25 @@ +Fix Perl module Module::Pluggable such that it can find plugins that live in +symlinked directories. + +Patch borrowed/adapted from Nixpkgs. + +--- Module-Pluggable-5.2/lib/Module/Pluggable/Object.pm 2015-04-08 23:28:48.120164135 -0500 ++++ Module-Pluggable-5.2/lib/Module/Pluggable/Object.pm 2015-04-08 23:30:27.032166704 -0500 +@@ -164,7 +164,7 @@ + my $sp = catdir($dir, (split /::/, $searchpath)); + + # if it doesn't exist or it's not a dir then skip it +- next unless ( -e $sp && -d _ ); # Use the cached stat the second time ++ next unless ( -e $sp ); + + my @files = $self->find_files($sp); + +@@ -279,7 +279,7 @@ + (my $path = $File::Find::name) =~ s#^\\./##; + push @files, $path; + } +- }, $search_path ); ++ }, "$search_path/." ); + } + #chdir $cwd; + return @files; \ No newline at end of file diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 51fb96516a..4d9806cf4b 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2015 Eric Bavier +;;; Copyright © 2015, 2016 Eric Bavier ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Mark H Weaver ;;; @@ -3077,6 +3077,26 @@ strictly correct manner with ExtUtils::MakeMaker, and will run on any Perl installation version 5.005 or newer.") (license (package-license perl)))) +(define-public perl-module-pluggable + (package + (name "perl-module-pluggable") + (version "5.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/S/SI/SIMONW/" + "Module-Pluggable-" version ".tar.gz")) + (sha256 + (base32 + "1px6qmszmfc69v36vd8d92av4nkrif6xf4nrj3xv647xwi2svwmk")) + (patches (list (search-patch "perl-module-pluggable-search.patch"))))) + (build-system perl-build-system) + (home-page "http://search.cpan.org/dist/Module-Pluggable") + (synopsis "Give your Perl module the ability to have plugins") + (description "This module provides a simple but extensible way of having +'plugins' for your Perl module.") + (license (package-license perl)))) + (define-public perl-module-runtime (package (name "perl-module-runtime") -- cgit v1.2.3 From a2190cccc2f2b371cf4a4259519ee3466f2f63ac Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 20 Jan 2016 17:15:41 -0600 Subject: gnu: Add dependencies on Perl modules as needed. This is a follow-on to bb8afbf5. * gnu/packages/language.scm (perl-lingua-en-inflect, perl-lingua-stem) (perl-snowball-norwegian, perl-snowball-swedish): Add 'native-inputs' field. * gnu/packages/perl.scm (perl-aliased, perl-class-accessor-chained) (perl-datetime-set, perl-datetime-format-ical, perl-datetime-locale) (perl-error, perl-module-runtime, perl-module-runtime-conflicts) (perl-path-class, perl-posix-strftime-compiler, perl-readonly) (perl-test-differences, perl-test-pod, perl-test-trap) (perl-text-aligner, perl-text-glob, perl-text-table, perl-tie-ixhash) (perl-time-mock): Ditto. (perl-config-any): Add 'propagated-inputs' field. (perl-data-page, perl-datetime, perl-datetime-format-natural) (perl-moosex-getopt, perl-moosex-role-parameterized) (perl-moosex-types, perl-namespace-autoclean, perl-params-validate) (perl-tree-simple-visitorfactory)[native-inputs]: Add PERL-MODULE-BUILD. (perl-file-changenotify)[native-inputs]: Ditto. [propagated-inputs]: Add PERL-MODULE-PLUGGABLE. (perl-datetime-format-flexible, perl-test-writevariants) [propagated-inputs]: Ditto. (perl-test-mockobject): Add 'arguments' field. * gnu/packages/mail.scm (perl-email-abstract)[propagated-inputs]: Ditto. * gnu/packages/web.scm (perl-datetime-format-http, perl-io-socket-ip) (perl-plack-middleware-methodoverride, perl-uri-find) (perl-www-mechanize): Add 'native-inputs' field. (perl-html-template, perl-http-server-simple): Add 'propagated-inputs' field. (perl-apache-logformat-compiler, perl-html-tree)[native-inputs]: Add PERL-MODULE-BUILD. (perl-catalyst-runtime)[propagated-inputs]: Add PERL-MODULE-PLUGGABLE. (perl-finance-quote)[propagated-inputs]: Add PERL-CGI. --- gnu/packages/language.scm | 7 +++++- gnu/packages/mail.scm | 1 + gnu/packages/perl.scm | 64 +++++++++++++++++++++++++++++++++++++++-------- gnu/packages/web.scm | 21 ++++++++++++++-- 4 files changed, 80 insertions(+), 13 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index b0fa7aa179..6c837948c0 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Eric Bavier +;;; Copyright © 2015, 2016 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +60,7 @@ manipulating such numbers.") (base32 "0drzg9a2dkjxgf00n6jg0jzhd8972bh3j4wdnmdxpqi3zmfqhwcy")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Lingua-EN-Inflect") (synopsis "Convert singular to plural") (description "Lingua::EN::Inflect provides plural inflections, @@ -224,6 +225,8 @@ Moreira, V. and Huyck, C.") (base32 "12avh2mnnc7llmmshrr5bgb473fvydxnlqrqbl2815mf2dp4pxcg")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-lingua-pt-stemmer" ,perl-lingua-pt-stemmer) ("perl-lingua-stem-fr" ,perl-lingua-stem-fr) @@ -329,6 +332,7 @@ Lingua::Stem::Snowball::Se.") (base32 "0675v45bbsh7vr7kpf36xs2q79g02iq1kmfw22h20xdk4rzqvkqx")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Snowball-Norwegian") (synopsis "Porters stemming algorithm for Norwegian") (description "Lingua::Stem::Snowball::No is a perl port of the norwegian @@ -348,6 +352,7 @@ stemmer at http://snowball.tartarus.org.") (base32 "0agwc12jk5kmabnpsplw3wf4ii5w1zb159cpin44x3srb0sr5apg")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Snowball-Swedish") (synopsis "Porters stemming algorithm for Swedish") (description "Lingua::Stem::Snowball::Se is a perl port of the swedish diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index f765728ae4..1057564b39 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -764,6 +764,7 @@ mailboxes. Currently Maildir and IMAP are supported types.") (build-system perl-build-system) (propagated-inputs `(("perl-email-simple" ,perl-email-simple) + ("perl-module-pluggable" ,perl-module-pluggable) ("perl-mro-compat" ,perl-mro-compat))) (home-page "http://search.cpan.org/dist/Email-Abstract") (synopsis "Interface to mail representations") diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 4d9806cf4b..0e63aa943e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -168,6 +168,7 @@ differences.") (base32 "1syyqzy462501kn5ma9gl6xbmcahqcn4qpafhsmpz0nd0x2m4l63")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/aliased") (synopsis "Use shorter versions of class names") (description "The alias module loads the class you specify and exports @@ -503,6 +504,8 @@ your class.") (base32 "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-class-accessor" ,perl-class-accessor))) (home-page "http://search.cpan.org/dist/Class-Accessor-Chained") @@ -922,6 +925,8 @@ as defined by two typical specimens of Perl coders.") (base32 "06n6jn3q3xhk57icwip0ihzqixxav6sgp6rrb35hahj1z748y3vi")))) (build-system perl-build-system) + (propagated-inputs + `(("perl-module-pluggable" ,perl-module-pluggable))) (home-page "http://search.cpan.org/dist/Config-Any") (synopsis "Load configuration from different file formats") (description "Config::Any provides a facility for Perl applications and @@ -1179,7 +1184,8 @@ indentation and newlines plus sub deparsing.") "1hvi92c4h2angryc6pngw7gbm3ysc2jfmyxk2wh9ia4vdwpbs554")))) (build-system perl-build-system) (native-inputs - `(("perl-test-exception" ,perl-test-exception))) + `(("perl-module-build" ,perl-module-build) + ("perl-test-exception" ,perl-test-exception))) (propagated-inputs `(("perl-class-accessor-chained" ,perl-class-accessor-chained))) (home-page "http://search.cpan.org/dist/Data-Page") @@ -1384,7 +1390,8 @@ time from another, or parsing international times.") "0fli1ls298qa8nfki15myxqqqfpxvslxk4j5r3vjk577wfgjrnms")))) (build-system perl-build-system) (native-inputs - `(("perl-test-fatal" ,perl-test-fatal) + `(("perl-module-build" ,perl-module-build) + ("perl-test-fatal" ,perl-test-fatal) ("perl-test-warnings" ,perl-test-warnings))) (propagated-inputs `(("perl-datetime-locale" ,perl-datetime-locale) @@ -1411,6 +1418,8 @@ time before its creation (in 1582).") (base32 "1b27699zkj68w5ll9chjhs52vmf39f9via6x5r5844as30qh9zxb")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-datetime" ,perl-datetime) ("perl-params-validate" ,perl-params-validate) @@ -1513,6 +1522,7 @@ to do this without writing reams of structural code.") ("perl-datetime-format-builder" ,perl-datetime-format-builder) ("perl-datetime-timezone" ,perl-datetime-timezone) ("perl-list-moreutils" ,perl-list-moreutils) + ("perl-module-pluggable" ,perl-module-pluggable) ("perl-test-mocktime" ,perl-test-mocktime))) (home-page "http://search.cpan.org/dist/DateTime-Format-Flexible") (synopsis "Parse data/time strings") @@ -1533,6 +1543,8 @@ give it and parse it into a DateTime object.") (base32 "0cvwk7pigj7czsp81z35h7prxvylkrlk2l0kwvq0v72ykx9zc2cb")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-datetime" ,perl-datetime) ("perl-datetime-event-ical" ,perl-datetime-event-ical) @@ -1560,7 +1572,8 @@ order to create the appropriate objects.") "1qq3adq1y08d0jlmwk9059s5d39hb26f3zjag099gjjyvs5c8yal")))) (build-system perl-build-system) (native-inputs - `(("perl-module-util" ,perl-module-util) + `(("perl-module-build" ,perl-module-build) + ("perl-module-util" ,perl-module-util) ("perl-test-mocktime" ,perl-test-mocktime))) (propagated-inputs `(("perl-boolean" ,perl-boolean) @@ -1617,6 +1630,8 @@ takes a string and a pattern and returns the `DateTime` object associated.") (base32 "175grkrxiv012n6ch3z1sip4zprcili6m5zqi3njdk5c1gdvi8ca")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-list-moreutils" ,perl-list-moreutils) ("perl-params-validate" ,perl-params-validate))) @@ -1954,6 +1969,7 @@ modules separately and deal with them after the module is done installing.") (base32 "0dsxic78mxy30qvbbdzfyp501hbkwhnbmafqfxipr0yqfy8f2j5g")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Error") (synopsis "OO-ish Error/Exception handling for Perl") (description "The Error package provides two interfaces. Firstly Error @@ -2133,10 +2149,12 @@ module building modules.") "090i265f73jlcl5rv250791vw32j9vvl4nd5abc7myg0klb8109w")))) (build-system perl-build-system) (native-inputs - `(("perl-test-exception" ,perl-test-exception))) + `(("perl-module-build" ,perl-module-build) + ("perl-test-exception" ,perl-test-exception))) (propagated-inputs `(("perl-class-load" ,perl-class-load) ("perl-list-moreutils" ,perl-list-moreutils) + ("perl-module-pluggable" ,perl-module-pluggable) ("perl-moose" ,perl-moose) ("perl-moosex-params-validate" ,perl-moosex-params-validate) ("perl-moosex-semiaffordanceaccessor" @@ -3110,6 +3128,7 @@ installation version 5.005 or newer.") (base32 "19326f094jmjs6mgpwkyisid54k67w34br8yfh0gvaaml87gwi2c")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Module-Runtime") (synopsis "Perl runtime module handling") (description "The functions exported by this module deal with runtime @@ -3129,6 +3148,8 @@ handling of Perl modules, which are normally handled at compile time.") (base32 "0pz23ch78lbpn4kdbm04icgsmbr7jvmxwq1p5m4x2pap8qwd0wqg")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-module-runtime" ,perl-module-runtime) ("perl-dist-checkconflicts" ,perl-dist-checkconflicts))) @@ -3335,7 +3356,8 @@ private methods are not.") "1nkzvbsiwldmpn6207ns7rinh860djnw098h6cnvywf429rjnz60")))) (build-system perl-build-system) (native-inputs - `(("perl-test-deep" ,perl-test-deep) + `(("perl-module-build" ,perl-module-build) + ("perl-test-deep" ,perl-test-deep) ("perl-test-fatal" ,perl-test-fatal) ("perl-test-requires" ,perl-test-requires) ("perl-test-trap" ,perl-test-trap) @@ -3498,6 +3520,7 @@ manually setting up a subclass.") (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) + ("perl-module-build" ,perl-module-build) ("perl-moosex-role-withoverloading" ,perl-moosex-role-withoverloading) ("perl-test-fatal" ,perl-test-fatal) ("perl-test-requires" ,perl-test-requires))) @@ -3630,7 +3653,8 @@ search for traits and some extra attributes.") "1iq90s1f0xbmr194q0mhnp9wxqxwwilkbdml040ibqbqvfiz87yh")))) (build-system perl-build-system) (native-inputs - `(("perl-test-fatal" ,perl-test-fatal) + `(("perl-module-build" ,perl-module-build) + ("perl-test-fatal" ,perl-test-fatal) ("perl-test-requires" ,perl-test-requires))) (propagated-inputs `(("perl-carp-clan" ,perl-carp-clan) @@ -3798,7 +3822,8 @@ Perl (back to 5.6.0).") "0msggbg2zbixxjq1fda19h0yygavxndfzc4j4pq11nfghmawjsb0")))) (build-system perl-build-system) (native-inputs - `(("perl-test-requires" ,perl-test-requires))) + `(("perl-module-build" ,perl-module-build) + ("perl-test-requires" ,perl-test-requires))) (propagated-inputs `(("perl-b-hooks-endofscope" ,perl-b-hooks-endofscope) ("perl-namespace-clean" ,perl-namespace-clean) @@ -4038,7 +4063,8 @@ checking parameters easier.") "1wh23i9kkma6493c0q1kvy6wmahd6spg6xm3xbp2ar1iy1xhks5l")))) (build-system perl-build-system) (native-inputs - `(("perl-test-fatal" ,perl-test-fatal) + `(("perl-module-build" ,perl-module-build) + ("perl-test-fatal" ,perl-test-fatal) ("perl-test-requires" ,perl-test-requires))) (propagated-inputs `(("perl-module-implementation" ,perl-module-implementation))) @@ -4099,6 +4125,7 @@ up inheritance from those modules at the same time.") (base32 "1viaj8jyshcj135la0kgfgzalaw06xnbsg9h54jx09v1342v69lj")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Path-Class") (synopsis "Path specification manipulation") (description "Path::Class is a module for manipulation of file and @@ -4158,6 +4185,7 @@ used for writing documentation for Perl and for Perl modules.") (base32 "0f9p3hx0vqx8zg5v24pz0s4zc8ln100c7c91ks681wq02phqj2v7")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (arguments `(#:tests? #f)) ;TODO: Timezone test failures (home-page "http://search.cpan.org/dist/POSIX-strftime-Compiler") (synopsis "GNU C library compatible strftime for loggers and servers") @@ -4201,6 +4229,7 @@ Module::Build project, but has been externalized here for general use.") (base32 "165zcf9lpijdpkx82za0g9rx8ckjnhipmcivdkyzshl8jmp1bl4v")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Readonly") (synopsis "Create read-only scalars, arrays, hashes") (description "This module provides a facility for creating non-modifiable @@ -4958,6 +4987,8 @@ structures without getting caught in an infinite loop.") (base32 "0rhs4q6qn64ji06ns7lwl6iiiw3mggvd9xk9nkiqvx1jihbplrbw")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-text-diff" ,perl-text-diff) ("perl-capture-tiny" ,perl-capture-tiny))) @@ -5129,6 +5160,7 @@ you test against long strings.") ("perl-test-warn" ,perl-test-warn) ("perl-universal-can" ,perl-universal-can) ("perl-universal-isa" ,perl-universal-isa))) + (arguments `(#:tests? #f)) ;TODO: tests require perl-cgi (home-page "http://search.cpan.org/dist/Test-MockObject") (synopsis "Emulate troublesome interfaces in Perl") (description "Test::MockObject allows you to create objects that conform @@ -5246,6 +5278,7 @@ as flexible as possible to the tester.") (base32 "1hmwwhabyng4jrnll926b4ab73r40w3pfchlrvs0yx6kh6kwwy14")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Test-Pod") (synopsis "Check for POD errors in files") (description "Check POD files for errors or warnings in a test file, using @@ -5390,6 +5423,8 @@ a minimum of effort.") (base32 "05b4zc4087imwphls4yksg4chzx9yavbri301gaxas9kv1yhx13w")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-test-tester" ,perl-test-tester) ("perl-data-dump" ,perl-data-dump))) @@ -5504,7 +5539,8 @@ installed.") ("perl-test-directory" ,perl-test-directory))) (propagated-inputs `(("perl-data-tumbler" ,perl-data-tumbler) - ("perl-file-homedir" ,perl-file-homedir))) + ("perl-file-homedir" ,perl-file-homedir) + ("perl-module-pluggable" ,perl-module-pluggable))) (home-page "http://search.cpan.org/dist/Test-WriteVariants") (synopsis "Dynamic generation of tests") (description "The Test::WriteVariants module provides for the dynamic @@ -5545,6 +5581,7 @@ support.") (base32 "0a6zkchc0apvzkch6z18cx6h97xfiv50r7n4xhg90x8dvk75qzcs")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Text-Aligner") (synopsis "Align text") (description "Text::Aligner exports a single function, align(), which is @@ -5627,6 +5664,7 @@ generally slower on larger files.") (base32 "0lr76wrsj8wcxrq4wi8z1640w4dmdbkznp06q744rg3g0bd238d5")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Text-Glob") (synopsis "Match globbing patterns against text") (description "Text::Glob implements glob(3) style matching that can be @@ -5665,6 +5703,8 @@ you want to do full file globbing use the File::Glob module instead.") (base32 "02c8v38k639r23dgxwgvsy4myjjzvgdb238kpiffsiz25ab3xp5j")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-text-aligner" ,perl-text-aligner))) (home-page "http://search.cpan.org/dist/Text-Table") @@ -5733,6 +5773,7 @@ as exceptions to standard program flow.") (base32 "0mmg9iyh42syal3z1p2pn9airq65yrkfs66cnqs9nz76jy60pfzs")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Tie-IxHash") (synopsis "Ordered associative arrays for Perl") (description "This Perl module implements Perl hashes that preserve the @@ -5862,6 +5903,8 @@ time values and formatting dates into ASCII strings.") (base32 "0bwqyg8z98m8cjw1qcm4wg502n225k33j2fp8ywxkgfjdd1zgllv")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-timedate" ,perl-timedate))) ;For Date::Parse (home-page "http://search.cpan.org/dist/Time-Mock") @@ -5908,7 +5951,8 @@ simple n-ary tree.") "1g27xl48q1vr7aikhxg4vvcsj1si8allxz59vmnks61wsw4by7vg")))) (build-system perl-build-system) (native-inputs - `(("perl-test-exception" ,perl-test-exception))) + `(("perl-module-build" ,perl-module-build) + ("perl-test-exception" ,perl-test-exception))) (propagated-inputs `(("perl-tree-simple" ,perl-tree-simple) ("perl-base" ,perl-base))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 33db3639de..02317d2fef 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -737,6 +737,7 @@ language known as SASS.") (build-system perl-build-system) (native-inputs `(("perl-http-message" ,perl-http-message) + ("perl-module-build" ,perl-module-build) ("perl-test-mocktime" ,perl-test-mocktime) ("perl-try-tiny" ,perl-try-tiny) ("perl-uri" ,perl-uri))) @@ -1318,6 +1319,7 @@ MIME type directly to the browser, without being processed through Catalyst.") ("perl-io-stringy" ,perl-io-stringy) ("perl-json-maybexs" ,perl-json-maybexs) ("perl-libwww" ,perl-libwww) + ("perl-module-pluggable" ,perl-module-pluggable) ("perl-moose" ,perl-moose) ("perl-moosex-emulate-class-accessor-fast" ,perl-moosex-emulate-class-accessor-fast) @@ -1629,6 +1631,8 @@ inputs, in a manner reminiscent of how PHP does.") (base32 "0h6qqdg1yzqkdxp7hqlp0qa7d1y64nilgimxs79dys2ryjfpcknh")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-datetime" ,perl-datetime) ("perl-http-date" ,perl-http-date))) @@ -1723,7 +1727,8 @@ which can be used to parse directory listings.") (search-patch "perl-finance-quote-unuse-mozilla-ca.patch"))))) (build-system perl-build-system) (propagated-inputs - `(("perl-datetime" ,perl-datetime) + `(("perl-cgi" ,perl-cgi) + ("perl-datetime" ,perl-datetime) ("perl-html-parser" ,perl-html-parser) ("perl-html-tableextract" ,perl-html-tableextract) ("perl-html-tree" ,perl-html-tree) @@ -1870,7 +1875,8 @@ in tables within an HTML document, either as text or encoded element trees.") "13qlqbpixw470gnck0xgny8hyjj576m8y24bba2p9ai2lvy76vbx")))) (build-system perl-build-system) (native-inputs - `(("perl-test-fatal" ,perl-test-fatal))) + `(("perl-module-build" ,perl-module-build) + ("perl-test-fatal" ,perl-test-fatal))) (propagated-inputs `(("perl-html-parser" ,perl-html-parser) ("perl-html-tagset" ,perl-html-tagset) @@ -1937,6 +1943,8 @@ kinds of HTML parsing operations.") (base32 "07ahpfgidxsw2yb7y8i7bbr8s64aq6qgq832h9jswmksxbd0l43q")))) (build-system perl-build-system) + (propagated-inputs + `(("perl-cgi" ,perl-cgi))) (home-page "http://search.cpan.org/dist/HTML-Template") (synopsis "HTML-like templates") (description @@ -2195,6 +2203,8 @@ environment from an HTTP::Request.") (base32 "05klpfkss2a6i5ihmvcm27fyar0f2v4ispg2f49agab3va1gix6g")))) (build-system perl-build-system) + (propagated-inputs + `(("perl-cgi" ,perl-cgi))) (arguments ;; See the discussion of a related tests issue at ;; https://lists.gnu.org/archive/html/guix-devel/2015-01/msg00346.html @@ -2265,6 +2275,7 @@ algorithm specified in section 8.2.2.1 of the draft standard.") (base32 "0ky20hmln6waipzqikizyw04vpszf70fgpshz7ib8zv8480ri456")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/IO-Socket-IP") (synopsis "Family-neutral IP socket supporting both IPv4 and IPv6") (description "This module provides a protocol-independent way to use IPv4 @@ -2589,6 +2600,8 @@ already set.") (base32 "1hb8dx7i4vs74n0p737wrvpdnnw6argxrjpr6kj6432zabp8325z")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-plack" ,perl-plack))) (home-page "http://search.cpan.org/dist/Plack-Middleware-MethodOverride") @@ -2813,6 +2826,8 @@ and updated by RFC 2732.") (base32 "0czc4h182s7sx3k123m7qlg7yybnwxgh369hap3c3b6xgrglrhy0")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-uri" ,perl-uri))) (home-page "http://search.cpan.org/dist/URI-Find") @@ -2880,6 +2895,8 @@ library.") (base32 "1zrw8aadhwy48q51x2z2rqlkwf17bya4j4h3hy89mw783j96rmg9")))) (build-system perl-build-system) + (native-inputs ;only for tests + `(("perl-cgi" ,perl-cgi))) (propagated-inputs `(("perl-html-form" ,perl-html-form) ("perl-html-parser" ,perl-html-parser) -- cgit v1.2.3 From 86fa2ea92f431fe9d23d41aa22c198ec2ce9a5f1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 21 Jan 2016 00:28:03 -0500 Subject: gnu: libtiff: Update to 4.0.6. Add fixes for CVE-2015-{8665,8683}. * gnu/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch, gnu/packages/patches/libtiff-oob-accesses-in-decode.patch, gnu/packages/patches/libtiff-oob-write-in-nextdecode.patch: New files. * gnu-system.am (dist_patch_DATA): Add them. * gnu/packages/image.scm (libtiff): Update to 4.0.6. [source]: Add patches. --- gnu-system.am | 3 + gnu/packages/image.scm | 10 +- .../libtiff-CVE-2015-8665+CVE-2015-8683.patch | 107 +++++++++++++ .../patches/libtiff-oob-accesses-in-decode.patch | 171 +++++++++++++++++++++ .../patches/libtiff-oob-write-in-nextdecode.patch | 49 ++++++ 5 files changed, 337 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch create mode 100644 gnu/packages/patches/libtiff-oob-accesses-in-decode.patch create mode 100644 gnu/packages/patches/libtiff-oob-write-in-nextdecode.patch diff --git a/gnu-system.am b/gnu-system.am index fe421a9569..d37775d235 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -547,6 +547,9 @@ dist_patch_DATA = \ gnu/packages/patches/libmad-frame-length.patch \ gnu/packages/patches/libmad-mips-newgcc.patch \ gnu/packages/patches/libtheora-config-guess.patch \ + gnu/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch \ + gnu/packages/patches/libtiff-oob-accesses-in-decode.patch \ + gnu/packages/patches/libtiff-oob-write-in-nextdecode.patch \ gnu/packages/patches/libtool-skip-tests2.patch \ gnu/packages/patches/libsndfile-CVE-2014-9496.patch \ gnu/packages/patches/libsndfile-CVE-2015-7805.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index d3ed92fde8..bf120f0184 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014, 2015 Alex Kost ;;; Copyright © 2014 Ricardo Wurmus ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer @@ -131,13 +131,17 @@ maximum quality factor.") (define-public libtiff (package (name "libtiff") - (version "4.0.5") + (version "4.0.6") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.remotesensing.org/pub/libtiff/tiff-" version ".tar.gz")) (sha256 (base32 - "171hgy4mylwmvdm7gp6ffjva81m4j56v3fbqsbfl7avzxn1slpp2")))) + "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd")) + (patches (map search-patch + '("libtiff-oob-accesses-in-decode.patch" + "libtiff-oob-write-in-nextdecode.patch" + "libtiff-CVE-2015-8665+CVE-2015-8683.patch"))))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.3 MiB of HTML documentation diff --git a/gnu/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch b/gnu/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch new file mode 100644 index 0000000000..811516dbe9 --- /dev/null +++ b/gnu/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch @@ -0,0 +1,107 @@ +2015-12-26 Even Rouault + + * libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage + interface in case of unsupported values of SamplesPerPixel/ExtraSamples + for LogLUV / CIELab. Add explicit call to TIFFRGBAImageOK() in + TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by limingxing and + CVE-2015-8683 reported by zzf of Alibaba. + +diff -u -r1.93 -r1.94 +--- libtiff/libtiff/tif_getimage.c 22 Nov 2015 15:31:03 -0000 1.93 ++++ libtiff/libtiff/tif_getimage.c 26 Dec 2015 17:32:03 -0000 1.94 +@@ -182,20 +182,22 @@ + "Planarconfiguration", td->td_planarconfig); + return (0); + } +- if( td->td_samplesperpixel != 3 ) ++ if( td->td_samplesperpixel != 3 || colorchannels != 3 ) + { + sprintf(emsg, +- "Sorry, can not handle image with %s=%d", +- "Samples/pixel", td->td_samplesperpixel); ++ "Sorry, can not handle image with %s=%d, %s=%d", ++ "Samples/pixel", td->td_samplesperpixel, ++ "colorchannels", colorchannels); + return 0; + } + break; + case PHOTOMETRIC_CIELAB: +- if( td->td_samplesperpixel != 3 || td->td_bitspersample != 8 ) ++ if( td->td_samplesperpixel != 3 || colorchannels != 3 || td->td_bitspersample != 8 ) + { + sprintf(emsg, +- "Sorry, can not handle image with %s=%d and %s=%d", ++ "Sorry, can not handle image with %s=%d, %s=%d and %s=%d", + "Samples/pixel", td->td_samplesperpixel, ++ "colorchannels", colorchannels, + "Bits/sample", td->td_bitspersample); + return 0; + } +@@ -255,6 +257,9 @@ + int colorchannels; + uint16 *red_orig, *green_orig, *blue_orig; + int n_color; ++ ++ if( !TIFFRGBAImageOK(tif, emsg) ) ++ return 0; + + /* Initialize to normal values */ + img->row_offset = 0; +@@ -2509,29 +2514,33 @@ + case PHOTOMETRIC_RGB: + switch (img->bitspersample) { + case 8: +- if (img->alpha == EXTRASAMPLE_ASSOCALPHA) ++ if (img->alpha == EXTRASAMPLE_ASSOCALPHA && ++ img->samplesperpixel >= 4) + img->put.contig = putRGBAAcontig8bittile; +- else if (img->alpha == EXTRASAMPLE_UNASSALPHA) ++ else if (img->alpha == EXTRASAMPLE_UNASSALPHA && ++ img->samplesperpixel >= 4) + { + if (BuildMapUaToAa(img)) + img->put.contig = putRGBUAcontig8bittile; + } +- else ++ else if( img->samplesperpixel >= 3 ) + img->put.contig = putRGBcontig8bittile; + break; + case 16: +- if (img->alpha == EXTRASAMPLE_ASSOCALPHA) ++ if (img->alpha == EXTRASAMPLE_ASSOCALPHA && ++ img->samplesperpixel >=4 ) + { + if (BuildMapBitdepth16To8(img)) + img->put.contig = putRGBAAcontig16bittile; + } +- else if (img->alpha == EXTRASAMPLE_UNASSALPHA) ++ else if (img->alpha == EXTRASAMPLE_UNASSALPHA && ++ img->samplesperpixel >=4 ) + { + if (BuildMapBitdepth16To8(img) && + BuildMapUaToAa(img)) + img->put.contig = putRGBUAcontig16bittile; + } +- else ++ else if( img->samplesperpixel >=3 ) + { + if (BuildMapBitdepth16To8(img)) + img->put.contig = putRGBcontig16bittile; +@@ -2540,7 +2549,7 @@ + } + break; + case PHOTOMETRIC_SEPARATED: +- if (buildMap(img)) { ++ if (img->samplesperpixel >=4 && buildMap(img)) { + if (img->bitspersample == 8) { + if (!img->Map) + img->put.contig = putRGBcontig8bitCMYKtile; +@@ -2636,7 +2645,7 @@ + } + break; + case PHOTOMETRIC_CIELAB: +- if (buildMap(img)) { ++ if (img->samplesperpixel == 3 && buildMap(img)) { + if (img->bitspersample == 8) + img->put.contig = initCIELabConversion(img); + break; diff --git a/gnu/packages/patches/libtiff-oob-accesses-in-decode.patch b/gnu/packages/patches/libtiff-oob-accesses-in-decode.patch new file mode 100644 index 0000000000..3fea745056 --- /dev/null +++ b/gnu/packages/patches/libtiff-oob-accesses-in-decode.patch @@ -0,0 +1,171 @@ +2015-12-27 Even Rouault + + * libtiff/tif_luv.c: fix potential out-of-bound writes in decode + functions in non debug builds by replacing assert()s by regular if + checks (bugzilla #2522). + Fix potential out-of-bound reads in case of short input data. + +diff -u -r1.40 -r1.41 +--- libtiff/libtiff/tif_luv.c 21 Jun 2015 01:09:09 -0000 1.40 ++++ libtiff/libtiff/tif_luv.c 27 Dec 2015 16:25:11 -0000 1.41 +@@ -1,4 +1,4 @@ +-/* $Id: tif_luv.c,v 1.40 2015-06-21 01:09:09 bfriesen Exp $ */ ++/* $Id: tif_luv.c,v 1.41 2015-12-27 16:25:11 erouault Exp $ */ + + /* + * Copyright (c) 1997 Greg Ward Larson +@@ -202,7 +202,11 @@ + if (sp->user_datafmt == SGILOGDATAFMT_16BIT) + tp = (int16*) op; + else { +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + tp = (int16*) sp->tbuf; + } + _TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0])); +@@ -211,9 +215,11 @@ + cc = tif->tif_rawcc; + /* get each byte string */ + for (shft = 2*8; (shft -= 8) >= 0; ) { +- for (i = 0; i < npixels && cc > 0; ) ++ for (i = 0; i < npixels && cc > 0; ) { + if (*bp >= 128) { /* run */ +- rc = *bp++ + (2-128); /* TODO: potential input buffer overrun when decoding corrupt or truncated data */ ++ if( cc < 2 ) ++ break; ++ rc = *bp++ + (2-128); + b = (int16)(*bp++ << shft); + cc -= 2; + while (rc-- && i < npixels) +@@ -223,6 +229,7 @@ + while (--cc && rc-- && i < npixels) + tp[i++] |= (int16)*bp++ << shft; + } ++ } + if (i != npixels) { + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFErrorExt(tif->tif_clientdata, module, +@@ -268,13 +275,17 @@ + if (sp->user_datafmt == SGILOGDATAFMT_RAW) + tp = (uint32 *)op; + else { +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + tp = (uint32 *) sp->tbuf; + } + /* copy to array of uint32 */ + bp = (unsigned char*) tif->tif_rawcp; + cc = tif->tif_rawcc; +- for (i = 0; i < npixels && cc > 0; i++) { ++ for (i = 0; i < npixels && cc >= 3; i++) { + tp[i] = bp[0] << 16 | bp[1] << 8 | bp[2]; + bp += 3; + cc -= 3; +@@ -325,7 +336,11 @@ + if (sp->user_datafmt == SGILOGDATAFMT_RAW) + tp = (uint32*) op; + else { +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + tp = (uint32*) sp->tbuf; + } + _TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0])); +@@ -334,11 +349,13 @@ + cc = tif->tif_rawcc; + /* get each byte string */ + for (shft = 4*8; (shft -= 8) >= 0; ) { +- for (i = 0; i < npixels && cc > 0; ) ++ for (i = 0; i < npixels && cc > 0; ) { + if (*bp >= 128) { /* run */ ++ if( cc < 2 ) ++ break; + rc = *bp++ + (2-128); + b = (uint32)*bp++ << shft; +- cc -= 2; /* TODO: potential input buffer overrun when decoding corrupt or truncated data */ ++ cc -= 2; + while (rc-- && i < npixels) + tp[i++] |= b; + } else { /* non-run */ +@@ -346,6 +363,7 @@ + while (--cc && rc-- && i < npixels) + tp[i++] |= (uint32)*bp++ << shft; + } ++ } + if (i != npixels) { + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFErrorExt(tif->tif_clientdata, module, +@@ -413,6 +431,7 @@ + static int + LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + { ++ static const char module[] = "LogL16Encode"; + LogLuvState* sp = EncoderState(tif); + int shft; + tmsize_t i; +@@ -433,7 +452,11 @@ + tp = (int16*) bp; + else { + tp = (int16*) sp->tbuf; +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + (*sp->tfunc)(sp, bp, npixels); + } + /* compress each byte string */ +@@ -506,6 +529,7 @@ + static int + LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + { ++ static const char module[] = "LogLuvEncode24"; + LogLuvState* sp = EncoderState(tif); + tmsize_t i; + tmsize_t npixels; +@@ -521,7 +545,11 @@ + tp = (uint32*) bp; + else { + tp = (uint32*) sp->tbuf; +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + (*sp->tfunc)(sp, bp, npixels); + } + /* write out encoded pixels */ +@@ -553,6 +581,7 @@ + static int + LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + { ++ static const char module[] = "LogLuvEncode32"; + LogLuvState* sp = EncoderState(tif); + int shft; + tmsize_t i; +@@ -574,7 +603,11 @@ + tp = (uint32*) bp; + else { + tp = (uint32*) sp->tbuf; +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + (*sp->tfunc)(sp, bp, npixels); + } + /* compress each byte string */ diff --git a/gnu/packages/patches/libtiff-oob-write-in-nextdecode.patch b/gnu/packages/patches/libtiff-oob-write-in-nextdecode.patch new file mode 100644 index 0000000000..50657b667c --- /dev/null +++ b/gnu/packages/patches/libtiff-oob-write-in-nextdecode.patch @@ -0,0 +1,49 @@ +2015-12-27 Even Rouault + + * libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode() + triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif + (bugzilla #2508) + +diff -u -r1.16 -r1.18 +--- libtiff/libtiff/tif_next.c 29 Dec 2014 12:09:11 -0000 1.16 ++++ libtiff/libtiff/tif_next.c 27 Dec 2015 17:14:52 -0000 1.18 +@@ -1,4 +1,4 @@ +-/* $Id: tif_next.c,v 1.16 2014-12-29 12:09:11 erouault Exp $ */ ++/* $Id: tif_next.c,v 1.18 2015-12-27 17:14:52 erouault Exp $ */ + + /* + * Copyright (c) 1988-1997 Sam Leffler +@@ -37,7 +37,7 @@ + case 0: op[0] = (unsigned char) ((v) << 6); break; \ + case 1: op[0] |= (v) << 4; break; \ + case 2: op[0] |= (v) << 2; break; \ +- case 3: *op++ |= (v); break; \ ++ case 3: *op++ |= (v); op_offset++; break; \ + } \ + } + +@@ -103,6 +103,7 @@ + } + default: { + uint32 npixels = 0, grey; ++ tmsize_t op_offset = 0; + uint32 imagewidth = tif->tif_dir.td_imagewidth; + if( isTiled(tif) ) + imagewidth = tif->tif_dir.td_tilewidth; +@@ -122,10 +123,15 @@ + * bounds, potentially resulting in a security + * issue. + */ +- while (n-- > 0 && npixels < imagewidth) ++ while (n-- > 0 && npixels < imagewidth && op_offset < scanline) + SETPIXEL(op, grey); + if (npixels >= imagewidth) + break; ++ if (op_offset >= scanline ) { ++ TIFFErrorExt(tif->tif_clientdata, module, "Invalid data for scanline %ld", ++ (long) tif->tif_row); ++ return (0); ++ } + if (cc == 0) + goto bad; + n = *bp++, cc--; -- cgit v1.2.3 From 1022da10e1dfc9edc7197370930e9d6c589b4b10 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 21 Jan 2016 22:09:42 -0600 Subject: gnu: texi2html: Disable tests. * gnu/packages/texinfo.scm (texi2html): New 'arguments' field. --- gnu/packages/texinfo.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index cc53293221..bffff788fc 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès -;;; Copyright © 2014 Eric Bavier +;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -111,6 +111,11 @@ is on expressing the content semantically, avoiding physical markup commands.") '(utime "texi2html.pl" 0 0 0 0)))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) + (arguments + ;; Tests fail because of warnings on stderr from Perl 5.22. Adjusting + ;; texi2html.pl to avoid the warnings seems non-trivial, so we simply + ;; disable the tests. + '(#:tests? #f)) (home-page "http://www.nongnu.org/texi2html/") (synopsis "Convert Texinfo to HTML") (description -- cgit v1.2.3 From 68716289995d106c7adc779548eebc5df324e6cf Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Fri, 22 Jan 2016 14:33:07 +0800 Subject: gnu: mozjs: Make milestone.pl compatible with Perl 5.22+. * gnu/packages/gnuzilla.scm (mozjs, mozjs-24)[source]: Add snippet. --- gnu/packages/gnuzilla.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 6fac8ced40..03ca0b7ca0 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -64,7 +64,12 @@ name version ".tar.gz")) (sha256 (base32 - "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij")))) + "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij")) + (modules '((guix build utils))) + (snippet + ;; Fix incompatibility with Perl 5.22+. + '(substitute* '("js/src/config/milestone.pl") + (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))))) (build-system gnu-build-system) (native-inputs `(("perl", perl) @@ -103,7 +108,12 @@ in C/C++.") name "-" version ".tar.bz2")) (sha256 (base32 - "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6")))) + "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6")) + (modules '((guix build utils))) + (snippet + ;; Fix incompatibility with Perl 5.22+. + '(substitute* '("js/src/config/milestone.pl") + (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 46854e99caadcaaa282be1093e3ea6454667cac3 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 25 Jan 2016 23:33:54 +0100 Subject: gnu: webkitgtk-2.4, webkitgtk/gtk+-2, qt: Disable parallel builds. * gnu/packages/webkit.scm (webkitgtk-2.4, webkitgtk/gtk+-2): Disable parallel builds as suggested in https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html . * gnu/packages/qt.scm (qt): Likewise. --- gnu/packages/qt.scm | 7 ++++++- gnu/packages/webkit.scm | 12 +++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8f148c9e90..dccc9a2e48 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -182,7 +182,12 @@ X11 (yet).") ("ruby" ,ruby) ("which" ,(@ (gnu packages base) which)))) (arguments - `(#:phases + `(;; FIXME: Disabling parallel building is a quick hack to avoid the + ;; failure described in + ;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html + ;; A more structural fix is needed. + #:parallel-build? #f + #:phases (alist-replace 'configure (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index dd05446603..f902433786 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -149,6 +149,11 @@ HTML/CSS applications to full-fledged web browsers.") (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests + ;; FIXME: Disabling parallel building is a quick hack to avoid the + ;; failure described in + ;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html + ;; A more structural fix is needed. + #:parallel-build? #f #:phases (modify-phases %standard-phases (add-after 'unpack 'set-gcc @@ -163,7 +168,12 @@ HTML/CSS applications to full-fledged web browsers.") (package (inherit webkitgtk-2.4) (name "webkitgtk-gtk2") (arguments - `(#:configure-flags + `(;; FIXME: Disabling parallel building is a quick hack to avoid the + ;; failure described in + ;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html + ;; A more structural fix is needed. + #:parallel-build? #f + #:configure-flags '("--enable-webkit2=no" "--with-gtk=2.0") ,@(package-arguments webkitgtk-2.4))) -- cgit v1.2.3 From a394c60aa381d2284e382b48af990b6bdc5f33b4 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 26 Jan 2016 15:10:23 +0100 Subject: gnu: hop: Add input avahi. gnu/packages/scheme.scm (hop)[inputs]: Add avahi. --- gnu/packages/scheme.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index aea8b54433..b438c3e90c 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -256,7 +256,8 @@ Scheme and C programs and between Scheme and Java programs.") "-ldopt -Wl,-rpath," out "/lib"))))) %standard-phases) #:tests? #f)) ; no test suite - (inputs `(("bigloo" ,bigloo) + (inputs `(("avahi" ,avahi) + ("bigloo" ,bigloo) ("which" ,which))) (home-page "http://hop.inria.fr/") (synopsis "Multi-tier programming language for the Web 2.0") -- cgit v1.2.3 From 29a780147d066d5ce218d1fa2678a0a36a1145e3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 28 Jan 2016 00:22:49 -0500 Subject: gnu: icecat: Add fixes for CVE-2016-{1930,1935} and other bugs. * gnu/packages/patches/icecat-CVE-2016-1930-pt01.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt02.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt03.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt04.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt05.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt06.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt07.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt08.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt09.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt10.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt11.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt12.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt13.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt15.patch, gnu/packages/patches/icecat-CVE-2016-1935.patch, gnu/packages/patches/icecat-bug-1146335-pt1.patch, gnu/packages/patches/icecat-bug-1146335-pt2.patch, gnu/packages/patches/icecat-limit-max-buffers-size-for-ANGLE.patch: New files. * gnu-system.am (dist_patch_DATA): Add them. * gnu/packages/gnuzilla.scm (icecat)[source]: Add patches. --- gnu-system.am | 19 ++ gnu/packages/gnuzilla.scm | 24 +- .../patches/icecat-CVE-2016-1930-pt01.patch | 34 +++ .../patches/icecat-CVE-2016-1930-pt02.patch | 33 +++ .../patches/icecat-CVE-2016-1930-pt03.patch | 308 +++++++++++++++++++++ .../patches/icecat-CVE-2016-1930-pt04.patch | 47 ++++ .../patches/icecat-CVE-2016-1930-pt05.patch | 51 ++++ .../patches/icecat-CVE-2016-1930-pt06.patch | 170 ++++++++++++ .../patches/icecat-CVE-2016-1930-pt07.patch | 56 ++++ .../patches/icecat-CVE-2016-1930-pt08.patch | 48 ++++ .../patches/icecat-CVE-2016-1930-pt09.patch | 189 +++++++++++++ .../patches/icecat-CVE-2016-1930-pt10.patch | 33 +++ .../patches/icecat-CVE-2016-1930-pt11.patch | 183 ++++++++++++ .../patches/icecat-CVE-2016-1930-pt12.patch | 91 ++++++ .../patches/icecat-CVE-2016-1930-pt13.patch | 34 +++ .../patches/icecat-CVE-2016-1930-pt14.patch | 83 ++++++ .../patches/icecat-CVE-2016-1930-pt15.patch | 35 +++ gnu/packages/patches/icecat-CVE-2016-1935.patch | 77 ++++++ gnu/packages/patches/icecat-bug-1146335-pt1.patch | 141 ++++++++++ gnu/packages/patches/icecat-bug-1146335-pt2.patch | 43 +++ .../icecat-limit-max-buffers-size-for-ANGLE.patch | 73 +++++ 21 files changed, 1770 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt01.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt02.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt03.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt04.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt05.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt06.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt07.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt08.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt09.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt10.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt11.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt12.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt13.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1930-pt15.patch create mode 100644 gnu/packages/patches/icecat-CVE-2016-1935.patch create mode 100644 gnu/packages/patches/icecat-bug-1146335-pt1.patch create mode 100644 gnu/packages/patches/icecat-bug-1146335-pt2.patch create mode 100644 gnu/packages/patches/icecat-limit-max-buffers-size-for-ANGLE.patch diff --git a/gnu-system.am b/gnu-system.am index 297f40a50e..45511d2eb8 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -517,7 +517,26 @@ dist_patch_DATA = \ gnu/packages/patches/hop-linker-flags.patch \ gnu/packages/patches/hydra-automake-1.15.patch \ gnu/packages/patches/hydra-disable-darcs-test.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt01.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt02.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt03.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt04.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt05.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt06.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt07.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt08.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt09.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt10.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt11.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt12.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt13.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch \ + gnu/packages/patches/icecat-CVE-2016-1930-pt15.patch \ + gnu/packages/patches/icecat-CVE-2016-1935.patch \ gnu/packages/patches/icecat-avoid-bundled-includes.patch \ + gnu/packages/patches/icecat-bug-1146335-pt1.patch \ + gnu/packages/patches/icecat-bug-1146335-pt2.patch \ + gnu/packages/patches/icecat-limit-max-buffers-size-for-ANGLE.patch \ gnu/packages/patches/icu4c-CVE-2014-6585.patch \ gnu/packages/patches/icu4c-CVE-2015-1270.patch \ gnu/packages/patches/icu4c-CVE-2015-4760.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 03ca0b7ca0..62010dbf6b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès -;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu ;;; ;;; This file is part of GNU Guix. @@ -287,7 +287,27 @@ standards.") (sha256 (base32 "0m18xyb0rd02yaw9xd5z4bab1wr2599iszzqhm86c134jv5vk6cg")) - (patches (map search-patch '("icecat-avoid-bundled-includes.patch"))) + (patches (map search-patch + '("icecat-avoid-bundled-includes.patch" + "icecat-CVE-2016-1930-pt01.patch" + "icecat-CVE-2016-1930-pt02.patch" + "icecat-CVE-2016-1930-pt03.patch" + "icecat-CVE-2016-1930-pt04.patch" + "icecat-CVE-2016-1930-pt05.patch" + "icecat-CVE-2016-1930-pt06.patch" + "icecat-CVE-2016-1930-pt07.patch" + "icecat-CVE-2016-1930-pt08.patch" + "icecat-CVE-2016-1930-pt09.patch" + "icecat-CVE-2016-1930-pt10.patch" + "icecat-CVE-2016-1930-pt11.patch" + "icecat-CVE-2016-1930-pt12.patch" + "icecat-CVE-2016-1930-pt13.patch" + "icecat-bug-1146335-pt1.patch" + "icecat-bug-1146335-pt2.patch" + "icecat-CVE-2016-1935.patch" + "icecat-CVE-2016-1930-pt14.patch" + "icecat-CVE-2016-1930-pt15.patch" + "icecat-limit-max-buffers-size-for-ANGLE.patch"))) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/icecat-CVE-2016-1930-pt01.patch b/gnu/packages/patches/icecat-CVE-2016-1930-pt01.patch new file mode 100644 index 0000000000..27768fa1ac --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2016-1930-pt01.patch @@ -0,0 +1,34 @@ +Copied from: https://hg.mozilla.org/releases/mozilla-esr38/rev/925215cae26f +Security advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2016-01/ +Mozilla Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1233346 + +# HG changeset patch +# User Nils Ohlmeier +# Date 1451439902 18000 +# Node ID 925215cae26f9c0ccff07ef403a5b3194a4c45c4 +# Parent ff8e52467d793e935b80bf22a722a71a96fe2d63 +Bug 1233346 - r=ekr a=abillings + +diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs.c b/media/mtransport/third_party/nICEr/src/stun/addrs.c +--- a/media/mtransport/third_party/nICEr/src/stun/addrs.c ++++ b/media/mtransport/third_party/nICEr/src/stun/addrs.c +@@ -530,16 +530,18 @@ stun_get_win32_addrs(nr_local_addr addrs + + for (tmpAddress = AdapterAddresses; tmpAddress != NULL; tmpAddress = tmpAddress->Next) { + char *c; + + if (tmpAddress->OperStatus != IfOperStatusUp) + continue; + + snprintf(munged_ifname, IFNAMSIZ, "%S%c", tmpAddress->FriendlyName, 0); ++ munged_ifname[IFNAMSIZ-1] = '\0'; ++ + /* replace spaces with underscores */ + c = strchr(munged_ifname, ' '); + while (c != NULL) { + *c = '_'; + c = strchr(munged_ifname, ' '); + } + c = strchr(munged_ifname, '.'); + while (c != NULL) { + diff --git a/gnu/packages/patches/icecat-CVE-2016-1930-pt02.patch b/gnu/packages/patches/icecat-CVE-2016-1930-pt02.patch new file mode 100644 index 0000000000..fa1804eb82 --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2016-1930-pt02.patch @@ -0,0 +1,33 @@ +Copied from: https://hg.mozilla.org/releases/mozilla-esr38/rev/fc78180165a8 +Security advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2016-01/ +Mozilla Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1223670 + +# HG changeset patch +# User Karl Tomlinson +# Date 1449117514 -46800 +# Node ID fc78180165a8262c80bbb722ed99b2e0c27b02d0 +# Parent 925215cae26f9c0ccff07ef403a5b3194a4c45c4 +bug 1223670 assert that connected streams have the same graph r=padenot a=abillings + +diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp +--- a/dom/media/MediaStreamGraph.cpp ++++ b/dom/media/MediaStreamGraph.cpp +@@ -2696,16 +2696,17 @@ ProcessedMediaStream::AllocateInputPort( + unused << mPort.forget(); + } + virtual void RunDuringShutdown() + { + Run(); + } + nsRefPtr mPort; + }; ++ MOZ_ASSERT(aStream->GraphImpl() == GraphImpl()); + nsRefPtr port = new MediaInputPort(aStream, this, aFlags, + aInputNumber, aOutputNumber); + port->SetGraphImpl(GraphImpl()); + GraphImpl()->AppendMessage(new Message(port)); + return port.forget(); + } + + void + diff --git a/gnu/packages/patches/icecat-CVE-2016-1930-pt03.patch b/gnu/packages/patches/icecat-CVE-2016-1930-pt03.patch new file mode 100644 index 0000000000..cf0843b8b3 --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2016-1930-pt03.patch @@ -0,0 +1,308 @@ +Copied from: https://hg.mozilla.org/releases/mozilla-esr38/rev/f746c38d160e +Security advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2016-01/ +Mozilla Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1223670 + +# HG changeset patch +# User Karl Tomlinson +# Date 1449764754 18000 +# Node ID f746c38d160ea29088c15cacae44f3662befaec5 +# Parent fc78180165a8262c80bbb722ed99b2e0c27b02d0 +bug 1223670 replace public constructors with fallible factory methods r=baku a=abillings + +diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp +--- a/dom/media/webaudio/AudioContext.cpp ++++ b/dom/media/webaudio/AudioContext.cpp +@@ -299,32 +299,29 @@ AudioContext::CreateMediaElementSource(H + aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR); + return nullptr; + } + #endif + nsRefPtr stream = aMediaElement.MozCaptureStream(aRv); + if (aRv.Failed()) { + return nullptr; + } +- nsRefPtr mediaElementAudioSourceNode = +- new MediaElementAudioSourceNode(this, stream); +- return mediaElementAudioSourceNode.forget(); ++ return MediaElementAudioSourceNode::Create(this, stream, aRv); + } + + already_AddRefed + AudioContext::CreateMediaStreamSource(DOMMediaStream& aMediaStream, + ErrorResult& aRv) + { + if (mIsOffline) { + aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR); + return nullptr; + } +- nsRefPtr mediaStreamAudioSourceNode = +- new MediaStreamAudioSourceNode(this, &aMediaStream); +- return mediaStreamAudioSourceNode.forget(); ++ ++ return MediaStreamAudioSourceNode::Create(this, &aMediaStream, aRv); + } + + already_AddRefed + AudioContext::CreateGain() + { + nsRefPtr gainNode = new GainNode(this); + return gainNode.forget(); + } +diff --git a/dom/media/webaudio/AudioNode.cpp b/dom/media/webaudio/AudioNode.cpp +--- a/dom/media/webaudio/AudioNode.cpp ++++ b/dom/media/webaudio/AudioNode.cpp +@@ -61,34 +61,29 @@ AudioNode::AudioNode(AudioContext* aCont + ChannelInterpretation aChannelInterpretation) + : DOMEventTargetHelper(aContext->GetParentObject()) + , mContext(aContext) + , mChannelCount(aChannelCount) + , mChannelCountMode(aChannelCountMode) + , mChannelInterpretation(aChannelInterpretation) + , mId(gId++) + , mPassThrough(false) +-#ifdef DEBUG +- , mDemiseNotified(false) +-#endif + { + MOZ_ASSERT(aContext); + DOMEventTargetHelper::BindToOwner(aContext->GetParentObject()); + aContext->UpdateNodeCount(1); + } + + AudioNode::~AudioNode() + { + MOZ_ASSERT(mInputNodes.IsEmpty()); + MOZ_ASSERT(mOutputNodes.IsEmpty()); + MOZ_ASSERT(mOutputParams.IsEmpty()); +-#ifdef DEBUG +- MOZ_ASSERT(mDemiseNotified, ++ MOZ_ASSERT(!mStream, + "The webaudio-node-demise notification must have been sent"); +-#endif + if (mContext) { + mContext->UpdateNodeCount(-1); + } + } + + size_t + AudioNode::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const + { +@@ -399,19 +394,16 @@ AudioNode::DestroyMediaStream() + mStream = nullptr; + + nsCOMPtr obs = services::GetObserverService(); + if (obs) { + nsAutoString id; + id.AppendPrintf("%u", mId); + obs->NotifyObservers(nullptr, "webaudio-node-demise", id.get()); + } +-#ifdef DEBUG +- mDemiseNotified = true; +-#endif + } + } + + void + AudioNode::RemoveOutputParam(AudioParam* aParam) + { + mOutputParams.RemoveElement(aParam); + } +diff --git a/dom/media/webaudio/AudioNode.h b/dom/media/webaudio/AudioNode.h +--- a/dom/media/webaudio/AudioNode.h ++++ b/dom/media/webaudio/AudioNode.h +@@ -239,19 +239,14 @@ private: + nsTArray > mOutputParams; + uint32_t mChannelCount; + ChannelCountMode mChannelCountMode; + ChannelInterpretation mChannelInterpretation; + const uint32_t mId; + // Whether the node just passes through its input. This is a devtools API that + // only works for some node types. + bool mPassThrough; +-#ifdef DEBUG +- // In debug builds, check to make sure that the node demise notification has +- // been properly sent before the node is destroyed. +- bool mDemiseNotified; +-#endif + }; + + } + } + + #endif +diff --git a/dom/media/webaudio/MediaElementAudioSourceNode.cpp b/dom/media/webaudio/MediaElementAudioSourceNode.cpp +--- a/dom/media/webaudio/MediaElementAudioSourceNode.cpp ++++ b/dom/media/webaudio/MediaElementAudioSourceNode.cpp +@@ -5,22 +5,36 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + + #include "MediaElementAudioSourceNode.h" + #include "mozilla/dom/MediaElementAudioSourceNodeBinding.h" + + namespace mozilla { + namespace dom { + +-MediaElementAudioSourceNode::MediaElementAudioSourceNode(AudioContext* aContext, +- DOMMediaStream* aStream) +- : MediaStreamAudioSourceNode(aContext, aStream) ++MediaElementAudioSourceNode::MediaElementAudioSourceNode(AudioContext* aContext) ++ : MediaStreamAudioSourceNode(aContext) + { + } + ++/* static */ already_AddRefed ++MediaElementAudioSourceNode::Create(AudioContext* aContext, ++ DOMMediaStream* aStream, ErrorResult& aRv) ++{ ++ nsRefPtr node = ++ new MediaElementAudioSourceNode(aContext); ++ ++ node->Init(aStream, aRv); ++ if (aRv.Failed()) { ++ return nullptr; ++ } ++ ++ return node.forget(); ++} ++ + JSObject* + MediaElementAudioSourceNode::WrapObject(JSContext* aCx) + { + return MediaElementAudioSourceNodeBinding::Wrap(aCx, this); + } + + } + } +diff --git a/dom/media/webaudio/MediaElementAudioSourceNode.h b/dom/media/webaudio/MediaElementAudioSourceNode.h +--- a/dom/media/webaudio/MediaElementAudioSourceNode.h ++++ b/dom/media/webaudio/MediaElementAudioSourceNode.h +@@ -10,28 +10,30 @@ + #include "MediaStreamAudioSourceNode.h" + + namespace mozilla { + namespace dom { + + class MediaElementAudioSourceNode : public MediaStreamAudioSourceNode + { + public: +- MediaElementAudioSourceNode(AudioContext* aContext, +- DOMMediaStream* aStream); ++ static already_AddRefed ++ Create(AudioContext* aContext, DOMMediaStream* aStream, ErrorResult& aRv); + + virtual JSObject* WrapObject(JSContext* aCx) override; + + virtual const char* NodeType() const override + { + return "MediaElementAudioSourceNode"; + } + + virtual size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override + { + return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf); + } ++private: ++ explicit MediaElementAudioSourceNode(AudioContext* aContext); + }; + + } + } + + #endif +diff --git a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp +--- a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp ++++ b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp +@@ -25,26 +25,45 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END + + NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaStreamAudioSourceNode) + NS_INTERFACE_MAP_END_INHERITING(AudioNode) + + NS_IMPL_ADDREF_INHERITED(MediaStreamAudioSourceNode, AudioNode) + NS_IMPL_RELEASE_INHERITED(MediaStreamAudioSourceNode, AudioNode) + +-MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* aContext, +- DOMMediaStream* aMediaStream) ++MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* aContext) + : AudioNode(aContext, + 2, + ChannelCountMode::Max, +- ChannelInterpretation::Speakers), +- mInputStream(aMediaStream) ++ ChannelInterpretation::Speakers) + { ++} ++ ++/* static */ already_AddRefed ++MediaStreamAudioSourceNode::Create(AudioContext* aContext, ++ DOMMediaStream* aStream, ErrorResult& aRv) ++{ ++ nsRefPtr node = ++ new MediaStreamAudioSourceNode(aContext); ++ ++ node->Init(aStream, aRv); ++ if (aRv.Failed()) { ++ return nullptr; ++ } ++ ++ return node.forget(); ++} ++ ++void ++MediaStreamAudioSourceNode::Init(DOMMediaStream* aMediaStream, ErrorResult& aRv) ++{ ++ mInputStream = aMediaStream; + AudioNodeEngine* engine = new MediaStreamAudioSourceNodeEngine(this); +- mStream = aContext->Graph()->CreateAudioNodeExternalInputStream(engine); ++ mStream = Context()->Graph()->CreateAudioNodeExternalInputStream(engine); + ProcessedMediaStream* outputStream = static_cast(mStream.get()); + mInputPort = outputStream->AllocateInputPort(aMediaStream->GetStream(), + MediaInputPort::FLAG_BLOCK_INPUT); + mInputStream->AddConsumerToKeepAlive(static_cast(this)); + + PrincipalChanged(mInputStream); // trigger enabling/disabling of the connector + mInputStream->AddPrincipalChangeObserver(this); + } +diff --git a/dom/media/webaudio/MediaStreamAudioSourceNode.h b/dom/media/webaudio/MediaStreamAudioSourceNode.h +--- a/dom/media/webaudio/MediaStreamAudioSourceNode.h ++++ b/dom/media/webaudio/MediaStreamAudioSourceNode.h +@@ -38,17 +38,18 @@ public: + private: + bool mEnabled; + }; + + class MediaStreamAudioSourceNode : public AudioNode, + public DOMMediaStream::PrincipalChangeObserver + { + public: +- MediaStreamAudioSourceNode(AudioContext* aContext, DOMMediaStream* aMediaStream); ++ static already_AddRefed ++ Create(AudioContext* aContext, DOMMediaStream* aStream, ErrorResult& aRv); + + NS_DECL_ISUPPORTS_INHERITED + NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaStreamAudioSourceNode, AudioNode) + + virtual JSObject* WrapObject(JSContext* aCx) override; + + virtual void DestroyMediaStream() override; + +@@ -60,16 +61,18 @@ public: + } + + virtual size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override; + virtual size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override; + + virtual void PrincipalChanged(DOMMediaStream* aMediaStream) override; + + protected: ++ explicit MediaStreamAudioSourceNode(AudioContext* aContext); ++ void Init(DOMMediaStream* aMediaStream, ErrorResult& aRv); + virtual ~MediaStreamAudioSourceNode(); + + private: + nsRefPtr mInputPort; + nsRefPtr mInputStream; + }; + + } + diff --git a/gnu/packages/patches/icecat-CVE-2016-1930-pt04.patch b/gnu/packages/patches/icecat-CVE-2016-1930-pt04.patch new file mode 100644 index 0000000000..b212a70d4a --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2016-1930-pt04.patch @@ -0,0 +1,47 @@ +Copied from: https://hg.mozilla.org/releases/mozilla-esr38/rev/6d43ff33bd55 +Security advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2016-01/ +Mozilla Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1223670 + +# HG changeset patch +# User Karl Tomlinson +# Date 1451362442 -46800 +# Node ID 6d43ff33bd552b8f7a34e4105cf5bcc0a8c8ea8c +# Parent f746c38d160ea29088c15cacae44f3662befaec5 +bug 1223670 throw not supported when creating a node from a stream with different channel r=baku a=abillings + +diff --git a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp +--- a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp ++++ b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp +@@ -51,21 +51,29 @@ MediaStreamAudioSourceNode::Create(Audio + } + + return node.forget(); + } + + void + MediaStreamAudioSourceNode::Init(DOMMediaStream* aMediaStream, ErrorResult& aRv) + { ++ MOZ_ASSERT(aMediaStream); ++ MediaStream* inputStream = aMediaStream->GetStream(); ++ MediaStreamGraph* graph = Context()->Graph(); ++ if (NS_WARN_IF(graph != inputStream->Graph())) { ++ aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR); ++ return; ++ } ++ + mInputStream = aMediaStream; + AudioNodeEngine* engine = new MediaStreamAudioSourceNodeEngine(this); +- mStream = Context()->Graph()->CreateAudioNodeExternalInputStream(engine); ++ mStream = graph->CreateAudioNodeExternalInputStream(engine); + ProcessedMediaStream* outputStream = static_cast(mStream.get()); +- mInputPort = outputStream->AllocateInputPort(aMediaStream->GetStream(), ++ mInputPort = outputStream->AllocateInputPort(inputStream, + MediaInputPort::FLAG_BLOCK_INPUT); + mInputStream->AddConsumerToKeepAlive(static_cast(this)); + + PrincipalChanged(mInputStream); // trigger enabling/disabling of the connector + mInputStream->AddPrincipalChangeObserver(this); + } + + MediaStreamAudioSourceNode::~MediaStreamAudioSourceNode() + diff --git a/gnu/packages/patches/icecat-CVE-2016-1930-pt05.patch b/gnu/packages/patches/icecat-CVE-2016-1930-pt05.patch new file mode 100644 index 0000000000..3e62c9c5f1 --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2016-1930-pt05.patch @@ -0,0 +1,51 @@ +Copied from: https://hg.mozilla.org/releases/mozilla-esr38/rev/4f6e81673f69 +Security advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2016-01/ +Mozilla Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1223670 + +# HG changeset patch +# User Karl Tomlinson +# Date 1449145091 -46800 +# Node ID 4f6e81673f6938719c86516606f2fda493e8c23c +# Parent 6d43ff33bd552b8f7a34e4105cf5bcc0a8c8ea8c +bug 1223670 make SetMozAudioChannelType() private because the type will not change after construction r=baku a=abillings + +diff --git a/dom/media/webaudio/AudioDestinationNode.h b/dom/media/webaudio/AudioDestinationNode.h +--- a/dom/media/webaudio/AudioDestinationNode.h ++++ b/dom/media/webaudio/AudioDestinationNode.h +@@ -57,17 +57,16 @@ public: + void StartRendering(Promise* aPromise); + + void OfflineShutdown(); + + // nsIDOMEventListener - by proxy + NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) override; + + AudioChannel MozAudioChannelType() const; +- void SetMozAudioChannelType(AudioChannel aValue, ErrorResult& aRv); + + virtual void NotifyMainThreadStateChanged() override; + void FireOfflineCompletionEvent(); + + // An amount that should be added to the MediaStream's current time to + // get the AudioContext.currentTime. + double ExtraCurrentTime(); + +@@ -86,16 +85,17 @@ public: + + void InputMuted(bool aInputMuted); + void ResolvePromise(AudioBuffer* aRenderedBuffer); + + protected: + virtual ~AudioDestinationNode(); + + private: ++ void SetMozAudioChannelType(AudioChannel aValue, ErrorResult& aRv); + bool CheckAudioChannelPermissions(AudioChannel aValue); + + void SetCanPlay(bool aCanPlay); + + void NotifyStableState(); + void ScheduleStableStateNotification(); + + SelfReference mOfflineRenderingRef; + diff --git a/gnu/packages/patches/icecat-CVE-2016-1930-pt06.patch b/gnu/packages/patches/icecat-CVE-2016-1930-pt06.patch new file mode 100644 index 0000000000..ec1f479ee4 --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2016-1930-pt06.patch @@ -0,0 +1,170 @@ +Copied from: https://hg.mozilla.org/releases/mozilla-esr38/rev/93617c30c0df +Security advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2016-01/ +Mozilla Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1230686 + +# HG changeset patch +# User Lee Salzman +# Date 1451932822 18000 +# Node ID 93617c30c0df35f719dead526b78649d564f5ac3 +# Parent 4f6e81673f6938719c86516606f2fda493e8c23c +Bug 1230686 - use RefPtr& instead of DrawTarget* to track changes in SurfaceFromElement a=ritu + +diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp +--- a/layout/base/nsLayoutUtils.cpp ++++ b/layout/base/nsLayoutUtils.cpp +@@ -6494,17 +6494,17 @@ nsLayoutUtils::IsReallyFixedPos(nsIFrame + nsIAtom *parentType = aFrame->GetParent()->GetType(); + return parentType == nsGkAtoms::viewportFrame || + parentType == nsGkAtoms::pageContentFrame; + } + + nsLayoutUtils::SurfaceFromElementResult + nsLayoutUtils::SurfaceFromElement(nsIImageLoadingContent* aElement, + uint32_t aSurfaceFlags, +- DrawTarget* aTarget) ++ RefPtr& aTarget) + { + SurfaceFromElementResult result; + nsresult rv; + + nsCOMPtr imgRequest; + rv = aElement->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST, + getter_AddRefs(imgRequest)); + if (NS_FAILED(rv) || !imgRequest) +@@ -6586,41 +6586,41 @@ nsLayoutUtils::SurfaceFromElement(nsIIma + result.mImageRequest = imgRequest.forget(); + + return result; + } + + nsLayoutUtils::SurfaceFromElementResult + nsLayoutUtils::SurfaceFromElement(HTMLImageElement *aElement, + uint32_t aSurfaceFlags, +- DrawTarget* aTarget) ++ RefPtr& aTarget) + { + return SurfaceFromElement(static_cast(aElement), + aSurfaceFlags, aTarget); + } + + nsLayoutUtils::SurfaceFromElementResult + nsLayoutUtils::SurfaceFromElement(HTMLCanvasElement* aElement, + uint32_t aSurfaceFlags, +- DrawTarget* aTarget) ++ RefPtr& aTarget) + { + SurfaceFromElementResult result; + + bool* isPremultiplied = nullptr; + if (aSurfaceFlags & SFE_PREFER_NO_PREMULTIPLY_ALPHA) { + isPremultiplied = &result.mIsPremultiplied; + } + + gfxIntSize size = aElement->GetSize(); + + result.mSourceSurface = aElement->GetSurfaceSnapshot(isPremultiplied); + if (!result.mSourceSurface) { + // If the element doesn't have a context then we won't get a snapshot. The canvas spec wants us to not error and just + // draw nothing, so return an empty surface. +- DrawTarget *ref = aTarget ? aTarget : gfxPlatform::GetPlatform()->ScreenReferenceDrawTarget(); ++ DrawTarget *ref = aTarget ? aTarget.get() : gfxPlatform::GetPlatform()->ScreenReferenceDrawTarget(); + RefPtr dt = ref->CreateSimilarDrawTarget(IntSize(size.width, size.height), + SurfaceFormat::B8G8R8A8); + if (dt) { + result.mSourceSurface = dt->Snapshot(); + } + } else if (aTarget) { + RefPtr opt = aTarget->OptimizeSourceSurface(result.mSourceSurface); + if (opt) { +@@ -6637,17 +6637,17 @@ nsLayoutUtils::SurfaceFromElement(HTMLCa + result.mIsWriteOnly = aElement->IsWriteOnly(); + + return result; + } + + nsLayoutUtils::SurfaceFromElementResult + nsLayoutUtils::SurfaceFromElement(HTMLVideoElement* aElement, + uint32_t aSurfaceFlags, +- DrawTarget* aTarget) ++ RefPtr& aTarget) + { + SurfaceFromElementResult result; + + NS_WARN_IF_FALSE((aSurfaceFlags & SFE_PREFER_NO_PREMULTIPLY_ALPHA) == 0, "We can't support non-premultiplied alpha for video!"); + + #ifdef MOZ_EME + if (aElement->ContainsRestrictedContent()) { + return result; +@@ -6689,17 +6689,17 @@ nsLayoutUtils::SurfaceFromElement(HTMLVi + result.mIsWriteOnly = false; + + return result; + } + + nsLayoutUtils::SurfaceFromElementResult + nsLayoutUtils::SurfaceFromElement(dom::Element* aElement, + uint32_t aSurfaceFlags, +- DrawTarget* aTarget) ++ RefPtr& aTarget) + { + // If it's a , we may be able to just grab its internal surface + if (HTMLCanvasElement* canvas = + HTMLCanvasElement::FromContentOrNull(aElement)) { + return SurfaceFromElement(canvas, aSurfaceFlags, aTarget); + } + + // Maybe it's