Merge pull request #6797 from cms-sw/slc7-drop-openssl

drop openssl and use it from system
cms-sw · May 29, 2021 · 4f36a58 · 4f36a58
2 parents 772f082 + 6a751fb
commit 4f36a58
Show file tree

Hide file tree

Showing 31 changed files with 42 additions and 426 deletions.
diff --git a/autotools.spec b/autotools.spec
@@ -6,7 +6,7 @@
 %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.19.8.1
+%define gettext_version 0.20.1
 %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

diff --git a/bazel-0.29.1-patches.patch b/bazel-0.29.1-patches.patch
diff --git a/blackhat.spec b/blackhat.spec
@@ -3,7 +3,7 @@
 %define branch cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
-Requires: qd python openssl
+Requires: qd python
 
 %prep
 %setup -n %{n}-%{realversion}
@@ -16,7 +16,7 @@ rm -f ./config.{sub,guess}
 %get_config_guess ./config.guess
 chmod +x ./config.{sub,guess}
 
-./configure --prefix=%i --with-QDpath=$QD_ROOT CXXFLAGS="-Wno-deprecated -I$OPENSSL_ROOT/include" LDFLAGS="-L$OPENSSL_ROOT/lib"
+./configure --prefix=%i --with-QDpath=$QD_ROOT CXXFLAGS="-Wno-deprecated"
 # The following hack insures that the bins with the library linked explicitly
 # rather than indirectly, as required by the gold linker
 %build

diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
@@ -21,7 +21,6 @@ Requires: cppunit-toolfile
 Requires: curl-toolfile
 Requires: das_client-toolfile
 Requires: db6-toolfile
-Requires: dpm-toolfile
 Requires: davix-toolfile
 Requires: evtgen-toolfile
 Requires: expat-toolfile
@@ -59,7 +58,6 @@ Requires: libungif-toolfile
 Requires: libxml2-toolfile
 Requires: lwtnn-toolfile
 Requires: meschach-toolfile
-Requires: openssl-toolfile
 Requires: pcre-toolfile
 Requires: photos-toolfile
 Requires: photospp-toolfile
@@ -121,7 +119,6 @@ Requires: mctester-toolfile
 Requires: vdt-toolfile
 Requires: icc-gcc-toolfile
 Requires: ccache-gcc-toolfile
-Requires: distcc-gcc-toolfile
 Requires: gnuplot-toolfile
 Requires: sloccount-toolfile
 Requires: millepede-toolfile
@@ -186,7 +183,6 @@ Requires: dmtcp-toolfile
 Requires: tkonlinesw-toolfile
 Requires: oracle-toolfile
 Requires: intel-vtune
-Requires: glibc-toolfile
 Requires: cmsmon-tools
 Requires: dip-toolfile
 %else

diff --git a/coral-tool-conf.spec b/coral-tool-conf.spec
@@ -7,7 +7,6 @@ Requires: expat-toolfile
 Requires: boost-toolfile
 Requires: frontier_client-toolfile
 Requires: gcc-toolfile
-Requires: openssl-toolfile
 
 Requires: sqlite-toolfile
 Requires: libuuid-toolfile

diff --git a/curl.spec b/curl.spec
@@ -1,6 +1,5 @@
 ### RPM external curl 7.70.0
 Source: http://curl.haxx.se/download/%{n}-%{realversion}.tar.gz
-Requires: openssl
 Requires: zlib
 
 %prep
@@ -19,7 +18,6 @@ esac
   --without-libidn \
   --disable-ldap \
   --with-zlib=${ZLIB_ROOT} \
-  --with-ssl=${OPENSSL_ROOT} \
   --without-nss \
   --without-libssh2 \
   --with-gssapi=${KERBEROS_ROOT}

diff --git a/davix-toolfile.spec b/davix-toolfile.spec
@@ -16,7 +16,6 @@ cat << \EOF_TOOLFILE > %i/etc/scram.d/davix.xml
     </client>
     <runtime name="PATH" value="$DAVIX_BASE/bin" type="path"/>
     <use name="boost_system"/>
-    <use name="openssl"/>
     <use name="libxml2"/>
   </tool>
 EOF_TOOLFILE

diff --git a/davix.spec b/davix.spec
@@ -11,7 +11,7 @@ Source0: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&exp
 %endif
 
 BuildRequires: cmake gmake git
-Requires: openssl libxml2 libuuid
+Requires: libxml2 libuuid
 %prep
 %setup -n %{n}-%{realversion}
 
@@ -27,7 +27,6 @@ cmake -DCMAKE_INSTALL_PREFIX="%{i}" \
  -DLIBXML2_LIBRARY="${LIBXML2_ROOT}/lib/libxml2.%{soext}" \
  -DUUID_INCLUDE_DIR="${LIBUUID_ROOT}/include" \
  -DUUID_LIBRARY="${LIBUUID_ROOT}/lib64/libuuid.%{soext}" \
- -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT}" \
  ../
 
 make VERBOSE=1 %{makeprocesses}

diff --git a/frontier_client-toolfile.spec b/frontier_client-toolfile.spec
@@ -19,7 +19,6 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/frontier_client.xml
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
   <use name="root_cxxdefaults"/>
   <use name="zlib"/>
-  <use name="openssl"/>
   <use name="expat"/>
   <use name="python"/>
 </tool>

diff --git a/frontier_client.spec b/frontier_client.spec
@@ -6,17 +6,17 @@
 %define branch cms/%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
-Requires: expat openssl pacparser python zlib
+Requires: expat pacparser python zlib
 
 %prep
 %setup -n %{n}-%{realversion}
 
-%define makeargs "EXPAT_DIR=${EXPAT_ROOT} PACPARSER_DIR=${PACPARSER_ROOT} COMPILER_TAG=gcc_$(gcc -dumpversion) ZLIB_DIR=${ZLIB_ROOT}  OPENSSL_DIR=${OPENSSL_ROOT}"
+%define makeargs "EXPAT_DIR=${EXPAT_ROOT} PACPARSER_DIR=${PACPARSER_ROOT} COMPILER_TAG=gcc_$(gcc -dumpversion) ZLIB_DIR=${ZLIB_ROOT}"
 
 %build
 
 export MAKE_ARGS=%{makeargs}
-make $MAKE_ARGS CXXFLAGS="-ldl" CFLAGS="-I${OPENSSL_ROOT}/include"
+make $MAKE_ARGS CXXFLAGS="-ldl" CFLAGS=""
 
 %install
 mkdir -p %i/lib

diff --git a/fwlite-tool-conf.spec b/fwlite-tool-conf.spec
@@ -25,7 +25,6 @@ Requires: libjpeg-turbo-toolfile
 Requires: libpng-toolfile
 Requires: libtiff-toolfile
 Requires: libungif-toolfile
-Requires: openssl-toolfile
 Requires: pcre-toolfile
 Requires: python-toolfile
 Requires: root-toolfile
@@ -49,12 +48,6 @@ Requires: py2-pybind11-toolfile
 Requires: fwlite_python_tools
 Requires: zstd-toolfile
 
-%ifarch x86_64
-%ifos linux
-Requires: glibc-toolfile
-%endif
-%endif
-
 # Only for Darwin platform.
 %ifarch darwin
 Requires: freetype-toolfile

diff --git a/git.spec b/git.spec
@@ -9,7 +9,7 @@ Source0: https://github.com/git/git/archive/v%{realversion}.tar.gz
 Source1: https://raw.github.com/bagder/curl/curl-7_59_0/lib/mk-ca-bundle.pl
 Patch1: git-2.19.0-runtime
 
-Requires: curl expat openssl zlib pcre
+Requires: curl expat zlib pcre
 BuildRequires: autotools
 
 # Fake provides for git add --interactive
@@ -33,12 +33,11 @@ Provides: perl(Scalar::Util)
 %patch1 -p1
 
 %build
-export LDFLAGS="-L${OPENSSL_ROOT}/lib"
+export LDFLAGS=""
 export NO_LIBPCRE1_JIT=1
 make %{makeprocesses} configure
 ./configure prefix=%{i} \
    --with-curl=${CURL_ROOT} \
-   --with-openssl=${OPENSSL_ROOT} \
    --with-expat=${EXPAT_ROOT} \
    --with-libpcre=${PCRE_ROOT} \
    --without-python \

diff --git a/glibc-toolfile.spec b/glibc-toolfile.spec
diff --git a/glibc.spec b/glibc.spec
diff --git a/openldap-toolfile.spec b/openldap-toolfile.spec
@@ -13,7 +13,6 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/openldap.xml
     <environment name="OPENLDAP_BASE" default="@TOOL_ROOT@"/>
     <environment name="LIBDIR" default="$OPENLDAP_BASE/lib"/>
   </client>
-  <use name="openssl"/>
   <use name="db6"/>
 </tool>
 EOF_TOOLFILE

diff --git a/openldap.spec b/openldap.spec
@@ -1,7 +1,7 @@
 ### RPM external openldap 2.4.45
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib
 Source: ftp://ftp.openldap.org/pub/OpenLDAP/%{n}-release/%{n}-%{realversion}.tgz
-Requires: openssl db6
+Requires: db6
 
 %prep
 %setup -q -n %{n}-%{realversion}
@@ -19,8 +19,8 @@ chmod +x ./build/config.{sub,guess}
   --with-tls=openssl \
   --disable-static \
   --disable-slapd \
-  CPPFLAGS="-I${OPENSSL_ROOT}/include -I${DB6_ROOT}/include" \
-  LDFLAGS="-L${OPENSSL_ROOT}/lib -L${DB6_ROOT}/lib"
+  CPPFLAGS="-I${DB6_ROOT}/include" \
+  LDFLAGS="-L${DB6_ROOT}/lib"
 make depend
 make
 

diff --git a/openssl-1.0.2d-disable-install-openssldir.patch b/openssl-1.0.2d-disable-install-openssldir.patch