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

WIP: feat(deps): Integrates LibreSSL as gitsubmodule #500

Closed
wants to merge 6 commits into from
Closed

WIP: feat(deps): Integrates LibreSSL as gitsubmodule #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb07ec0
feat(deps): Integrates LibreSSL as git submodule
GoetzGoerisch Oct 26, 2021
26c7707
feat(Server): Updates initialbuild to use LibreSSL
GoetzGoerisch Oct 26, 2021
cafdc83
fix(CI): Fix LibreSSL prep
GoetzGoerisch Oct 26, 2021
dec0ac4
chore: Bumps libressl 3.4.3
GoetzGoerisch Jul 7, 2022
235a096
fix(deps): Bump LibreSSL to 3.7.0
GoetzGoerisch Jan 24, 2023
4be7403
feat(ci): Adapt build workflow
GoetzGoerisch Jan 24, 2023
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
7 changes: 2 additions & 5 deletions .github/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,8 @@ find_package(Patch REQUIRED)
# Patch command might be applied already, so errors need to be ignored.
externalproject_add(
libreSSLExternal
DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/libreSslDownload
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libreSslSource
URL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.0.tar.gz"
URL_HASH SHA256=3fc1290f4007ec75f6e9acecbb25512630d1b9ab8c53ba79844e395868c3e006
PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 --forward -d ${CMAKE_CURRENT_BINARY_DIR}/libreSslSource <
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../deps/libressl/portable
PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 --forward -d ${CMAKE_CURRENT_BINARY_DIR}/../deps/libressl/portable <
${CMAKE_CURRENT_SOURCE_DIR}/ciPatches/libressl-no_postfix.patch || echo "Patch returned non-zero"
CMAKE_ARGS -DLIBRESSL_APPS:BOOL=0 -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ jobs:
echo "ARG_CTEST=-C Debug">> "$env:GITHUB_ENV"
- name: Build server with dependencies
run: |
echo "BASEDIR=$(pwd)" >> "$env:GITHUB_ENV"
cd Sample-Server/deps/libressl/portable/
./autogen.sh
cd ${{ env.BASEDIR }}
mkdir -p build
cd build
cmake ../Sample-Server/.github/ -DCMAKE_INSTALL_PREFIX:PATH=${{ env.CMAKE_INSTALL_PREFIX }}
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
[submodule "deps/json"]
path = deps/json
url = https://github.com/nlohmann/json.git
[submodule "deps/libressl/portable"]
path = deps/libressl/portable
url = https://github.com/libressl-portable/portable.git
1 change: 1 addition & 0 deletions deps/libressl/portable
Open in desktop
Submodule portable added at 5a590f
3 changes: 3 additions & 0 deletions initialbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@

BASEDIR=$(pwd)

cd deps/libressl/portable || exit
./autogen.sh
cd $BASEDIR || exit
mkdir build
cd build || exit
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH="$BASEDIR/install" ../.github/
Expand Down