[arch-commits] Commit in root/trunk (8351.patch PKGBUILD)

[Konstantin Gizdov]

    Date: Thursday, November 11, 2021 @ 02:24:47
  Author: kgizdov
Revision: 1040869

upgpkg: root 6.24.06-4: cudnn and xrootd rebuild

Added:
  root/trunk/8351.patch
Modified:
  root/trunk/PKGBUILD

------------+
 8351.patch |   29 +++++++++++++++++++++++++++++
 PKGBUILD   |    4 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)

Added: 8351.patch
===================================================================
--- 8351.patch	                        (rev 0)
+++ 8351.patch	2021-11-11 02:24:47 UTC (rev 1040869)
@@ -0,0 +1,29 @@
+From 87a0caf0c8b2b4158a6f35e948087ae64c4c06a7 Mon Sep 17 00:00:00 2001
+From: Enrico Guiraud <enrico.guiraud at cern.ch>
+Date: Mon, 7 Jun 2021 11:02:48 +0200
+Subject: [PATCH] [io] Avoid nullptr deref when printing warning in
+ TStreamerInfo
+
+---
+ io/io/src/TStreamerInfo.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/io/io/src/TStreamerInfo.cxx b/io/io/src/TStreamerInfo.cxx
+index d545ab7be8e3..a02663589066 100644
+--- a/io/io/src/TStreamerInfo.cxx
++++ b/io/io/src/TStreamerInfo.cxx
+@@ -1109,12 +1109,12 @@ void TStreamerInfo::BuildCheck(TFile *file /* = 0 */, Bool_t load /* = kTRUE */)
+                              fClassVersion, GetName(), GetName(), GetName(), fClassVersion);
+                   } else {
+                      Warning("BuildCheck", "\n\
+-   The StreamerInfo from %s does not match existing one (%s:%d)\n\
++   The StreamerInfo does not match existing one (%s:%d)\n\
+    The existing one has not been used yet and will be discarded.\n\
+    Reading should work properly, however writing object of\n\
+    type %s will not work properly.  Most likely the version number\n\
+    of the class was not properly updated [See ClassDef(%s,%d)].",
+-                             file->GetName(), GetName(), fClassVersion, GetName(), GetName(), fClassVersion);
++                             GetName(), fClassVersion, GetName(), GetName(), fClassVersion);
+                   }
+                }
+             }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-11 02:24:08 UTC (rev 1040868)
+++ PKGBUILD	2021-11-11 02:24:47 UTC (rev 1040869)
@@ -7,7 +7,7 @@
 pkgbase=root
 pkgname=('root' 'root-cuda')
 pkgver=6.24.06
-pkgrel=3
+pkgrel=4
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
 url='https://root.cern'
@@ -95,6 +95,7 @@
     'settings-cuda.cmake'
     'jupyter_notebook_config.py'
     'nbman-for-arch.patch'
+    '8351.patch'
     'thisroot.fail'
 )
 sha512sums=('356d6287df2900de9e831347d9513f444bf7cbd29c39fbb5841051ae877dac1e22dc255c64166cd3925b82aac860ae67ef6ce171732c16fd23d7919a47e7cb5a'
@@ -105,6 +106,7 @@
             '99cfdd351f1ec1eaca84fffefa82d1f9f9af691e5d5dd8955b047aac324b8cb0ba2b657074d8e0a707e44f024d2f465a9a410bf7c729f12c0d84fcd17c63ca01'
             '1c905ee7a3f8f5f3f567d957f9be6b503a8631565d4d9b9bfea5e496ef86865c5a8be1a1f8c7842754029879cf0afd2465249f532a116cc43660aa2e460ae682'
             '12814f50b7016bd86d3f91e0e31c052783a0c0fa72b7d6a072d3ae6f86c2437323d585e531235377ebbfdd9cb76abd7da84d9631de821151547f1d4b13417e69'
+            '870740fbbd678056dd71b275c5d96f9b0db503ca8e0e9e84f784c3115aae66bb28a1eb531f665c1c8306a52686e5ce484ef65b3194bef6cb0d631664ccb1e3f9'
             'ff555ac4db568affe139701907f86d919a2206f3e304f69dd317b756ea0904b5934d9364a524060778aa507809ce78448621619bb34039ba34c5a71af71a4a8c')
 
 get_pyver () {