Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ADD Alpine 3.16.x as distribution with old SSL version #4425

Merged
merged 1 commit into from
Sep 11, 2023
Merged

ADD Alpine 3.16.x as distribution with old SSL version #4425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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
Loading