Skip to content

Commit

Permalink
Merge pull request #4425 from fisuda/hardening/use_old_ssl_version
Browse files Browse the repository at this point in the history
ADD Alpine 3.16.x as distribution with old SSL version
  • Loading branch information
fgalan authored Sep 11, 2023
2 parents dabd64b + 2aaa4e9 commit ca1cae1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ endif (${CMAKE_BUILD_TYPE} STREQUAL DEBUG)

# Enables some some #ifdef in the code for compiling in old system
# FIXME: cleanup OLD_SSL_VERSION_FORMAT stuff after consolidating the change to Debian 12+
IF(${DISTRO} MATCHES "Debian_11.*")
IF((${DISTRO} MATCHES "Debian_11.*") OR (${DISTRO} MATCHES "Alpine_3.16.*"))
ADD_DEFINITIONS(-DOLD_SSL_VERSION_FORMAT)
ENDIF()

Expand Down
5 changes: 5 additions & 0 deletions scripts/build/osDistro.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ suse_distro=$(cat /etc/SuSE-release 2> /dev/null | grep SUSE | cut -d ' ' -f 1-2

centos_distro=$(cat /etc/redhat-release 2> /dev/null | awk '{print $3}')

alpine_distro=$(cat /etc/alpine-release 2> /dev/null)

# In some cases (e.g. CentOS 7.x) we have found that the /etc/redhat-release content uses the following pattern:
#
# CentOS Linux release 7.2.1511 (Core)
Expand Down Expand Up @@ -69,6 +71,9 @@ then
elif [ "$centos_distro" != "" ]
then
distro=CentOS_$centos_distro
elif [ "$alpine_distro" != "" ]
then
distro=Alpine_$alpine_distro
fi

echo -n $distro

0 comments on commit ca1cae1

Please sign in to comment.