Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Upgrade to OpenSSL 1.1.1 #1897

Closed
wants to merge 14 commits into from
Closed

Upgrade to OpenSSL 1.1.1 #1897

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8e33045
Update to Open SSL 1.1.1
tst-lsavoie Jan 29, 2021
221f6f0
Update RPM dependencies and build instructions
tst-lsavoie Jan 29, 2021
543b8a9
Fix mangled configure string
tst-lsavoie Jan 29, 2021
0e9a3dd
Remove openssl from TravisCI build
tst-lsavoie Jan 29, 2021
cf8719a
Ensure that Fusion and Server are upgraded before opengee-extra
tst-lsavoie Feb 5, 2021
e28a171
Remove duplicate references to libgif-dev
tst-lsavoie Feb 5, 2021
f2f75ef
Add requirements for pre- and post-install scripts
tst-lsavoie Feb 5, 2021
8a3ac5c
Allow MrSID as an RPM dependency
tst-lsavoie Feb 8, 2021
285ab4e
Revert "Allow MrSID as an RPM dependency"
tst-lsavoie Feb 9, 2021
25746f5
Handle out-of-order installs with opengee-extra
tst-lsavoie Feb 10, 2021
105131e
Remove debugging statements
tst-lsavoie Feb 11, 2021
d0bde00
Restore missing OpenSSL files
tst-lsavoie Feb 11, 2021
a5d4b43
Update copyright dates
tst-lsavoie Feb 16, 2021
a2055c5
Remove extra comment symbol
tst-lsavoie Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ before_install:
libstdc++6 libtool libgif-dev libtiff-dev libgtk2.0-dev libglib2.0-dev
libx11-dev libxcursor-dev libxerces-c-dev libxft-dev libxinerama-dev
libxml2-dev libxml2-utils libxmu-dev libxrandr-dev libyaml-cpp-dev libpcre3-dev
openssl shunit2 git git-lfs libqt4-dev qt4-default libqt4-opengl-dev
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's really possible to avoid installing the system ssl libraries because so many other packages reference them.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The system libraries should be installed by default. This is just indicating that we don't require openssl for Open GEE to run.

shunit2 git git-lfs libqt4-dev qt4-default libqt4-opengl-dev
python-dev python-git python-imaging python-setuptools python-psycopg2 python-lxml
swig xorg-dev zlib1g-dev
script: echo "Running build..."
Expand Down
4 changes: 2 additions & 2 deletions earth_enterprise/BUILD_RHEL_CentOS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ sudo yum install -y \
gdbm-devel geos-devel giflib-devel glib2-devel GitPython gtk2-devel \
libcap-devel libicu-devel libmng-devel libpng-devel libtiff-devel libX11-devel libXcursor-devel \
libXft-devel libXinerama-devel libxml2-devel libXmu-devel libXrandr-devel \
ogdi-devel openjpeg-devel openjpeg2-devel openssl-devel \
ogdi-devel openjpeg-devel openjpeg2-devel \
perl-Alien-Packages perl-Perl4-CoreLibs proj-devel python-devel \
rpm-build rpmrebuild rsync scons \
xerces-c xerces-c-devel xorg-x11-server-devel yaml-cpp-devel zlib-devel
Expand All @@ -154,7 +154,7 @@ sudo yum install -y \
gdbm-devel geos-devel gettext giflib-devel gtk2-devel \
libcap-devel libmng-devel libpng-devel libX11-devel libXcursor-devel \
libXft-devel libXinerama-devel libxml2-devel libXmu-devel libXrandr-devel \
ogdi-devel openjpeg-devel openjpeg2-devel openssl-devel pcre pcre-devel \
ogdi-devel openjpeg-devel openjpeg2-devel pcre pcre-devel \
proj-devel python27 glib2-devel libtiff-devel \
python27-pip python27-devel python27-setuptools python-unittest2 \
python-devel rpm-build rpmrebuild rsync scons shunit2 \
Expand Down
4 changes: 2 additions & 2 deletions earth_enterprise/BUILD_Ubuntu.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ sudo apt-get install \
libgdbm-dev libgeos-dev libgeos++-dev libgif-dev libgtest-dev \
libjpeg-dev libjpeg8-dev libmng-dev libogdi3.2-dev \
libperl4-corelibs-perl libpng12-0 libpng12-dev libpq-dev libproj-dev \
libstdc++6 libtool libgif-dev libtiff-dev libgtk2.0-dev libglib2.0-dev \
libstdc++6 libtool libtiff-dev libgtk2.0-dev libglib2.0-dev \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to add libicu-dev as well ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know of a reason to add it. It's not a direct requirement of Open GEE that I'm aware of, and if any of these packages require it, apt should automatically bring it in.

libx11-dev libxcursor-dev libxerces-c-dev libxft-dev libxinerama-dev \
libxml2-dev libxml2-utils libxmu-dev libxrandr-dev libyaml-cpp-dev \
openssl libpcre3 libpcre3-dev \
libpcre3 libpcre3-dev \
python-dev python-imaging python-psycopg2 \
python-setuptools python2.7 python2.7-dev python-git \
scons shunit2 xorg-dev zlib1g-dev
Expand Down
21 changes: 20 additions & 1 deletion earth_enterprise/rpms/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,16 @@ task openGeePostGisRpm(type: GeeRpm) {
autoFindProvides = true
tst-lsavoie marked this conversation as resolved.
Show resolved Hide resolved
autoFindRequires = true

// "requires" is for runtime dependencies. "requiresPre" is for pre-install
// script dependencies. We need both because pre- and post-install scripts
// call Open GEE binaries, and they may fail if a different version of
// common libraries is installed.
// In this case, opengee-postgis doesn't have a pre- or post-install script
// to worry about, but we do need to make sure that opengee-common's
// pre-install script runs first.
requires('opengee-common', ospackage.version, GREATER | EQUAL)
requiresPre('opengee-common', ospackage.version, GREATER | EQUAL)

// The code in GeeRpm decides that this RPM should depend on proj, but
// it actually depends on proj-devel.
requires('proj-devel')
Expand Down Expand Up @@ -463,7 +472,6 @@ task openGeeCommonDeb (type: GeeDeb, dependsOn: openGeeCommonInitScripts) {
requires('libstdc++6')
requires('libtool')
requires('libxml2-utils')
requires('openssl')
requires('python-imaging')
requires('python-lxml')
requires('python-psycopg2')
Expand Down Expand Up @@ -536,9 +544,14 @@ task openGeeServerRpm(type: GeeRpm, dependsOn: openGeeServerInitScripts) {
autoFindProvides = true
autoFindRequires = true

// "requires" is for runtime dependencies. "requiresPre" is for pre-install
// script dependencies. We need both because pre- and post-install scripts
// call Open GEE binaries, and they may fail if a different version of
// common libraries is installed.
requires('opengee-common', ospackage.version, GREATER | EQUAL)
requiresPre('opengee-common', ospackage.version, GREATER | EQUAL)
requires('opengee-postgis', '2.3.9', GREATER | EQUAL)
requiresPre('opengee-postgis', '2.3.9', GREATER | EQUAL)
conflicts('opengee-postgis', '2.0', LESS )
conflicts('opengee-postgis', '2.4', GREATER | EQUAL)
requires('python-unittest2')
Expand Down Expand Up @@ -770,7 +783,12 @@ built from raster, vector, and location properties data.
autoFindProvides = true
autoFindRequires = true

// "requires" is for runtime dependencies. "requiresPre" is for pre-install
// script dependencies. We need both because pre- and post-install scripts
// call Open GEE binaries, and they may fail if a different version of
// common libraries is installed.
requires('opengee-common', ospackage.version, GREATER | EQUAL)
requiresPre('opengee-common', ospackage.version, GREATER | EQUAL)
requires('proj-devel') /* This dependency is not being picked up automatically by GeeRpm task */
requires('/etc/rc.d/init.d/functions')
requiresCommands(
Expand Down Expand Up @@ -914,6 +932,7 @@ task openGeeExtraInitScripts(type: Copy, dependsOn: openGeeSharedFiles) {

CopySpecTemplates.expand(delegate, [
'openGeeVersion': ospackage.version,
'openGeeRelease': ospackage.release,
'project': project
])
}
Expand Down
16 changes: 14 additions & 2 deletions earth_enterprise/rpms/opengee-extra/snippets/post-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,15 @@ umask 002

main_postinstall()
{
if [ -f "/etc/init.d/geserver" ]; then
# Check if opengee-fusion and opengee-server are the expected version. If
# not, we may be in the middle of an upgrade with incompatible libraries
# and binaries. In that case, we skip the steps below and let
# opengee-fusion and opengee-server take care of them.
EXTRA_VERSION="${CURRENT_VERSION}"
SERVER_VERSION=$(get_package_version opengee-server)
FUSION_VERSION=$(get_package_version opengee-fusion)

if [ "$SERVER_VERSION" == "$EXTRA_VERSION" ]; then
install_searchexample_database

# Set up the ExampleSearch plugin. The opengee-server-core RPM does
Expand All @@ -27,12 +35,16 @@ main_postinstall()
run_as_user "$GEPGUSER" "$BASEINSTALLDIR_OPT/bin/psql -q -d gesearch geuser -f $SQLDIR/examplesearch.sql"

service geserver restart
else
echo "Skipping example search set up. It will be set up when opengee-server-${EXTRA_VERSION} is installed."
fi

if [ -f "/etc/init.d/gefusion" ]; then
if [ "$FUSION_VERSION" == "$EXTRA_VERSION" ]; then
service gefusion stop
add_fusion_tutorial_volume
service gefusion start
else
echo "Skipping tutorial volume set up. It will be set up when opengee-fusion-${EXTRA_VERSION} is installed."
fi
}

Expand Down
1 change: 1 addition & 0 deletions earth_enterprise/rpms/opengee-extra/src/post-install.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Prefix variable definitions to install script:
new File("${project.buildDir}/shared/install-utils.sh").text
%>
CURRENT_VERSION=<%= openGeeVersion %>-<%= openGeeRelease %>.x86_64
<%= new File("${project.buildDir}/shared/searchexample.sh").text %>
<%= new File("${project.buildDir}/shared/fusiontutorial.sh").text %>
<%= new File(thisTemplateFile.parent, '../snippets/post-install.sh').text %>
15 changes: 15 additions & 0 deletions earth_enterprise/rpms/shared/snippets/install-utils-main.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,18 @@ run_as_user()
( cd / ;sudo -u $1 $2 )
fi
}

get_package_version()
{
local PACKAGE_NAME="${1}"
# Declare variable first; otherwise $? will be the exit code of local,
# which is always 0
local FULL_VERSION
FULL_VERSION=`rpm -q "${PACKAGE_NAME}"`
if [ $? -eq 0 ]; then
# Strip off the package name and return just the version
echo ${FULL_VERSION#"$PACKAGE_NAME-"}
else
echo "None"
fi
}
11 changes: 0 additions & 11 deletions earth_enterprise/src/installer/install_fusion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,20 +627,10 @@ copy_files_to_target()
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -rf $TMPOPENSSLPATH/private $BASEINSTALLDIR_VAR/openssl
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f $TMPOPENSSLPATH/misc/CA.sh $BASEINSTALLDIR_VAR/openssl/misc
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f $TMPOPENSSLPATH/misc/tsget $BASEINSTALLDIR_VAR/openssl/misc
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f $TMPOPENSSLPATH/misc/c_name $BASEINSTALLDIR_VAR/openssl/misc
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f $TMPOPENSSLPATH/misc/CA.pl $BASEINSTALLDIR_VAR/openssl/misc
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f $TMPOPENSSLPATH/misc/c_issuer $BASEINSTALLDIR_VAR/openssl/misc
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f $TMPOPENSSLPATH/misc/c_info $BASEINSTALLDIR_VAR/openssl/misc
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f $TMPOPENSSLPATH/misc/c_hash $BASEINSTALLDIR_VAR/openssl/misc
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -rf $TMPOPENSSLPATH/certs $BASEINSTALLDIR_VAR/openssl
if [ $? -ne 0 ]; then error_on_copy=1; fi

Expand Down Expand Up @@ -990,4 +980,3 @@ main_install
# Post-Install Main
#-----------------------------------------------------------------
main_postinstall

10 changes: 0 additions & 10 deletions earth_enterprise/src/installer/install_server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,20 +498,10 @@ copy_files_to_target()
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -rf "$TMPOPENSSLPATH/private" "$BASEINSTALLDIR_VAR/openssl"
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f "$TMPOPENSSLPATH/misc/CA.sh" "$BASEINSTALLDIR_VAR/openssl/misc"
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f "$TMPOPENSSLPATH/misc/tsget" "$BASEINSTALLDIR_VAR/openssl/misc"
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f "$TMPOPENSSLPATH/misc/c_name" "$BASEINSTALLDIR_VAR/openssl/misc"
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f "$TMPOPENSSLPATH/misc/CA.pl" "$BASEINSTALLDIR_VAR/openssl/misc"
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f "$TMPOPENSSLPATH/misc/c_issuer" "$BASEINSTALLDIR_VAR/openssl/misc"
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f "$TMPOPENSSLPATH/misc/c_info" "$BASEINSTALLDIR_VAR/openssl/misc"
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -f "$TMPOPENSSLPATH/misc/c_hash" "$BASEINSTALLDIR_VAR/openssl/misc"
if [ $? -ne 0 ]; then error_on_copy=1; fi
cp -rf "$TMPOPENSSLPATH/certs" "$BASEINSTALLDIR_VAR/openssl"
if [ $? -ne 0 ]; then error_on_copy=1; fi

Expand Down
3 changes: 0 additions & 3 deletions earth_enterprise/src/third_party/apache2/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,6 @@ to_prune_http = ['man', 'error', 'bin/htdbm',
'htdocs/apache_pb.gif', 'htdocs/index.html'
]

# Note: used when compiling with crosstool
# TODO: delete.
#stdc = '/opt/google/lib64/libstdc++.so.6'
apache_target = '%s/.install' % current_dir
apache_install = apache_env.Command(
apache_target, apache_configure,
Expand Down
7 changes: 3 additions & 4 deletions earth_enterprise/src/third_party/openssl/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
Import('third_party_env')
import os

openssl_version = 'openssl-1.0.2h'
openssl_version = 'openssl-1.1.1i'
ge_version = openssl_version.replace('openssl', 'openssl-ge')

current_dir = Dir('.').abspath
Expand Down Expand Up @@ -55,7 +55,6 @@ openssl_configure = openssl_env.Command(
openssl_target, openssl_extract,
[openssl_env.MultiCommand(
'cd %s\n'
'perl util/perlpath.pl /usr/bin/perl\n'
'%s%s ./Configure -DSSL_ALLOW_ADH --prefix=/opt/google '
'--openssldir=/var/opt/google/openssl linux-x86_64 shared\n'
'touch %s' % (build_root, openssl_env['ENV']['mod_env'], env_opt,
Expand All @@ -79,7 +78,7 @@ openssl_install = openssl_env.Command(
openssl_target, openssl_build,
[openssl_env.MultiCommand(
'cd %s\n'
'make INSTALL_PREFIX=%s install_sw\n'
'make DESTDIR=%s install_sw install_ssldirs\n'
'cd %s\n'
'if [ -d ./lib64 ]; then rsync -rltpvu ./lib64/ ./lib; rm -rf ./lib64; fi\n'
'rm -rf lib/pkgconfig\n'
Expand All @@ -89,7 +88,7 @@ openssl_install = openssl_env.Command(
'rm -rf share/doc/packages/%s\n'
'mkdir -p share/doc/packages/%s\n'
'cd -\n'
'cp -pr CHANGES CHANGES.SSLeay LICENSE NEWS README '
'cp -pr CHANGES LICENSE NEWS README '
'%s/opt/google/share/doc/packages/%s\n'
'touch %s' % (build_root, install_root, install_root_opt, ge_version,
ge_version, install_root, ge_version, openssl_target))])
Expand Down
2 changes: 1 addition & 1 deletion earth_enterprise/third_party/openssl/README.google
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
URL: http://www.openssl.org/
Version: 1.0.2h
Version: 1.1.1h
License: bsd-ish, requires acknowledgment
License File: LICENSE

Expand Down
3 changes: 0 additions & 3 deletions earth_enterprise/third_party/openssl/openssl-1.0.2h.tar.gz
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions earth_enterprise/third_party/openssl/openssl-1.1.1i.tar.gz
View file
Open in desktop
Git LFS file not shown