Attachment 234152 Details for Bug 257232 – Third big jitsi patch

[patch] Third big jitsi patch

big_jitsi_update.patch (text/plain), 44.98 KB, created by Michael Gmelin on 2022-05-23 17:01:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Gmelin

Created: 2022-05-23 17:01:12 UTC

Size: 44.98 KB

patch

obsolete

>diff --git a/net-im/Makefile b/net-im/Makefile
>index def6a62fb..488cc4aba 100644
>--- a/net-im/Makefile
>+++ b/net-im/Makefile
>@@ -33,6 +33,8 @@
>     SUBDIR += jarl
>     SUBDIR += jggtrans
>     SUBDIR += jicofo
>+    SUBDIR += jitsi-meet-full
>+    SUBDIR += jitsi-prosody-plugins
>     SUBDIR += jitsi-videobridge
>     SUBDIR += kaccounts-integration
>     SUBDIR += kaccounts-providers
>diff --git a/net-im/jicofo/Makefile b/net-im/jicofo/Makefile
>index 2307a5416..c834433ad 100644
>--- a/net-im/jicofo/Makefile
>+++ b/net-im/jicofo/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	jicofo
>-DISTVERSION=	1.0-555
>-PORTREVISION=	2
>+DISTVERSION=	1.0-877
> CATEGORIES=	net-im java
> 
> MAINTAINER=	acm@FreeBSD.org
>@@ -8,14 +7,15 @@ COMMENT=	Server side focus component used in Jitsi Meet conferences
> 
> LICENSE=	APACHE20
> 
>-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
>+ONLY_FOR_ARCHS=	amd64 i386 powerpc64 powerpc64le
> 
>-ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
>+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	jitsi
>-GH_TAGNAME=	ec1b29e
>+GH_TAGNAME=	d8cca3d
> USE_JAVA=	yes
>+JAVA_VERSION=	11
> 
> USE_RC_SUBR=	${PORTNAME}
> SUB_FILES+=	pkg-message
>@@ -29,7 +29,7 @@ post-build:
> 	@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} m2
> 	@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
> .else
>-MASTER_SITES+=	LOCAL/acm/:maven
>+MASTER_SITES+=	LOCAL/grembo/:maven
> DISTFILES+=	${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
> MAVEN_ARGS=	--offline
> .endif
>@@ -39,25 +39,16 @@ MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/m2
> 
> do-build:
> 	cd ${WRKSRC}; \
>-		${SETENV} mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
>+		${SETENV} JAVA_VERSION=11 mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}
> 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
> 	cd ${WRKSRC}/lib \
> 		&& ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/lib/{} \;
>+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample \
>+		${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
>+	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-1.1-SNAPSHOT-jar-with-dependencies.jar \
>+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
> 
>-	@(echo "JVB_XMPP_HOST=localhost"; \
>-	echo "JVB_XMPP_DOMAIN=jitsi.example.com"; \
>-	echo "JVB_XMPP_PORT=5347"; \
>-	echo "JVB_XMPP_SECRET=YOURSECRET3"; \
>-	echo "JVB_XMPP_USER_DOMAIN=auth.jitsi.example.com"; \
>-	echo "JVB_XMPP_USER_NAME=focus"; \
>-	echo "JVB_XMPP_USER_SECRET=YOURSECRET3"; \
>-        echo ""; \
>-        echo "MAX_MEMORY=3072m"; \
>-        ) > ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
>-
>-	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-1.1-SNAPSHOT-jar-with-dependencies.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
>- 	
> .include <bsd.port.mk>
>diff --git a/net-im/jicofo/distinfo b/net-im/jicofo/distinfo
>index f12f47f24..2fb01aba1 100644
>--- a/net-im/jicofo/distinfo
>+++ b/net-im/jicofo/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1587854975
>-SHA256 (jicofo-1.0-555-deps.tar.gz) = 25cb5f8263922415c07f83daf4b4c3d3ff387f0344fda9bfdf4787d4951c4b88
>-SIZE (jicofo-1.0-555-deps.tar.gz) = 122309690
>-SHA256 (jitsi-jicofo-1.0-555-ec1b29e_GH0.tar.gz) = 6d0222aebdff1d32397d462b97f12c190505e5526fb8a140944192f6685264ca
>-SIZE (jitsi-jicofo-1.0-555-ec1b29e_GH0.tar.gz) = 291752
>+TIMESTAMP = 1652976335
>+SHA256 (jicofo-1.0-877-deps.tar.gz) = 4d98c46192101c632f5c9ed7b82fae3e2b168b4f4a9569afeeaba37a4e387858
>+SIZE (jicofo-1.0-877-deps.tar.gz) = 146671715
>+SHA256 (jitsi-jicofo-1.0-877-d8cca3d_GH0.tar.gz) = 1749da8f3fbb93e7f297e7312838d7ffdec37d43a9462bdcd155dad367f1f640
>+SIZE (jitsi-jicofo-1.0-877-d8cca3d_GH0.tar.gz) = 232999
>diff --git a/net-im/jicofo/files/jicofo.conf.sample b/net-im/jicofo/files/jicofo.conf.sample
>new file mode 100644
>index 000000000..1da3a21a2
>--- /dev/null
>+++ b/net-im/jicofo/files/jicofo.conf.sample
>@@ -0,0 +1,21 @@
>+jicofo {
>+  bridge {
>+    brewery-jid = "JvbBrewery@internal.auth.jitsi.example.com"
>+  }
>+
>+  sctp {
>+    enabled = false
>+  }
>+
>+  xmpp {
>+    client {
>+      enabled = true
>+      hostname = "localhost"
>+      port = 5222
>+      domain = "auth.jitsi.example.com"
>+      username = "focus"
>+      password = "supersecret"
>+      conference-muc-jid = "conference.jitsi.example.com"
>+    }
>+  }
>+}
>diff --git a/net-im/jicofo/files/jicofo.in b/net-im/jicofo/files/jicofo.in
>index f2d1bfd50..aa53cda41 100644
>--- a/net-im/jicofo/files/jicofo.in
>+++ b/net-im/jicofo/files/jicofo.in
>@@ -7,6 +7,7 @@
> # Configuration settings for jicofo in /etc/rc.conf:
> #
> # jicofo_enable:	run jicofo server (default=NO)
>+# jicofo_maxmem:	maximum memory used (default=3072m)
> # jicofo_flags:		additional flags for jicofo server (default="")
> #
> 
>@@ -15,7 +16,7 @@
> name="jicofo"
> rcvar=${name}_enable
> 
>-jicofo_env_file="%%ETCDIR%%/jicofo.conf"
>+jicofo_config="%%ETCDIR%%/jicofo.conf"
> jicofo_jar="%%JAVAJARDIR%%/jicofo.jar"
> jicofo_logging_config="%%DATADIR%%/lib/logging.properties"
> jicofo_trust_store="%%ETCDIR%%/truststore.jks"
>@@ -23,11 +24,12 @@ jicofo_trust_store="%%ETCDIR%%/truststore.jks"
> load_rc_config "${name}"
> 
> : ${jicofo_enable="NO"}
>+: ${jicofo_maxmem="3072m"}
> : ${jicofo_flags=""}
> 
> command="%%JAVA%%"
> pidfile="/var/run/jicofo.pid"
>-required_files="${jicofo_env_file} ${jicofo_trust_store}"
>+required_files="${jicofo_config} ${jicofo_trust_store}"
> 
> start_cmd=${name}_start
> stop_cmd=${name}_stop
>@@ -37,45 +39,41 @@ restart_cmd=${name}_restart
> jicofo_start()
> {
> 	daemon -p ${pidfile} -o /var/log/${name}.log \
>-		${command} -Xmx${MAX_MEMORY} \
>-                -XX:+HeapDumpOnOutOfMemoryError \
>-                -XX:HeapDumpPath=/tmp \
>-                -Djava.util.logging.config.file=${jicofo_logging_config} \
>-                -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=%%LOCALBASE%%/etc/jitsi \
>-                -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo \
>-                -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/ \
>+		${command} -Xmx${jicofo_maxmem} \
>+		-XX:+HeapDumpOnOutOfMemoryError \
>+		-XX:HeapDumpPath=/tmp \
>+		-Djava.util.logging.config.file=${jicofo_logging_config} \
>+		-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=%%LOCALBASE%%/etc/jitsi \
>+		-Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo \
>+		-Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/ \
>+		-Dconfig.file=${jicofo_config} \
> 		-Djavax.net.ssl.trustStore=${jicofo_trust_store} \
>-                -cp ${jicofo_jar} \
>-                org.jitsi.jicofo.Main \
>-                --host=${JVB_XMPP_HOST} \
>-                --domain=${JVB_XMPP_DOMAIN} \
>-                --port=${JVB_XMPP_PORT} \
>-                --secret=${JVB_XMPP_SECRET} \
>-		--user_domain=${JVB_XMPP_USER_DOMAIN} \
>-		--user_name=${JVB_XMPP_USER_NAME} \
>-		--user_password=${JVB_XMPP_USER_SECRET} ${jicofo_flags}
>+		-cp ${jicofo_jar} \
>+		org.jitsi.jicofo.Main \
>+		${jicofo_flags}
>+
> 		echo "Started"
> }
> 
> jicofo_stop()
> {
>-        if [ -f ${pidfile} ]
>-        then
>-                kill `cat ${pidfile}`
>-                rm ${pidfile}
>+	if [ -f ${pidfile} ]
>+	then
>+		kill `cat ${pidfile}`
>+		rm ${pidfile}
> 		echo "Stopped"
>-        fi
>+	fi
> }
> 
> jicofo_status()
> {
>-        # If running, show pid
>-        if [ -f ${pidfile} ]
>-        then
>-                echo "${name} is running as pid" `cat ${pidfile}`
>-        else
>-                echo "${name} is not running"
>-        fi
>+	# If running, show pid
>+	if [ -f ${pidfile} ]
>+	then
>+		echo "${name} is running as pid" `cat ${pidfile}`
>+	else
>+		echo "${name} is not running"
>+	fi
> }
> 
> jicofo_restart()
>diff --git a/net-im/jicofo/files/pkg-message.in b/net-im/jicofo/files/pkg-message.in
>index 8ed474246..04e966229 100644
>--- a/net-im/jicofo/files/pkg-message.in
>+++ b/net-im/jicofo/files/pkg-message.in
>@@ -3,20 +3,24 @@
>   message: <<EOM
> Jitsi Conference Focus was installed
> 
>-1) The configuration file is used by the startup rcfile and located at:
>+1) Edit the configuration file located at:
> 
>    %%ETCDIR%%/jicofo.conf
> 
>-2) Add jicofo_enable="YES" to /etc/rc.conf.
>+2) Enable the service:
>+
>+   service jicofo enable
> 
> 3) For use of jicofo with net-im/prosody, you need to import prosody's
>    auth.jitsi.example.com TLS certificate into a Java truststore.
>+   You should also install net-im/jitsi-prosody-plugins.
>    The startup rcfile will pass this filename to jicofo:
>    %%ETCDIR%%/truststore.jks - for example:
> 
>    # prosodyctl cert generate jitsi.example.com
>    # prosodyctl cert generate auth.jitsi.example.com
>-   # keytool -noprompt -keystore %%ETCDIR%%/truststore.jks -importcert -alias prosody -file /path/to/prosody/auth.jitsi.example.com.crt
>+   # keytool -noprompt -keystore %%ETCDIR%%/truststore.jks -importcert \
>+     -alias prosody -file /path/to/prosody/auth.jitsi.example.com.crt
> 
> 4) Enjoy it
> EOM
>diff --git a/net-im/jitsi-meet-full/Makefile b/net-im/jitsi-meet-full/Makefile
>new file mode 100644
>index 000000000..5974cdd76
>--- /dev/null
>+++ b/net-im/jitsi-meet-full/Makefile
>@@ -0,0 +1,16 @@
>+PORTNAME=	jitsi-meet-full
>+PORTVERSION=	2.0.7287
>+CATEGORIES=	net-im
>+
>+MAINTAINER=	grembo@FreeBSD.org
>+COMMENT=	All components to run Jitsi Meet video conferencing
>+
>+USES=		metaport
>+
>+RUN_DEPENDS+=	jicofo>=1.0.877:net-im/jicofo \
>+		jitsi-meet>=1.0.6155:www/jitsi-meet \
>+		jitsi-prosody-plugins>=2.0.7287:net-im/jitsi-prosody-plugins \
>+		jitsi-videobridge>=2.1.681:net-im/jitsi-videobridge \
>+		nginx>0:www/nginx
>+
>+.include <bsd.port.mk>
>diff --git a/net-im/jitsi-meet-full/pkg-descr b/net-im/jitsi-meet-full/pkg-descr
>new file mode 100644
>index 000000000..c3053d8f4
>--- /dev/null
>+++ b/net-im/jitsi-meet-full/pkg-descr
>@@ -0,0 +1,5 @@
>+This is a metaport to install all dependencies to run Jitsi Meet,
>+a set of Open Source projects which empower users to use and deploy video
>+conferencing platforms with state-of-the-art video quality and features.
>+
>+WWW: https://jitsi.org/jitsi-meet/
>diff --git a/net-im/jitsi-prosody-plugins/Makefile b/net-im/jitsi-prosody-plugins/Makefile
>new file mode 100644
>index 000000000..3f217fe3a
>--- /dev/null
>+++ b/net-im/jitsi-prosody-plugins/Makefile
>@@ -0,0 +1,41 @@
>+PORTNAME=	jitsi
>+PORTVERSION=	2.0.7287
>+CATEGORIES=	net-im
>+PKGNAMESUFFIX=	-prosody-plugins
>+
>+MAINTAINER=	grembo@FreeBSD.org
>+COMMENT=	Prosody plugins for Jitsi Meet
>+
>+LICENSE=	APACHE20
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+RUN_DEPENDS=	prosodyctl:net-im/prosody
>+
>+NO_ARCH=	yes
>+NO_BUILD=	yes
>+
>+USE_GITHUB=	yes
>+GH_PROJECT=	${PORTNAME}-meet
>+GH_TAGNAME=	stable/jitsi-meet_7287
>+
>+INSTALLPATH=	${PREFIX}/lib/jitsi-prosody-plugins
>+
>+post-extract:
>+	${INSTALL_DATA} ${FILESDIR}/prosody.cfg.lua.in \
>+		${WRKSRC}/prosody.cfg.lua
>+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>+		${WRKSRC}/prosody.cfg.lua
>+	@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|' \
>+		${WRKSRC}/prosody.cfg.lua
>+
>+do-install:
>+	${MKDIR} ${STAGEDIR}${INSTALLPATH}/token
>+	cd ${WRKSRC}/resources/prosody-plugins && \
>+		${INSTALL_DATA} *.lua ${STAGEDIR}${INSTALLPATH}
>+	cd ${WRKSRC}/resources/prosody-plugins/token && \
>+		${INSTALL_DATA} *.lua ${STAGEDIR}${INSTALLPATH}/token
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/prosody.cfg.lua \
>+		${STAGEDIR}${EXAMPLESDIR}/prosody.cfg.lua
>+
>+.include <bsd.port.mk>
>diff --git a/net-im/jitsi-prosody-plugins/distinfo b/net-im/jitsi-prosody-plugins/distinfo
>new file mode 100644
>index 000000000..e1c3e270c
>--- /dev/null
>+++ b/net-im/jitsi-prosody-plugins/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1653081177
>+SHA256 (jitsi-jitsi-meet-2.0.7287-stable-jitsi-meet_7287_GH0.tar.gz) = 4fe30eaf5d77918a3eff24599dd79c72e67763e27283cef13b44ef43d867967b
>+SIZE (jitsi-jitsi-meet-2.0.7287-stable-jitsi-meet_7287_GH0.tar.gz) = 117185028
>diff --git a/net-im/jitsi-prosody-plugins/files/prosody.cfg.lua.in b/net-im/jitsi-prosody-plugins/files/prosody.cfg.lua.in
>new file mode 100644
>index 000000000..7c20c254d
>--- /dev/null
>+++ b/net-im/jitsi-prosody-plugins/files/prosody.cfg.lua.in
>@@ -0,0 +1,170 @@
>+-- Place this file in %%LOCALBASE%%/etc/prosody/prosody.cfg.lua
>+--
>+-- Then run
>+--
>+--    prosodyctl cert generate jitsi.example.com
>+--    prosodyctl cert generate auth.jitsi.example.com
>+--    keytool -noprompt -keystore %%ETCDIR%%/jicofo/truststore.jks -importcert \
>+--      -alias prosody -file /var/db/prosody/auth.jitsi.example.com.crt
>+--
>+--    prosodyctl register jvb auth.jitsi.example.com "supersecret"
>+--    prosodyctl register focus auth.jitsi.example.com "supersecret"
>+--    prosodyctl mod_roster_command subscribe focus.jitsi.example.com focus@auth.jitsi.example.com "supersecret"
>+
>+plugin_paths = { "%%LOCALBASE%%/lib/jitsi-prosody-plugins/" }
>+
>+log = {
>+  -- Log files (change âinfoâ to âdebugâ for debug logs):
>+  info = "/var/log/prosody.log";
>+  error = "/var/log/prosody.err";
>+  -- Syslog:
>+  --debug = "*syslog";
>+}
>+
>+-- domain mapper options, must at least have domain base set to use the mapper
>+muc_mapper_domain_base = "jitsi.example.com";
>+
>+-- external_service_secret = "__turnSecret__";
>+-- external_services = {
>+--     { type = "stun", host = "jitsi.example.com", port = 3478 },
>+--     { type = "turn", host = "jitsi.example.com", port = 3478, transport = "udp", secret = true, ttl = 86400, algorithm = "turn" },
>+--     { type = "turns", host = "jitsi.example.com", port = 5349, transport = "tcp", secret = true, ttl = 86400, algorithm = "turn" }
>+--};
>+
>+--cross_domain_bosh = true;
>+consider_bosh_secure = true;
>+https_ports = { }; -- Remove this line to prevent listening on port 5284
>+
>+-- by default prosody 0.12 sends cors headers, if you want to disable it uncomment the following (the config is available on 0.12.1)
>+--http_cors_override = {
>+--    bosh = {
>+--        enabled = false;
>+--    };
>+--    websocket = {
>+--        enabled = false;
>+--    };
>+--}
>+
>+-- https://ssl-config.mozilla.org/#server=haproxy&version=2.1&config=intermediate&openssl=1.1.0g&guideline=5.4
>+ssl = {
>+    protocol = "tlsv1_2+";
>+    ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"
>+}
>+
>+unlimited_jids = {
>+    "focus@auth.jitsi.example.com",
>+    "jvb@auth.jitsi.example.com"
>+}
>+
>+VirtualHost "jitsi.example.com"
>+    -- enabled = false -- Remove this line to enable this host
>+    authentication = "anonymous"
>+    -- Properties below are modified by jitsi-meet-tokens package config
>+    -- and authentication above is switched to "token"
>+    --app_id="example_app_id"
>+    --app_secret="example_app_secret"
>+    -- Assign this host a certificate for TLS, otherwise it would use the one
>+    -- set in the global section (if any).
>+    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
>+    -- use the global one.
>+    ssl = {
>+        key = "/var/db/prosody/jitsi.example.com.key";
>+        certificate = "/var/db/prosody/jitsi.example.com.crt";
>+    }
>+    av_moderation_component = "avmoderation.jitsi.example.com"
>+    speakerstats_component = "speakerstats.jitsi.example.com"
>+    conference_duration_component = "conferenceduration.jitsi.example.com"
>+    -- we need bosh
>+    modules_enabled = {
>+        "bosh";
>+        "pubsub";
>+        "ping"; -- Enable mod_ping
>+        "speakerstats";
>+        "external_services";
>+        "conference_duration";
>+        "muc_lobby_rooms";
>+        "muc_breakout_rooms";
>+        "av_moderation";
>+        "saslauth";
>+    }
>+    c2s_require_encryption = false
>+    lobby_muc = "lobby.jitsi.example.com"
>+    breakout_rooms_muc = "breakout.jitsi.example.com"
>+    main_muc = "conference.jitsi.example.com"
>+    -- muc_lobby_whitelist = { "recorder.jitsi.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
>+
>+Component "conference.jitsi.example.com" "muc"
>+    restrict_room_creation = true
>+    storage = "memory"
>+    modules_enabled = {
>+        "muc_meeting_id";
>+        "muc_domain_mapper";
>+        "polls";
>+        --"token_verification";
>+        "muc_rate_limit";
>+        "saslauth";
>+    }
>+    admins = { "focus@auth.jitsi.example.com" }
>+    muc_room_locking = false
>+    muc_room_default_public_jids = true
>+    c2s_require_encryption = false
>+
>+Component "breakout.jitsi.example.com" "muc"
>+    restrict_room_creation = true
>+    storage = "memory"
>+    modules_enabled = {
>+        "muc_meeting_id";
>+        "muc_domain_mapper";
>+        --"token_verification";
>+        "muc_rate_limit";
>+        "polls";
>+        "saslauth";
>+    }
>+    admins = { "focus@auth.jitsi.example.com" }
>+    muc_room_locking = false
>+    muc_room_default_public_jids = true
>+
>+-- internal muc component
>+Component "internal.auth.jitsi.example.com" "muc"
>+    storage = "memory"
>+    modules_enabled = {
>+        "ping";
>+    }
>+    admins = { "focus@auth.jitsi.example.com", "jvb@auth.jitsi.example.com" }
>+    muc_room_locking = false
>+    muc_room_default_public_jids = true
>+    c2s_require_encryption = false
>+
>+VirtualHost "auth.jitsi.example.com"
>+    modules_enabled = {
>+        "limits_exception";
>+        "saslauth";
>+    }
>+    -- authentication = "internal_plain" 
>+    c2s_require_encryption = false
>+    authentication = "internal_hashed"
>+
>+-- Proxy to jicofo's user JID, so that it doesn't have to register as a component.
>+Component "focus.jitsi.example.com" "client_proxy"
>+    target_address = "focus@auth.jitsi.example.com"
>+
>+Component "speakerstats.jitsi.example.com" "speakerstats_component"
>+    muc_component = "conference.jitsi.example.com"
>+
>+Component "conferenceduration.jitsi.example.com" "conference_duration_component"
>+    muc_component = "conference.jitsi.example.com"
>+
>+Component "avmoderation.jitsi.example.com" "av_moderation_component"
>+    muc_component = "conference.jitsi.example.com"
>+
>+Component "lobby.jitsi.example.com" "muc"
>+    storage = "memory"
>+    restrict_room_creation = true
>+    muc_room_locking = false
>+    muc_room_default_public_jids = true
>+    modules_enabled = {
>+        "muc_rate_limit";
>+        "polls";
>+        "saslauth";
>+    }
>+    c2s_require_encryption = false
>diff --git a/net-im/jitsi-prosody-plugins/pkg-descr b/net-im/jitsi-prosody-plugins/pkg-descr
>new file mode 100644
>index 000000000..cbf9675bb
>--- /dev/null
>+++ b/net-im/jitsi-prosody-plugins/pkg-descr
>@@ -0,0 +1,3 @@
>+Prosody modules for jitsi-meet.
>+
>+WWW: https://github.com/jitsi/jitsi-meet/
>diff --git a/net-im/jitsi-prosody-plugins/pkg-plist b/net-im/jitsi-prosody-plugins/pkg-plist
>new file mode 100644
>index 000000000..7f83797c1
>--- /dev/null
>+++ b/net-im/jitsi-prosody-plugins/pkg-plist
>@@ -0,0 +1,41 @@
>+lib/jitsi-prosody-plugins/ext_events.lib.lua
>+lib/jitsi-prosody-plugins/mod_auth_jitsi-anonymous.lua
>+lib/jitsi-prosody-plugins/mod_auth_token.lua
>+lib/jitsi-prosody-plugins/mod_av_moderation.lua
>+lib/jitsi-prosody-plugins/mod_av_moderation_component.lua
>+lib/jitsi-prosody-plugins/mod_client_proxy.lua
>+lib/jitsi-prosody-plugins/mod_conference_duration.lua
>+lib/jitsi-prosody-plugins/mod_conference_duration_component.lua
>+lib/jitsi-prosody-plugins/mod_external_services.lua
>+lib/jitsi-prosody-plugins/mod_filter_iq_jibri.lua
>+lib/jitsi-prosody-plugins/mod_filter_iq_rayo.lua
>+lib/jitsi-prosody-plugins/mod_jiconop.lua
>+lib/jitsi-prosody-plugins/mod_jitsi_session.lua
>+lib/jitsi-prosody-plugins/mod_limits_exception.lua
>+lib/jitsi-prosody-plugins/mod_muc_allowners.lua
>+lib/jitsi-prosody-plugins/mod_muc_breakout_rooms.lua
>+lib/jitsi-prosody-plugins/mod_muc_call.lua
>+lib/jitsi-prosody-plugins/mod_muc_census.lua
>+lib/jitsi-prosody-plugins/mod_muc_domain_mapper.lua
>+lib/jitsi-prosody-plugins/mod_muc_lobby_rooms.lua
>+lib/jitsi-prosody-plugins/mod_muc_max_occupants.lua
>+lib/jitsi-prosody-plugins/mod_muc_meeting_id.lua
>+lib/jitsi-prosody-plugins/mod_muc_password_whitelist.lua
>+lib/jitsi-prosody-plugins/mod_muc_poltergeist.lua
>+lib/jitsi-prosody-plugins/mod_muc_rate_limit.lua
>+lib/jitsi-prosody-plugins/mod_muc_size.lua
>+lib/jitsi-prosody-plugins/mod_muc_transcription_filter.lua
>+lib/jitsi-prosody-plugins/mod_polls.lua
>+lib/jitsi-prosody-plugins/mod_poltergeist_component.lua
>+lib/jitsi-prosody-plugins/mod_presence_identity.lua
>+lib/jitsi-prosody-plugins/mod_reservations.lua
>+lib/jitsi-prosody-plugins/mod_roster_command.lua
>+lib/jitsi-prosody-plugins/mod_smacks.lua
>+lib/jitsi-prosody-plugins/mod_speakerstats.lua
>+lib/jitsi-prosody-plugins/mod_speakerstats_component.lua
>+lib/jitsi-prosody-plugins/mod_token_verification.lua
>+lib/jitsi-prosody-plugins/mod_turncredentials.lua
>+lib/jitsi-prosody-plugins/poltergeist.lib.lua
>+lib/jitsi-prosody-plugins/token/util.lib.lua
>+lib/jitsi-prosody-plugins/util.lib.lua
>+%%EXAMPLESDIR%%/prosody.cfg.lua
>diff --git a/net-im/jitsi-videobridge/Makefile b/net-im/jitsi-videobridge/Makefile
>index 8d97edc96..70a222c1a 100644
>--- a/net-im/jitsi-videobridge/Makefile
>+++ b/net-im/jitsi-videobridge/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	jitsi
>-DISTVERSION=	2.1-183
>-PORTREVISION=	3
>+DISTVERSION=	2.1-681
> CATEGORIES=	net-im java
> PKGNAMESUFFIX=	-videobridge
> 
>@@ -9,15 +8,16 @@ COMMENT=	WebRTC compatible video router or SFU
> 
> LICENSE=	APACHE20
> 
>+ONLY_FOR_ARCHS=	amd64 i386 powerpc64 powerpc64le
>+
> BUILD_DEPENDS=	${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
> RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
> 
>-ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
>-
> USE_GITHUB=	yes
> GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
>-GH_TAGNAME=	dbddd16
>+GH_TAGNAME=	3544ed05
> USE_JAVA=	yes
>+JAVA_VERSION=	11
> 
> DATADIR=	${JAVASHAREDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
> USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
>@@ -33,7 +33,7 @@ post-build:
> 	@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX} m2
> 	@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}"
> .else
>-MASTER_SITES+=	LOCAL/acm/:maven
>+MASTER_SITES+=	LOCAL/grembo/:maven
> DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
> MAVEN_ARGS=	--offline
> .endif
>@@ -41,28 +41,21 @@ MAVEN_ARGS=	--offline
> MAVEN_ARGS+=	-PbuildFatJar -DskipTests -Dassembly.skipAssembly=false
> MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/m2
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|1.0-20190319.172750-1|1.0-0-ge979298|g' ${WRKSRC}/pom.xml
>-
> do-build:
> 	cd ${WRKSRC}; \
>-		${SETENV} mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
>+		${SETENV} JAVA_VERSION=11 mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}
>-	cd ${WRKSRC}/lib \
>+	cd ${WRKSRC}/jvb/lib \
> 		&& ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/lib/{} \;
> 
>-	@(echo "JVB_XMPP_HOST=localhost"; \
>-	echo "JVB_XMPP_DOMAIN=jitsi.example.com"; \
>-	echo "JVB_XMPP_PORT=5347"; \
>-	echo "JVB_XMPP_SECRET=YOURSECRET1"; \
>-	echo ""; \
>-	echo "VIDEOBRIDGE_MAX_MEMORY=3072m"; \
>-	echo "# VIDEOBRIDGE_DEBUG_OPTIONS=\"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000\" "; \
>-	) > ${STAGEDIR}${ETCDIR}/${PORTNAME}${PKGNAMESUFFIX}.conf.sample
>+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}${PKGNAMESUFFIX}.conf.sample \
>+		${STAGEDIR}${ETCDIR}/${PORTNAME}${PKGNAMESUFFIX}.conf.sample
>+	${INSTALL_DATA} ${FILESDIR}/sip-communicator.properties.sample \
>+		${STAGEDIR}${ETCDIR}/sip-communicator.properties.sample
>+	${INSTALL_DATA} ${WRKSRC}/jvb/target/${PORTNAME}${PKGNAMESUFFIX}-2.1-SNAPSHOT-jar-with-dependencies.jar \
>+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}.jar
> 
>-	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}${PKGNAMESUFFIX}-2.1-SNAPSHOT-jar-with-dependencies.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}.jar
>- 	
> .include <bsd.port.mk>
>diff --git a/net-im/jitsi-videobridge/distinfo b/net-im/jitsi-videobridge/distinfo
>index 9f91808a5..83739431e 100644
>--- a/net-im/jitsi-videobridge/distinfo
>+++ b/net-im/jitsi-videobridge/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1587857041
>-SHA256 (jitsi-videobridge-2.1-183-deps.tar.gz) = 20c2c63d4ab3936245b69a9c4400c3855945c512ab86a9bfde3365cfdba89b27
>-SIZE (jitsi-videobridge-2.1-183-deps.tar.gz) = 159703250
>-SHA256 (jitsi-jitsi-videobridge-2.1-183-dbddd16_GH0.tar.gz) = e8da60e17f4825f06629e66dee8b9236d641fb2b3ba22a9c7da0f12a1e189349
>-SIZE (jitsi-jitsi-videobridge-2.1-183-dbddd16_GH0.tar.gz) = 277281
>+TIMESTAMP = 1652970724
>+SHA256 (jitsi-videobridge-2.1-681-deps.tar.gz) = 8cd50855acd89cc2bc2d324c454ddc902489389de1297a95f66a758dfd2a77e3
>+SIZE (jitsi-videobridge-2.1-681-deps.tar.gz) = 243043143
>+SHA256 (jitsi-jitsi-videobridge-2.1-681-3544ed05_GH0.tar.gz) = 7370050eeb89be0f677b01756c53225f896ff3fdc1f054ec85b0e24cc152627b
>+SIZE (jitsi-jitsi-videobridge-2.1-681-3544ed05_GH0.tar.gz) = 379386
>diff --git a/net-im/jitsi-videobridge/files/jitsi-videobridge.conf.sample b/net-im/jitsi-videobridge/files/jitsi-videobridge.conf.sample
>new file mode 100644
>index 000000000..0cfcb3834
>--- /dev/null
>+++ b/net-im/jitsi-videobridge/files/jitsi-videobridge.conf.sample
>@@ -0,0 +1,51 @@
>+videobridge {
>+  http-servers {
>+      public {
>+          port = 9090
>+      }
>+  }
>+  websockets {
>+      enabled = true
>+      domain = "jitsi.example.com:443"
>+      tls = true
>+      server-id = "default-id"
>+  }
>+  sctp {
>+       enabled = false
>+  }
>+
>+  stats {
>+    # Enable broadcasting stats/presence in a MUC
>+    enabled = true
>+    transports = [
>+      { type = "colibri" }
>+    ]
>+  }
>+
>+  apis {
>+    xmpp-client {
>+      configs {
>+        xmpp-server-1 {
>+          hostname="localhost"
>+          domain = "auth.jitsi.example.com"
>+          username = "jvb"
>+          password = "supersecret"
>+          muc_jids = "JvbBrewery@internal.auth.jitsi.example.com"
>+          muc_nickname = "unique-instance-id"
>+          # disable_certificate_verification = true
>+        }
>+      }
>+    }
>+  }
>+
>+  ice {
>+    tcp {
>+      enabled = true
>+      port = 4443
>+    }
>+
>+    udp {
>+      port = 10000
>+    }      
>+  }
>+}
>diff --git a/net-im/jitsi-videobridge/files/jitsi-videobridge.in b/net-im/jitsi-videobridge/files/jitsi-videobridge.in
>old mode 100644
>new mode 100755
>index 324e9a61c..d1846dbcb
>--- a/net-im/jitsi-videobridge/files/jitsi-videobridge.in
>+++ b/net-im/jitsi-videobridge/files/jitsi-videobridge.in
>@@ -7,6 +7,7 @@
> # Configuration settings for jitsi-videobridge in /etc/rc.conf:
> #
> # jitsi_videobridge_enable:	run jitsi_videobridge server (default=NO)
>+# jitsi_videobridge_maxmem:	maximum memory used (default=3072m)
> # jitsi_videobridge_flags:	additional flags for jitsi_videobridge server (default="")
> #
> 
>@@ -15,19 +16,20 @@
> name="jitsi_videobridge"
> rcvar=${name}_enable
> 
>-jitsi_videobridge_env_file="%%ETCDIR%%/jitsi-videobridge.conf"
>+jitsi_videobridge_config="%%ETCDIR%%/jitsi-videobridge.conf"
> jitsi_videobridge_jar="%%JAVAJARDIR%%/jitsi-videobridge.jar"
> jitsi_videobridge_logging_config="%%DATADIR%%/lib/logging.properties"
> 
> load_rc_config "${name}"
> 
> : ${jitsi_videobridge_enable="NO"}
>+: ${jitsi_videobridge_maxmem="3072m"}
> : ${jitsi_videobridge_flags=""}
> 
> command="%%JAVA%%"
> 
> pidfile="/var/run/jitsi-videobridge.pid"
>-required_files="${jitsi_videobridge_env_file}"
>+required_files="${jitsi_videobridge_config}"
> start_cmd=${name}_start
> stop_cmd=${name}_stop
> status_cmd=${name}_status
>@@ -36,42 +38,41 @@ restart_cmd=${name}_restart
> jitsi_videobridge_start()
> {
> 	daemon -p ${pidfile} -o /var/log/jitsi-videobridge.log \
>-		${command} -Xmx${VIDEOBRIDGE_MAX_MEMORY} \
>-                -XX:+UseConcMarkSweepGC \
>-                -XX:+HeapDumpOnOutOfMemoryError \
>-                -XX:HeapDumpPath=/tmp \
>-                -Djava.util.logging.config.file=${jitsi_videobridge_logging_config} \
>-                -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=%%LOCALBASE%%/etc/jitsi \
>-                -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge \
>-                -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/ \
>-                -cp ${jitsi_videobridge_jar} \
>-                org.jitsi.videobridge.Main \
>-                --host=${JVB_XMPP_HOST} \
>-                --domain=${JVB_XMPP_DOMAIN} \
>-                --port=${JVB_XMPP_PORT} \
>-                --secret=${JVB_XMPP_SECRET} ${jitsi_videobridge_flags}
>-                echo "Started"
>+		${command} -Xmx${jitsi_videobridge_maxmem} \
>+		-XX:+UseConcMarkSweepGC \
>+		-XX:+HeapDumpOnOutOfMemoryError \
>+		-XX:HeapDumpPath=/tmp \
>+		-Djava.util.logging.config.file=${jitsi_videobridge_logging_config} \
>+		-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=%%LOCALBASE%%/etc/jitsi \
>+		-Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge \
>+		-Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/ \
>+		-Dconfig.file=${jitsi_videobridge_config} \
>+		-cp ${jitsi_videobridge_jar} \
>+		org.jitsi.videobridge.MainKt \
>+		 ${jitsi_videobridge_flags}
>+
>+		echo "Started"
> }
> 
> jitsi_videobridge_stop()
> {
>-        if [ -f ${pidfile} ]
>-        then
>-                kill `cat ${pidfile}`
>-                rm ${pidfile}
>+	if [ -f ${pidfile} ]
>+	then
>+		kill `cat ${pidfile}`
>+		rm ${pidfile}
> 		echo "Stopped"
>-        fi
>+	fi
> }
> 
> jitsi_videobridge_status()
> {
>-        # If running, show pid
>-        if [ -f ${pidfile} ]
>-        then
>-                echo "${name} is running as pid" `cat ${pidfile}`
>-        else
>-                echo "${name} is not running"
>-        fi
>+	# If running, show pid
>+	if [ -f ${pidfile} ]
>+	then
>+		echo "${name} is running as pid" `cat ${pidfile}`
>+	else
>+		echo "${name} is not running"
>+	fi
> }
> 
> jitsi_videobridge_restart()
>diff --git a/net-im/jitsi-videobridge/files/pkg-message.in b/net-im/jitsi-videobridge/files/pkg-message.in
>index 90470b003..ac3306358 100644
>--- a/net-im/jitsi-videobridge/files/pkg-message.in
>+++ b/net-im/jitsi-videobridge/files/pkg-message.in
>@@ -3,27 +3,27 @@
>   message: <<EOM
> Jitsi Video Bridge was installed
> 
>-1) The configuration file is used by the startup rcfile and located at:
>-   
>+1) Edit the configuration file located at:
>+
>    %%ETCDIR%%/jitsi-videobridge.conf
> 
>-2) Add jitsi_videobridge_enable="YES" to /etc/rc.conf.
>+2) Enable the service:
>+
>+   service jitsi-videobridge enable
> 
> 3) Additional jitsi-videobridge properties to control the TCP-related 
>    functionality can be defined at:
> 
>    %%ETCDIR%%/sip-communicator.properties
> 
>-   This file not exists by default
>-
> 4) If jitsi-videobridge server is running behind NAT, you must add the 
>-   following lines to sip-comunnicator.properties file
>+   following lines to the sip-comunnicator.properties file
> 
>    org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=Local_IP_Address
>    org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=Public_IP_Address
> 
>    Also, you must redirect TCP/4443 and UDP/10000 ports to jitsi-videobridge 
>-   server
>+   server.
> 
> 5) More about jitsi-videobridge properties at:
> 
>diff --git a/net-im/jitsi-videobridge/files/sip-communicator.properties.sample b/net-im/jitsi-videobridge/files/sip-communicator.properties.sample
>new file mode 100644
>index 000000000..b928779fd
>--- /dev/null
>+++ b/net-im/jitsi-videobridge/files/sip-communicator.properties.sample
>@@ -0,0 +1,5 @@
>+org.ice4j.ice.harvest.DISABLE_AWS_HARVESTER=true
>+
>+# NAT
>+#org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=10.1.1.17
>+#org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=1.2.3.4
>diff --git a/net-im/jitsi-videobridge/pkg-plist b/net-im/jitsi-videobridge/pkg-plist
>index 6c6d41a5d..2075dbc50 100644
>--- a/net-im/jitsi-videobridge/pkg-plist
>+++ b/net-im/jitsi-videobridge/pkg-plist
>@@ -1,4 +1,5 @@
> @sample %%ETCDIR%%/jitsi-videobridge.conf.sample
>+@sample %%ETCDIR%%/sip-communicator.properties.sample
> %%JAVAJARDIR%%/jitsi-videobridge.jar
> %%DATADIR%%/lib/logging.properties
> %%DATADIR%%/lib/videobridge.rc
>diff --git a/www/jitsi-meet/Makefile b/www/jitsi-meet/Makefile
>index 0b3645c61..aae14a11e 100644
>--- a/www/jitsi-meet/Makefile
>+++ b/www/jitsi-meet/Makefile
>@@ -1,9 +1,8 @@
> PORTNAME=	jitsi
>-PORTVERSION=	1.0.4048
>-PORTREVISION=	2
>+PORTVERSION=	1.0.6155
>+DISTVERSIONPREFIX=	meet-
> CATEGORIES=	www net-im
> MASTER_SITES=	https://download.jitsi.org/jitsi-meet/src/
>-DISTVERSIONPREFIX=	meet-
> PKGNAMESUFFIX=	-meet
> 
> MAINTAINER=	acm@FreeBSD.org
>@@ -13,6 +12,7 @@ LICENSE=	APACHE20
> 
> USES=		cpe tar:bzip2
> NO_BUILD=	yes
>+NO_ARCH=	yes
> 
> CPE_VENDOR=	jitsi
> CPE_PRODUCT=	meet
>@@ -25,9 +25,16 @@ WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
> post-extract:
> 	@${MV} ${WRKSRC}/config.js ${WRKSRC}/config.js.sample
> 	@${MV} ${WRKSRC}/interface_config.js ${WRKSRC}/interface_config.js.sample
>+	${INSTALL_DATA} ${FILESDIR}/nginx.conf.in \
>+		${WRKDIR}/nginx.conf
>+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>+		${WRKDIR}/nginx.conf
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${WWWDIR}
> 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
>+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKDIR}/nginx.conf \
>+		${STAGEDIR}${EXAMPLESDIR}/nginx.conf
> 
> .include <bsd.port.mk>
>diff --git a/www/jitsi-meet/distinfo b/www/jitsi-meet/distinfo
>index c2a190069..8d62eed96 100644
>--- a/www/jitsi-meet/distinfo
>+++ b/www/jitsi-meet/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1587866160
>-SHA256 (jitsi-meet-1.0.4048.tar.bz2) = 7a6e046273a3821b85bb50bb3b2e20134af64e0112ab60128d95348509e80ea0
>-SIZE (jitsi-meet-1.0.4048.tar.bz2) = 7396829
>+TIMESTAMP = 1652966435
>+SHA256 (jitsi-meet-1.0.6155.tar.bz2) = 6da0915587b5cf6b87def49be4a6d6b34cb82b24183b72694f2a0615921942aa
>+SIZE (jitsi-meet-1.0.6155.tar.bz2) = 16104152
>diff --git a/www/jitsi-meet/files/nginx.conf.in b/www/jitsi-meet/files/nginx.conf.in
>new file mode 100644
>index 000000000..c36cfdd1b
>--- /dev/null
>+++ b/www/jitsi-meet/files/nginx.conf.in
>@@ -0,0 +1,75 @@
>+worker_processes  1;
>+
>+events {
>+    worker_connections  1024;
>+}
>+
>+
>+http {
>+    include       mime.types;
>+    default_type  application/octet-stream;
>+    types {
>+        application/wasm wasm;
>+    }
>+
>+    sendfile        on;
>+    keepalive_timeout  65;
>+
>+    server {
>+        listen 80 default_server;
>+
>+        server_name _;
>+
>+        return 301 https://$host$request_uri;
>+    }
>+
>+    server {
>+        listen 0.0.0.0:443 ssl http2;
>+        http2_push_preload on;
>+
>+        ssl_certificate      jitsi.example.com.crt;
>+        ssl_certificate_key  jitsi.example.com.key;
>+
>+        ssl_session_cache    shared:SSL:1m;
>+        ssl_session_timeout  5m;
>+
>+        ssl_ciphers  HIGH:!aNULL:!MD5;
>+        ssl_prefer_server_ciphers  on;
>+
>+        ssl_early_data on;
>+
>+        server_name jitsi.example.com;
>+
>+        root %%LOCALBASE%%/www/jitsi-meet;
>+
>+        index index.html;
>+        location ~ ^/([a-zA-Z0-9=\?\-])+$ {
>+            rewrite ^/(.*)$ / break;
>+        }
>+        location / {
>+            ssi on;
>+        }
>+        # BOSH, Bidirectional-streams Over Synchronous HTTP
>+        # https://en.wikipedia.org/wiki/BOSH_(protocol)
>+        location = /http-bind {
>+            proxy_pass       http://localhost:5280/http-bind;
>+            proxy_set_header X-Forwarded-For $remote_addr;
>+            proxy_set_header Host $http_host;
>+        }
>+
>+        location ~ ^/colibri-ws/default-id/(.*) {
>+            proxy_pass http://127.0.0.1:9090/colibri-ws/default-id/$1$is_args$args;
>+            proxy_http_version 1.1;
>+            proxy_set_header Upgrade $http_upgrade;
>+            proxy_set_header Connection "upgrade";
>+            tcp_nodelay on;
>+        }
>+
>+        # external_api.js must be accessible from the root of the
>+        # installation for the electron version of Jitsi Meet to work
>+        # https://github.com/jitsi/jitsi-meet-electron
>+        location /external_api.js {
>+            alias /srv/jitsi-meet/libs/external_api.min.js;
>+        }
>+    }
>+}
>diff --git a/www/jitsi-meet/files/pkg-message.in b/www/jitsi-meet/files/pkg-message.in
>index b912182d6..ac9699289 100644
>--- a/www/jitsi-meet/files/pkg-message.in
>+++ b/www/jitsi-meet/files/pkg-message.in
>@@ -7,12 +7,13 @@ Jitsi Meet was installed
> 
>    www/nginx
>    net-im/prosody
>+   net-im/jitsi-prosody-plugins
>    net-im/jicofo
>    net-im/jitsi-videobridge
> 
>-2) You can look a basic configuration at the following url:
>+2) You can find a basic configuration example here:
> 
>-   https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-manual
>+   %%EXAMPLESDIR%%/nginx.conf
> 
> 3) Configuration and interface options files are installed like 
> 
>diff --git a/www/jitsi-meet/pkg-plist b/www/jitsi-meet/pkg-plist
>index f4ef6cf7f..ece9bca51 100644
>--- a/www/jitsi-meet/pkg-plist
>+++ b/www/jitsi-meet/pkg-plist
>@@ -1,7 +1,7 @@
>-%%WWWDIR%%/ConferenceEvents.js
> %%WWWDIR%%/LICENSE
> %%WWWDIR%%/analytics-ga.js
> %%WWWDIR%%/app.js
>+%%WWWDIR%%/babel.config.js
> %%WWWDIR%%/base.html
> %%WWWDIR%%/body.html
> %%WWWDIR%%/conference.js
>@@ -12,72 +12,100 @@
> %%WWWDIR%%/connection_optimization/do_external_connect.js
> %%WWWDIR%%/css/all.css
> %%WWWDIR%%/favicon.ico
>+%%WWWDIR%%/fonts.html
> %%WWWDIR%%/fonts/OpenSans-Light-webfont.eot
> %%WWWDIR%%/fonts/OpenSans-Light-webfont.svg
> %%WWWDIR%%/fonts/OpenSans-Light-webfont.ttf
> %%WWWDIR%%/fonts/OpenSans-Light-webfont.woff
> %%WWWDIR%%/head.html
>+%%WWWDIR%%/images/GIPHY_icon.png
>+%%WWWDIR%%/images/GIPHY_logo.png
>+%%WWWDIR%%/images/app-store-badge.png
> %%WWWDIR%%/images/apple-touch-icon.png
> %%WWWDIR%%/images/avatar.png
> %%WWWDIR%%/images/btn_google_signin_dark_normal.png
>+%%WWWDIR%%/images/calendar.svg
> %%WWWDIR%%/images/chromeLogo.svg
> %%WWWDIR%%/images/dropboxLogo_square.png
>+%%WWWDIR%%/images/f-droid-badge.png
> %%WWWDIR%%/images/favicon.ico
> %%WWWDIR%%/images/flags.png
> %%WWWDIR%%/images/flags@2x.png
>+%%WWWDIR%%/images/google-play-badge.png
> %%WWWDIR%%/images/googleLogo.svg
>+%%WWWDIR%%/images/icon-cloud.png
>+%%WWWDIR%%/images/icon-info.png
> %%WWWDIR%%/images/icon-users.png
>-%%WWWDIR%%/images/jitsiLogo_square.png
> %%WWWDIR%%/images/jitsilogo.png
> %%WWWDIR%%/images/logo-deep-linking.png
> %%WWWDIR%%/images/microsoftLogo.svg
>-%%WWWDIR%%/images/user-groups.svg
>-%%WWWDIR%%/images/watermark.png
>+%%WWWDIR%%/images/share-audio.gif
>+%%WWWDIR%%/images/virtual-background/background-1.jpg
>+%%WWWDIR%%/images/virtual-background/background-2.jpg
>+%%WWWDIR%%/images/virtual-background/background-3.jpg
>+%%WWWDIR%%/images/virtual-background/background-4.jpg
>+%%WWWDIR%%/images/virtual-background/background-5.jpg
>+%%WWWDIR%%/images/virtual-background/background-6.jpg
>+%%WWWDIR%%/images/virtual-background/background-7.jpg
>+%%WWWDIR%%/images/watermark.svg
>+%%WWWDIR%%/images/welcome-background.png
> %%WWWDIR%%/index.android.js
> %%WWWDIR%%/index.html
> %%WWWDIR%%/index.ios.js
> @sample %%WWWDIR%%/interface_config.js.sample
> %%WWWDIR%%/lang/languages-af.json
> %%WWWDIR%%/lang/languages-ar.json
>-%%WWWDIR%%/lang/languages-az.json
>+%%WWWDIR%%/lang/languages-be.json
> %%WWWDIR%%/lang/languages-bg.json
> %%WWWDIR%%/lang/languages-ca.json
> %%WWWDIR%%/lang/languages-cs.json
> %%WWWDIR%%/lang/languages-da.json
> %%WWWDIR%%/lang/languages-de.json
>+%%WWWDIR%%/lang/languages-el.json
> %%WWWDIR%%/lang/languages-enGB.json
> %%WWWDIR%%/lang/languages-eo.json
> %%WWWDIR%%/lang/languages-es.json
> %%WWWDIR%%/lang/languages-esUS.json
> %%WWWDIR%%/lang/languages-et.json
>+%%WWWDIR%%/lang/languages-eu.json
> %%WWWDIR%%/lang/languages-fa.json
> %%WWWDIR%%/lang/languages-fi.json
> %%WWWDIR%%/lang/languages-fr.json
> %%WWWDIR%%/lang/languages-frCA.json
>+%%WWWDIR%%/lang/languages-fy.json
> %%WWWDIR%%/lang/languages-gl.json
>+%%WWWDIR%%/lang/languages-he.json
>+%%WWWDIR%%/lang/languages-hi.json
> %%WWWDIR%%/lang/languages-hr.json
> %%WWWDIR%%/lang/languages-hu.json
> %%WWWDIR%%/lang/languages-hy.json
>+%%WWWDIR%%/lang/languages-id.json
> %%WWWDIR%%/lang/languages-is.json
> %%WWWDIR%%/lang/languages-it.json
> %%WWWDIR%%/lang/languages-ja.json
>+%%WWWDIR%%/lang/languages-ka.json
> %%WWWDIR%%/lang/languages-kab.json
> %%WWWDIR%%/lang/languages-km.json
> %%WWWDIR%%/lang/languages-ko.json
> %%WWWDIR%%/lang/languages-lt.json
>+%%WWWDIR%%/lang/languages-lv.json
> %%WWWDIR%%/lang/languages-mn.json
>+%%WWWDIR%%/lang/languages-mr.json
> %%WWWDIR%%/lang/languages-nb.json
> %%WWWDIR%%/lang/languages-nl.json
> %%WWWDIR%%/lang/languages-oc.json
> %%WWWDIR%%/lang/languages-pl.json
> %%WWWDIR%%/lang/languages-pt.json
> %%WWWDIR%%/lang/languages-ptBR.json
>+%%WWWDIR%%/lang/languages-ro.json
> %%WWWDIR%%/lang/languages-ru.json
> %%WWWDIR%%/lang/languages-sc.json
> %%WWWDIR%%/lang/languages-sk.json
> %%WWWDIR%%/lang/languages-sl.json
>+%%WWWDIR%%/lang/languages-sq.json
> %%WWWDIR%%/lang/languages-sr.json
> %%WWWDIR%%/lang/languages-sv.json
>+%%WWWDIR%%/lang/languages-te.json
> %%WWWDIR%%/lang/languages-tr.json
> %%WWWDIR%%/lang/languages-uk.json
> %%WWWDIR%%/lang/languages-vi.json
>@@ -86,35 +114,40 @@
> %%WWWDIR%%/lang/languages.json
> %%WWWDIR%%/lang/main-af.json
> %%WWWDIR%%/lang/main-ar.json
>-%%WWWDIR%%/lang/main-az.json
> %%WWWDIR%%/lang/main-be.json
> %%WWWDIR%%/lang/main-bg.json
> %%WWWDIR%%/lang/main-ca.json
> %%WWWDIR%%/lang/main-cs.json
> %%WWWDIR%%/lang/main-da.json
> %%WWWDIR%%/lang/main-de.json
>+%%WWWDIR%%/lang/main-el.json
> %%WWWDIR%%/lang/main-enGB.json
> %%WWWDIR%%/lang/main-eo.json
> %%WWWDIR%%/lang/main-es.json
> %%WWWDIR%%/lang/main-esUS.json
> %%WWWDIR%%/lang/main-et.json
>+%%WWWDIR%%/lang/main-eu.json
> %%WWWDIR%%/lang/main-fa.json
> %%WWWDIR%%/lang/main-fi.json
> %%WWWDIR%%/lang/main-fr.json
> %%WWWDIR%%/lang/main-frCA.json
> %%WWWDIR%%/lang/main-gl.json
> %%WWWDIR%%/lang/main-he.json
>+%%WWWDIR%%/lang/main-hi.json
> %%WWWDIR%%/lang/main-hr.json
> %%WWWDIR%%/lang/main-hu.json
> %%WWWDIR%%/lang/main-hy.json
>+%%WWWDIR%%/lang/main-id.json
> %%WWWDIR%%/lang/main-is.json
> %%WWWDIR%%/lang/main-it.json
> %%WWWDIR%%/lang/main-ja.json
> %%WWWDIR%%/lang/main-kab.json
>-%%WWWDIR%%/lang/main-km.json
> %%WWWDIR%%/lang/main-ko.json
> %%WWWDIR%%/lang/main-lt.json
>+%%WWWDIR%%/lang/main-lv.json
>+%%WWWDIR%%/lang/main-ml.json
> %%WWWDIR%%/lang/main-mn.json
>+%%WWWDIR%%/lang/main-mr.json
> %%WWWDIR%%/lang/main-nb.json
> %%WWWDIR%%/lang/main-nl.json
> %%WWWDIR%%/lang/main-oc.json
>@@ -126,8 +159,10 @@
> %%WWWDIR%%/lang/main-sc.json
> %%WWWDIR%%/lang/main-sk.json
> %%WWWDIR%%/lang/main-sl.json
>+%%WWWDIR%%/lang/main-sq.json
> %%WWWDIR%%/lang/main-sr.json
> %%WWWDIR%%/lang/main-sv.json
>+%%WWWDIR%%/lang/main-te.json
> %%WWWDIR%%/lang/main-tr.json
> %%WWWDIR%%/lang/main-uk.json
> %%WWWDIR%%/lang/main-vi.json
>@@ -135,40 +170,52 @@
> %%WWWDIR%%/lang/main-zhTW.json
> %%WWWDIR%%/lang/main.json
> %%WWWDIR%%/lang/readme.md
>+%%WWWDIR%%/lang/update-translation.js
> %%WWWDIR%%/libs/alwaysontop.min.js
>-%%WWWDIR%%/libs/alwaysontop.min.map
>+%%WWWDIR%%/libs/alwaysontop.min.js.map
> %%WWWDIR%%/libs/analytics-ga.js
> %%WWWDIR%%/libs/analytics-ga.min.js
>-%%WWWDIR%%/libs/analytics-ga.min.map
>+%%WWWDIR%%/libs/analytics-ga.min.js.map
> %%WWWDIR%%/libs/app.bundle.min.js
>-%%WWWDIR%%/libs/app.bundle.min.map
>+%%WWWDIR%%/libs/app.bundle.min.js.map
> %%WWWDIR%%/libs/capabilities.json
>-%%WWWDIR%%/libs/device_selection_popup_bundle.min.js
>-%%WWWDIR%%/libs/device_selection_popup_bundle.min.map
>+%%WWWDIR%%/libs/close3.min.js
> %%WWWDIR%%/libs/dial_in_info_bundle.min.js
>-%%WWWDIR%%/libs/dial_in_info_bundle.min.map
>+%%WWWDIR%%/libs/dial_in_info_bundle.min.js.map
> %%WWWDIR%%/libs/do_external_connect.min.js
>-%%WWWDIR%%/libs/do_external_connect.min.map
>+%%WWWDIR%%/libs/do_external_connect.min.js.map
> %%WWWDIR%%/libs/external_api.min.js
>-%%WWWDIR%%/libs/external_api.min.map
>+%%WWWDIR%%/libs/external_api.min.js.map
> %%WWWDIR%%/libs/external_connect.js
>-%%WWWDIR%%/libs/flacEncodeWorker.min.js
>-%%WWWDIR%%/libs/flacEncodeWorker.min.map
>+%%WWWDIR%%/libs/face-landmarks-worker.min.js
>+%%WWWDIR%%/libs/face-landmarks-worker.min.js.map
>+%%WWWDIR%%/libs/face_expression_model-weights_manifest.json
>+%%WWWDIR%%/libs/face_expression_model.bin
>+%%WWWDIR%%/libs/lib-jitsi-meet.e2ee-worker.js
> %%WWWDIR%%/libs/lib-jitsi-meet.min.js
> %%WWWDIR%%/libs/lib-jitsi-meet.min.map
>-%%WWWDIR%%/libs/libflac4-1.3.2.min.js
>-%%WWWDIR%%/libs/libflac4-1.3.2.min.js.mem
>-%%WWWDIR%%/libs/rnnoise-processor.min.js
>-%%WWWDIR%%/libs/rnnoise-processor.min.map
>+%%WWWDIR%%/libs/olm.wasm
> %%WWWDIR%%/libs/rnnoise.wasm
>-%%WWWDIR%%/libs/video-blur-effect.min.js
>-%%WWWDIR%%/libs/video-blur-effect.min.map
>+%%WWWDIR%%/libs/selfie_segmentation_landscape.tflite
>+%%WWWDIR%%/libs/tfjs-backend-wasm-simd.wasm
>+%%WWWDIR%%/libs/tfjs-backend-wasm-threaded-simd.wasm
>+%%WWWDIR%%/libs/tfjs-backend-wasm.wasm
>+%%WWWDIR%%/libs/tflite-simd.wasm
>+%%WWWDIR%%/libs/tflite.wasm
>+%%WWWDIR%%/libs/tiny_face_detector_model-weights_manifest.json
>+%%WWWDIR%%/libs/tiny_face_detector_model.bin
> %%WWWDIR%%/logging_config.js
> %%WWWDIR%%/metro.config.js
> %%WWWDIR%%/plugin.head.html
>+%%WWWDIR%%/pwa-worker.js
>+%%WWWDIR%%/react-native.config.js
> %%WWWDIR%%/robots.txt
>+%%WWWDIR%%/sounds/asked-unmute.mp3
>+%%WWWDIR%%/sounds/e2eeOff.mp3
>+%%WWWDIR%%/sounds/e2eeOn.mp3
> %%WWWDIR%%/sounds/incomingMessage.wav
> %%WWWDIR%%/sounds/joined.wav
>+%%WWWDIR%%/sounds/knock.mp3
> %%WWWDIR%%/sounds/left.wav
> %%WWWDIR%%/sounds/liveStreamingOff.mp3
> %%WWWDIR%%/sounds/liveStreamingOn.mp3
>@@ -176,6 +223,13 @@
> %%WWWDIR%%/sounds/noisyAudioInput.mp3
> %%WWWDIR%%/sounds/outgoingRinging.wav
> %%WWWDIR%%/sounds/outgoingStart.wav
>+%%WWWDIR%%/sounds/reactions-applause.mp3
>+%%WWWDIR%%/sounds/reactions-boo.mp3
>+%%WWWDIR%%/sounds/reactions-crickets.mp3
>+%%WWWDIR%%/sounds/reactions-laughter.mp3
>+%%WWWDIR%%/sounds/reactions-raised-hand.mp3
>+%%WWWDIR%%/sounds/reactions-surprise.mp3
>+%%WWWDIR%%/sounds/reactions-thumbs-up.mp3
> %%WWWDIR%%/sounds/recordingOff.mp3
> %%WWWDIR%%/sounds/recordingOn.mp3
> %%WWWDIR%%/sounds/rejected.wav
>@@ -188,12 +242,20 @@
> %%WWWDIR%%/static/close.js
> %%WWWDIR%%/static/close2.html
> %%WWWDIR%%/static/close3.html
>-%%WWWDIR%%/static/deviceSelectionPopup.html
>+%%WWWDIR%%/static/close3.js
> %%WWWDIR%%/static/dialInInfo.html
> %%WWWDIR%%/static/msredirect.html
> %%WWWDIR%%/static/oauth.html
>+%%WWWDIR%%/static/offline.html
>+%%WWWDIR%%/static/planLimit.html
>+%%WWWDIR%%/static/prejoin.html
>+%%WWWDIR%%/static/pwa/icons/icon192.png
>+%%WWWDIR%%/static/pwa/icons/icon512.png
>+%%WWWDIR%%/static/pwa/icons/iconMask.png
> %%WWWDIR%%/static/recommendedBrowsers.html
> %%WWWDIR%%/static/settingsToolbarAdditionalContent.html
>+%%WWWDIR%%/static/welcomePageAdditionalCard.html
> %%WWWDIR%%/static/welcomePageAdditionalContent.html
> %%WWWDIR%%/title.html
> %%WWWDIR%%/webpack.config.js
>+%%EXAMPLESDIR%%/nginx.conf

Actions: View | Diff

Attachments on bug 257232: 226514 | 226781 | 229994 | 234073 | 234117 | 234152