From c073038c81f3ef84bf892c875f562d71e7213906 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Apr 08 2016 11:55:37 +0000 Subject: Update to 5.34.36 --- diff --git a/root-private-public.patch b/root-private-public.patch new file mode 100644 index 0000000..40c2b6b --- /dev/null +++ b/root-private-public.patch @@ -0,0 +1,142 @@ +diff -ur root-6.04.02.orig/proof/proofx/inc/TXSocket.h root-6.04.02/proof/proofx/inc/TXSocket.h +--- root-6.04.02.orig/proof/proofx/inc/TXSocket.h 2015-07-14 12:54:01.000000000 +0200 ++++ root-6.04.02/proof/proofx/inc/TXSocket.h 2015-07-24 23:17:46.482814148 +0200 +@@ -43,8 +43,8 @@ + #ifndef ROOT_TSocket + #include "TSocket.h" + #endif +-#ifndef ROOT_XrdProofConn +-#include "XrdProofConn.h" ++#ifndef __XPTYPES_H ++#include "XProtocol/XPtypes.hh" + #endif + #ifndef XRC_UNSOLMSG_H + #include "XrdClient/XrdClientUnsolMsg.hh" +@@ -58,6 +58,7 @@ + class TXHandler; + class TXSocketHandler; + class XrdClientMessage; ++class XrdProofConn; + + // To transmit info to Handlers + typedef struct { +@@ -140,7 +141,7 @@ + void PostMsg(Int_t type, const char *msg = 0); + + // Auxilliary +- Int_t GetLowSocket() const { return (fConn ? fConn->GetLowSocket() : -1); } ++ Int_t GetLowSocket() const; + + static void SetLocation(const char *loc = ""); // Set location string + +@@ -170,13 +171,13 @@ + + virtual Int_t GetClientID() const { return -1; } + virtual Int_t GetClientIDSize() const { return 1; } +- Int_t GetLogConnID() const { return (fConn ? fConn->GetLogConnID() : -1); } +- Int_t GetOpenError() const { return (fConn ? fConn->GetOpenError() : -1); } +- Int_t GetServType() const { return (fConn ? fConn->GetServType() : -1); } +- Int_t GetSessionID() const { return (fConn ? fConn->GetSessionID() : -1); } ++ Int_t GetLogConnID() const; ++ Int_t GetOpenError() const; ++ Int_t GetServType() const; ++ Int_t GetSessionID() const; + Int_t GetXrdProofdVersion() const { return fXrdProofdVersion; } + +- Bool_t IsValid() const { return (fConn ? (fConn->IsValid()) : kFALSE); } ++ Bool_t IsValid() const; + Bool_t IsServProofd(); + virtual void RemoveClientID() { } + virtual void SetClientID(Int_t) { } +@@ -215,10 +216,7 @@ + void SendUrgent(Int_t type, Int_t int1, Int_t int2); + + // Interrupt the low level socket +- inline void SetInterrupt(Bool_t i = kTRUE) { R__LOCKGUARD(fAMtx); +- fRDInterrupt = i; +- if (i && fConn) fConn->SetInterrupt(); +- if (i && fAWait) fASem.Post(); } ++ void SetInterrupt(Bool_t i = kTRUE); + inline Bool_t IsInterrupt() { R__LOCKGUARD(fAMtx); return fRDInterrupt; } + // Set / Check async msg queue waiting status + inline void SetAWait(Bool_t w = kTRUE) { R__LOCKGUARD(fAMtx); fAWait = w; } +diff -ur root-6.04.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.04.02/proof/proofx/src/TXProofMgr.cxx +--- root-6.04.02.orig/proof/proofx/src/TXProofMgr.cxx 2015-07-14 12:54:01.000000000 +0200 ++++ root-6.04.02/proof/proofx/src/TXProofMgr.cxx 2015-07-25 00:18:56.528053529 +0200 +@@ -39,6 +39,8 @@ + #include "TSysEvtHandler.h" + #include "XProofProtocol.h" + ++#include "XrdProofConn.h" ++ + ClassImp(TXProofMgr) + + // +diff -ur root-6.04.02.orig/proof/proofx/src/TXSocket.cxx root-6.04.02/proof/proofx/src/TXSocket.cxx +--- root-6.04.02.orig/proof/proofx/src/TXSocket.cxx 2015-07-14 12:54:01.000000000 +0200 ++++ root-6.04.02/proof/proofx/src/TXSocket.cxx 2015-07-24 23:23:46.982746510 +0200 +@@ -924,6 +924,36 @@ + } + + //____________________________________________________________________________ ++Int_t TXSocket::GetLogConnID() const ++{ ++ return (fConn ? fConn->GetLogConnID() : -1); ++} ++ ++//____________________________________________________________________________ ++Int_t TXSocket::GetOpenError() const ++{ ++ return (fConn ? fConn->GetOpenError() : -1); ++} ++ ++//____________________________________________________________________________ ++Int_t TXSocket::GetServType() const ++{ ++ return (fConn ? fConn->GetServType() : -1); ++} ++ ++//____________________________________________________________________________ ++Int_t TXSocket::GetSessionID() const ++{ ++ return (fConn ? fConn->GetSessionID() : -1); ++} ++ ++//____________________________________________________________________________ ++Bool_t TXSocket::IsValid() const ++{ ++ return (fConn ? (fConn->IsValid()) : kFALSE); ++} ++ ++//____________________________________________________________________________ + Bool_t TXSocket::IsServProofd() + { + // Return kTRUE if the remote server is a 'proofd' +@@ -1643,6 +1673,15 @@ + } + + //______________________________________________________________________________ ++void TXSocket::SetInterrupt(Bool_t i) ++{ ++ R__LOCKGUARD(fAMtx); ++ fRDInterrupt = i; ++ if (i && fConn) fConn->SetInterrupt(); ++ if (i && fAWait) fASem.Post(); ++} ++ ++//______________________________________________________________________________ + Int_t TXSocket::Send(const TMessage &mess) + { + // Send a TMessage object. Returns the number of bytes in the TMessage +@@ -1933,6 +1972,11 @@ + } + + //_____________________________________________________________________________ ++Int_t TXSocket::GetLowSocket() const { ++ return (fConn ? fConn->GetLowSocket() : -1); ++} ++ ++//_____________________________________________________________________________ + void TXSocket::InitEnvs() + { + // Init environment variables for XrdClient diff --git a/root.spec b/root.spec index f552292..618fe54 100644 --- a/root.spec +++ b/root.spec @@ -43,16 +43,16 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: root -Version: 5.34.32 +Version: 5.34.36 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 9%{?dist} +Release: 1%{?dist} Summary: Numerical data analysis framework Group: Applications/Engineering License: LGPLv2+ -URL: http://root.cern.ch/ +URL: https://root.cern.ch/ # The upstream source is modified to exclude proprietary fonts: -# wget -N ftp://root.cern.ch/root/root_v%{version}.source.tar.gz +# wget -N https://root.cern.ch/download/root_v%{version}.source.tar.gz # tar -z -x -f root_v%{version}.source.tar.gz # find root/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';' # mv root root-%{version} @@ -90,11 +90,15 @@ Patch8: %{name}-dont-link-jvm.patch # Use local copy of input file during documentation generation Patch9: %{name}-usa.patch # Adapt to GFAL 2.10 +# https://github.com/root-mirror/root/pull/106 Patch10: %{name}-gfal2.patch +# Public header #includes private header +# https://github.com/root-mirror/root/pull/88 +Patch11: %{name}-private-public.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # The build segfaults on ppc(64) during an invocation of cint: # https://savannah.cern.ch/bugs/index.php?70542 -ExcludeArch: ppc ppc64 ppc64le +ExcludeArch: ppc %{power64} # The cint interpreter is not fully ported to arm # https://sft.its.cern.ch/jira/browse/ROOT-5398 # https://sft.its.cern.ch/jira/browse/ROOT-5399 @@ -1640,6 +1644,7 @@ fi %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 find . '(' -name '*.cxx' -o -name '*.cpp' -o -name '*.C' -o -name '*.c' -o \ -name '*.h' -o -name '*.hh' -o -name '*.hi' -o -name '*.py' -o \ @@ -2954,7 +2959,7 @@ fi %{_datadir}/%{name}/plugins/TSQLServer/P050_TODBCServer.C %files sql-sqlite -f includelist-sql-sqlite -%{_libdir}/%{name}/libSQLite.* +%{_libdir}/%{name}/libRSQLite.* %{_datadir}/%{name}/plugins/TSQLServer/P060_TSQLiteServer.C %files sql-pgsql -f includelist-sql-pgsql @@ -2980,6 +2985,9 @@ fi %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C %changelog +* Fri Apr 08 2016 Mattias Ellert - 5.34.36-1 +- Update to 5.34.36 + * Thu Feb 04 2016 Fedora Release Engineering - 5.34.32-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 9ba3f64..c19ad71 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b4e593a5740a8154635c2fe5d3081cd2 root-5.34.32.tar.xz +eb9d4a4c6becba8dc591c7945a0b2544 root-5.34.36.tar.xz afb35390554c43a7d92576a6d9d3ae8a usa.root