packaging: update dependencies

This patch updates both the packaging files and the dockerfiles to
remove unused dependencies and add dependencies which can be installed
from the system instead of being built from contrib.

- remove libsrtp
- add jsoncpp
- add libupnp
- add libav related packages for Ubuntu 16.04, since it's recent enough
  to use the packaged version

Change-Id: I5b3432f15582c3f8170a580a8e783bec33a98c05
Tuleap: #823

debian/control

@@ -10,10 +10,10 @@ Build-Depends: debhelper (>= 9),
 # ring-daemon
  autoconf, automake, libpulse-dev, libsamplerate0-dev, libtool, libdbus-1-dev,
  libasound2-dev, libexpat1-dev, libpcre3-dev, libyaml-cpp-dev, libboost-dev,
- libdbus-c++-dev, libsndfile1-dev, libsrtp-dev, libxext-dev,
+ libdbus-c++-dev, libsndfile1-dev, libxext-dev,
  libxfixes-dev, yasm, autopoint, unbound-anchor, git-core, libspeex-dev,
  libspeexdsp-dev, autotools-dev, chrpath, check, astyle,
- uuid-dev, libudev-dev, cmake
+ uuid-dev, libudev-dev, libjsoncpp-dev, cmake
 
 Package: ring-daemon
 Architecture: any

docker/debian_8/Dockerfile

@@ -2,9 +2,9 @@ FROM debian:jessie
 
 RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
 RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
- rsync git  autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
- libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
- libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
+ libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
  libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
  libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake --fix-missing
+ uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing

docker/debian_8_i386/Dockerfile

 FROM savoirfairelinux/ring-debian32:8
 
 RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
-RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git  autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
- libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
- libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
+ libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
  libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
  libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake --fix-missing
+ uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing

docker/debian_9/Dockerfile

 FROM debian:stretch
 
 RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
-RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git  autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
- libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
- libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
+ libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
  libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
  libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake --fix-missing
+ uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing

docker/debian_9_i386/Dockerfile

 FROM savoirfairelinux/ring-debian32:9
 
 RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
-RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git  autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
- libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
- libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
+ libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
  libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
  libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake --fix-missing
+ uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing

docker/fedora_22/Dockerfile

 FROM fedora:22
 
 RUN yum upgrade -y
-RUN yum install rpm-build tar rsync git make autoconf automake cmake speexdsp-devel pulseaudio-libs-devel \
- libsamplerate-devel libtool dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel dbus-c++-devel dbus-devel \
-  libsndfile-devel libsrtp-devel libXext-devel libXfixes-devel yasm git speex-devel chrpath check astyle uuid-c++-devel \
-   gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel uuid-devel gnutls-devel nettle-devel opus-devel speexdsp-devel -y
+RUN yum install rpm-build tar rsync git make autoconf automake cmake \
+    speexdsp-devel pulseaudio-libs-devel libsamplerate-devel libtool \
+    dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel \
+    dbus-c++-devel dbus-devel libsndfile-devel libXext-devel libXfixes-devel \
+    yasm git speex-devel chrpath check astyle uuid-c++-devel libupnp-devel \
+    gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel \
+    uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel -y

docker/fedora_22_i386/Dockerfile

 FROM savoirfairelinux/ring-fedora32:22
 
 RUN yum upgrade -y
-RUN yum install rpm-build tar rsync git make autoconf automake cmake speexdsp-devel pulseaudio-libs-devel \
- libsamplerate-devel libtool dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel dbus-c++-devel dbus-devel \
-  libsndfile-devel libsrtp-devel libXext-devel libXfixes-devel yasm git speex-devel chrpath check astyle uuid-c++-devel \
-   gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel uuid-devel gnutls-devel nettle-devel opus-devel -y
+RUN yum install rpm-build tar rsync git make autoconf automake cmake \
+    speexdsp-devel pulseaudio-libs-devel libsamplerate-devel libtool \
+    dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel \
+    dbus-c++-devel dbus-devel libsndfile-devel libXext-devel libXfixes-devel \
+    yasm git speex-devel chrpath check astyle uuid-c++-devel libupnp-devel \
+    gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel \
+    uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel -y

docker/fedora_23/Dockerfile

 FROM fedora:23
 
 RUN dnf upgrade -y
-RUN dnf install rpm-build tar rsync git make autoconf automake cmake speexdsp-devel pulseaudio-libs-devel \
- libsamplerate-devel libtool dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel dbus-c++-devel dbus-devel \
-  libsndfile-devel libsrtp-devel libXext-devel libXfixes-devel yasm git speex-devel chrpath check astyle uuid-c++-devel \
-   gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel uuid-devel gnutls-devel nettle-devel opus-devel speexdsp-devel -y
+RUN dnf install rpm-build tar rsync git make autoconf automake cmake \
+    speexdsp-devel pulseaudio-libs-devel libsamplerate-devel libtool \
+    dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel \
+    dbus-c++-devel dbus-devel libsndfile-devel libXext-devel libXfixes-devel \
+    yasm git speex-devel chrpath check astyle uuid-c++-devel libupnp-devel \
+    gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel \
+    uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel -y

docker/fedora_23_i386/Dockerfile

 FROM savoirfairelinux/ring-fedora32:23
 
-RUN yum upgrade -y
-RUN yum install rpm-build tar rsync git make autoconf automake cmake speexdsp-devel pulseaudio-libs-devel \
- libsamplerate-devel libtool dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel dbus-c++-devel dbus-devel \
-  libsndfile-devel libsrtp-devel libXext-devel libXfixes-devel yasm git speex-devel chrpath check astyle uuid-c++-devel \
-   gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel uuid-devel gnutls-devel nettle-devel opus-devel -y
+RUN dnf upgrade -y
+RUN dnf install rpm-build tar rsync git make autoconf automake cmake \
+    speexdsp-devel pulseaudio-libs-devel libsamplerate-devel libtool \
+    dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel \
+    dbus-c++-devel dbus-devel libsndfile-devel libXext-devel libXfixes-devel \
+    yasm git speex-devel chrpath check astyle uuid-c++-devel libupnp-devel \
+    gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel \
+    uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel -y

docker/ubuntu_14.04/Dockerfile

 FROM ubuntu:14.04
 
 RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
-RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
- autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
- libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
- libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
+ libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
  libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
- libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake --fix-missing
+ libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev \
+ uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing

docker/ubuntu_14.04_i386/Dockerfile

 FROM savoirfairelinux/ring-ubuntu32:14.04
 
 RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
-RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
- autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
- libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
- libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
+ libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
  libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
- libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake --fix-missing
+ libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev \
+ uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing

docker/ubuntu_15.10/Dockerfile

 FROM ubuntu:15.10
 
 RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
-RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
- autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
- libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
- libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev libgnutls-dev \
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
+ libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
  libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
- libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev qtbase5-dev \
- libgnutls28-dev libebook1.2-dev gnome-icon-theme-symbolic libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libgtk-3-dev libnotify-dev qttools5-dev-tools qttools5-dev \
- uuid-dev libudev-dev cmake --fix-missing
+ libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev \
+ uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing

docker/ubuntu_15.10_i386/Dockerfile

 FROM savoirfairelinux/ring-ubuntu32:15.10
 
 RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
-RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
- autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
- libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
- libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev libgnutls-dev \
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
+ libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
  libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
- libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake --fix-missing
+ libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev \
+ uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing

docker/ubuntu_16.04/Dockerfile

 FROM ubuntu:16.04
 
 RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
-RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
- autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
- libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
- libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev libgnutls-dev \
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
+ libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev libgnutls-dev \
  libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
  libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake --fix-missing
+ uuid-dev libudev-dev cmake libjsoncpp-dev \
+ libavcodec-dev libavcodec-extra libavdevice-dev libavformat-dev --fix-missing

docker/ubuntu_16.04_i386/Dockerfile

 FROM savoirfairelinux/ring-ubuntu32:16.04
 
 RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
-RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
- autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
- libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
- libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev libgnutls-dev \
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
+ rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
+ libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev libgnutls-dev \
  libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
  libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake --fix-missing
+ uuid-dev libudev-dev cmake libjsoncpp-dev \
+ libavcodec-dev libavcodec-extra libavdevice-dev libavformat-dev --fix-missing

ring-daemon.spec

@@ -11,13 +11,14 @@ Group:              Applications/Internet
 License:            GPLv3
 URL:                http://ring.cx/
 Source:             daemon
-BuildRequires:      make autoconf automake cmake pulseaudio-libs-devel libsamplerate-devel
-BuildRequires:      libtool dbus-devel expat-devel pcre-devel yaml-cpp-devel
-BuildRequires:      boost-devel dbus-c++-devel dbus-devel libsndfile-devel libsrtp-devel
-BuildRequires:      libXext-devel libXfixes-devel yasm git speex-devel
-BuildRequires:      chrpath check astyle uuid-c++-devel gettext-devel
-BuildRequires:      gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel uuid-devel
-BuildRequires:      gnutls-devel nettle-devel opus-devel
+BuildRequires:      make autoconf automake cmake pulseaudio-libs-devel
+BuildRequires:      libsamplerate-devel libtool dbus-devel expat-devel
+BuildRequires:      pcre-devel yaml-cpp-devel boost-devel dbus-c++-devel
+BuildRequires:      dbus-devel libsndfile-devel libXext-devel libXfixes-devel
+BuildRequires:      yasm git speex-devel chrpath check astyle uuid-c++-devel
+BuildRequires:      gettext-devel gcc-c++ which alsa-lib-devel systemd-devel
+BuildRequires:      libuuid-devel uuid-devel gnutls-devel nettle-devel
+BuildRequires:      opus-devel jsoncpp-devel
 
 %description
 Ring is free software for distributed and secured communication.