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

updates dependencies to use gravitational boring fork #36190

Closed
wants to merge 4 commits into from
Closed

updates dependencies to use gravitational boring fork #36190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81e9c6d
Update Clang from 12 to 14 to match BoringSSL `fips-20220613` tag
reedloden Dec 31, 2023
96b342a
updates dependencies to use gravitational boring fork
Jan 2, 2024
b9265cf
Updates boring ref and e ref
Jan 4, 2024
dcc72c6
add gcc-c++ to final centos7 image, update boring ref
Jan 10, 2024
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
15 changes: 6 additions & 9 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions build.assets/Dockerfile-centos7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ RUN yum groupinstall -y 'Development Tools' && \
# As mentioned above, these packages are unsigned.
RUN yum install --nogpgcheck -y \
${DEVTOOLSET}-gcc \
${DEVTOOLSET}-gcc-c++ \
${DEVTOOLSET}-make && \
yum clean all

Expand Down
26 changes: 13 additions & 13 deletions build.assets/Dockerfile-centos7-assets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ RUN yum groupinstall -y 'Development Tools' && \
yum update -y && \
yum install -y centos-release-scl-rh && \
yum install -y \
centos-release-scl \
cmake3 \
git \
scl-utils && \
centos-release-scl \
cmake3 \
git \
scl-utils && \
yum clean all

# As mentioned above, these packages are unsigned.
RUN yum install --nogpgcheck -y \
${DEVTOOLSET}-gcc \
${DEVTOOLSET}-gcc-c++ \
${DEVTOOLSET}-make && \
${DEVTOOLSET}-gcc \
${DEVTOOLSET}-gcc-c++ \
${DEVTOOLSET}-make && \
yum clean all

# Use just created devtool image with newer GCC and Cmake
Expand All @@ -54,12 +54,12 @@ RUN git clone --branch llvmorg-14.0.6 --depth=1 https://github.com/llvm/llvm-pro
[ "$(git rev-parse HEAD)" = 'f28c006a5895fc0e329fe15fead81e37457cb1d1' ] && \
mkdir build && cd build/ && \
scl enable ${DEVTOOLSET} 'bash -c "cmake3 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/opt/llvm \
-DLLVM_ENABLE_PROJECTS=clang \
-DLLVM_BUILD_TOOLS=ON \
-G \"Unix Makefiles\" ../llvm && \
make -j$(grep -c processor /proc/cpuinfo) install-llvm-strip install-clang-format install-clang install-clang-resource-headers install-libclang"' && \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/opt/llvm \
-DLLVM_ENABLE_PROJECTS=clang \
-DLLVM_BUILD_TOOLS=ON \
-G \"Unix Makefiles\" ../llvm && \
make -j$(grep -c processor /proc/cpuinfo) install-llvm-strip install-clang-format install-clang install-clang-resource-headers install-libclang"' && \
cd ../.. && \
rm -rf llvm-project

Expand Down
4 changes: 2 additions & 2 deletions lib/srv/desktop/rdp/rdpclient/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ crate-type = ["staticlib"]

[dependencies]
bitflags = "2.4.1"
boring = { version = "4.3.0", optional = true }
boring = { git = "https://github.com/gravitational/boring", rev="eb1296f580475ce77017c7169f3f59d0eca36a0d", optional = true }
byteorder = "1.5.0"
bytes = "1.4.0"
env_logger = "0.10.1"
Expand All @@ -33,7 +33,7 @@ rsa = "0.9.6"
sspi = { git = "https://github.com/Devolutions/sspi-rs", rev="d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79", features = ["network_client"] }
static_init = "1.0.3"
tokio = { version = "1.35", features = ["full"] }
tokio-boring = { version = "4.3.0", optional = true }
tokio-boring = { git = "https://github.com/gravitational/boring", rev="eb1296f580475ce77017c7169f3f59d0eca36a0d", optional = true }
utf16string = "0.2.0"
uuid = { version = "1.6.1", features = ["v4"] }

Expand Down
Loading