From nobody Tue May 24 03:03:13 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 80B861B4FBA0; Tue, 24 May 2022 03:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L6fCQ24gVz3kNw; Tue, 24 May 2022 03:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653361394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54xUAI2e0oo1N7elh/VjF255TWRvfYzRxMD7+7FSYQU=; b=x1aaLybDoqBmxLOZvjSOf2nJj/+Qs4TNO60pWZntF9lcLNL2Yn1bCzlnE9rzPFDsNeg1xh 8r3zbNJGqMuOZwOWp4ce4EUVwtzJhcPd+UPr5WgLqjH53h86NwBh26wm7eBGaxdGRd8k0K d0ALueiGAVr2uYWHeeV5P4d7Jv9fJS7owto5FVMNv6oxP0p8JwC1a9q68Q4sUynqP5sNsP bJZK1ZeuSibmToGWHATZEVgwFQULSZIn62wyqTeG+T7yOTgmha5h+qFDsZJWjE7aHwBOZH ExDSw9+3ve9IPKw13IUwiJ+IXMQspvtYwrXiSVMRCq7Jt9cUmQrmzo3waiAYdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F0A641C917; Tue, 24 May 2022 03:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24O33DUA090185; Tue, 24 May 2022 03:03:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24O33Dhu090184; Tue, 24 May 2022 03:03:13 GMT (envelope-from git) Date: Tue, 24 May 2022 03:03:13 GMT Message-Id: <202205240303.24O33Dhu090184@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 395d57a73b08 - main - net-im/jitsi-videobridge: update to 2.1-681 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 395d57a73b08f1986309bd299575d64126062c79 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653361394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54xUAI2e0oo1N7elh/VjF255TWRvfYzRxMD7+7FSYQU=; b=oK++15JfH7X05DD8iUReWuCyfktk93mCCJjZkzgPCwopsIPVCDTIsvI/E3g6zE8XMPPa0g B7Ty3yxpk02MNf9bioYMV2YP9RZiIABpZA8OW3J7EVlL2rlS2/MkjR3I9xVoshNWe4WyiR bPPDWTTB3r0NFGWgdqfxY/RrbmUqVidZ8olMQtYS5Rz5rmLxp4jjZgHAi2MDAc/vggcCWV 60SUoH4QKyDc7lbhvPHDeRt2NELhmkQ2KT7HyeX4/U51D0uQMBOEDsTlqhPtR30C34d/qM qnKXJCdU5t1uwyjrvEUhdgVTvxQga/oX/0AashZXuwlH1juUj1qgqBZYC6I+Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653361394; a=rsa-sha256; cv=none; b=n07CB2jrfDuENaFv8Dgq6dY3u5X/0yjTmJi1w6I1m5aS3wIPliGT0Y1vCWZbKE0KiTfOXU m8IyQVlpMNb1Lza5OUuY6EkyGZwFItrfN/SU6A2hmGmjiESBdQnKwh7wVvzditax4TL0Ug OdmJCoAcJ8PHoYqi509X8pjyQX19N4FbLtCtjReEkR8VNrTxHXtBL3nXrngOI/Yf+RLYWX /jEiPSup5KkUbRTkxJi+Di7ZKeA01tiDenhGNyBMF/Scw0zJecDHULAENJS98ubyWY618T UZ/sZdEqLq20824s8IAfSVVktCiZ8cN4jab7LdBSji1SN127uYw8wIfbhbYMCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=395d57a73b08f1986309bd299575d64126062c79 commit 395d57a73b08f1986309bd299575d64126062c79 Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-05-24 02:56:52 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2022-05-24 02:56:52 +0000 net-im/jitsi-videobridge: update to 2.1-681 - Add config samples - Now jitsi-videobridge is init using jvb user - Modify pkg-message file PR: 257232 Reported by: grembo --- net-im/jitsi-videobridge/Makefile | 39 ++++++------- net-im/jitsi-videobridge/distinfo | 10 ++-- .../files/jitsi-videobridge.conf.sample | 51 +++++++++++++++++ .../jitsi-videobridge/files/jitsi-videobridge.in | 66 +++++++++++----------- net-im/jitsi-videobridge/files/pkg-message.in | 12 ++-- .../files/sip-communicator.properties.sample | 5 ++ net-im/jitsi-videobridge/pkg-plist | 6 ++ 7 files changed, 125 insertions(+), 64 deletions(-) diff --git a/net-im/jitsi-videobridge/Makefile b/net-im/jitsi-videobridge/Makefile index 8d97edc96357..2626818d1908 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,17 @@ COMMENT= WebRTC compatible video router or SFU LICENSE= APACHE20 +ONLY_FOR_ARCHS= i386 amd64 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} @@ -26,6 +27,9 @@ SUB_FILES+= pkg-message SUB_LIST+= JAVA=${JAVA} ETCDIR= ${PREFIX}/etc/jitsi/videobridge +USERS= jvb ${PORTNAME} +GROUPS= ${USERS} + DEV_UPDATE_MODE= no .if (${DEV_UPDATE_MODE} == "yes") @@ -33,7 +37,8 @@ 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/acm/:maven \ + LOCAL/grembo/:maven DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven MAVEN_ARGS= --offline .endif @@ -41,28 +46,20 @@ 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=${JAVA_VERSION} 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} ${WRKSRC}/target/${PORTNAME}${PKGNAMESUFFIX}-2.1-SNAPSHOT-jar-with-dependencies.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}.jar + ${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 .include diff --git a/net-im/jitsi-videobridge/distinfo b/net-im/jitsi-videobridge/distinfo index 9f91808a5178..18c371425eaf 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 = 1653273596 +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 000000000000..0cfcb3834dde --- /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 index 324e9a61c8fb..8c2d7ce777e4 100644 --- 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,21 @@ 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" +jitsi_videobridge_user="jvb" 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 @@ -35,48 +38,47 @@ 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" + daemon -u ${jitsi_videobridge_user} -p ${pidfile} -o /var/log/jitsi-videobridge.log \ + ${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 "Starting ${name}" } jitsi_videobridge_stop() { - if [ -f ${pidfile} ] - then - kill `cat ${pidfile}` - rm ${pidfile} - echo "Stopped" - fi + if [ -f ${pidfile} ] + then + kill `cat ${pidfile}` + rm ${pidfile} + echo "Stopping ${name}" + 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() { - echo "Performing restart" + echo "Performing restart ${name}" jitsi_videobridge_stop sleep 5 jitsi_videobridge_start diff --git a/net-im/jitsi-videobridge/files/pkg-message.in b/net-im/jitsi-videobridge/files/pkg-message.in index 90470b003ed3..816b5282b6c0 100644 --- a/net-im/jitsi-videobridge/files/pkg-message.in +++ b/net-im/jitsi-videobridge/files/pkg-message.in @@ -3,27 +3,27 @@ message: <