Revert "Merge pull request #1585 from AxelNennker/libsodium-1.0.17"

This reverts commit c9a16f8, reversing changes made to 61232de.
hyperledger-archives · Aug 29, 2019 · 2322013 · 2322013
1 parent d00c101
commit 2322013
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 33 deletions.
diff --git a/docs/build-guides/rhel-build.md b/docs/build-guides/rhel-build.md
@@ -42,12 +42,12 @@ dnf install -y \
 For Amazon Linux 2017.03 or other distributions without `libsodium` available in system repositories:
 ```
 cd /tmp
-curl https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz | tar -xz
-cd /tmp/libsodium-1.0.18
+curl https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14.tar.gz | tar -xz
+cd /tmp/libsodium-1.0.14
 ./configure
 make
 make install
-rm -rf /tmp/libsodium-1.0.18
+rm -rf /tmp/libsodium-1.0.14
 
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

diff --git a/docs/build-guides/ubuntu-build.md b/docs/build-guides/ubuntu-build.md
@@ -15,16 +15,16 @@
       libncursesw5-dev
    ```
 
-1. `libindy` requires the modern `1.0.18` version of `libsodium` but Ubuntu 16.04 does not support installation it's from `apt` repository.
+1. `libindy` requires the modern `1.0.14` version of `libsodium` but Ubuntu 16.04 does not support installation it's from `apt` repository.
  Because of this, it requires to build and install `libsodium` from source:
  ```
 cd /tmp && \
-   curl https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz | tar -xz && \
-    cd /tmp/libsodium-1.0.18 && \
-    ./configure && \
+   curl https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14.tar.gz | tar -xz && \
+    cd /tmp/libsodium-1.0.14 && \
+    ./configure --disable-shared && \
     make && \
     make install && \
-    rm -rf /tmp/libsodium-1.0.18
+    rm -rf /tmp/libsodium-1.0.14
 ```
 
 1. Build `libindy`

diff --git a/docs/build-guides/windows-build.md b/docs/build-guides/windows-build.md
@@ -43,7 +43,7 @@ git clone https://github.com/hyperledger/indy-sdk.git
 ### Binary deps
 
 - https://www.npcglib.org/~stathis/downloads/openssl-1.0.2k-vs2017.7z
-- https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-msvc.zip
+- https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14-msvc.zip
 
 ### Source deps
 

diff --git a/libindy/ci/centos.dockerfile b/libindy/ci/centos.dockerfile
@@ -22,12 +22,12 @@ RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash -
 RUN yum -y install nodejs
 
 RUN cd /tmp && \
-   curl https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz | tar -xz && \
-    cd /tmp/libsodium-1.0.18 && \
+   curl https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14.tar.gz | tar -xz && \
+    cd /tmp/libsodium-1.0.14 && \
     ./configure && \
     make && \
     make install && \
-    rm -rf /tmp/libsodium-1.0.18
+    rm -rf /tmp/libsodium-1.0.14
 
 ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

diff --git a/libindy/ci/ubuntu.dockerfile b/libindy/ci/ubuntu.dockerfile
@@ -9,9 +9,6 @@ RUN apt-get update && \
       libgmp3-dev \
       curl \
       build-essential \
-      autoconf \
-      automake \
-      libtool \
       libsqlite3-dev \
       cmake \
       git \
@@ -24,6 +21,7 @@ RUN apt-get update && \
       wget \
       devscripts \
       libncursesw5-dev \
+      libzmq3-dev \
       zip \
       unzip \
       jq
@@ -40,27 +38,13 @@ RUN pip3 install -U \
 	plumbum \
 	deb-pkg-tools
 
-ARG LIBSODIUM_VERSION=1.0.18
-
-RUN cd /tmp && \
-   curl https://download.libsodium.org/libsodium/releases/libsodium-$LIBSODIUM_VERSION.tar.gz | tar -xz && \
-    cd /tmp/libsodium-$LIBSODIUM_VERSION && \
-    ./configure && \
-    make && \
-    make install && \
-    rm -rf /tmp/libsodium-$LIBSODIUM_VERSION && \
-    ldconfig -n /usr/local/lib
-
-ARG LIBZEROMQ_VERSION=4.3.1
-
 RUN cd /tmp && \
-   curl https://codeload.github.com/zeromq/libzmq/tar.gz/v$LIBZEROMQ_VERSION | tar -xz && \
-    cd /tmp/libzmq-$LIBZEROMQ_VERSION && \
-    ./autogen.sh && ./configure && \
+   curl https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14.tar.gz | tar -xz && \
+    cd /tmp/libsodium-1.0.14 && \
+    ./configure --disable-shared && \
     make && \
     make install && \
-    rm -rf /tmp/libzmq-$LIBZEROMQ_VERSION && \
-    ldconfig -n /usr/local/lib
+    rm -rf /tmp/libsodium-1.0.14
 
 RUN apt-get update && apt-get install openjdk-8-jdk -y
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64