[PATCH 0/6] Libreoffice CVE and update

[PATCH 0/6] Libreoffice CVE and update

[Efraim Flashner]

Now that vigra is building again, I've put together a patch to update
libreoffice to address CVE-2016-0794 and CVE-2016-0795. Currently its
building on my machine, but hydra says the last successful build took
7 hours and I'm currently ~5.5 into my build, but I'm expecting close
to 20 hours for a complete build. So in addition to checking over the
patches (notably liblangtag which is new, mdds which has a second version
and libreoffice with several changes), if someone with a fast computer
wants to see if they can finish building before me that'd be great.

Efraim Flashner (6):
  gnu: Add liblangtag.
  gnu: mdds: Update to 1.1.0.
  gnu: orcus: Update to 0.11.0.
  gnu: ixion: Update to 0.11.0.
  gnu: libetonyek: Update to 0.1.6.
  gnu: libreoffice: Update to 5.1.1.3. [Fixes CVE-2016-{0794, 0795}].

 gnu/packages/boost.scm       | 26 +++++++++++++----
 gnu/packages/libreoffice.scm | 67 ++++++++++++++++++++++++++++++++++----------
 2 files changed, 73 insertions(+), 20 deletions(-)

-- 
2.7.0

[PATCH 1/6] gnu: Add liblangtag.

[Efraim Flashner]

* gnu/packages/libreoffice.scm (liblangtag): New variable.
---
 gnu/packages/libreoffice.scm | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index a82cde7..62dcb59 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
+;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,7 +22,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module ((guix licenses)
-                #:select (gpl2+ lgpl2.1+ mpl1.1 mpl2.0
+                #:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0
                           non-copyleft x11-style))
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -373,6 +374,33 @@ CorelDRAW documents of all versions.")
 Apple Keynote documents.  It currently supports Keynote versions 2 to 5.")
     (license mpl2.0)))
 
+(define-public liblangtag
+  (package
+    (name "liblangtag")
+    (version "0.5.8")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://bitbucket.org/tagoh/liblangtag/downloads/"
+                            name "-" version ".tar.bz2"))
+        (sha256
+         (base32
+          "1akf0d7yp29pv3j2pw2riii4n5kyjr9szc0y77khnx9zzr5zdqh8"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxml2" ,libxml2)))
+    (home-page "http://tagoh.bitbucket.org/liblangtag/")
+    (synopsis "Library to access tags for identifying languages")
+    (description "liblangtag is an interface library to access/deal with tags
+for identifying languages, which is described in RFC 5646.  It supports
+extensions in extensions RFC6067, RFC6497, and new T Extensions for
+language/locale identifier in CLDR 21.0.2.")
+    (license (list lgpl3+ mpl2.0))))
+
+
 (define-public libexttextcat
   (package
     (name "libexttextcat")
-- 
2.7.0

Re: [PATCH 1/6] gnu: Add liblangtag.

[Andreas Enge]

On Mon, Mar 07, 2016 at 12:42:02PM +0200, Efraim Flashner wrote:
> * gnu/packages/libreoffice.scm (liblangtag): New variable.

It compiles without problem for me.

> +    (description "liblangtag is an interface library to access/deal with tags
> +for identifying languages, which is described in RFC 5646.  It supports
> +extensions in extensions RFC6067, RFC6497, and new T Extensions for
> +language/locale identifier in CLDR 21.0.2.")

The description is a bit convoluted and not really understandable.
How about, as a first approximation:
liblangtag implements an interface to work with tags
for identifying languages as described in RFC 5646.  It supports
the extensions described in RFC6067 and RFC6497, and Extension T for
language/locale identifier as described in the Unicode CLDR standard 21.0.2.

I do not know whether we capitalise the first letter of the proper name
"liblangtag".

Andreas

Re: [PATCH 1/6] gnu: Add liblangtag.

[Leo Famulari]

On Mon, Mar 07, 2016 at 12:42:02PM +0200, Efraim Flashner wrote:
> * gnu/packages/libreoffice.scm (liblangtag): New variable.
> ---
>  gnu/packages/libreoffice.scm | 32 ++++++++++++++++++++++++++++++--
>  1 file changed, 30 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
> index a82cde7..62dcb59 100644
> --- a/gnu/packages/libreoffice.scm
> +++ b/gnu/packages/libreoffice.scm
> @@ -1,6 +1,7 @@
>  ;;; GNU Guix --- Functional package management for GNU
> -;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
>  ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
> +;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>

Same question here as for Eric's line.

> +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -21,7 +22,7 @@
>    #:use-module (guix build-system gnu)
>    #:use-module (guix download)
>    #:use-module ((guix licenses)
> -                #:select (gpl2+ lgpl2.1+ mpl1.1 mpl2.0
> +                #:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0
>                            non-copyleft x11-style))
>    #:use-module (guix packages)
>    #:use-module (guix utils)
> @@ -373,6 +374,33 @@ CorelDRAW documents of all versions.")
>  Apple Keynote documents.  It currently supports Keynote versions 2 to 5.")
>      (license mpl2.0)))
>  
> +(define-public liblangtag
> +  (package
> +    (name "liblangtag")
> +    (version "0.5.8")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (string-append "https://bitbucket.org/tagoh/liblangtag/downloads/"
> +                            name "-" version ".tar.bz2"))
> +        (sha256
> +         (base32
> +          "1akf0d7yp29pv3j2pw2riii4n5kyjr9szc0y77khnx9zzr5zdqh8"))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("libtool" ,libtool)
> +       ("pkg-config" ,pkg-config)))
> +    (inputs
> +     `(("libxml2" ,libxml2)))
> +    (home-page "http://tagoh.bitbucket.org/liblangtag/")
> +    (synopsis "Library to access tags for identifying languages")
> +    (description "liblangtag is an interface library to access/deal with tags
> +for identifying languages, which is described in RFC 5646.  It supports
> +extensions in extensions RFC6067, RFC6497, and new T Extensions for
> +language/locale identifier in CLDR 21.0.2.")
> +    (license (list lgpl3+ mpl2.0))))
> +
> +
>  (define-public libexttextcat
>    (package
>      (name "libexttextcat")
> -- 
> 2.7.0
> 
> 

Re: [PATCH 1/6] gnu: Add liblangtag.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]

On Mon, 7 Mar 2016 14:43:02 -0500
Leo Famulari <leo@famulari.name> wrote:

> On Mon, Mar 07, 2016 at 12:42:02PM +0200, Efraim Flashner wrote:
> > * gnu/packages/libreoffice.scm (liblangtag): New variable.
> > ---
> >  gnu/packages/libreoffice.scm | 32 ++++++++++++++++++++++++++++++--
> >  1 file changed, 30 insertions(+), 2 deletions(-)
> > 
> > diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
> > index a82cde7..62dcb59 100644
> > --- a/gnu/packages/libreoffice.scm
> > +++ b/gnu/packages/libreoffice.scm
> > @@ -1,6 +1,7 @@
> >  ;;; GNU Guix --- Functional package management for GNU
> > -;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
> >  ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
> > +;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>  
> 
> Same question here as for Eric's line.
> 

I wanted the copyright lines to be organized by year, that's all that change
was.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 2/6] gnu: mdds: Update to 1.1.0.

[Efraim Flashner]

* gnu/packages/boost.scm (mdds): Update to 1.1.0.
[home-page]: Update to new homepage.
(mdds-0.12.1): Keep for libreoffice.
---
 gnu/packages/boost.scm | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 0a644e8..47eacd1 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -2,8 +2,9 @@
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -107,21 +108,36 @@ across a broad spectrum of applications.")
 (define-public mdds
   (package
     (name "mdds")
-    (version "0.12.1")
+    (version "1.1.0")
     (source (origin
              (method url-fetch)
              (uri (string-append
-                   "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2"))
+                   "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2"))
              (sha256
               (base32
-               "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"))))
+               "07qnzg9qn6vlh70wdn72kywil680z3qlgqjh38r7kdcbzs9snls2"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("boost" ,boost))) ; inclusion of header files
-    (home-page "https://code.google.com/p/multidimalgorithm/")
+    (home-page "https://gitlab.com/mdds/mdds")
     (synopsis "Multi-dimensional C++ data structures and indexing algorithms")
     (description "Mdds (multi-dimensional data structure) provides a
 collection of multi-dimensional data structures and indexing algorithms
 for C++.  It includes flat segment trees, segment trees, rectangle sets,
 point quad trees, multi-type vectors and multi-type matrices.")
     (license license:expat)))
+
+;; Libreoffice needs mdds-0.12.1 to build, but its dependancies need mdds-1.0+.
+;; Rather than use an external binary while building libreoffice, it's better
+;; to keep this version around until Libreoffice updates its dependancy.
+(define-public mdds-0.12.1
+  (package
+    (inherit mdds)
+    (version "0.12.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2"))
+        (sha256
+         (base32
+          "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"))))))
-- 
2.7.0

Re: [PATCH 2/6] gnu: mdds: Update to 1.1.0.

[Leo Famulari]

On Mon, Mar 07, 2016 at 12:42:03PM +0200, Efraim Flashner wrote:
> * gnu/packages/boost.scm (mdds): Update to 1.1.0.
> [home-page]: Update to new homepage.
> (mdds-0.12.1): Keep for libreoffice.

While I wait for the build to finish, here is a superficial review.

[...]

>  ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
>  ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
> -;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
>  ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
> +;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
> +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>

Is it possible to keep Eric's line in place, just to reduce noise in the
logs?

>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -107,21 +108,36 @@ across a broad spectrum of applications.")
>  (define-public mdds
>    (package
>      (name "mdds")
> -    (version "0.12.1")
> +    (version "1.1.0")
>      (source (origin
>               (method url-fetch)
>               (uri (string-append
> -                   "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2"))
> +                   "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2"))

I can't figure out what the difference is between these lines...

[...]

> +;; Libreoffice needs mdds-0.12.1 to build, but its dependancies need mdds-1.0+.
> +;; Rather than use an external binary while building libreoffice, it's better
> +;; to keep this version around until Libreoffice updates its dependancy.
> +(define-public mdds-0.12.1

Could this be a private variable in libreoffice.scm?

> +  (package
> +    (inherit mdds)
> +    (version "0.12.1")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (string-append "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2"))
> +        (sha256
> +         (base32
> +          "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"))))))
> -- 
> 2.7.0
> 
> 

Re: [PATCH 2/6] gnu: mdds: Update to 1.1.0.

[Andreas Enge]

On Mon, Mar 07, 2016 at 02:41:22PM -0500, Leo Famulari wrote:
> > -                   "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2"))
> > +                   "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2"))
> I can't figure out what the difference is between these lines...

Underscore vs. dash.

Andreas

Re: [PATCH 2/6] gnu: mdds: Update to 1.1.0.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

On Mon, 7 Mar 2016 14:41:22 -0500
Leo Famulari <leo@famulari.name> wrote:

> On Mon, Mar 07, 2016 at 12:42:03PM +0200, Efraim Flashner wrote:
> 
> > +;; Libreoffice needs mdds-0.12.1 to build, but its dependancies need mdds-1.0+.
> > +;; Rather than use an external binary while building libreoffice, it's better
> > +;; to keep this version around until Libreoffice updates its dependancy.
> > +(define-public mdds-0.12.1  
> 
> Could this be a private variable in libreoffice.scm?
> 
> > +  (package
> > +    (inherit mdds)
> > +    (version "0.12.1")
> > +    (source
> > +      (origin
> > +        (method url-fetch)
> > +        (uri (string-append "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2"))
> > +        (sha256
> > +         (base32
> > +          "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"))))))
> > -- 
> > 2.7.0
> > 

I tried making it private at first in libreoffice.scm, but for some reason it
gave me an error "unknown variable mdds" or something like that.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 3/6] gnu: orcus: Update to 0.11.0.

[Efraim Flashner]

* gnu/packages/libreoffice.scm (orcus): Update to 0.11.0.
---
 gnu/packages/libreoffice.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 62dcb59..6366639 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -94,19 +94,20 @@ their dependencies automatically upon calculation.")
 (define-public orcus
   (package
     (name "orcus")
-    (version "0.7.1")
+    (version "0.11.0")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "http://kohei.us/files/" name "/src/lib"
                           name "-" version ".tar.xz"))
       (sha256 (base32
-               "0hva4qalg3dk6n1118ncr5fy8cqnj2f7fwldw7aa04124rj6p104"))))
+               "15qgkcryqddlq841x43v267y3i2ayy6bkf7dyx6h0drj9gjfykmw"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
      (inputs
       `(("ixion" ,ixion)
+        ("python" ,python-wrapper)
         ("mdds" ,mdds)
         ("zlib" ,zlib)))
     (home-page "https://gitlab.com/orcus/orcus")
-- 
2.7.0

[PATCH 4/6] gnu: ixion: Update to 0.11.0.

[Efraim Flashner]

* gnu/packages/libreoffice.scm (ixion): Update to 0.11.0.
---
 gnu/packages/libreoffice.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 6366639..7ae6020 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -69,20 +69,20 @@
 (define-public ixion
   (package
     (name "ixion")
-    (version "0.9.1")
+    (version "0.11.0")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "http://kohei.us/files/ixion/src/libixion-"
                           version ".tar.xz"))
       (sha256 (base32
-               "18g3nk29ljiqbyi0ml49j2x3f3xrqckdm9i66sw5fxnj7hb5rqvp"))))
+               "14s20b5sl06y6wg9jwh4h99w7z0w5zv1skpyfsggdgzwn7rfg9lp"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
      (inputs
       `(("mdds" ,mdds)
-        ("python" ,python-2))) ; looks for python.pc, not python3.pc
+        ("python" ,python)))
     (home-page "https://gitlab.com/ixion/ixion")
     (synopsis "General purpose formula parser and interpreter")
     (description "Ixion is a library for calculating the results of formula
-- 
2.7.0

[PATCH 5/6] gnu: libetonyek: Update to 0.1.6.

[Efraim Flashner]

* gnu/packages/libreoffice.scm (libetonyek): Update to 0.1.6.
---
 gnu/packages/libreoffice.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 7ae6020..0195a28 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -348,20 +348,21 @@ CorelDRAW documents of all versions.")
 (define-public libetonyek
   (package
     (name "libetonyek")
-    (version "0.1.3")
+    (version "0.1.6")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
                           name "-" version ".tar.xz"))
       (sha256 (base32
-               "0mghaqzj0qqza8z1gzprw62702adlww4kgdzynj5qpxxc9m2f4py"))))
+               "0y60vi1plyq69fqbcjnc0v8mvcjqjsl1ry6rmb3bq3q7j8a2fm6z"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("cppunit" ,cppunit)
        ("doxygen" ,doxygen)
        ("glm" ,glm)
        ("gperf" ,gperf)
+       ("liblangtag" ,liblangtag)
        ("mdds" ,mdds)
        ("pkg-config" ,pkg-config)))
     (propagated-inputs ; in Requires or Requires.private field of .pkg
-- 
2.7.0

Re: [PATCH 5/6] gnu: libetonyek: Update to 0.1.6.

[Andreas Enge]

Hello,

I locally applied it, but changed the commit message as follows:

    gnu: libetonyek: Update to 0.1.6.
    
    * gnu/packages/libreoffice.scm (libetonyek)[source]: Update to 0.1.6.
      [inputs]: Add required input liblangtag.

to record all modifications. This requires the 1.0 version of mdds, which
may not be compatible with what libreoffice currently needs. So I will
hold it back for the moment.

I also (re-)enabled parallel builds for libreoffice; at least on my x86_64
laptop, this works, and libreoffice does not build an any other architecture
right now anyway...

Now I will try if libreoffice 5.1 builds without updating other libraries.

None of this is pushed so far, but I consider pushing the parallel build
feature as well as Efraim's liblangtag with a modified description as I
suggested in a previous message; since this library is not used yet, it
cannot break anything...

Andreas

Re: [PATCH 5/6] gnu: libetonyek: Update to 0.1.6.

[Andreas Enge]

[-- Attachment #1: Type: text/plain, Size: 811 bytes --]

On Wed, Mar 09, 2016 at 10:50:46AM +0100, Andreas Enge wrote:
> Now I will try if libreoffice 5.1 builds without updating other libraries.

It does not, I think your patches are really necessary, Efraim. I pushed
the liblangtag one. Libreoffice 5.1 still checks for the old mdds, and
insists on the non-existing orcus-0.10 (instead of the 0.9 we have and the
0.11 that is available). I modified the configure script to search for the
newer versions instead, but now the build fails in a part related to orcus.
So I think all we can do now is wait and hope that libreoffice sorts out
this mess in the next release.

I modified a few packages, in particular to document all modifications in the
commit message. For maybe future use, I am attaching them all, as well as the
error message from the build.

Andreas


[-- Attachment #2: 0001-gnu-mdds-Update-to-1.1.0.patch --]
[-- Type: text/plain, Size: 2857 bytes --]

From 951c16948908343566c2234f55e6bd7a4b390233 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 7 Mar 2016 12:42:03 +0200
Subject: [PATCH 1/5] gnu: mdds: Update to 1.1.0.

* gnu/packages/boost.scm (mdds): Update to 1.1.0.
[home-page]: Update to new homepage.
(mdds-0.12.1): Keep for libreoffice.
---
 gnu/packages/boost.scm | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 0a644e8..47eacd1 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -2,8 +2,9 @@
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -107,21 +108,36 @@ across a broad spectrum of applications.")
 (define-public mdds
   (package
     (name "mdds")
-    (version "0.12.1")
+    (version "1.1.0")
     (source (origin
              (method url-fetch)
              (uri (string-append
-                   "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2"))
+                   "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2"))
              (sha256
               (base32
-               "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"))))
+               "07qnzg9qn6vlh70wdn72kywil680z3qlgqjh38r7kdcbzs9snls2"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("boost" ,boost))) ; inclusion of header files
-    (home-page "https://code.google.com/p/multidimalgorithm/")
+    (home-page "https://gitlab.com/mdds/mdds")
     (synopsis "Multi-dimensional C++ data structures and indexing algorithms")
     (description "Mdds (multi-dimensional data structure) provides a
 collection of multi-dimensional data structures and indexing algorithms
 for C++.  It includes flat segment trees, segment trees, rectangle sets,
 point quad trees, multi-type vectors and multi-type matrices.")
     (license license:expat)))
+
+;; Libreoffice needs mdds-0.12.1 to build, but its dependancies need mdds-1.0+.
+;; Rather than use an external binary while building libreoffice, it's better
+;; to keep this version around until Libreoffice updates its dependancy.
+(define-public mdds-0.12.1
+  (package
+    (inherit mdds)
+    (version "0.12.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2"))
+        (sha256
+         (base32
+          "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"))))))
-- 
2.6.3


[-- Attachment #3: 0002-gnu-libetonyek-Update-to-0.1.6.patch --]
[-- Type: text/plain, Size: 1456 bytes --]

From 3c0843d049634d6a20dd6aa791ae5382bd3a1aab Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 7 Mar 2016 12:42:06 +0200
Subject: [PATCH 2/5] gnu: libetonyek: Update to 0.1.6.

* gnu/packages/libreoffice.scm (libetonyek)[source]: Update to 0.1.6.
  [inputs]: Add required input liblangtag.
---
 gnu/packages/libreoffice.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 9d58a26..57e53b7 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -347,20 +347,21 @@ CorelDRAW documents of all versions.")
 (define-public libetonyek
   (package
     (name "libetonyek")
-    (version "0.1.3")
+    (version "0.1.6")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
                           name "-" version ".tar.xz"))
       (sha256 (base32
-               "0mghaqzj0qqza8z1gzprw62702adlww4kgdzynj5qpxxc9m2f4py"))))
+               "0y60vi1plyq69fqbcjnc0v8mvcjqjsl1ry6rmb3bq3q7j8a2fm6z"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("cppunit" ,cppunit)
        ("doxygen" ,doxygen)
        ("glm" ,glm)
        ("gperf" ,gperf)
+       ("liblangtag" ,liblangtag)
        ("mdds" ,mdds)
        ("pkg-config" ,pkg-config)))
     (propagated-inputs ; in Requires or Requires.private field of .pkg
-- 
2.6.3


[-- Attachment #4: 0003-gnu-ixion-Update-to-0.11.0.patch --]
[-- Type: text/plain, Size: 1480 bytes --]

From 05c009c3e6353b00506ac298dd4288fe342f1967 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 7 Mar 2016 12:42:05 +0200
Subject: [PATCH 3/5] gnu: ixion: Update to 0.11.0.

* gnu/packages/libreoffice.scm (ixion)[source]: Update to 0.11.0.
  [inputs]: Replace python-2 by python.
---
 gnu/packages/libreoffice.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 57e53b7..d94fa6b 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -69,20 +69,20 @@
 (define-public ixion
   (package
     (name "ixion")
-    (version "0.9.1")
+    (version "0.11.0")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "http://kohei.us/files/ixion/src/libixion-"
                           version ".tar.xz"))
       (sha256 (base32
-               "18g3nk29ljiqbyi0ml49j2x3f3xrqckdm9i66sw5fxnj7hb5rqvp"))))
+               "14s20b5sl06y6wg9jwh4h99w7z0w5zv1skpyfsggdgzwn7rfg9lp"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
      (inputs
       `(("mdds" ,mdds)
-        ("python" ,python-2))) ; looks for python.pc, not python3.pc
+        ("python" ,python)))
     (home-page "https://gitlab.com/ixion/ixion")
     (synopsis "General purpose formula parser and interpreter")
     (description "Ixion is a library for calculating the results of formula
-- 
2.6.3


[-- Attachment #5: 0004-gnu-orcus-Update-to-0.11.0.patch --]
[-- Type: text/plain, Size: 1390 bytes --]

From 0b0f1957971c297540ffbd1b9fc5e2613a940c94 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 7 Mar 2016 12:42:04 +0200
Subject: [PATCH 4/5] gnu: orcus: Update to 0.11.0.

* gnu/packages/libreoffice.scm (orcus)[source]: Update to 0.11.0.
  [inputs]: Replace python by python-wrapper.
---
 gnu/packages/libreoffice.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index d94fa6b..1fb46f1 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -94,19 +94,20 @@ their dependencies automatically upon calculation.")
 (define-public orcus
   (package
     (name "orcus")
-    (version "0.7.1")
+    (version "0.11.0")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "http://kohei.us/files/" name "/src/lib"
                           name "-" version ".tar.xz"))
       (sha256 (base32
-               "0hva4qalg3dk6n1118ncr5fy8cqnj2f7fwldw7aa04124rj6p104"))))
+               "15qgkcryqddlq841x43v267y3i2ayy6bkf7dyx6h0drj9gjfykmw"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
      (inputs
       `(("ixion" ,ixion)
+        ("python" ,python-wrapper)
         ("mdds" ,mdds)
         ("zlib" ,zlib)))
     (home-page "https://gitlab.com/orcus/orcus")
-- 
2.6.3


[-- Attachment #6: 0005-gnu-libreoffice-Update-to-5.1.1.3.patch --]
[-- Type: text/plain, Size: 3616 bytes --]

From b8405903a22f62b399ed17c9f39ea1dd22857472 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Wed, 9 Mar 2016 14:24:20 +0100
Subject: [PATCH 5/5] gnu: libreoffice: Update to 5.1.1.3.

* gnu/packages/libreoffice.scm (libreoffice)[source]: Update to 5.1.1.3.
  [inputs]: Add gtk+. Replace python by python-wrapper.
  [native-inputs]: Add doxygen.
  [arguments]: Patch configure to detect newer versions of mdds and orcus.
---
 gnu/packages/libreoffice.scm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 1fb46f1..ed28c63 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
-;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -711,7 +711,7 @@ and to return information on pronunciations, meanings and synonyms.")
 (define-public libreoffice
   (package
     (name "libreoffice")
-    (version "5.0.5.2")
+    (version "5.1.1.3")
     (source
      (origin
       (method url-fetch)
@@ -720,7 +720,7 @@ and to return information on pronunciations, meanings and synonyms.")
           "http://download.documentfoundation.org/libreoffice/src/"
           (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
       (sha256 (base32
-               "120vcxpxzs0za76fyfry281ysv6d1ianb37d1yq8py8chkdjkrqy"))))
+               "0f4fpi5agmz5lbs558d75z0czaa5fc1a7w110lmz1ahdw5vznnic"))))
     (build-system gnu-build-system)
     (native-inputs
      `(;; autoreconf is run by the LibreOffice build system, since after
@@ -730,6 +730,7 @@ and to return information on pronunciations, meanings and synonyms.")
        ("automake" ,automake)
        ("bison" ,bison)
        ("cppunit" ,cppunit)
+       ("doxygen" ,doxygen)
        ("flex" ,flex)
        ("pkg-config" ,pkg-config)
        ("python" ,python)
@@ -747,7 +748,8 @@ and to return information on pronunciations, meanings and synonyms.")
        ("gperf" ,gperf)
        ("graphite2" ,graphite2)
        ("gst-plugins-base" ,gst-plugins-base)
-       ("gtk+" ,gtk+-2)
+       ("gtk+-2" ,gtk+-2)
+       ("gtk+" ,gtk+)
        ("harfbuzz" ,harfbuzz)
        ("hunspell" ,hunspell)
        ("hyphen" ,hyphen)
@@ -783,7 +785,7 @@ and to return information on pronunciations, meanings and synonyms.")
        ("perl-zip" ,perl-zip)
        ("poppler" ,poppler)
        ("postgresql" ,postgresql)
-       ("python" ,python)
+       ("python" ,python-wrapper)
        ("redland" ,redland)
        ("sane-backends" ,sane-backends)
        ("unixodbc" ,unixodbc)
@@ -819,6 +821,12 @@ and to return information on pronunciations, meanings and synonyms.")
                  (setenv "CONFIG_SHELL" (which "bash"))
                  (substitute* "external/libxmlsec/ExternalProject_xmlsec.mk"
                    (("./configure") "$(CONFIG_SHELL) ./configure" ))
+                 ;; Fix the check for mdds.
+                 (substitute* "configure"
+                   (("mdds >= 0.12.0") "mdds-1.0 >= 0.12.0"))
+                 ;; Fix the check for orcus.
+                 (substitute* "configure"
+                   (("liborcus-0.10 >= 0.9.0") "liborcus-0.11 >= 0.9.0"))
                  #t)))
            (add-after 'install 'bin-install
              ;; Create a symlink bin/soffice to the executable script.
-- 
2.6.3


[-- Attachment #7: libreoffice.txt --]
[-- Type: text/plain, Size: 21687 bytes --]

[build CXX] sc/source/filter/orcus/orcusfiltersimpl.cxx
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:26:0,
                 from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:10:
/gnu/store/q7v0pl9sa3n220x53sshl27vjcp5i3bf-orcus-0.11.0/include/liborcus-0.11/orcus/spreadsheet/import_interface.hpp:110:18: warning: ‘virtual void orcus::spreadsheet::iface::import_styles::set_border_style(orcus::spreadsheet::border_direction_t, orcus::spreadsheet::border_style_t)’ was hidden [-Woverloaded-virtual]
     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, border_style_t style) = 0;
                  ^
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:10:0:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:383:18: warning:   by ‘virtual void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t, const char*, size_t)’ [-Woverloaded-virtual]
     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override;
                  ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:459:19: error: cannot declare field ‘ScOrcusFactory::maStyles’ to be of abstract type ‘ScOrcusStyles’
     ScOrcusStyles maStyles;
                   ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:252:7: note:   because the following virtual functions are pure within ‘ScOrcusStyles’:
 class ScOrcusStyles : public orcus::spreadsheet::iface::import_styles
       ^
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:26:0,
                 from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:10:
/gnu/store/q7v0pl9sa3n220x53sshl27vjcp5i3bf-orcus-0.11.0/include/liborcus-0.11/orcus/spreadsheet/import_interface.hpp:110:18: note: 	virtual void orcus::spreadsheet::iface::import_styles::set_border_style(orcus::spreadsheet::border_direction_t, orcus::spreadsheet::border_style_t)
     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, border_style_t style) = 0;
                  ^
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:26:0,
                 from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:10:
/gnu/store/q7v0pl9sa3n220x53sshl27vjcp5i3bf-orcus-0.11.0/include/liborcus-0.11/orcus/spreadsheet/import_interface.hpp:152:18: note: 	virtual void orcus::spreadsheet::iface::import_styles::set_cell_style_parent_name(const char*, size_t)
     virtual void set_cell_style_parent_name(const char* s, size_t n) = 0;
                  ^
[build CXX] sc/source/filter/orcus/xmlcontext.cxx
[build CXX] sc/source/filter/orcus/filterdetect.cxx
[build CXX] sc/source/ui/vba/excelvbahelper.cxx
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx: In member function ‘virtual orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const’:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:58:12: error: ‘formula_grammar_unknown’ is not a member of ‘orcus::spreadsheet’
     return orcus::spreadsheet::formula_grammar_unknown;
            ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx: In function ‘double {anonymous}::translateToInternal(double, orcus::length_unit_t)’:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:234:14: error: ‘length_unit_inch’ is not a member of ‘orcus’
         case orcus::length_unit_inch:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:237:14: error: ‘length_unit_twip’ is not a member of ‘orcus’
         case orcus::length_unit_twip:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:240:14: error: ‘length_unit_point’ is not a member of ‘orcus’
         case orcus::length_unit_point:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:243:14: error: ‘length_unit_centimeter’ is not a member of ‘orcus’
         case orcus::length_unit_centimeter:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:246:14: error: ‘length_unit_unknown’ is not a member of ‘orcus’
         case orcus::length_unit_unknown:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx: In member function ‘virtual void ScOrcusConditionalFormat::set_type(orcus::spreadsheet::conditional_format_t)’:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:396:14: error: ‘conditional_format_condition’ is not a member of ‘os’
         case os::conditional_format_condition:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:397:14: error: ‘conditional_format_formula’ is not a member of ‘os’
         case os::conditional_format_formula:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:401:14: error: ‘conditional_format_date’ is not a member of ‘os’
         case os::conditional_format_date:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:403:14: error: ‘conditional_format_colorscale’ is not a member of ‘os’
         case os::conditional_format_colorscale:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:405:14: error: ‘conditional_format_databar’ is not a member of ‘os’
         case os::conditional_format_databar:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:407:14: error: ‘conditional_format_iconset’ is not a member of ‘os’
         case os::conditional_format_iconset:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx: In function ‘formula::FormulaGrammar::Grammar {anonymous}::getCalcGrammarFromOrcus(orcus::spreadsheet::formula_grammar_t)’:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:552:14: error: ‘formula_grammar_ods’ is not a member of ‘orcus::spreadsheet’
         case orcus::spreadsheet::formula_grammar_ods:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:555:14: error: ‘formula_grammar_xlsx_2007’ is not a member of ‘orcus::spreadsheet’
         case orcus::spreadsheet::formula_grammar_xlsx_2007:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:556:14: error: ‘formula_grammar_xlsx_2010’ is not a member of ‘orcus::spreadsheet’
         case orcus::spreadsheet::formula_grammar_xlsx_2010:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:559:14: error: ‘formula_grammar_gnumeric’ is not a member of ‘orcus::spreadsheet’
         case orcus::spreadsheet::formula_grammar_gnumeric:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:562:14: error: ‘formula_grammar_unknown’ is not a member of ‘orcus::spreadsheet’
         case orcus::spreadsheet::formula_grammar_unknown:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:550:11: warning: enumeration value ‘unknown’ not handled in switch [-Wswitch]
     switch(grammar)
           ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:550:11: warning: enumeration value ‘xlsx_2007’ not handled in switch [-Wswitch]
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:550:11: warning: enumeration value ‘xlsx_2010’ not handled in switch [-Wswitch]
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:550:11: warning: enumeration value ‘ods’ not handled in switch [-Wswitch]
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:550:11: warning: enumeration value ‘gnumeric’ not handled in switch [-Wswitch]
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx: In function ‘SvxBoxItemLine {anonymous}::getDirection(orcus::spreadsheet::border_direction_t)’:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:802:14: error: ‘border_right’ is not a member of ‘os’
         case os::border_right:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:805:14: error: ‘border_left’ is not a member of ‘os’
         case os::border_left:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:808:14: error: ‘border_top’ is not a member of ‘os’
         case os::border_top:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:811:14: error: ‘border_bottom’ is not a member of ‘os’
         case os::border_bottom:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx: In member function ‘virtual void ScOrcusStyles::set_font_underline(orcus::spreadsheet::underline_t)’:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:951:14: error: ‘underline_single’ is not a member of ‘orcus::spreadsheet’
         case orcus::spreadsheet::underline_single:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:952:14: error: ‘underline_single_accounting’ is not a member of ‘orcus::spreadsheet’
         case orcus::spreadsheet::underline_single_accounting:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:955:14: error: ‘underline_double’ is not a member of ‘orcus::spreadsheet’
         case orcus::spreadsheet::underline_double:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:956:14: error: ‘underline_double_accounting’ is not a member of ‘orcus::spreadsheet’
         case orcus::spreadsheet::underline_double_accounting:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:959:14: error: ‘underline_none’ is not a member of ‘orcus::spreadsheet’
         case orcus::spreadsheet::underline_none:
              ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:949:11: warning: enumeration value ‘none’ not handled in switch [-Wswitch]
     switch(e)
           ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:949:11: warning: enumeration value ‘single_line’ not handled in switch [-Wswitch]
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:949:11: warning: enumeration value ‘single_accounting’ not handled in switch [-Wswitch]
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:949:11: warning: enumeration value ‘double_line’ not handled in switch [-Wswitch]
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:949:11: warning: enumeration value ‘double_accounting’ not handled in switch [-Wswitch]
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:26:0,
                 from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/orcusfiltersimpl.cxx:11:
/gnu/store/q7v0pl9sa3n220x53sshl27vjcp5i3bf-orcus-0.11.0/include/liborcus-0.11/orcus/spreadsheet/import_interface.hpp:110:18: warning: ‘virtual void orcus::spreadsheet::iface::import_styles::set_border_style(orcus::spreadsheet::border_direction_t, orcus::spreadsheet::border_style_t)’ was hidden [-Woverloaded-virtual]
     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, border_style_t style) = 0;
                  ^
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/orcusfiltersimpl.cxx:11:0:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:383:18: warning:   by ‘virtual void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t, const char*, size_t)’ [-Woverloaded-virtual]
     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override;
                  ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx: In member function ‘virtual orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const’:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx:59:1: warning: control reaches end of non-void function [-Wreturn-type]
 }
 ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:459:19: error: cannot declare field ‘ScOrcusFactory::maStyles’ to be of abstract type ‘ScOrcusStyles’
     ScOrcusStyles maStyles;
                   ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:252:7: note:   because the following virtual functions are pure within ‘ScOrcusStyles’:
 class ScOrcusStyles : public orcus::spreadsheet::iface::import_styles
       ^
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:26:0,
                 from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/orcusfiltersimpl.cxx:11:
/gnu/store/q7v0pl9sa3n220x53sshl27vjcp5i3bf-orcus-0.11.0/include/liborcus-0.11/orcus/spreadsheet/import_interface.hpp:110:18: note: 	virtual void orcus::spreadsheet::iface::import_styles::set_border_style(orcus::spreadsheet::border_direction_t, orcus::spreadsheet::border_style_t)
     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, border_style_t style) = 0;
                  ^
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:26:0,
                 from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/orcusfiltersimpl.cxx:11:
/gnu/store/q7v0pl9sa3n220x53sshl27vjcp5i3bf-orcus-0.11.0/include/liborcus-0.11/orcus/spreadsheet/import_interface.hpp:152:18: note: 	virtual void orcus::spreadsheet::iface::import_styles::set_cell_style_parent_name(const char*, size_t)
     virtual void set_cell_style_parent_name(const char* s, size_t n) = 0;
                  ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/solenv/gbuild/LinkTarget.mk:189: recipe for target '/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/workdir/CxxObject/sc/source/filter/orcus/interface.o' failed
make[1]: *** [/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/workdir/CxxObject/sc/source/filter/orcus/interface.o] Error 1
make[1]: *** Waiting for unfinished jobs....
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/filterdetect.cxx: In member function ‘virtual rtl::OUString {anonymous}::OrcusFormatDetect::detect(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)’:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/filterdetect.cxx:96:20: error: ‘format_gnumeric’ is not a member of ‘orcus’
     if (eFormat == orcus::format_gnumeric)
                    ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/solenv/gbuild/LinkTarget.mk:189: recipe for target '/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/workdir/CxxObject/sc/source/filter/orcus/filterdetect.o' failed
make[1]: *** [/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/workdir/CxxObject/sc/source/filter/orcus/filterdetect.o] Error 1
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:26:0,
                 from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/xmlcontext.cxx:11:
/gnu/store/q7v0pl9sa3n220x53sshl27vjcp5i3bf-orcus-0.11.0/include/liborcus-0.11/orcus/spreadsheet/import_interface.hpp:110:18: warning: ‘virtual void orcus::spreadsheet::iface::import_styles::set_border_style(orcus::spreadsheet::border_direction_t, orcus::spreadsheet::border_style_t)’ was hidden [-Woverloaded-virtual]
     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, border_style_t style) = 0;
                  ^
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/xmlcontext.cxx:11:0:
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:383:18: warning:   by ‘virtual void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t, const char*, size_t)’ [-Woverloaded-virtual]
     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override;
                  ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:459:19: error: cannot declare field ‘ScOrcusFactory::maStyles’ to be of abstract type ‘ScOrcusStyles’
     ScOrcusStyles maStyles;
                   ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:252:7: note:   because the following virtual functions are pure within ‘ScOrcusStyles’:
 class ScOrcusStyles : public orcus::spreadsheet::iface::import_styles
       ^
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:26:0,
                 from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/xmlcontext.cxx:11:
/gnu/store/q7v0pl9sa3n220x53sshl27vjcp5i3bf-orcus-0.11.0/include/liborcus-0.11/orcus/spreadsheet/import_interface.hpp:110:18: note: 	virtual void orcus::spreadsheet::iface::import_styles::set_border_style(orcus::spreadsheet::border_direction_t, orcus::spreadsheet::border_style_t)
     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, border_style_t style) = 0;
                  ^
In file included from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx:26:0,
                 from /tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/sc/source/filter/orcus/xmlcontext.cxx:11:
/gnu/store/q7v0pl9sa3n220x53sshl27vjcp5i3bf-orcus-0.11.0/include/liborcus-0.11/orcus/spreadsheet/import_interface.hpp:152:18: note: 	virtual void orcus::spreadsheet::iface::import_styles::set_cell_style_parent_name(const char*, size_t)
     virtual void set_cell_style_parent_name(const char* s, size_t n) = 0;
                  ^
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/solenv/gbuild/LinkTarget.mk:189: recipe for target '/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/workdir/CxxObject/sc/source/filter/orcus/orcusfiltersimpl.o' failed
make[1]: *** [/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/workdir/CxxObject/sc/source/filter/orcus/orcusfiltersimpl.o] Error 1
/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/solenv/gbuild/LinkTarget.mk:189: recipe for target '/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/workdir/CxxObject/sc/source/filter/orcus/xmlcontext.o' failed
make[1]: *** [/tmp/guix-build-libreoffice-5.1.1.3.drv-0/libreoffice-5.1.1.3/workdir/CxxObject/sc/source/filter/orcus/xmlcontext.o] Error 1
Makefile:244: recipe for target 'build' failed
make: *** [build] Error 2
phase `build' failed after 9082.6 seconds
builder for `/gnu/store/3awnzn71vidvgjwc489vichb2rgqd0jq-libreoffice-5.1.1.3.drv' failed with exit code 1
@ build-failed /gnu/store/3awnzn71vidvgjwc489vichb2rgqd0jq-libreoffice-5.1.1.3.drv - 1 builder for `/gnu/store/3awnzn71vidvgjwc489vichb2rgqd0jq-libreoffice-5.1.1.3.drv' failed with exit code 1
guix build: error: build failed: build of `/gnu/store/3awnzn71vidvgjwc489vichb2rgqd0jq-libreoffice-5.1.1.3.drv' failed

[PATCH 6/6] gnu: libreoffice: Update to 5.1.1.3. [Fixes CVE-2016-{0794, 0795}].

[Efraim Flashner]

* gnu/packages/libreoffice.scm (libreoffice): Update to 5.1.1.3.
[inputs]: Remove python, add python-wrapper, gtk+, liblangtag, specify
mdds-0.12.1.
[arguments]: Build without doxygen, manually configure CFLAGS for orcus,
enable liblangtag.
---
 gnu/packages/libreoffice.scm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 0195a28..7a6fc39 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -711,7 +711,7 @@ and to return information on pronunciations, meanings and synonyms.")
 (define-public libreoffice
   (package
     (name "libreoffice")
-    (version "5.0.3.2")
+    (version "5.1.1.3")
     (source
      (origin
       (method url-fetch)
@@ -720,7 +720,7 @@ and to return information on pronunciations, meanings and synonyms.")
           "http://download.documentfoundation.org/libreoffice/src/"
           (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
       (sha256 (base32
-               "1gflcsnw7bx02jbb2x5darf56x0qgia03ylaycadk68ikibckybp"))))
+               "0f4fpi5agmz5lbs558d75z0czaa5fc1a7w110lmz1ahdw5vznnic"))))
     (build-system gnu-build-system)
     (native-inputs
      `(;; autoreconf is run by the LibreOffice build system, since after
@@ -747,6 +747,7 @@ and to return information on pronunciations, meanings and synonyms.")
        ("gperf" ,gperf)
        ("graphite2" ,graphite2)
        ("gst-plugins-base" ,gst-plugins-base)
+       ("gtk+" ,gtk+)
        ("gtk+" ,gtk+-2)
        ("harfbuzz" ,harfbuzz)
        ("hunspell" ,hunspell)
@@ -759,6 +760,7 @@ and to return information on pronunciations, meanings and synonyms.")
        ("libetonyek" ,libetonyek)
        ("libexttextcat" ,libexttextcat)
        ("libfreehand" ,libfreehand)
+       ("liblangtag" ,liblangtag)
        ("libmspub" ,libmspub)
        ("libmwaw" ,libmwaw)
        ("libodfgen" ,libodfgen)
@@ -771,7 +773,7 @@ and to return information on pronunciations, meanings and synonyms.")
        ("libxslt" ,libxslt)
        ("libxt" ,libxt)
        ("lpsolve" ,lpsolve)
-       ("mdds" ,mdds)
+       ("mdds" ,mdds-0.12.1)
        ("mythes" ,mythes)
        ("neon" ,neon)
        ("nspr" ,nspr)
@@ -783,7 +785,7 @@ and to return information on pronunciations, meanings and synonyms.")
        ("perl-zip" ,perl-zip)
        ("poppler" ,poppler)
        ("postgresql" ,postgresql)
-       ("python" ,python)
+       ("python" ,python-wrapper)
        ("redland" ,redland)
        ("sane-backends" ,sane-backends)
        ("unixodbc" ,unixodbc)
@@ -799,7 +801,8 @@ and to return information on pronunciations, meanings and synonyms.")
          (modify-phases %standard-phases
            (add-before 'configure 'prepare-src
              (lambda* (#:key inputs #:allow-other-keys)
-               (let ((xmlsec (assoc-ref inputs "xmlsec-src")))
+               (let ((xmlsec (assoc-ref inputs "xmlsec-src"))
+                     (orcus  (assoc-ref inputs "orcus")))
                  (substitute*
                    (list "sysui/CustomTarget_share.mk"
                          "solenv/gbuild/gbuild.mk"
@@ -820,6 +823,10 @@ and to return information on pronunciations, meanings and synonyms.")
                  (setenv "CONFIG_SHELL" (which "bash"))
                  (substitute* "external/libxmlsec/ExternalProject_xmlsec.mk"
                    (("./configure") "$(CONFIG_SHELL) ./configure" ))
+                 ;; pkg-config doesn't pick up orcus, so we need to set the
+                 ;; environmental variables so libreoffice can pick it up.
+                 (setenv "ORCUS_CFLAGS" (string-append orcus "/include"))
+                 (setenv "ORCUS_LIBS" (string-append orcus "/lib -lorcus"))
                  #t)))
            (add-after 'install 'bin-install
              ;; Create a symlink bin/soffice to the executable script.
@@ -854,7 +861,7 @@ and to return information on pronunciations, meanings and synonyms.")
           "--disable-coinmp"
           "--disable-firebird-sdbc" ; embedded firebird
           "--disable-gltf"
-          "--disable-liblangtag")))
+          "--without-doxygen")))
     (home-page "https://www.libreoffice.org/")
     (synopsis "Office suite")
     (description "LibreOffice is a comprehensive office suite.  It contains
-- 
2.7.0

Re: [PATCH 0/6] Libreoffice CVE and update

[Leo Famulari]

On Mon, Mar 07, 2016 at 12:42:01PM +0200, Efraim Flashner wrote:
> Now that vigra is building again, I've put together a patch to update
> libreoffice to address CVE-2016-0794 and CVE-2016-0795. Currently its
> building on my machine, but hydra says the last successful build took
> 7 hours and I'm currently ~5.5 into my build, but I'm expecting close
> to 20 hours for a complete build. So in addition to checking over the
> patches (notably liblangtag which is new, mdds which has a second version
> and libreoffice with several changes), if someone with a fast computer
> wants to see if they can finish building before me that'd be great.

I'll start it now.

> 
> Efraim Flashner (6):
>   gnu: Add liblangtag.
>   gnu: mdds: Update to 1.1.0.
>   gnu: orcus: Update to 0.11.0.
>   gnu: ixion: Update to 0.11.0.
>   gnu: libetonyek: Update to 0.1.6.
>   gnu: libreoffice: Update to 5.1.1.3. [Fixes CVE-2016-{0794, 0795}].
> 
>  gnu/packages/boost.scm       | 26 +++++++++++++----
>  gnu/packages/libreoffice.scm | 67 ++++++++++++++++++++++++++++++++++----------
>  2 files changed, 73 insertions(+), 20 deletions(-)
> 
> -- 
> 2.7.0
> 
> 

Re: [PATCH 0/6] Libreoffice CVE and update

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1752 bytes --]

On Mon,  7 Mar 2016 12:42:01 +0200
Efraim Flashner <efraim@flashner.co.il> wrote:

> Now that vigra is building again, I've put together a patch to update
> libreoffice to address CVE-2016-0794 and CVE-2016-0795. Currently its
> building on my machine, but hydra says the last successful build took
> 7 hours and I'm currently ~5.5 into my build, but I'm expecting close
> to 20 hours for a complete build. So in addition to checking over the
> patches (notably liblangtag which is new, mdds which has a second version
> and libreoffice with several changes), if someone with a fast computer
> wants to see if they can finish building before me that'd be great.
> 
> Efraim Flashner (6):
>   gnu: Add liblangtag.
>   gnu: mdds: Update to 1.1.0.
>   gnu: orcus: Update to 0.11.0.
>   gnu: ixion: Update to 0.11.0.
>   gnu: libetonyek: Update to 0.1.6.
>   gnu: libreoffice: Update to 5.1.1.3. [Fixes CVE-2016-{0794, 0795}].
> 
>  gnu/packages/boost.scm       | 26 +++++++++++++----
>  gnu/packages/libreoffice.scm | 67 ++++++++++++++++++++++++++++++++++----------
>  2 files changed, 73 insertions(+), 20 deletions(-)
> 

It turns out libreoffice fails to build with this patch set. After discussing
it with Andreas and Leo on irc we've decided on trying 5.0.5.2 as per
https://www.libreoffice.org/about-us/security/advisories/cve-2016-0795/ and
we'll work on the rest later.

If anyone wants to work on the update now, mdds stays at 0.12.2, orcus to
0.9.2, ixion to 0.9.1, and that's a good starting point.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 0/6] Libreoffice CVE and update

[Leo Famulari]

On Mon, Mar 07, 2016 at 10:03:17PM +0200, Efraim Flashner wrote:
> On Mon,  7 Mar 2016 12:42:01 +0200
> Efraim Flashner <efraim@flashner.co.il> wrote:
> 
> > Now that vigra is building again, I've put together a patch to update
> > libreoffice to address CVE-2016-0794 and CVE-2016-0795. Currently its
> > building on my machine, but hydra says the last successful build took
> > 7 hours and I'm currently ~5.5 into my build, but I'm expecting close
> > to 20 hours for a complete build. So in addition to checking over the
> > patches (notably liblangtag which is new, mdds which has a second version
> > and libreoffice with several changes), if someone with a fast computer
> > wants to see if they can finish building before me that'd be great.
> > 
> > Efraim Flashner (6):
> >   gnu: Add liblangtag.
> >   gnu: mdds: Update to 1.1.0.
> >   gnu: orcus: Update to 0.11.0.
> >   gnu: ixion: Update to 0.11.0.
> >   gnu: libetonyek: Update to 0.1.6.
> >   gnu: libreoffice: Update to 5.1.1.3. [Fixes CVE-2016-{0794, 0795}].
> > 
> >  gnu/packages/boost.scm       | 26 +++++++++++++----
> >  gnu/packages/libreoffice.scm | 67 ++++++++++++++++++++++++++++++++++----------
> >  2 files changed, 73 insertions(+), 20 deletions(-)
> > 
> 
> It turns out libreoffice fails to build with this patch set. After discussing
> it with Andreas and Leo on irc we've decided on trying 5.0.5.2 as per
> https://www.libreoffice.org/about-us/security/advisories/cve-2016-0795/ and
> we'll work on the rest later.

Updated to 5.0.5.2 with commit 165e0382b.

> 
> If anyone wants to work on the update now, mdds stays at 0.12.2, orcus to
> 0.9.2, ixion to 0.9.1, and that's a good starting point.
> 
> -- 
> Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted

Re: [PATCH 0/6] Libreoffice CVE and update

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Mon, Mar 07, 2016 at 10:03:17PM +0200, Efraim Flashner wrote:
>> On Mon,  7 Mar 2016 12:42:01 +0200
>> Efraim Flashner <efraim@flashner.co.il> wrote:
>> 
>> > Now that vigra is building again, I've put together a patch to update
>> > libreoffice to address CVE-2016-0794 and CVE-2016-0795. Currently its
>> > building on my machine, but hydra says the last successful build took
>> > 7 hours and I'm currently ~5.5 into my build, but I'm expecting close
>> > to 20 hours for a complete build. So in addition to checking over the
>> > patches (notably liblangtag which is new, mdds which has a second version
>> > and libreoffice with several changes), if someone with a fast computer
>> > wants to see if they can finish building before me that'd be great.
>> > 
>> > Efraim Flashner (6):
>> >   gnu: Add liblangtag.
>> >   gnu: mdds: Update to 1.1.0.
>> >   gnu: orcus: Update to 0.11.0.
>> >   gnu: ixion: Update to 0.11.0.
>> >   gnu: libetonyek: Update to 0.1.6.
>> >   gnu: libreoffice: Update to 5.1.1.3. [Fixes CVE-2016-{0794, 0795}].
>> > 
>> >  gnu/packages/boost.scm       | 26 +++++++++++++----
>> >  gnu/packages/libreoffice.scm | 67 ++++++++++++++++++++++++++++++++++----------
>> >  2 files changed, 73 insertions(+), 20 deletions(-)
>> > 
>> 
>> It turns out libreoffice fails to build with this patch set. After discussing
>> it with Andreas and Leo on irc we've decided on trying 5.0.5.2 as per
>> https://www.libreoffice.org/about-us/security/advisories/cve-2016-0795/ and
>> we'll work on the rest later.
>
> Updated to 5.0.5.2 with commit 165e0382b.

Good, thanks for taking care of this!

Ludo’.