Merge branch 'IB/CMSSW_12_3_X/geant4_vecgeom' into Geant4_10.7.9

archive/graphviz.spec

@@ -23,14 +23,11 @@ do
 done
 
 %build
-case %cmsplatf in
-    slc*|fc*|cc*)
+%ifnos darwin
         ADDITIONAL_OPTIONS="--with-freetype2=no --disable-shared --enable-static --disable-ltdl"
-    ;;
-    osx*)
+%else
         ADDITIONAL_OPTIONS="--with-freetype2=no"
-    ;;
-esac
+%endif
 ./configure \
   --disable-silent-rules \
   --with-expatlibdir=$EXPAT_ROOT/lib \
@@ -76,10 +73,8 @@ make install
 rm -rf %{i}/lib/pkgconfig
 
 # To match configure options above
-case %{cmsplatf} in
-    slc*|fc*|cc*)
+%ifnos darwin
         ln -s dot_static %{i}/bin/dot
-    ;;
-esac
+%endif
 # Drop static libraries.
 rm -rf %{i}/lib/*.{l,}a

autotools.spec

@@ -1,25 +1,27 @@
-### RPM external autotools 1.4
+### RPM external autotools 1.5
 ## INITENV SET M4 %{i}/bin/m4
 # We keep all of them together to simplify the "requires" statements.
-%define autoconf_version 2.69
-%define automake_version 1.16.1
+%define autoconf_version 2.71
+%define automake_version 1.16.3
 %define automake_maj %(echo %{automake_version} | cut -f1,2 -d.)
 %define libtool_version 2.4.6
 %define m4_version 1.4.18
-%define gettext_version 0.20.1
+%define gettext_version 0.21
 %define pkgconfig_version 0.29.2
 Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{autoconf_version}.tar.gz
 Source1: http://ftp.gnu.org/gnu/automake/automake-%{automake_version}.tar.gz
 Source2: http://ftp.gnu.org/gnu/libtool/libtool-%{libtool_version}.tar.gz
 Source3: http://ftp.gnu.org/gnu/m4/m4-%{m4_version}.tar.bz2
 Source4: http://ftp.gnu.org/gnu/gettext/gettext-%{gettext_version}.tar.gz
 Source5: http://pkgconfig.freedesktop.org/releases/pkg-config-%{pkgconfig_version}.tar.gz
+Patch0: m4-centos8
 
 %prep
 %setup -D -T -b 0 -n autoconf-%{autoconf_version}
 %setup -D -T -b 1 -n automake-%{automake_version}
 %setup -D -T -b 2 -n libtool-%{libtool_version}
 %setup -D -T -b 3 -n m4-%{m4_version}
+%patch0 -p1
 %setup -D -T -b 4 -n gettext-%{gettext_version}
 %setup -D -T -b 5 -n pkg-config-%{pkgconfig_version}
 

bazel-3.7.0-patches.patch

@@ -11,3 +11,15 @@ index 0ea30a9..8df189f 100755
              named = true,
              positional = false,
              doc = "Whether the action should use the built in shell environment or not."),
+diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
+index d48485b..40ca051 100755
+--- a/tools/cpp/unix_cc_configure.bzl
++++ b/tools/cpp/unix_cc_configure.bzl
+@@ -193,6 +193,7 @@ def _find_gold_linker_path(repository_ctx, cc):
+     Returns:
+       String to put as value to -fuse-ld= flag, or None if gold couldn't be found.
+     """
++    return None
+     result = repository_ctx.execute([
+         cc,
+         str(repository_ctx.path("tools/cpp/empty.cc")),

bazel-3.7.2-gcc11.patch

@@ -0,0 +1,24 @@
+diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc
+index 6e3a908..030e9ca 100755
+--- a/third_party/ijar/mapped_file_unix.cc
++++ b/third_party/ijar/mapped_file_unix.cc
+@@ -19,6 +19,7 @@
+ #include <sys/mman.h>
+
+ #include <algorithm>
++#include <limits>
+
+ #include "third_party/ijar/mapped_file.h"
+
+diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h
+index ed66163..c4b051e 100755
+--- a/third_party/ijar/zlib_client.h
++++ b/third_party/ijar/zlib_client.h
+@@ -16,6 +16,7 @@
+ #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_
+
+ #include <limits.h>
++#include <limits>
+
+ #include "third_party/ijar/common.h"
+

bazel.spec

@@ -17,6 +17,7 @@ BuildRequires: java-env python3
 # configuration issue
 # https://github.com/bazelbuild/bazel/issues/9392
 Patch0: bazel-3.7.0-patches
+Patch1: bazel-3.7.2-gcc11
 
 %prep
 
@@ -25,6 +26,7 @@ Patch0: bazel-3.7.0-patches
 %setup -q -n bazel-%{realversion}
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 

bison.spec

@@ -1,4 +1,4 @@
-### RPM external bison 3.5
+### RPM external bison 3.7.6
 ## INITENV SET BISON_PKGDATADIR %{i}/share/bison
 
 Source: http://ftp.gnu.org/gnu/%{n}/%{n}-%{realversion}.tar.gz

bootstrap-driver.spec

@@ -1,15 +1,13 @@
-### RPM external bootstrap-driver 32.0
+### RPM external bootstrap-driver 40.0
 ## NOCOMPILER
-Source: cmsos
 Requires: rpm
-BuildRequires: cms-common
+BuildRequires: cms-common fakesystem
 
 #danger! cms-common version is now hardwired below (and in bootstrap.file)
 
 %prep
 %build
 %install
-cp %{_sourcedir}/cmsos %{i}/
 packageList=""
 echo requiredtools `echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'`
 for tool in `echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'`
@@ -28,17 +26,11 @@ do
 done
 
 additionalProvides=""
-defaultSeeds="glibc glibc-32bit coreutils bash tcsh zsh pdksh perl tcl tk perl-Tk readline openssl ncurses XFree86-libs
-        e2fsprogs krb5-libs freetype fontconfig XFree86-Mesa-libGLU XFree86-Mesa-libGL xorg-x11-deprecated-libs
-        xorg-x11-libs xorg-x11-Mesa-libGLU xorg-x11-Mesa-libGL compat-libstdc++-33 fglrx_6_8_0 libidn"
 ##############################
 # Packages to seed for runtime
 ##############################
-platformSeeds="bash bzip2-libs glibc nspr nss nss-util perl popt zlib glibc-devel openssl openssl-devel openssl-libs krb5-libs
-      libcom_err tcsh perl-Carp perl-Data-Dumper perl-Exporter perl-File-Path perl-File-Temp perl-Getopt-Long perl-PathTools perl-Text-ParseWords
-      perl-Thread-Queue perl-constant perl-Digest-MD5 perl-Socket libX11 libXext libXft libXpm libglvnd-glx libglvnd-opengl mesa-libGLU"
-# Needed by oracle
-platformSeeds+=" libaio"
+platformSeeds="bash tcsh perl bzip2-libs glibc nspr nss nss-util popt zlib glibc-devel openssl openssl-devel openssl-libs krb5-libs
+               libcom_err libX11 libXext libXft libXpm libglvnd-glx libglvnd-opengl mesa-libGLU"
 # Needed by python runtime
 platformSeeds+=" readline ncurses-libs tcl tk"
 # Seed packages which provides these
@@ -47,39 +39,33 @@ packagesWithProvides="/usr/bin/python3 /usr/bin/perl /usr/bin/env /usr/bin/uname
 ##############################
 #Packages to seed for build
 ##############################
-platformBuildSeeds="git patch make zip unzip bzip2 java-1.8.0-openjdk-devel libcom_err-devel which libXpm-devel libXft-devel mesa-libGLU-devel rsync"
+platformBuildSeeds="git patch perl make zip unzip bzip2 java-1.8.0-openjdk-devel libcom_err-devel which libXpm-devel libXft-devel mesa-libGLU-devel rsync"
+#Needed by autotools,go and lcov
+platformBuildSeeds+=" perl-Carp perl-Data-Dumper perl-Digest-MD5 perl-Exporter perl-File-Path perl-File-Temp perl-Getopt-Long perl-PathTools perl-Text-ParseWords perl-constant"
 #needed by python build
 platformBuildSeeds+=" readline-devel ncurses-devel tcl-devel tk-devel"
 packagesWithBuildProvides=""
 
+%ifnarch aarch64
+# Needed by oracle
+platformSeeds+=" libaio"
+%endif
+
 case %cmsplatf in
-cc* )
-  platformSeeds+=" libxcrypt"
+cc*|cs* )
+  platformSeeds+=" libxcrypt perl-libs perl-IO"
   ;;
 slc*)
-  platformSeeds+=" perl-Switch"
+  platformBuildSeeds+=" perl-Switch"
   ;;
 esac
 
-# Seeds for unsupported platforms. These will not make bootstrap die, if not found.
-# OpenSuse
-unsupportedSeeds="xorg-x11-Mesa compat-readline4 compat-curl2 freetype2 xorg-x11-libX11"
-# Ubuntu
-unsupportedSeeds="$unsupportedSeeds libcomerr2 libidn11 libxi6 libxpm4 libxinerama1 libncurses5 libsm6 libice6 libc6 libxcursor1 libxmu6
-        libgl1-mesa-glx libxft2 perl-base xserver-xorg xserver-xorg-core libfreetype6 libfontconfig1 libgl1-mesa libxrandr2 libglu1-mesa libxext6 libx11-6 libxrender1"
-# Fedora
-unsupportedSeeds="$unsupportedSeeds libX11 libXmu libSM libICE libXcursor
-        libXext libXrandr libXft mesa-libGLU mesa-libGL e2fsprogs-libs libXi libXinerama
-        libXft libXrender libXpm ncurses-libs libc6-i686 compat-readline5"
-# PU-IAS
-unsupportedSeeds="$unsupportedSeeds libcom_err"
-
-defaultPkgs="cms+cms-common+1.0"
+defaultPkgs="cms+cms-common+1.0 cms+fakesystem+1.0"
 
 mkdir -p %{i}/etc/profile.d
 (echo "rpm_version=$RPM_VERSION"; \
- echo "platformSeeds=\"$defaultSeeds\""; \
- echo "unsupportedSeeds=\"$unsupportedSeeds\""; \
+ echo "platformSeeds=\"\""; \
+ echo "unsupportedSeeds=\"\""; \
  echo "%{cmsos}_platformSeeds=\"$platformSeeds\""; \
  echo "%{cmsos}_platformBuildSeeds=\"$platformBuildSeeds\""; \
  echo "%{cmsos}_packagesWithProvides=\"$packagesWithProvides\""; \

cms-common.spec

@@ -1,8 +1,8 @@
 ### RPM cms cms-common 1.0
-## REVISION 1214
+## REVISION 1215
 ## NOCOMPILER
 
-%define tag 166543613737055cac97d283ec2f5ec5297cdd12
+%define tag be997745c00b3f046795520d349ad52d95ca87f0
 Source:  git+https://github.com/cms-sw/cms-common.git?obj=master/%{tag}&export=%{n}-%{realversion}-%{tag}&output=/%{n}-%{realversion}-%{tag}.tgz
 
 %prep

cmsLHEtoEOSManager.tmpl

@@ -1,4 +1,4 @@
-### RPM cms cmsLHEtoEOSManager @VERSION@01
+### RPM cms cmsLHEtoEOSManager @VERSION@02
 ## NOCOMPILER
 ## NO_VERSION_SUFFIX
 

cmsmon-tools.spec

@@ -3,14 +3,14 @@
 
 %define arch amd64
 %define linuxarch linux-amd64
-%define promv 2.30.3
+%define promv 2.31.1
 %define amver 0.23.0
 %define sternv 1.11.0
 %define apsver 0.2.15
-%define trivyver 0.20.2
+%define trivyver 0.21.1
 %define heyver 0.0.2
 %define k8s_info_ver 0.0.1
-%define gocurlver 0.0.2
+%define gocurlver 0.0.4
 %define monit_commands monit ggus_parser alert annotationManager nats-sub nats-pub dbs_vm
 %define common_commands promtool amtool prometheus hey stern trivy k8s_info gocurl
 %define flags -ldflags="-s -w -extldflags -static" -p %{compiling_processes}

cmsos.file

@@ -29,7 +29,13 @@ cmsos()
       else
         os="slc"
         if egrep -q "CentOS" /etc/redhat-release 2>/dev/null; then
-          if [ ${slc_version} -gt 7 ] ; then os="cc" ; fi
+          if [ ${slc_version} -gt 7 ] ; then
+            if egrep -q " Stream " /etc/redhat-release 2>/dev/null; then
+              os="cs"
+            else
+              os="cc"
+            fi
+          fi
         fi
         echo ${os}${slc_version}_${cpuarch}
       fi
@@ -71,19 +77,4 @@ cmsos()
   fi
 }
 
-defaultCompiler()
-{
-  case `cmsos` in
-    slc4* ) echo gcc345 ;;
-    slc5* ) echo gcc432 ;;
-    slc6* ) echo gcc630 ;;
-    slc7* ) echo gcc820 ;;
-    cc* )   echo gcc8   ;;
-    osx104* ) echo gcc400 ;;
-    osx105* ) echo gcc401 ;;
-    osx106* ) echo gcc421 ;;
-    * ) echo gcc345 ;;
-  esac
-}
-
 cmsos

cmssw-osenv.spec

@@ -1,10 +1,10 @@
-### RPM cms cmssw-osenv 211007.0
+### RPM cms cmssw-osenv 211125.0
 ## NOCOMPILER
 ## NO_VERSION_SUFFIX
 
 # ***Do not change minor number of the above version. ***
 
-%define commit b3b917bf8931b3f778bce339d54f1636f465f90a
+%define commit 3a1d33d8dc9989257ec91e3543eda8250e5a3593
 %define branch master
 # We do not use a revision explicitly, because revisioned packages do not get
 # updated automatically when there are dependencies.

cmssw-tool-conf.spec

@@ -55,13 +55,12 @@ Requires: libungif
 Requires: libxml2
 Requires: lwtnn
 Requires: meschach
-Requires: pcre
+Requires: pcre2
 Requires: photos
 Requires: photospp
 Requires: pyquen
 Requires: pythia6
 Requires: pythia8
-Requires: python
 Requires: python3
 Requires: root
 Requires: sherpa

cmssw-wm-tools.spec

@@ -1,7 +1,7 @@
 ################################################################
 ####For any change, always update version number to latest date#
 ################################################################
-### RPM cms cmssw-wm-tools 211103
+### RPM cms cmssw-wm-tools 211210
 ## NOCOMPILER
 ## NO_VERSION_SUFFIX
 

cmsswdata-github.file

@@ -16,7 +16,7 @@
 %define source0 git+https://github.com/cms-data/%{data_repo}.git?obj=master/%{realversion}&no-cmssdt-cache=1&export=%{export_dir}&output=/%{n}-%{realversion}.tgz
 %endif
 
-Source: %{source0}
+Source0: %{source0}
 
 %prep
 %{?PrePrep:%PrePrep}

cmsswdata.file

@@ -0,0 +1,58 @@
+%prep
+
+%build
+
+%install
+
+mkdir -p %i/etc/scram.d
+cat << \EOF_TOOLFILE >%i/etc/scram.d/cmsswdata.xml
+  <tool name="cmsswdata" version="%v">
+    <client>
+      <environment name="CMSSWDATA_BASE" default="%{cmsroot}/%{cmsplatf}/%{pkgcategory}"/>
+      <environment name="CMSSW_DATA_PATH" default="$CMSSWDATA_BASE"/>
+EOF_TOOLFILE
+
+cat << \EOF_TOOLFILE > %i/searchpath.xml
+    </client>
+    <runtime name="CMSSW_DATA_PATH" value="$CMSSWDATA_BASE" type="path"/>
+EOF_TOOLFILE
+
+for toolbase in `echo %pkgreqs | tr ' ' '\n' | grep 'cms/data-'` ; do
+  toolver=`basename $toolbase`
+  pack=`echo $toolbase | cut -d/ -f2 | sed 's|data-||;s|-|/|'`
+  echo "    <flags CMSSW_DATA_PACKAGE=\"$pack=$toolver\"/>" >> %i/etc/scram.d/cmsswdata.xml
+  echo "    <runtime name=\"CMSSW_SEARCH_PATH\" default=\"%{cmsroot}/%{cmsplatf}/$toolbase\" type=\"path\"/>" >> %i/searchpath.xml
+done
+
+cat %i/searchpath.xml >> %i/etc/scram.d/cmsswdata.xml
+echo "  </tool>"      >> %i/etc/scram.d/cmsswdata.xml
+rm -f %i/searchpath.xml
+
+%post
+%{relocateConfig}etc/scram.d/*.xml
+echo "%{BaseTool}_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
+echo "set %{BaseTool}_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
+echo "%{BaseTool}_PKGREQUIRED='%pkgreqs'" >> $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
+echo "set %{BaseTool}_PKGREQUIRED='%pkgreqs'" >> $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
+
+for DATA_PATH in %directpkgreqs; do
+  PKG_DIR=$(echo $DATA_PATH | cut -d/ -f2)
+  [ $(echo $PKG_DIR | grep '^data-' | wc -l) -eq 1 ] || continue
+  PKG_DIR=$(echo $PKG_DIR | sed 's|^data-||;s|-|/|')
+  SOURCE=$RPM_INSTALL_PREFIX/%{cmsplatf}/$DATA_PATH
+  DES_PATH=$(echo $DATA_PATH | cut -d/ -f1,2)/$(echo $DATA_PATH | cut -d/ -f3 | tr '-' '\n' | grep '^V[0-9][0-9]$\|^[0-9][0-9]$' | tr '\n' '-' | sed 's|-$||')
+  PKG_DATA=$(echo $PKG_DIR | cut -d/ -f1)
+  if [ ! -e $RPM_INSTALL_PREFIX/share/$DES_PATH/$PKG_DIR ] ; then
+    rm -rf $RPM_INSTALL_PREFIX/share/$DES_PATH
+    mkdir -p $RPM_INSTALL_PREFIX/share/$DES_PATH
+    if [ -L $SOURCE/$PKG_DATA ] ; then
+      ln -fs ../../../../%{cmsplatf}/$DATA_PATH/$PKG_DATA $RPM_INSTALL_PREFIX/share/$DES_PATH/$PKG_DATA
+    else
+      echo "Moving $DATA_PATH in share"
+      rsync -aq --no-t --size-only $SOURCE/$PKG_DATA/ $RPM_INSTALL_PREFIX/share/$DES_PATH/$PKG_DATA/
+    fi
+  fi
+  if [ ! -L $SOURCE/$PKG_DATA ] ; then
+    rm -rf $SOURCE/$PKG_DATA && ln -fs ../../../../share/$DES_PATH/$PKG_DATA $SOURCE/$PKG_DATA
+  fi
+done