On 23/02/18 09:16AM, aisha wrote:
> Hi,
> I've attached the update for net/jitsi and friends to the 8252 release.
>
> The meta port has a small change to reorder jicofo before jvb. The previous
> setup works as well, except it takes a few more seconds for initial setup to
> get warmed up.
>
> No major changes in functionality, mostly bug fixes.
>
> OK?
>
Now the patch updates to 2.0.8319.
OK to commit?
diff --git a/meta/jitsi/Makefile b/meta/jitsi/Makefile
index 1c265977b41..ceca9137027 100644
--- a/meta/jitsi/Makefile
+++ b/meta/jitsi/Makefile
@@ -3,6 +3,7 @@ COMMENT= meta package for all Jitsi Meet components
CATEGORIES= meta net
VERSION= 1.0
+REVISION= 0
MAINTAINER= Philipp Buehler <pb-open...@sysfive.com>, \
Aisha Tammy <open...@aisha.cc>
diff --git a/meta/jitsi/pkg/README b/meta/jitsi/pkg/README
index 133269f5531..e4e6b4a7794 100644
--- a/meta/jitsi/pkg/README
+++ b/meta/jitsi/pkg/README
@@ -221,9 +221,9 @@ Spinning up the daemons
The daemons needs to be started in the order given:
- $ rcctl enable nginx prosody jvb jicofo
- $ rcctl order nginx prosody jvb jicofo
- $ rcctl start nginx prosody jvb jicofo
+ $ rcctl enable nginx prosody jicofo jvb
+ $ rcctl order nginx prosody jicofo jvb
+ $ rcctl start nginx prosody jicofo jvb
The setup can be tested by visiting the site at https://jitsi.example.com.
diff --git a/net/jitsi/jicofo/Makefile b/net/jitsi/jicofo/Makefile
index f1c2295c1c7..b907cf1c46e 100644
--- a/net/jitsi/jicofo/Makefile
+++ b/net/jitsi/jicofo/Makefile
@@ -2,12 +2,12 @@ COMMENT = server-side focus component used in Jitsi Meet
conferences
CATEGORIES = net
-VERSION = 2.0.8044
+VERSION = 2.0.8319
PKGNAME = jicofo-${VERSION}
GH_ACCOUNT = jitsi
GH_PROJECT = jicofo
-GH_TAGNAME = jitsi-meet_8044
+GH_TAGNAME = jitsi-meet_8319
DISTFILES += ${GH_DISTFILE}
diff --git a/net/jitsi/jicofo/distinfo b/net/jitsi/jicofo/distinfo
index 0308dace884..f3446133a81 100644
--- a/net/jitsi/jicofo/distinfo
+++ b/net/jitsi/jicofo/distinfo
@@ -1,4 +1,4 @@
-SHA256 (jicofo-deps-2.0.8044.tgz) =
fNlANQl/9uxxhu4FA66UD3hHVf8dHbhoKSxKtuxZoNQ=
-SHA256 (jicofo-jitsi-meet_8044.tar.gz) =
CQ4fetc91JzTuF39Y7wahF7wPWS443MNnlWPh2kqQ08=
-SIZE (jicofo-deps-2.0.8044.tgz) = 157769469
-SIZE (jicofo-jitsi-meet_8044.tar.gz) = 248660
+SHA256 (jicofo-deps-2.0.8319.tgz) =
V9jkwhNIGvf1tWUPFgeJ/RCH0e+Tcz3OAbIjAvu1wqI=
+SHA256 (jicofo-jitsi-meet_8319.tar.gz) =
3wMjV5GmEL7qIM4kcNXrSc+kbMeED3YMrF6dxqUJVZ0=
+SIZE (jicofo-deps-2.0.8319.tgz) = 162128316
+SIZE (jicofo-jitsi-meet_8319.tar.gz) = 1883342
diff --git a/net/jitsi/jicofo/pkg/PLIST b/net/jitsi/jicofo/pkg/PLIST
index e2ad416a1d7..39f5beb23f3 100644
--- a/net/jitsi/jicofo/pkg/PLIST
+++ b/net/jitsi/jicofo/pkg/PLIST
@@ -16,14 +16,12 @@ share/jicofo/jicofo.conf.sample
@group _jicofo
@sample ${SYSCONFDIR}/jicofo/jicofo.conf
@mode
-@owner
@group
share/jicofo/jicofo.in.sh.sample
@mode 640
@group _jicofo
@sample ${SYSCONFDIR}/jicofo/jicofo.in.sh
@mode
-@owner
@group
share/jicofo/lib/
share/jicofo/lib/logging.properties.sample
diff --git a/net/jitsi/meet/Makefile b/net/jitsi/meet/Makefile
index 60b8f81454e..c83f414bee1 100644
--- a/net/jitsi/meet/Makefile
+++ b/net/jitsi/meet/Makefile
@@ -2,7 +2,7 @@ COMMENT = web files for Jitsi Meet
CATEGORIES = net www
-VERSION = 1.0.6845
+VERSION = 1.0.7008
MASTER_SITES = https://download.jitsi.org/jitsi-meet/src/
DISTNAME = jitsi-meet-${VERSION}
EXTRACT_SUFX = .tar.bz2
diff --git a/net/jitsi/meet/distinfo b/net/jitsi/meet/distinfo
index 439933a9ccc..e1768192cc0 100644
--- a/net/jitsi/meet/distinfo
+++ b/net/jitsi/meet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jitsi-meet-1.0.6845.tar.bz2) =
yuWMmBYpUucZdKMI+r9nXuegLAGics8+p+FowhfBe1w=
-SIZE (jitsi-meet-1.0.6845.tar.bz2) = 18162747
+SHA256 (jitsi-meet-1.0.7008.tar.bz2) =
myFFY0xUg8L4tT36Z7Glc1fu2zwz+4XsI5IL+6ilZNY=
+SIZE (jitsi-meet-1.0.7008.tar.bz2) = 17535961
diff --git a/net/jitsi/meet/pkg/PLIST b/net/jitsi/meet/pkg/PLIST
index 37949b11d86..f0a61ff587e 100644
--- a/net/jitsi/meet/pkg/PLIST
+++ b/net/jitsi/meet/pkg/PLIST
@@ -41,6 +41,7 @@ www/jitsi-meet/images/icon-cloud.png
www/jitsi-meet/images/icon-info.png
www/jitsi-meet/images/icon-users.png
www/jitsi-meet/images/jitsilogo.png
+www/jitsi-meet/images/logo-deep-linking-mobile.png
www/jitsi-meet/images/logo-deep-linking.png
www/jitsi-meet/images/microsoftLogo.svg
www/jitsi-meet/images/share-audio.gif
@@ -132,8 +133,6 @@ www/jitsi-meet/libs/blazeface-front.bin
www/jitsi-meet/libs/blazeface-front.json
www/jitsi-meet/libs/capabilities.json
www/jitsi-meet/libs/close3.min.js
-www/jitsi-meet/libs/dial_in_info_bundle.min.js
-www/jitsi-meet/libs/dial_in_info_bundle.min.js.map
www/jitsi-meet/libs/do_external_connect.min.js
www/jitsi-meet/libs/do_external_connect.min.js.map
www/jitsi-meet/libs/emotion.bin
diff --git a/net/jitsi/prosody-plugins/Makefile
b/net/jitsi/prosody-plugins/Makefile
index 71dc7166a96..5ea90fc1c92 100644
--- a/net/jitsi/prosody-plugins/Makefile
+++ b/net/jitsi/prosody-plugins/Makefile
@@ -2,11 +2,11 @@ COMMENT = prosody modules for Jitsi Meet
CATEGORIES = net
-PKGNAME = jitsi-prosody-plugins-2.0.8044
+PKGNAME = jitsi-prosody-plugins-2.0.8252
GH_ACCOUNT = jitsi
GH_PROJECT = jitsi-meet
-GH_TAGNAME = jitsi-meet_8044
+GH_TAGNAME = jitsi-meet_8319
MAINTAINER = Philipp Buehler <pb-open...@sysfive.com>, \
Aisha Tammy <open...@aisha.cc>
diff --git a/net/jitsi/prosody-plugins/distinfo
b/net/jitsi/prosody-plugins/distinfo
index 11d3e746552..83e5905c66f 100644
--- a/net/jitsi/prosody-plugins/distinfo
+++ b/net/jitsi/prosody-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jitsi-meet-jitsi-meet_8044.tar.gz) =
KetHDO/cnoaN7ynVSWzBgEVGHB5BwP23BVtgkU8ezxY=
-SIZE (jitsi-meet-jitsi-meet_8044.tar.gz) = 117327796
+SHA256 (jitsi-meet-jitsi-meet_8319.tar.gz) =
IhGMolWSTBFGl6sS8/+v8+pHqXEISdq2n7fqbMxfJXI=
+SIZE (jitsi-meet-jitsi-meet_8319.tar.gz) = 116901298
diff --git a/net/jitsi/prosody-plugins/pkg/PLIST
b/net/jitsi/prosody-plugins/pkg/PLIST
index 303c3df94d3..1ec73da377f 100644
--- a/net/jitsi/prosody-plugins/pkg/PLIST
+++ b/net/jitsi/prosody-plugins/pkg/PLIST
@@ -5,6 +5,7 @@ share/jitsi-prosody-plugins/mod_auth_jitsi-anonymous.lua
share/jitsi-prosody-plugins/mod_auth_token.lua
share/jitsi-prosody-plugins/mod_av_moderation.lua
share/jitsi-prosody-plugins/mod_av_moderation_component.lua
+share/jitsi-prosody-plugins/mod_certs_s2soutinjection.lua
share/jitsi-prosody-plugins/mod_client_proxy.lua
share/jitsi-prosody-plugins/mod_conference_duration.lua
share/jitsi-prosody-plugins/mod_conference_duration_component.lua
@@ -12,6 +13,7 @@ share/jitsi-prosody-plugins/mod_end_conference.lua
share/jitsi-prosody-plugins/mod_external_services.lua
share/jitsi-prosody-plugins/mod_filter_iq_jibri.lua
share/jitsi-prosody-plugins/mod_filter_iq_rayo.lua
+share/jitsi-prosody-plugins/mod_fmuc.lua
share/jitsi-prosody-plugins/mod_jiconop.lua
share/jitsi-prosody-plugins/mod_jitsi_session.lua
share/jitsi-prosody-plugins/mod_limits_exception.lua
@@ -38,12 +40,16 @@ share/jitsi-prosody-plugins/mod_room_metadata.lua
share/jitsi-prosody-plugins/mod_room_metadata_component.lua
share/jitsi-prosody-plugins/mod_roster_command.lua
share/jitsi-prosody-plugins/mod_roster_command.patch
+share/jitsi-prosody-plugins/mod_s2s_whitelist.lua
+share/jitsi-prosody-plugins/mod_s2soutinjection.lua
+share/jitsi-prosody-plugins/mod_secure_interfaces.lua
share/jitsi-prosody-plugins/mod_smacks.lua
share/jitsi-prosody-plugins/mod_speakerstats.lua
share/jitsi-prosody-plugins/mod_speakerstats_component.lua
share/jitsi-prosody-plugins/mod_token_verification.lua
share/jitsi-prosody-plugins/mod_turncredentials.lua
share/jitsi-prosody-plugins/mod_websocket_session_event.patch
+share/jitsi-prosody-plugins/mod_xxl_conference.lua
share/jitsi-prosody-plugins/muc_owner_allow_kick-0.12.patch
share/jitsi-prosody-plugins/muc_owner_allow_kick.patch
share/jitsi-prosody-plugins/poltergeist.lib.lua
diff --git a/net/jitsi/videobridge/Makefile b/net/jitsi/videobridge/Makefile
index 01dc38dd8a8..59014aded95 100644
--- a/net/jitsi/videobridge/Makefile
+++ b/net/jitsi/videobridge/Makefile
@@ -2,12 +2,12 @@ COMMENT = WebRTC compatible video router for jitsi
CATEGORIES = net
-VERSION = 2.0.8044
+VERSION = 2.0.8319
DISTNAME = jitsi-videobridge-${VERSION}
GH_ACCOUNT = jitsi
GH_PROJECT = jitsi-videobridge
-GH_COMMIT = 98c9f868414abfe2cf2a92d16ecff526fe9a06b6
+GH_COMMIT = f6426ea01d6d4426149dd2bf658d388f447b9f5d
DISTFILES += ${GH_DISTFILE}
diff --git a/net/jitsi/videobridge/distinfo b/net/jitsi/videobridge/distinfo
index c56f4fab468..df89f771d27 100644
--- a/net/jitsi/videobridge/distinfo
+++ b/net/jitsi/videobridge/distinfo
@@ -1,4 +1,4 @@
-SHA256 (jitsi-videobridge-2.0.8044-98c9f868.tar.gz) =
DlhBeRBK+we81HOoR4b26jdBb4I4wZfAG4JaUfCwG/g=
-SHA256 (jitsi-videobridge-deps-2.0.8044.tgz) =
2bt8Rkby2Q4qLfkJBqfupRJX3LUb6DFuK+gT8oPpOSM=
-SIZE (jitsi-videobridge-2.0.8044-98c9f868.tar.gz) = 62336764
-SIZE (jitsi-videobridge-deps-2.0.8044.tgz) = 262484984
+SHA256 (jitsi-videobridge-2.0.8319-f6426ea0.tar.gz) =
/GgI7mBQc4f+JE9MPRKPSjiR5vN+pxzMTRwizQKMnxo=
+SHA256 (jitsi-videobridge-deps-2.0.8319.tgz) =
mX6HCbR+WqGEWiHo/FJBffARyYW4CVrdVh+o7EEfiB0=
+SIZE (jitsi-videobridge-2.0.8319-f6426ea0.tar.gz) = 62321833
+SIZE (jitsi-videobridge-deps-2.0.8319.tgz) = 189421319
