Merge branch 'master' into tasimage-draw-pdf-xobject

Author: dpiparo

.github/workflows/root-ci-config/buildconfig/alma10-clang_ninja.txt

@@ -5,12 +5,14 @@ builtin_freetype=ON
 builtin_ftgl=ON
 builtin_gif=ON
 builtin_gl2ps=ON
+builtin_gsl=ON
 builtin_jpeg=ON
 builtin_lz4=ON
 builtin_lzma=ON
 builtin_nlohmann=ON
 builtin_pcre=ON
 builtin_png=ON
+builtin_tbb=ON
 builtin_tiff=ON
 builtin_vdt=ON
 builtin_xxhash=ON

…/buildconfig/opensuse15-march_native.txt …/buildconfig/opensuse16-march_native.txt.github/workflows/root-ci-config/buildconfig/opensuse15-march_native.txt renamed to .github/workflows/root-ci-config/buildconfig/opensuse16-march_native.txt .github/workflows/root-ci-config/buildconfig/opensuse15-march_native.txt renamed to .github/workflows/root-ci-config/buildconfig/opensuse16-march_native.txt

@@ -438,8 +438,8 @@ jobs:
           #   property: gpu
           #   extra-runs-on: gpu
           # openSUSE Leap
-          - image: opensuse15
-            platform_config: opensuse15-march_native
+          - image: opensuse16
+            platform_config: opensuse16-march_native
             is_special: true
             property: march_native
 
@@ -648,7 +648,7 @@ jobs:
         echo +++ Creating the token
         kinit  -p ${{ secrets.KRB5USER }}@${{ secrets.KRB5REALM }} -kt ${KT_FILE_NAME}
         echo +++ Running the copy
-        xrdcp -rf Binaries*/root_v* ${EOS_ENDPOINT}/${EOS_PATH}/
+        xrdcp --parallel 64 -rf Binaries*/root_v* ${EOS_ENDPOINT}/${EOS_PATH}/
 
 
   invoke_rn_creation:
@@ -662,4 +662,4 @@ jobs:
       KRB5REALM: ${{ secrets.KRB5REALM }}
       KRB5USER: ${{ secrets.KRB5USER }}
     with:
-      branch: ${{ github.head_ref || github.ref_name }}
+      branch: ${{ github.head_ref || github.ref_name }}

.github/workflows/root-ci.yml

@@ -191,20 +191,22 @@ jobs:
       # them by extension. Once that is fixed in XRootD, a single command can be used
       # instead.
       run: |
+        failure=0
         echo ${RWEBEOS_KT} | base64 -d > ${KT_FILE_NAME}
         kinit -p ${{ secrets.KRB5USER }}@${{ secrets.KRB5REALM }} -kt ${KT_FILE_NAME}
         cd ${DOC_DIR}/html/
-        xrdcp --parallel 64 -rf ./*.html ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME}
+        xrdcp --parallel 64 -rf ./*.html ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME} || failure=1
         rm -rf *.html
-        xrdcp --parallel 64 -rf ./*.svg ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME}
+        xrdcp --parallel 64 -rf ./*.svg ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME} || failure=1
         rm -rf *.svg
-        xrdcp --parallel 64 -rf ./*.map ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME}
+        xrdcp --parallel 64 -rf ./*.map ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME} || failure=1
         rm -rf *.map
-        xrdcp --parallel 64 -rf ./*.md5 ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME}
+        xrdcp --parallel 64 -rf ./*.md5 ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME} || failure=1
         rm -rf *.md5
-        xrdcp --parallel 64 -rf ./ ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME}
+        xrdcp --parallel 64 -rf ./ ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME} || failure=1
         cd ..
         rm -r html
-        xrdcp --parallel 64 -rf ./ ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME}
+        xrdcp --parallel 64 -rf ./ ${EOS_ENDPOINT}/${EOS_BASE_PATH}/doc/${WEB_DIR_NAME} || failure=1
         cd ..
-        xrdcp -rf ${TAR_NAME}.gz ${EOS_ENDPOINT}/${EOS_BASE_PATH}/download
+        xrdcp -rf ${TAR_NAME}.gz ${EOS_ENDPOINT}/${EOS_BASE_PATH}/download || failure=1
+        exit $failure

.github/workflows/root-docs-ci.yml

@@ -637,8 +637,6 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
                          ${DIR_PERMISSIONS}
                          PATTERN "notebook/JsMVA" EXCLUDE
                          PATTERN "system.rootrc" EXCLUDE
-                         PATTERN "system.rootauthrc" EXCLUDE
-                         PATTERN "system.rootdaemonrc" EXCLUDE
                          PATTERN "root.mimes" EXCLUDE
                          PATTERN "*.in" EXCLUDE)
   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR} ${DIR_PERMISSIONS})

CMakeLists.txt

@@ -44,6 +44,7 @@ The following people have contributed to this new version:
 * The **RooStats::HybridPlot** class and the related **HybridResult::GetPlot** method were deprecated in ROOT 6.40 and are now removed.
 * The `builtin_zeromq` and `builtin_cppzmq` build options that were deprecated in ROOT 6.40 are now removed.
 * The ROOT **auth** package together with `TVirtualAuth` and `TROOT::GetListOfSecContexts()`, and the **authenticated sockets** (`TSocket::CreateAuthSocket()`) feature are now removed following deprecation in ROOT 6.40.
+* The `TSSLSocket` class is now removed following deprecation in ROOT 6.40.
 
 ## Python Interface
 
@@ -76,5 +77,3 @@ If the vectorized backend does not work for a given use case, **please report it
 ## Documentation and Examples
 
 ## Build, Configuration and Testing
-
-

README/README.AUTH

@@ -4,4 +4,4 @@
 
 If you would like to report a security issue, we would appreciate you give us a warning time by contacting us privately. We will respond to you privately, providing context and explanations if required.
 
-To contact us, please use the following email address rootdev∂cern.ch.
+To contact us, please use the following email address root-security∂cern.ch.

README/ReleaseNotes/v642/index.md

@@ -99,13 +99,9 @@ def test_inmemory_tree(self):
             x[0] = i
             tree.Fill()
 
-        # See https://github.com/root-project/root/issues/7541 and
-        # https://bugs.llvm.org/show_bug.cgi?id=49692 :
-        # llvm JIT fails to catch exceptions on M1, so we disable their testing
-        if platform.processor() != "arm" or platform.mac_ver()[0] == '':
-            with self.assertRaises(ROOT.std.runtime_error):
-                # Trees with no associated files are not supported
-                create_dummy_headnode(tree)
+        with self.assertRaises(ROOT.std.runtime_error):
+            # Trees with no associated files are not supported
+            create_dummy_headnode(tree)
 
     def assertArgs(self, args_list1, args_list2):
         """
@@ -231,31 +227,27 @@ def test_three_args_with_multiple_files(self):
 
     def test_tree_with_friends_and_treeindex(self):
         """TTreeIndex is not supported in distributed mode."""
-        # See https://github.com/root-project/root/issues/7541 and
-        # https://bugs.llvm.org/show_bug.cgi?id=49692 :
-        # llvm JIT fails to catch exceptions on M1, so we disable their testing
-        if platform.processor() != "arm" or platform.mac_ver()[0] == '':
-            main_file = "distrdf_indexed_friend_main.root"
-            aux_file = "distrdf_indexed_friend_aux.root"
-            fill_main_tree_and_indexed_friend(main_file, aux_file)
-
-            main_chain = ROOT.TChain("mainTree", "mainTree")
-            main_chain.Add(main_file)
-            aux_chain = ROOT.TChain("auxTree", "auxTree")
-            aux_chain.Add(aux_file)
-
-            aux_chain.BuildIndex("idx")
-            main_chain.AddFriend(aux_chain)
-
-            with self.assertRaises(ValueError) as context:
-                create_dummy_headnode(main_chain)
-
-            self.assertEqual(str(context.exception),
-                             "Friend tree 'auxTree' has a TTreeIndex. This is not supported in distributed mode.")
-
-            # Remove unnecessary .root files
-            os.remove(main_file)
-            os.remove(aux_file)
+        main_file = "distrdf_indexed_friend_main.root"
+        aux_file = "distrdf_indexed_friend_aux.root"
+        fill_main_tree_and_indexed_friend(main_file, aux_file)
+
+        main_chain = ROOT.TChain("mainTree", "mainTree")
+        main_chain.Add(main_file)
+        aux_chain = ROOT.TChain("auxTree", "auxTree")
+        aux_chain.Add(aux_file)
+
+        aux_chain.BuildIndex("idx")
+        main_chain.AddFriend(aux_chain)
+
+        with self.assertRaises(ValueError) as context:
+            create_dummy_headnode(main_chain)
+
+        self.assertEqual(str(context.exception),
+                         "Friend tree 'auxTree' has a TTreeIndex. This is not supported in distributed mode.")
+
+        # Remove unnecessary .root files
+        os.remove(main_file)
+        os.remove(aux_file)
 
 
 class NumEntriesTest(unittest.TestCase):

SECURITY.md

@@ -544,13 +544,12 @@ def get_errmsg(exc, allspace=allspace):
         assert "invaliddigit" in err
         assert "1aap=42;" in err
 
-    @mark.xfail(strict=True, condition=not IS_WINDOWS, reason="Fails on Windows")
     def test22_cppexec(self):
         """Interactive access to the Cling global scope"""
 
         import cppyy
 
-        cppyy.cppexec("int interactive_b = 4")
+        cppyy.cppdef("int interactive_b = 4;")
         assert cppyy.gbl.interactive_b == 4
 
         with raises(SyntaxError):