On 22/10/14 11:16AM, aisha wrote:
> On 22/10/06 09:37PM, aisha wrote:
> > Hi,
> > I've attached new ports for jitsi and a meta package (PKGNAME is jitsi
> > for simplicity).
> >
> > Things I'd appreciate feedback on -
> > * should I name the meta package something different? my aim was to just be
> > able to do `pkg_add jitsi` and then you should have everything you need.
> > * versioning for the meta package is just starting with 1.0 and any
> > updates/changes would follow normal rules of backward compatibility and
> > breaking changes.
> > * someone should try to setup a server with the README instructions and see
> > if they work for you.
> >
> > Any other feedback is also good to have.
> >
> > packages attached -
> > * jitsi-srtp: openssl bindings for encryption
> > * jitsi-prosody-plugins: additional plugins to be used for jitsi
> > * jitsi-meta: the meta package
> >
> > also attached a patch to update the samples in current ports to follow the
> > README directions.
> >
> > Best,
> > Aisha
> >
>
only updating the current packages right now, will add the new ones with more
testing.
ok for update?
diff --git a/net/jitsi/jicofo/Makefile b/net/jitsi/jicofo/Makefile
index d13e12e23e4..06d328ce86d 100644
--- a/net/jitsi/jicofo/Makefile
+++ b/net/jitsi/jicofo/Makefile
@@ -2,13 +2,12 @@ COMMENT = server-side focus component used in Jitsi Meet
conferences
CATEGORIES = net
-VERSION = 2.0.7648
+VERSION = 2.0.7882
PKGNAME = jicofo-${VERSION}
-REVISION = 0
GH_ACCOUNT = jitsi
GH_PROJECT = jicofo
-GH_TAGNAME = jitsi-meet_7648
+GH_TAGNAME = jitsi-meet_7882
DISTFILES += ${GH_DISTFILE}
@@ -45,6 +44,6 @@ do-install:
${FILESDIR}/jicofo.conf ${PREFIX}/share/jicofo/jicofo.conf.sample
${INSTALL_DATA} ${WRKSRC}/lib/logging.properties \
${PREFIX}/share/jicofo/lib/logging.properties.sample
- ${INSTALL_DATA}
${WRKSRC}/target/jicofo-1.1-SNAPSHOT-jar-with-dependencies.jar
${MODJAVA_JAR_DIR}/jicofo.jar
+ ${INSTALL_DATA}
${WRKSRC}/jicofo/target/jicofo-1.1-SNAPSHOT-jar-with-dependencies.jar
${MODJAVA_JAR_DIR}/jicofo.jar
.include <bsd.port.mk>
diff --git a/net/jitsi/jicofo/distinfo b/net/jitsi/jicofo/distinfo
index 55926583792..31f6aa6a613 100644
--- a/net/jitsi/jicofo/distinfo
+++ b/net/jitsi/jicofo/distinfo
@@ -1,4 +1,4 @@
-SHA256 (jicofo-deps-2.0.7648.tgz) =
l3oZplN8VplIVrlcch7Nbm7Gk7EcVXzZ6SMfg5+wzco=
-SHA256 (jicofo-jitsi-meet_7648.tar.gz) =
lTHSZtKUSHIo8q9Xjeg6QtdMe44arhtBR4Ui/O4HpKM=
-SIZE (jicofo-deps-2.0.7648.tgz) = 155908396
-SIZE (jicofo-jitsi-meet_7648.tar.gz) = 238108
+SHA256 (jicofo-deps-2.0.7882.tgz) =
iLhIxETlyQrwiCyn5bOls/m6lq0M0B1A/048K9UAL+s=
+SHA256 (jicofo-jitsi-meet_7882.tar.gz) =
BpPVmO9PYPdD5YpCHMg5LEPZ4ax4b/ULkyXsIa9xNNw=
+SIZE (jicofo-deps-2.0.7882.tgz) = 158418609
+SIZE (jicofo-jitsi-meet_7882.tar.gz) = 249764
diff --git a/net/jitsi/jicofo/files/jicofo.conf
b/net/jitsi/jicofo/files/jicofo.conf
index 087d8765e59..227542f0a0b 100644
--- a/net/jitsi/jicofo/files/jicofo.conf
+++ b/net/jitsi/jicofo/files/jicofo.conf
@@ -44,11 +44,11 @@ jicofo {
// The separate XMPP connection used for communication with clients
(endpoints).
client {
enabled = true
- hostname = "auth.jitsi.example.com"
+ hostname = "localhost"
port = 5222
- domain = auth.jitsi.example.com
+ domain = "auth.jitsi.example.com"
username = "focus"
- password = "CHANGE_ME"
+ password = "${FOCUS_COMP_PASS}"
// A flag to suppress the TLS certificate verification. XXX really?
disable-certificate-verification = false
diff --git a/net/jitsi/jicofo/files/jicofo.in.sh
b/net/jitsi/jicofo/files/jicofo.in.sh
index 644c63497c6..f0cf9fd18c6 100644
--- a/net/jitsi/jicofo/files/jicofo.in.sh
+++ b/net/jitsi/jicofo/files/jicofo.in.sh
@@ -1,6 +1,6 @@
JICOFO_CONF=${SYSCONFDIR}/jicofo/jicofo.conf
-JICOFO_LOG_CONFIG=${TRUEPREFIX}/share/jicofo/lib/logging.properties
-JICOFO_TRUSTSTORE=${SYSCONFDIR}/ssl/jicofo-key.store
-JICOFO_TRUSTSTORE_PASSWORD='CHANGE_ME'
+JICOFO_LOG_CONFIG=${SYSCONFDIR}/jicofo/logging.properties
+JICOFO_TRUSTSTORE=${SYSCONFDIR}/ssl/jitsi.store
+JICOFO_TRUSTSTORE_PASSWORD='${JAVA_TS_PASS}'
JICOFO_MAXMEM=3G
JICOFO_DHKEYSIZE=2048
diff --git a/net/jitsi/jicofo/pkg/PLIST b/net/jitsi/jicofo/pkg/PLIST
index 42336871387..e2ad416a1d7 100644
--- a/net/jitsi/jicofo/pkg/PLIST
+++ b/net/jitsi/jicofo/pkg/PLIST
@@ -29,4 +29,4 @@ share/jicofo/lib/
share/jicofo/lib/logging.properties.sample
@mode 640
@group _jicofo
-@sample share/jicofo/lib/logging.properties
+@sample ${SYSCONFDIR}/jicofo/logging.properties
diff --git a/net/jitsi/meet/Makefile b/net/jitsi/meet/Makefile
index 349bdaf392e..d73757a931b 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.6542
+VERSION = 1.0.6694
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 f468fec0a9b..1421468f1f2 100644
--- a/net/jitsi/meet/distinfo
+++ b/net/jitsi/meet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jitsi-meet-1.0.6542.tar.bz2) =
4GLa5VtyxoNA0U7ZrmsR8DnhKcU8Qmxj16nP99ihSUI=
-SIZE (jitsi-meet-1.0.6542.tar.bz2) = 17495588
+SHA256 (jitsi-meet-1.0.6694.tar.bz2) =
3U3v6n942q/hYmXQWhg5C/nD63syUzY0REKptkz1TMc=
+SIZE (jitsi-meet-1.0.6694.tar.bz2) = 18714022
diff --git a/net/jitsi/meet/pkg/PLIST b/net/jitsi/meet/pkg/PLIST
index da94c5d0133..a7a2bb983b0 100644
--- a/net/jitsi/meet/pkg/PLIST
+++ b/net/jitsi/meet/pkg/PLIST
@@ -82,7 +82,6 @@ www/jitsi-meet/lang/languages-fa.json
www/jitsi-meet/lang/languages-fi.json
www/jitsi-meet/lang/languages-fr.json
www/jitsi-meet/lang/languages-frCA.json
-www/jitsi-meet/lang/languages-fy.json
www/jitsi-meet/lang/languages-gl.json
www/jitsi-meet/lang/languages-he.json
www/jitsi-meet/lang/languages-hi.json
@@ -94,9 +93,7 @@ www/jitsi-meet/lang/languages-id.json
www/jitsi-meet/lang/languages-is.json
www/jitsi-meet/lang/languages-it.json
www/jitsi-meet/lang/languages-ja.json
-www/jitsi-meet/lang/languages-ka.json
www/jitsi-meet/lang/languages-kab.json
-www/jitsi-meet/lang/languages-km.json
www/jitsi-meet/lang/languages-ko.json
www/jitsi-meet/lang/languages-lt.json
www/jitsi-meet/lang/languages-lv.json
@@ -182,6 +179,7 @@ www/jitsi-meet/lang/main-zhCN.json
www/jitsi-meet/lang/main-zhTW.json
www/jitsi-meet/lang/main.json
www/jitsi-meet/lang/readme.md
+www/jitsi-meet/lang/translation-languages.json
www/jitsi-meet/lang/update-translation.js
www/jitsi-meet/libs/
www/jitsi-meet/libs/alwaysontop.min.js
@@ -201,6 +199,62 @@ 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
www/jitsi-meet/libs/emotion.json
+www/jitsi-meet/libs/excalidraw-assets/
+www/jitsi-meet/libs/excalidraw-assets/Cascadia.woff2
+www/jitsi-meet/libs/excalidraw-assets/Virgil.woff2
+www/jitsi-meet/libs/excalidraw-assets/bug-issue-template-7628a1d844446e5ca713.js
+www/jitsi-meet/libs/excalidraw-assets/locales/
+www/jitsi-meet/libs/excalidraw-assets/locales/ar-SA-json-df18063071043058bb35.js
+www/jitsi-meet/libs/excalidraw-assets/locales/bg-BG-json-ba39428df4dbd5ac051d.js
+www/jitsi-meet/libs/excalidraw-assets/locales/bn-BD-json-a7a189c1a6aa9e464a56.js
+www/jitsi-meet/libs/excalidraw-assets/locales/ca-ES-json-bf30dc22317ac1f4161e.js
+www/jitsi-meet/libs/excalidraw-assets/locales/cs-CZ-json-0798528a966e2cda88ec.js
+www/jitsi-meet/libs/excalidraw-assets/locales/da-DK-json-8167504a4d4ae6d98c27.js
+www/jitsi-meet/libs/excalidraw-assets/locales/de-DE-json-63e7d4cbfcde0ce1814c.js
+www/jitsi-meet/libs/excalidraw-assets/locales/el-GR-json-4a8497d64ac5d089474a.js
+www/jitsi-meet/libs/excalidraw-assets/locales/es-ES-json-88d0dd30227b3d87a8d5.js
+www/jitsi-meet/libs/excalidraw-assets/locales/eu-ES-json-fee6ad26c14c62db47ab.js
+www/jitsi-meet/libs/excalidraw-assets/locales/fa-IR-json-4cf3c4cac1aa86837e37.js
+www/jitsi-meet/libs/excalidraw-assets/locales/fi-FI-json-1e24513f7499a89764b0.js
+www/jitsi-meet/libs/excalidraw-assets/locales/fr-FR-json-e957f763c3571741d176.js
+www/jitsi-meet/libs/excalidraw-assets/locales/gl-ES-json-4c40e2b7e4ecefba7848.js
+www/jitsi-meet/libs/excalidraw-assets/locales/he-IL-json-29dec8d22c5fd34f9a12.js
+www/jitsi-meet/libs/excalidraw-assets/locales/hi-IN-json-72a7488b9f75a19d9041.js
+www/jitsi-meet/libs/excalidraw-assets/locales/hu-HU-json-0c93162cc32bb1b3a7d3.js
+www/jitsi-meet/libs/excalidraw-assets/locales/id-ID-json-4b6f560ef48810f7727d.js
+www/jitsi-meet/libs/excalidraw-assets/locales/it-IT-json-0ffa72ac304167deb544.js
+www/jitsi-meet/libs/excalidraw-assets/locales/ja-JP-json-8c7fb47849bc5c3fb51d.js
+www/jitsi-meet/libs/excalidraw-assets/locales/kab-KAB-json-a229aaf321c3da577428.js
+www/jitsi-meet/libs/excalidraw-assets/locales/kk-KZ-json-6f477840db7f293c3ff3.js
+www/jitsi-meet/libs/excalidraw-assets/locales/ko-KR-json-efb124deee025252945e.js
+www/jitsi-meet/libs/excalidraw-assets/locales/lt-LT-json-6a7d4de0f242c78c75b6.js
+www/jitsi-meet/libs/excalidraw-assets/locales/lv-LV-json-e118f62721061c931a18.js
+www/jitsi-meet/libs/excalidraw-assets/locales/mr-IN-json-f4f95feaf792f55f7c23.js
+www/jitsi-meet/libs/excalidraw-assets/locales/my-MM-json-a78c614847e6c2a3fe02.js
+www/jitsi-meet/libs/excalidraw-assets/locales/nb-NO-json-b45aa5fb41a16edbfa81.js
+www/jitsi-meet/libs/excalidraw-assets/locales/nl-NL-json-b1c420387d01fa484d1b.js
+www/jitsi-meet/libs/excalidraw-assets/locales/nn-NO-json-68936ef7537dcc9292c1.js
+www/jitsi-meet/libs/excalidraw-assets/locales/oc-FR-json-d41f58dcdb50f62b3523.js
+www/jitsi-meet/libs/excalidraw-assets/locales/pa-IN-json-41df950fa70ed85758d7.js
+www/jitsi-meet/libs/excalidraw-assets/locales/pl-PL-json-0021485601f1b07ebcab.js
+www/jitsi-meet/libs/excalidraw-assets/locales/pt-BR-json-72ff03498a41f90f233d.js
+www/jitsi-meet/libs/excalidraw-assets/locales/pt-PT-json-839be12fe9dbb95f0e8f.js
+www/jitsi-meet/libs/excalidraw-assets/locales/ro-RO-json-9a98741abc72447e08e1.js
+www/jitsi-meet/libs/excalidraw-assets/locales/ru-RU-json-c4aca6954a117af10985.js
+www/jitsi-meet/libs/excalidraw-assets/locales/si-LK-json-e73bb7fb47924abe3fc7.js
+www/jitsi-meet/libs/excalidraw-assets/locales/sk-SK-json-9bf76f9cbac85483adbe.js
+www/jitsi-meet/libs/excalidraw-assets/locales/sl-SI-json-089d1313b3307ef3168c.js
+www/jitsi-meet/libs/excalidraw-assets/locales/sv-SE-json-f0e61f7b9a925a8ac52f.js
+www/jitsi-meet/libs/excalidraw-assets/locales/ta-IN-json-771bc7ffd823c6d1f7f2.js
+www/jitsi-meet/libs/excalidraw-assets/locales/tr-TR-json-f67b553e451f94a58b73.js
+www/jitsi-meet/libs/excalidraw-assets/locales/uk-UA-json-030974ad2c103dc4f3e8.js
+www/jitsi-meet/libs/excalidraw-assets/locales/vi-VN-json-14a0d70677d88d13130b.js
+www/jitsi-meet/libs/excalidraw-assets/locales/zh-CN-json-ac83663c09303ebc3acc.js
+www/jitsi-meet/libs/excalidraw-assets/locales/zh-HK-json-fbdd69ac2e81d38f0aa9.js
+www/jitsi-meet/libs/excalidraw-assets/locales/zh-TW-json-872230fd45944e19c9e6.js
+www/jitsi-meet/libs/excalidraw-assets/socketIoClient-9dfbabed609bb6017f9b.js
+www/jitsi-meet/libs/excalidraw-assets/vendor-72035408b91d1da4ac31.js
+www/jitsi-meet/libs/excalidraw-assets/vendor-72035408b91d1da4ac31.js.LICENSE.txt
www/jitsi-meet/libs/external_api.min.js
www/jitsi-meet/libs/external_api.min.js.map
www/jitsi-meet/libs/external_connect.js
diff --git a/net/jitsi/videobridge/Makefile b/net/jitsi/videobridge/Makefile
index d1f7be24dc4..6544cc3650f 100644
--- a/net/jitsi/videobridge/Makefile
+++ b/net/jitsi/videobridge/Makefile
@@ -2,13 +2,12 @@ COMMENT = WebRTC compatible video router for jitsi
CATEGORIES = net
-VERSION = 2.0.7648
+VERSION = 2.0.7882
DISTNAME = jitsi-videobridge-${VERSION}
-REVISION = 0
GH_ACCOUNT = jitsi
GH_PROJECT = jitsi-videobridge
-GH_COMMIT = 42bc1b9986b375e4e9d5044585f6bd0604bf8d25
+GH_COMMIT = e8b20f06e0585aee6fb4f2184a03f31e59e1b1da
DISTFILES += ${GH_DISTFILE}
diff --git a/net/jitsi/videobridge/distinfo b/net/jitsi/videobridge/distinfo
index 56ca0340021..f4d8ecf3645 100644
--- a/net/jitsi/videobridge/distinfo
+++ b/net/jitsi/videobridge/distinfo
@@ -1,4 +1,4 @@
-SHA256 (jitsi-videobridge-2.0.7648-42bc1b99.tar.gz) =
sbXWnz6WsQyZ5E4wfIqKO8nBIACUJFmuDy/REPfkhRk=
-SHA256 (jitsi-videobridge-deps-2.0.7648.tgz) =
mIEMVYAMGEbkCBm4vcUVZxKuEl5UXeVDFykJZmJnQ/8=
-SIZE (jitsi-videobridge-2.0.7648-42bc1b99.tar.gz) = 62357177
-SIZE (jitsi-videobridge-deps-2.0.7648.tgz) = 268595272
+SHA256 (jitsi-videobridge-2.0.7882-e8b20f06.tar.gz) =
aQ8awpHJMstvsDaBw71Y+KI3yq9dwJUMuJI2dGjv5ac=
+SHA256 (jitsi-videobridge-deps-2.0.7882.tgz) =
R3+rHiZy9UBzme5qQTqlcMMx2IgFYSJFFXSYFK9LzmY=
+SIZE (jitsi-videobridge-2.0.7882-e8b20f06.tar.gz) = 62359972
+SIZE (jitsi-videobridge-deps-2.0.7882.tgz) = 265019689
diff --git a/net/jitsi/videobridge/files/jvb.conf
b/net/jitsi/videobridge/files/jvb.conf
index abf99167c40..3a125a29c19 100644
--- a/net/jitsi/videobridge/files/jvb.conf
+++ b/net/jitsi/videobridge/files/jvb.conf
@@ -10,10 +10,10 @@ videobridge {
presence-interval = 120s
configs {
ourprosody {
- hostname = "xmpp"
+ hostname = "auth.jitsi"
domain = "auth.jitsi.example.com"
username = "jvb"
- password = "CHANGE_ME"
+ password = "${JVB_COMP_PASS}"
muc_jids = "jvbbrew...@internal.auth.jitsi.example.com"
muc_nickname = "jvb"
disable_certificate_verification = true
diff --git a/net/jitsi/videobridge/files/jvb.in.sh
b/net/jitsi/videobridge/files/jvb.in.sh
index 678c8d3558d..fac3f3fe940 100644
--- a/net/jitsi/videobridge/files/jvb.in.sh
+++ b/net/jitsi/videobridge/files/jvb.in.sh
@@ -1,7 +1,7 @@
JVB_CONF=${SYSCONFDIR}/jvb/jvb.conf
-JVB_LOG_CONFIG=${TRUEPREFIX}/share/jvb/lib/logging.properties
-JVB_TRUSTSTORE=${SYSCONFDIR}/ssl/jvb-key.store
-JVB_TRUSTSTORE_PASSWORD='CHANGE_ME'
+JVB_LOG_CONFIG=${SYSCONFDIR}/jvb/logging.properties
+JVB_TRUSTSTORE=${SYSCONFDIR}/ssl/jitsi.store
+JVB_TRUSTSTORE_PASSWORD='${JAVA_TS_PASS}'
JVB_MAXMEM=3G
JVB_DHKEYSIZE=2048
JVB_GC_TYPE=G1GC
diff --git a/net/jitsi/videobridge/files/sip-communicator.properties
b/net/jitsi/videobridge/files/sip-communicator.properties
index e4668008d12..f764d843cc8 100644
--- a/net/jitsi/videobridge/files/sip-communicator.properties
+++ b/net/jitsi/videobridge/files/sip-communicator.properties
@@ -1,3 +1,3 @@
-org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=XX.XX.XX.XX
-org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=ZZ.ZZ.ZZ.ZZ
+#org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=${LOCAL_ADDRESS}
+#org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=${PUBLIC_ADDRESS}
org.ice4j.ice.harvest.DISABLE_AWS_HARVESTER=true
diff --git a/net/jitsi/videobridge/pkg/PLIST b/net/jitsi/videobridge/pkg/PLIST
index 90500239795..fdb4ba387e4 100644
--- a/net/jitsi/videobridge/pkg/PLIST
+++ b/net/jitsi/videobridge/pkg/PLIST
@@ -27,7 +27,7 @@ share/jvb/lib/
share/jvb/lib/logging.properties.sample
@mode 640
@group _jvb
-@sample share/jvb/lib/logging.properties
+@sample ${SYSCONFDIR}/jvb/logging.properties
@mode
@group
share/jvb/lib/sip-communicator.properties.sample
