[bug#73691] [PATCH 0/2] gnu: java-xerces: Update to 2.12.2. [security fixes]

[bug#73691] [PATCH 0/2] gnu: java-xerces: Update to 2.12.2. [security fixes]

[Nicolas Graves via Guix-patches via]

kodi wasn't building, I had to fix it to test refresh dependencies.

Nicolas Graves (2):
  gnu: java-xerces: Update to 2.12.2. [security fixes]
  gnu: kodi: Fix build.

 gnu/packages/java.scm |  4 ++--
 gnu/packages/kodi.scm | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

-- 
2.46.0

[bug#73691] [PATCH 1/2] gnu: java-xerces: Update to 2.12.2. [security fixes]

[Nicolas Graves via Guix-patches via]

This fixes CVE-2022-23437.

* gnu/packages/java.scm (java-xerces): Update to 2.12.2.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b43b57754b..fec741f5f2 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -12599,14 +12599,14 @@ (define-public java-joda-time
 (define-public java-xerces
   (package
     (name "java-xerces")
-    (version "2.12.1")
+    (version "2.12.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://apache/xerces/j/source/"
                            "Xerces-J-src." version ".tar.gz"))
        (sha256
-        (base32 "0494kq36gw3nah19ifb720vwxbpg4ww0k6m3zq6wyanw6a083p6s"))
+        (base32 "1s2fnfx5flmhs3q30bxdsa6vs52m6vbnqd3m4cc5r4wfr3afplbd"))
        (patches (search-patches
                  "java-xerces-xjavac_taskdef.patch"
                  "java-xerces-build_dont_unzip.patch"
-- 
2.46.0

[bug#73691] [PATCH 2/2] gnu: kodi: Fix build.

[Nicolas Graves via Guix-patches via]

* gnu/packages/kodi.scm (kodi): Fix build.
  [inputs]: Add libxcrypt.
  [arguments]<#:phases>: Ignore failing tests in 'patch-stuff phase.
---
 gnu/packages/kodi.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 655c82ad6c..432da7d3d5 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -43,6 +44,7 @@ (define-module (gnu packages kodi)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages documentation)
@@ -376,7 +378,12 @@ (define-public kodi
                 "TEST_F(TestSystemInfo, DISABLED_GetOsVersion)"))
              (substitute* "xbmc/utils/test/TestCPUInfo.cpp"
                (("TEST_F\\(TestCPUInfo, GetCPUFrequency\\)")
-                "TEST_F(TestCPUInfo, DISABLED_GetCPUFrequency)"))))
+                "TEST_F(TestCPUInfo, DISABLED_GetCPUFrequency)"))
+             (substitute* "xbmc/test/TestDateTime.cpp"
+               (("TEST_F\\(TestDateTime, TmOperators\\)")
+                "TEST_F(TestDateTime, DISABLED_TmOperators)")
+               (("TEST_F\\(TestDateTime, GetAsTm\\)")
+                "TEST_F(TestDateTime, DISABLED_GetAsTm)"))))
          (add-before 'build 'set-build-environment
            (lambda _
              ;; Some bundled build scripts fall back to /bin/sh
@@ -444,6 +451,7 @@ (define-public kodi
            libtiff
            libva
            libvorbis
+           libxcrypt
            libxml2
            libxrandr
            libxrender
-- 
2.46.0

bug#73691: gnu: java-xerces: Update to 2.12.2. [security fixes]

[Sharlatan Hellseher]

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


Pushed as 9b3f9090c8..053accdde3 to master.

Thanks,
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]