From 7ceaff34386a8a87dab6611b2c5624bc6c811b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 6 Apr 2018 10:36:12 -0400
Subject: [PATCH] dependencies: add openssl to dependencies
Change-Id: I77063f047e28fe4298d93649660d9dacb9f9e8a2
---
docker/Dockerfile_debian_8 | 3 ++-
docker/Dockerfile_debian_8_i386 | 3 ++-
docker/Dockerfile_debian_9 | 3 ++-
docker/Dockerfile_debian_9_i386 | 3 ++-
docker/Dockerfile_fedora_22 | 3 ++-
docker/Dockerfile_fedora_22_i386 | 3 ++-
docker/Dockerfile_fedora_23 | 3 ++-
docker/Dockerfile_fedora_23_i386 | 3 ++-
docker/Dockerfile_fedora_24 | 3 ++-
docker/Dockerfile_fedora_24_i386 | 3 ++-
docker/Dockerfile_fedora_25 | 3 ++-
docker/Dockerfile_fedora_25_i386 | 3 ++-
docker/Dockerfile_fedora_26 | 3 ++-
docker/Dockerfile_fedora_27 | 3 ++-
docker/Dockerfile_ubuntu_14.04 | 3 ++-
docker/Dockerfile_ubuntu_14.04_i386 | 3 ++-
docker/Dockerfile_ubuntu_15.10 | 3 ++-
docker/Dockerfile_ubuntu_15.10_i386 | 3 ++-
docker/Dockerfile_ubuntu_16.04 | 3 ++-
docker/Dockerfile_ubuntu_16.04_i386 | 3 ++-
docker/Dockerfile_ubuntu_16.10 | 3 ++-
docker/Dockerfile_ubuntu_16.10_i386 | 3 ++-
docker/Dockerfile_ubuntu_17.04 | 3 ++-
docker/Dockerfile_ubuntu_17.04_i386 | 3 ++-
docker/Dockerfile_ubuntu_17.10 | 3 ++-
docker/Dockerfile_ubuntu_17.10_i386 | 3 ++-
make-ring.py | 8 ++++----
27 files changed, 56 insertions(+), 30 deletions(-)
diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8
index 5d63b4b4..82e9cff6 100644
--- a/docker/Dockerfile_debian_8
+++ b/docker/Dockerfile_debian_8
@@ -61,7 +61,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_8_i386 b/docker/Dockerfile_debian_8_i386
index 23ab1571..31159220 100644
--- a/docker/Dockerfile_debian_8_i386
+++ b/docker/Dockerfile_debian_8_i386
@@ -61,7 +61,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
index a04f1a88..593669f4 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -63,7 +63,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
index 84e9190c..04fd65c5 100644
--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -63,7 +63,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_fedora_22 b/docker/Dockerfile_fedora_22
index 8c5948fd..b4067fc6 100644
--- a/docker/Dockerfile_fedora_22
+++ b/docker/Dockerfile_fedora_22
@@ -53,7 +53,8 @@ RUN dnf upgrade -y && \
cryptopp-devel \
libva-devel \
libvdpau-devel \
- NetworkManager-libnm-devel
+ NetworkManager-libnm-devel \
+ openssl-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_22_i386 b/docker/Dockerfile_fedora_22_i386
index 694e0cca..4e898bf8 100644
--- a/docker/Dockerfile_fedora_22_i386
+++ b/docker/Dockerfile_fedora_22_i386
@@ -53,7 +53,8 @@ RUN dnf upgrade -y && \
cryptopp-devel \
libva-devel \
libvdpau-devel \
- NetworkManager-libnm-devel
+ NetworkManager-libnm-devel \
+ openssl-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_23 b/docker/Dockerfile_fedora_23
index dbdb55d2..84deee95 100644
--- a/docker/Dockerfile_fedora_23
+++ b/docker/Dockerfile_fedora_23
@@ -53,7 +53,8 @@ RUN dnf upgrade -y && \
cryptopp-devel \
libva-devel \
libvdpau-devel \
- NetworkManager-libnm-devel
+ NetworkManager-libnm-devel \
+ openssl-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_23_i386 b/docker/Dockerfile_fedora_23_i386
index b06d139b..b6fa6707 100644
--- a/docker/Dockerfile_fedora_23_i386
+++ b/docker/Dockerfile_fedora_23_i386
@@ -53,7 +53,8 @@ RUN dnf upgrade -y && \
cryptopp-devel \
libva-devel \
libvdpau-devel \
- NetworkManager-libnm-devel
+ NetworkManager-libnm-devel \
+ openssl-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_24 b/docker/Dockerfile_fedora_24
index 8f0a85ce..18521d57 100644
--- a/docker/Dockerfile_fedora_24
+++ b/docker/Dockerfile_fedora_24
@@ -53,7 +53,8 @@ RUN dnf upgrade -y && \
cryptopp-devel \
libva-devel \
libvdpau-devel \
- NetworkManager-libnm-devel
+ NetworkManager-libnm-devel \
+ openssl-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_24_i386 b/docker/Dockerfile_fedora_24_i386
index 04e1af61..6bcf8ad7 100644
--- a/docker/Dockerfile_fedora_24_i386
+++ b/docker/Dockerfile_fedora_24_i386
@@ -53,7 +53,8 @@ RUN dnf upgrade -y && \
cryptopp-devel \
libva-devel \
libvdpau-devel \
- NetworkManager-libnm-devel
+ NetworkManager-libnm-devel \
+ openssl-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_25 b/docker/Dockerfile_fedora_25
index e956e6bf..04100b6b 100644
--- a/docker/Dockerfile_fedora_25
+++ b/docker/Dockerfile_fedora_25
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
libva-devel \
libvdpau-devel \
msgpack-devel \
- NetworkManager-libnm-devel
+ NetworkManager-libnm-devel \
+ openssl-devel
# Packaging tools
RUN dnf install -y yum-utils rpmdevtools
diff --git a/docker/Dockerfile_fedora_25_i386 b/docker/Dockerfile_fedora_25_i386
index 582fe139..311bb43b 100644
--- a/docker/Dockerfile_fedora_25_i386
+++ b/docker/Dockerfile_fedora_25_i386
@@ -54,7 +54,8 @@ RUN dnf upgrade -y && \
libva-devel \
libvdpau-devel \
msgpack-devel \
- NetworkManager-libnm-devel
+ NetworkManager-libnm-devel \
+ openssl-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_26
index e8a0535d..7c28f6d7 100644
--- a/docker/Dockerfile_fedora_26
+++ b/docker/Dockerfile_fedora_26
@@ -54,7 +54,8 @@ RUN dnf upgrade -y && \
libva-devel \
libvdpau-devel \
msgpack-devel \
- NetworkManager-libnm-devel
+ NetworkManager-libnm-devel \
+ openssl-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27
index fd9d5447..bf6f9815 100644
--- a/docker/Dockerfile_fedora_27
+++ b/docker/Dockerfile_fedora_27
@@ -54,7 +54,8 @@ RUN dnf upgrade -y && \
libva-devel \
libvdpau-devel \
msgpack-devel \
- NetworkManager-libnm-devel
+ NetworkManager-libnm-devel \
+ openssl-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_ubuntu_14.04 b/docker/Dockerfile_ubuntu_14.04
index d307b30f..201f9452 100644
--- a/docker/Dockerfile_ubuntu_14.04
+++ b/docker/Dockerfile_ubuntu_14.04
@@ -62,7 +62,8 @@ RUN apt-get update && \
libwebkit2gtk-3.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_14.04_i386 b/docker/Dockerfile_ubuntu_14.04_i386
index 4e951c13..46cc2e95 100644
--- a/docker/Dockerfile_ubuntu_14.04_i386
+++ b/docker/Dockerfile_ubuntu_14.04_i386
@@ -62,7 +62,8 @@ RUN apt-get update && \
libwebkit2gtk-3.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_15.10 b/docker/Dockerfile_ubuntu_15.10
index ed978f6c..1358ca4d 100644
--- a/docker/Dockerfile_ubuntu_15.10
+++ b/docker/Dockerfile_ubuntu_15.10
@@ -62,7 +62,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_15.10_i386 b/docker/Dockerfile_ubuntu_15.10_i386
index 3f8d5ec3..c80de94e 100644
--- a/docker/Dockerfile_ubuntu_15.10_i386
+++ b/docker/Dockerfile_ubuntu_15.10_i386
@@ -62,7 +62,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04
index 04f735c9..e8971775 100644
--- a/docker/Dockerfile_ubuntu_16.04
+++ b/docker/Dockerfile_ubuntu_16.04
@@ -62,7 +62,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386
index 229326bf..25b3e50f 100644
--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ b/docker/Dockerfile_ubuntu_16.04_i386
@@ -62,7 +62,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.10 b/docker/Dockerfile_ubuntu_16.10
index 55b0a6ee..d94e7bb1 100644
--- a/docker/Dockerfile_ubuntu_16.10
+++ b/docker/Dockerfile_ubuntu_16.10
@@ -72,7 +72,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.10_i386 b/docker/Dockerfile_ubuntu_16.10_i386
index fc05be48..75f26cb6 100644
--- a/docker/Dockerfile_ubuntu_16.10_i386
+++ b/docker/Dockerfile_ubuntu_16.10_i386
@@ -72,7 +72,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_17.04 b/docker/Dockerfile_ubuntu_17.04
index f625916a..eb3be15c 100644
--- a/docker/Dockerfile_ubuntu_17.04
+++ b/docker/Dockerfile_ubuntu_17.04
@@ -74,7 +74,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386
index 1f7be6dd..6c68f857 100644
--- a/docker/Dockerfile_ubuntu_17.04_i386
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -74,7 +74,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_17.10 b/docker/Dockerfile_ubuntu_17.10
index 978be9fa..4534e2d0 100644
--- a/docker/Dockerfile_ubuntu_17.10
+++ b/docker/Dockerfile_ubuntu_17.10
@@ -74,7 +74,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_17.10_i386 b/docker/Dockerfile_ubuntu_17.10_i386
index e4cb47c4..0bc6a1d8 100644
--- a/docker/Dockerfile_ubuntu_17.10_i386
+++ b/docker/Dockerfile_ubuntu_17.10_i386
@@ -74,7 +74,8 @@ RUN apt-get update && \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
- libvdpau-dev
+ libvdpau-dev \
+ libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/make-ring.py b/make-ring.py
index 9df5f681..282abde5 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -75,7 +75,7 @@ ZYPPER_DEPENDENCIES = [
'libnettle-devel', 'libopus-devel', 'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel',
'libavdevice-devel', 'pcre-devel', 'libogg-devel', 'libsndfile-devel', 'libvorbis-devel',
'flac-devel', 'libgsm-devel', 'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-devel',
- 'libvdpau-devel'
+ 'libvdpau-devel', 'libopenssl-devel',
# lrc
'libQt5Core-devel', 'libQt5DBus-devel', 'libqt5-linguist-devel',
# gnome client
@@ -110,7 +110,7 @@ DNF_DEPENDENCIES = [
'uuid-devel', 'gnutls-devel', 'nettle-devel', 'opus-devel', 'speexdsp-devel',
'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel',
'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-devel',
- 'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-devel',
+ 'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-devel', 'openssl-devel',
'webkitgtk4-devel', 'NetworkManager-libnm-devel', 'libvdpau-devel', 'msgpack-devel', 'libcanberra-devel'
]
@@ -121,7 +121,7 @@ APT_DEPENDENCIES = [
'libclutter-gtk-1.0-dev', 'libcppunit-dev', 'libdbus-1-dev',
'libdbus-c++-dev', 'libebook1.2-dev', 'libexpat1-dev', 'libgnutls28-dev',
'libgsm1-dev', 'libgtk-3-dev', 'libjack-dev', 'libnotify-dev',
- 'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libsamplerate0-dev',
+ 'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libsamplerate0-dev', 'libssl',
'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
@@ -134,7 +134,7 @@ PACMAN_DEPENDENCIES = [
'expat', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse', 'libsamplerate',
'libsndfile', 'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base',
'swig', 'yasm', 'qrencode', 'evolution-data-server', 'make', 'patch', 'pkg-config',
- 'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanbera'
+ 'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanbera', 'openssl'
]
OSX_DEPENDENCIES = [
--
GitLab