Merge pull request #78 from mozilla/feature/janus-upgrade/03192020

Feature/janus upgrade/03192020

ansible/roles/janus/tasks/main.yml

@@ -48,7 +48,6 @@
     copy:
       src: "perms.pub.der.{{ env }}"
       dest: "{{ work_dir.path }}/perms.pub.der"
-    when: env != 'local'
 
   - name: "Generate local cert"
     shell: "openssl req -newkey rsa:2048 -nodes -keyout \"{{ work_dir.path }}/{{ item }}.key\" -x509 -days 365 -out \"{{ work_dir.path }}/{{ item }}.pem\" -subj '/C=US/ST=California/L=Mountain View/O=YourOrg/OU=YourDept/CN=yoursite.com'"

plans/gengetopt/habitat/plan.sh

@@ -2,12 +2,12 @@ pkg_name=gengetopt
 pkg_origin=mozillareality
 pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
 
-pkg_version="2.22.6"
+pkg_version="2.23"
 pkg_license=('GPL')
-pkg_source="ftp://ftp.gnu.org/gnu/gengetopt/gengetopt-${pkg_version}.tar.gz"
+pkg_source="ftp://ftp.gnu.org/gnu/gengetopt/gengetopt-${pkg_version}.tar.xz"
-pkg_shasum="30b05a88604d71ef2a42a2ef26cd26df242b41f5b011ad03083143a31d9b01f7"
+pkg_shasum="b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac"
 pkg_filename="${pkg_name}-${pkg_version}.tar.gz"
-pkg_build_deps=(core/make core/gcc)
+pkg_build_deps=(core/make core/gcc core/texinfo)
 pkg_bin_dirs=(bin)
 pkg_description="Gengetopt is a tool to write command line option parsing code for C programs."
 pkg_upstream_url="https://www.gnu.org/software/gengetopt/gengetopt.html"

plans/gnutls/habitat/plan.sh

@@ -1,6 +1,6 @@
 pkg_origin=mozillareality
 pkg_name=gnutls
-pkg_version=3.6.1
+pkg_version=3.6.9
 pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
 
 pkg_license=('LGPLv2.1+')
@@ -8,7 +8,7 @@ pkg_description="GnuTLS is a secure communications library implementing the SSL,
 "protocols and technologies around them."
 pkg_upstream_url=http://www.gnutls.org
 pkg_source=https://www.gnupg.org/ftp/gcrypt/${pkg_name}/v3.6/${pkg_name}-${pkg_version}.tar.xz
-pkg_shasum=20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed
+pkg_shasum=4331fca55817ecdd74450b908a6c29b4f05bb24dd13144c6284aa34d872e1fcb
 pkg_deps=(
   core/glibc
   core/gmp
@@ -16,7 +16,7 @@ pkg_deps=(
   core/nettle
   core/libidn2
   core/libtasn1
-  mozillareality/unbound/1.6.3
+  mozillareality/unbound/1.9.2
 )
 pkg_build_deps=(
   core/gcc

plans/jansson/habitat/plan.sh

@@ -2,11 +2,11 @@ pkg_name=jansson
 pkg_origin=mozillareality
 pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
 
-pkg_version="2.10"
+pkg_version="2.12"
 pkg_license=('MIT')
 pkg_source="http://www.digip.org/jansson/releases/${pkg_name}-${pkg_version}.tar.gz"
 pkg_filename="${pkg_name}-${pkg_version}.tar.gz"
-pkg_shasum="78215ad1e277b42681404c1d66870097a50eb084be9d771b1d15576575cf6447"
+pkg_shasum="5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c7027d2c9"
 pkg_build_deps=(core/make core/gcc)
 pkg_lib_dirs=(lib)
 pkg_include_dirs=(include)

plans/janus-gateway/habitat/config/janus.cfg

@@ -4,6 +4,7 @@
 ; and, if needed, shared apisecret and/or token authentication mechanism
 ; between application(s) and Janus.
 [general]
+event_loops = 128
 configs_folder = {{ pkg.svc_config_path }}
 plugins_folder = {{ pkg.path }}/lib/janus/plugins		; Plugins folder
 transports_folder = {{ pkg.path }}/lib/janus/transports	; Transports folder

plans/janus-gateway/habitat/plan.sh

@@ -2,7 +2,7 @@ pkg_name=janus-gateway
 pkg_origin=mozillareality
 pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
 
-pkg_version="0.4.5"
+pkg_version="0.7.6"
 pkg_license=('GPLv3')
 pkg_description="Janus is an open source, general purpose, WebRTC gateway"
 pkg_upstream_url="https://janus.conf.meetecho.com/"
@@ -21,35 +21,36 @@ pkg_build_deps=(
     core/rust
     core/cacerts
     core/git
-    mozillareality/gnutls/3.6.1/20180914001821
+    mozillareality/gnutls/3.6.9
-    mozillareality/gengetopt
+    mozillareality/gengetopt/2.23
 )
 
 # versions are pinned for convenience building with Habitat, not because we give a crap about
 # having these versions in particular -- latest versions of everything should be sufficient
 pkg_deps=(
-    core/gcc/7.3.0/20180608051919 # reqd for libasan
+    core/gcc
-    core/glib/2.50.3/20180718153537
+    core/glib
-    core/openssl/1.0.2n/20180608102213
+    core/openssl
-    core/p11-kit/0.23.10/20180608191918
+    core/p11-kit
-    core/sqlite/3130000/20180608141313
+    core/sqlite
-    core/util-linux/2.31.1/20180608101132
+    core/util-linux
 
-    mozillareality/jansson/2.10/20170922013102
+    mozillareality/jansson/2.12
-    mozillareality/libmicrohttpd/0.9.55/20170923183119
+    mozillareality/libmicrohttpd/0.9.66
-    mozillareality/libnice/0.1.15/20180914001451
+    mozillareality/libnice/0.1.16
-    mozillareality/libsrtp/2.1.0/20170923183826
+    mozillareality/libsrtp/2.2.0
-    mozillareality/libwebsockets/2.4.2/20180702225550
+    mozillareality/libwebsockets/2.4.2
-    mozillareality/opus/1.2.1/20170922184322
+    mozillareality/opus/1.3.1
-    mozillareality/usrsctp/0.9.4.0/20170923224507
+    mozillareality/usrsctp/0.9.4.0
+    mozillareality/libconfig/1.7.2
 
     # https://github.com/habitat-sh/habitat/issues/3303
-    core/zlib/1.2.11/20180608050617
+    core/zlib
-    core/glibc/2.27/20180608041157
+    core/glibc
-    core/gcc-libs/7.3.0/20180608091701
+    core/gcc-libs
-    core/nettle/3.4/20180609173754
+    core/nettle
-    core/pcre/8.41/20180608092740
+    core/pcre
-    core/libtasn1/4.13/20180608191858
+    core/libtasn1
 )
 
 git-get () {
@@ -72,14 +73,11 @@ do_download() {
 
   pushd $HAB_CACHE_SRC_PATH
 
-  git-get meetecho/janus-gateway v0.4.5
+  git-get meetecho/janus-gateway v0.7.6
   pushd meetecho/janus-gateway
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1606886
-  # https://github.com/meetecho/janus-gateway/commit/435a1e91f1661e99d7a78c7953adfeedd95b66e3
-  git cherry-pick -n 435a1e91f1661e99d7a78c7953adfeedd95b66e3
   popd
 
-  git-get mozilla/janus-plugin-sfu 97be0ad45747d5c04f2e10a5b3e74cc997445d89
+  git-get mozilla/janus-plugin-sfu 14a33464726166fa0d3a20bd452ad05d2f7c53a6
 
   popd
 }
@@ -99,7 +97,7 @@ do_build() {
 
   ./autogen.sh
 
-  CFLAGS="${CFLAGS} -fsanitize=address -fno-omit-frame-pointer" LDFLAGS="${LDFLAGS} -lasan" ./configure --prefix="$pkg_prefix" --disable-all-plugins --disable-all-handlers
+  CFLAGS="${CFLAGS} -fno-omit-frame-pointer" ./configure --prefix="$pkg_prefix" --disable-all-plugins --disable-all-handlers
 
   make
 

plans/libconfig/.gitignore

@@ -0,0 +1 @@
+results/

plans/libconfig/habitat/default.toml

@@ -0,0 +1,3 @@
+# Use this file to templatize your application's native configuration files.
+# See the docs at https://www.habitat.sh/docs/create-packages-configure/.
+# You can safely delete this file if you don't need it.

plans/libconfig/habitat/plan.sh

@@ -0,0 +1,16 @@
+pkg_name=libconfig
+pkg_origin=mozillareality
+pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
+
+pkg_version="1.7.2"
+pkg_license=('BSD')
+pkg_source="https://hyperrealm.github.io/libconfig/dist/libconfig-${pkg_version}.tar.gz"
+pkg_filename="${pkg_name}-${pkg_version}.tar.gz"
+pkg_shasum="7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9"
+pkg_build_deps=(core/make core/gcc)
+pkg_bin_dirs=(bin)
+pkg_include_dirs=(include)
+pkg_lib_dirs=(lib)
+pkg_pconfig_dirs=(lib/pkgconfig)
+pkg_description="Libconfig is a simple library for processing structured configuration files"
+pkg_upstream_url="https://hyperrealm.github.io/libconfig/"

plans/libmicrohttpd/habitat/plan.sh

@@ -2,9 +2,9 @@ pkg_name=libmicrohttpd
 pkg_origin=mozillareality
 pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
 
-pkg_version="0.9.55"
+pkg_version="0.9.66"
-pkg_source="http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.55.tar.gz"
+pkg_source="http://ftp.gnu.org/gnu/${pkg_name}/${pkg_name}-${pkg_version}.tar.gz"
-pkg_shasum="0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8"
+pkg_shasum="4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b"
 pkg_build_deps=(core/make core/gcc) 
 pkg_license=('LGPL-2.1')
 pkg_description="GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application."

plans/libnice/habitat/plan.sh

@@ -7,9 +7,9 @@ pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
 #
 # 0.1.15 isn't released yet
 
-pkg_version="0.1.15"
+pkg_version="0.1.16"
 pkg_license=('MPL')
-pkg_shasum="61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1"
+pkg_shasum="06b678066f94dde595a4291588ed27acd085ee73775b8c4e8399e28c01eeefdf"
 pkg_lib_dirs=(lib)
 pkg_include_dirs=(include)
 
@@ -36,7 +36,7 @@ pkg_deps=(
   core/nettle
   core/pcre
   core/libtasn1
-  mozillareality/gnutls/3.6.1
+  mozillareality/gnutls/3.6.9
 )
 
 pkg_description="Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245)"
@@ -62,7 +62,7 @@ do_download() {
 
   pushd $HAB_CACHE_SRC_PATH
 
-  git-get libnice/libnice 34d60446ddfcdb98f2543611151ef8fbc5be4805
+  git-get gfodor/libnice 9a0607732902c2024960886a952edc8b9e3e5f77
 
   popd
 }
@@ -72,7 +72,7 @@ do_strip() {
 }
 
 do_build() {
-  pushd $HAB_CACHE_SRC_PATH/libnice/libnice
+  pushd $HAB_CACHE_SRC_PATH/gfodor/libnice
 
   libtoolize
 
@@ -101,7 +101,7 @@ do_build() {
 }
 
 do_install() {
-  pushd $HAB_CACHE_SRC_PATH/libnice/libnice
+  pushd $HAB_CACHE_SRC_PATH/gfodor/libnice
 
   do_default_install
 

plans/libsrtp/habitat/plan.sh

@@ -2,9 +2,9 @@ pkg_name=libsrtp
 pkg_origin=mozillareality
 pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
 
-pkg_version="2.1.0"
+pkg_version="2.2.0"
 pkg_source="https://github.com/cisco/libsrtp/archive/v${pkg_version}.zip"
-pkg_shasum="0885a868cbc3bc6593b2ac240687f42f2a5407374bde4e6d16bd3fbde5917e62"
+pkg_shasum="39fad3e6c805d6f98d8c7df101b17e22873de551938870cdd8936008af45d507"
 pkg_build_deps=(core/make core/gcc core/openssl core/automake) 
 pkg_description="This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel."
 pkg_upstream_url="https://github.com/cisco/libsrtp"

plans/opus/habitat/plan.sh

@@ -2,11 +2,11 @@ pkg_name=opus
 pkg_origin=mozillareality
 pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
 
-pkg_version="1.2.1"
+pkg_version="1.3.1"
 pkg_license=('BSD')
 pkg_source="https://archive.mozilla.org/pub/opus/opus-${pkg_version}.tar.gz"
 pkg_filename="${pkg_name}-${pkg_version}.tar.gz"
-pkg_shasum="cfafd339ccd9c5ef8d6ab15d7e1a412c054bf4cb4ecbbbcc78c12ef2def70732"
+pkg_shasum="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d"
 pkg_build_deps=(core/make core/gcc)
 pkg_lib_dirs=(lib)
 pkg_include_dirs=(include)

plans/unbound/habitat/plan.sh

@@ -1,12 +1,12 @@
 pkg_origin=mozillareality
 pkg_name=unbound
-pkg_version=1.6.3
+pkg_version=1.9.2
 pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
 pkg_license=('BSD')
 pkg_description="Unbound is a validating, recursive, and caching DNS resolver."
 pkg_upstream_url=https://www.unbound.net
 pkg_source=https://www.${pkg_name}.net/downloads/${pkg_name}-${pkg_version}.tar.gz
-pkg_shasum=4c7e655c1d0d2d133fdeb81bc1ab3aa5c155700f66c9f5fb53fa6a5c3ea9845f
+pkg_shasum=6f7acec5cf451277fcda31729886ae7dd62537c4f506855603e3aa153fcb6b95
 pkg_deps=(
   core/glibc core/libressl core/libsodium
   core/expat

plans/usrsctp/habitat/plan.sh

@@ -2,9 +2,9 @@ pkg_name=usrsctp
 pkg_origin=mozillareality
 pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
 
-pkg_version="0.9.4.0"
+pkg_version="0.9.6.0"
 pkg_source="https://github.com/gfodor/usrsctp/archive/${pkg_version}.tar.gz"
-pkg_shasum="7077e275125ef98d33c8bf2d88d457a806b7c5e7811c1f614d60bbca0723f69c"
+pkg_shasum="a7d1b2f68d744a4778ce5fb266eaa71844a79442d8390d285539592ed1d54000"
 pkg_license=('BSD-3')
 pkg_build_deps=(
   core/make