diff options
Diffstat (limited to 'academic/root')
| -rw-r--r-- | academic/root/fixWriteFastArray.patch | 126 | ||||
| -rw-r--r-- | academic/root/root.SlackBuild | 5 | ||||
| -rw-r--r-- | academic/root/root.info | 6 |
3 files changed, 4 insertions, 133 deletions
diff --git a/academic/root/fixWriteFastArray.patch b/academic/root/fixWriteFastArray.patch deleted file mode 100644 index 91d0b2f769..0000000000 --- a/academic/root/fixWriteFastArray.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 9f847714d9dbb432d9e6ce27954711e3819ddfee Mon Sep 17 00:00:00 2001 -From: Mattias Ellert <mattias.ellert@physics.uu.se> -Date: Fri, 7 Jun 2024 06:49:39 +0200 -Subject: [PATCH 1/2] [io] WriteFastArray: return early if n == 0, to prevent - crash in bswapcpy - ---- - io/io/src/TBufferFile.cxx | 25 ++++++++++++++++++++++++- - 1 file changed, 24 insertions(+), 1 deletion(-) - -diff --git a/io/io/src/TBufferFile.cxx b/io/io/src/TBufferFile.cxx -index 81e0f95e02..b5b7ef9831 100644 ---- a/io/io/src/TBufferFile.cxx -+++ b/io/io/src/TBufferFile.cxx -@@ -1948,6 +1948,8 @@ void TBufferFile::WriteArrayDouble32(const Double_t *d, Int_t n, TStreamerElemen - - void TBufferFile::WriteFastArray(const Bool_t *b, Long64_t n) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(UChar_t)); - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -1974,6 +1976,8 @@ void TBufferFile::WriteFastArray(const Bool_t *b, Long64_t n) - - void TBufferFile::WriteFastArray(const Char_t *c, Long64_t n) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Char_t)); - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -1995,6 +1999,8 @@ void TBufferFile::WriteFastArray(const Char_t *c, Long64_t n) - - void TBufferFile::WriteFastArrayString(const Char_t *c, Long64_t n) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Char_t)); - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -2023,6 +2029,8 @@ void TBufferFile::WriteFastArrayString(const Char_t *c, Long64_t n) - - void TBufferFile::WriteFastArray(const Short_t *h, Long64_t n) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Short_t)); - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -2054,7 +2062,8 @@ void TBufferFile::WriteFastArray(const Short_t *h, Long64_t n) - - void TBufferFile::WriteFastArray(const Int_t *ii, Long64_t n) - { -- -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = 4; - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -2086,6 +2095,8 @@ void TBufferFile::WriteFastArray(const Int_t *ii, Long64_t n) - - void TBufferFile::WriteFastArray(const Long_t *ll, Long64_t n) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = 8; - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -2108,6 +2119,8 @@ void TBufferFile::WriteFastArray(const Long_t *ll, Long64_t n) - - void TBufferFile::WriteFastArray(const ULong_t *ll, Long64_t n) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = 8; - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -2128,6 +2141,8 @@ void TBufferFile::WriteFastArray(const ULong_t *ll, Long64_t n) - - void TBufferFile::WriteFastArray(const Long64_t *ll, Long64_t n) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Long64_t)); - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -2154,6 +2169,8 @@ void TBufferFile::WriteFastArray(const Long64_t *ll, Long64_t n) - - void TBufferFile::WriteFastArray(const Float_t *f, Long64_t n) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Float_t)); - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -2185,6 +2202,8 @@ void TBufferFile::WriteFastArray(const Float_t *f, Long64_t n) - - void TBufferFile::WriteFastArray(const Double_t *d, Long64_t n) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Double_t)); - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -2212,6 +2231,8 @@ void TBufferFile::WriteFastArray(const Double_t *d, Long64_t n) - - void TBufferFile::WriteFastArrayFloat16(const Float_t *f, Long64_t n, TStreamerElement *ele) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Float_t)); - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) -@@ -2270,6 +2291,8 @@ void TBufferFile::WriteFastArrayFloat16(const Float_t *f, Long64_t n, TStreamerE - - void TBufferFile::WriteFastArrayDouble32(const Double_t *d, Long64_t n, TStreamerElement *ele) - { -+ if (n == 0) return; -+ - constexpr Int_t dataWidth = static_cast<Int_t>(sizeof(Float_t)); - const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth; - if (n < 0 || n > maxElements) --- -2.39.4 - diff --git a/academic/root/root.SlackBuild b/academic/root/root.SlackBuild index 23dfa4a17b..2ddbfe1a31 100644 --- a/academic/root/root.SlackBuild +++ b/academic/root/root.SlackBuild @@ -20,7 +20,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=root -VERSION=${VERSION:-6.32.04} +VERSION=${VERSION:-6.34.08} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -64,9 +64,6 @@ mv root-$VERSION src mkdir -p $PRGNAM-$VERSION mv src $PRGNAM-$VERSION cd $PRGNAM-$VERSION -cd src -patch -p1 <$CWD/fixWriteFastArray.patch -cd .. chown -R root:root . find -L . \ diff --git a/academic/root/root.info b/academic/root/root.info index 5996fbb32a..bfebcaae64 100644 --- a/academic/root/root.info +++ b/academic/root/root.info @@ -1,8 +1,8 @@ PRGNAM="root" -VERSION="6.32.04" +VERSION="6.34.08" HOMEPAGE="https://root.cern" -DOWNLOAD="https://root.cern/download/root_v6.32.04.source.tar.gz" -MD5SUM="d71795311fae41b0b53573ce24197a2b" +DOWNLOAD="https://root.cern/download/root_v6.34.08.source.tar.gz" +MD5SUM="e590b18edfe555415beca28981c34b75" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gl2ps libAfterImage python3-numpy tbb ftgl" |