Skip to content
This repository has been archived by the owner on Mar 11, 2024. It is now read-only.

Remove libsodium and time dependencies #200

Merged
merged 3 commits into from
Jan 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
130 changes: 62 additions & 68 deletions Cargo.lock

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

5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ found in Libursa.
Ursa uses the following external dependencies:

- [openssl 1.1.0j or greater](https://www.openssl.org/source/openssl-1.1.0j.tar.gz) (Written in C)
- [libsodium 1.0.18 or greater](https://github.com/jedisct1/libsodium/archive/1.0.18.tar.gz) (Written in C)
- [libsecp256k1](https://github.com/bitcoin-core/secp256k1) (Written in C)

These dependencies are used when building in the default secure mode. These
Expand All @@ -104,9 +103,7 @@ when using portable mode for their applications.

# Building from Source

Libursa and Libzmix rely on libsodium for the default
secure mode. Please see the following document for specific platform
installations [here](docs/build-environment.md).
Please see the following document for platform-specific installations [here](docs/build-environment.md).

## Libursa

Expand Down
12 changes: 2 additions & 10 deletions docker/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,10 @@ FROM centos:7
LABEL maintainer="Michael Lodder <[email protected]>"

ENV PATH /root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV SODIUM_LIB_DIR /usr/local/lib
ENV LD_LIBRARY_PATH /usr/local/lib

WORKDIR /root

RUN yum -y update && yum -y install sudo make autoconf libtool curl python3 pkg-config openssl-devel 2>&1 > /dev/null \
&& curl -fsSL https://github.com/jedisct1/libsodium/archive/1.0.18.tar.gz | tar -xz \
&& cd libsodium-1.0.18 \
&& ./autogen.sh \
&& ./configure --disable-dependency-tracking \
&& make \
&& make install \
&& cd .. \
&& rm -rf libsodium-1.0.18 \
RUN yum -y update \
&& yum -y install sudo make autoconf libtool curl python3 pkg-config openssl-devel 2>&1 > /dev/null \
&& curl https://sh.rustup.rs -sSf | sh -s -- -y
12 changes: 2 additions & 10 deletions docker/fedora/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,10 @@ FROM fedora:29
LABEL maintainer="Michael Lodder <[email protected]>"

ENV PATH /root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV SODIUM_LIB_DIR /usr/local/lib
ENV LD_LIBRARY_PATH /usr/local/lib

WORKDIR /root

RUN yum -y update && yum -y install sudo make autoconf libtool curl python3 pkg-config openssl-devel 2>&1 > /dev/null \
&& curl -fsSL https://github.com/jedisct1/libsodium/archive/1.0.18.tar.gz | tar -xz \
&& cd libsodium-1.0.18 \
&& ./autogen.sh \
&& ./configure --disable-dependency-tracking \
&& make \
&& make install \
&& cd .. \
&& rm -rf libsodium-1.0.18 \
RUN yum -y update \
&& yum -y install sudo make autoconf libtool curl python3 pkg-config openssl-devel 2>&1 > /dev/null \
&& curl https://sh.rustup.rs -sSf | sh -s -- -y
Loading