From nobody Tue May 24 03:03:12 2022 X-Original-To: dev-commits-ports-all@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 A7F0D1B4F9BA; Tue, 24 May 2022 03:03:13 +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 4L6fCP0kW7z3kTm; Tue, 24 May 2022 03:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653361393; 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=GfsUX/gOw0J7ybS6gpdsP21puU+V4sUVF6ed0QSbqpk=; b=cEYP8cff5f5mfDd9WgBxTcfaFvxjRUd8nvxdL73rD4pg8mD42d6GHrI3ieFI85HxGMLGDp jR7GNnORPNDFP3JFctLW8+aAYcQzovewQWqzjRYoqGNS9DURVcVor6Q5G5mXCIgWCcBvyd Tp88CMgLHx/O4loq2tABXnlKeBxZbuJAeXy2vBBmX5FmQAA/KuMFUIXBp9UZRtDZquY3kX WClE7D6ZH81znaABVcLphXHjQZWeZrMNM3IT7pSbgNhw8Ns05jjpibN4ahx2apYG7bv1L9 k+42arHe7iAtviZ+lQ9UoUr3wo86MuN1EjVP5lQuXgByOzh+KQn+5jJPZmVdzA== 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 CE4191C456; Tue, 24 May 2022 03:03:12 +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 24O33Ctx090161; Tue, 24 May 2022 03:03:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24O33C0I090160; Tue, 24 May 2022 03:03:12 GMT (envelope-from git) Date: Tue, 24 May 2022 03:03:12 GMT Message-Id: <202205240303.24O33C0I090160@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: 99b47104381e - main - net-im/jicofo: update to 1.0-877 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 99b47104381ee9f1e42c7da8c416ff194aef960c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653361393; 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=GfsUX/gOw0J7ybS6gpdsP21puU+V4sUVF6ed0QSbqpk=; b=UeuCRz+QaxS4j9gqKvLOG4TA+ma5EB87yt6Ob3eXozxttC4ZsGysGUD+9eIyguioZBSMkK Llyi+ihxly7EroVHMfcWMJm6jW9VMVAZLSBdAbuJycgFlJSFK2+frCHyGZGkRBjd0EXVCc j2y8D0IKU4SKDsIG87CqwVgr6efB/Gi9E2798+x1fsSHTZPjyoP+6+8tZg6v2sUVv7ZS/7 i9PyhhAnsCF8z8v4PKHIqgPuYckuvthMBPLRejx4+Y7mf1R/zg+YhSANv9vF7zVWNYU9eP +EGghR4wOkjMIfw2BJAusCv4Eg4G2wYX9HRw3LDV7gbpBdpaYms8s0uR3ghxcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653361393; a=rsa-sha256; cv=none; b=nORzQU2DSQXdsFOtrdanj6LTMCn10qZOAqBtMSjAxHzkxHRHpl7RkAgEhnhOlNuQsalPK4 oyngcFpBeqOb7tsf6d+qD9tDirviuZBDQhYWoQRABHafSYonBSc5ltL+faiFWBMum8dXpZ tFjYSPGXaYSwM+EFFB9C7FwwVVQuCzw8N0wDwEApUHYMHjfi6MkWXRguHHdYb0a7OFDlwL a0+c3Eqyx2AjkhP9d+FrnMS2mb5HL2+Nlho4gitc89K6AdJ2dRwLrcu5BQCsVtjhxSnOAU y4nejlv+eIR+LYLCaIYeheNEQpfthCRVQXvko1RCseM1fw35JJDhSNL+El4RUg== 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=99b47104381ee9f1e42c7da8c416ff194aef960c commit 99b47104381ee9f1e42c7da8c416ff194aef960c Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-05-24 02:47:00 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2022-05-24 02:47:00 +0000 net-im/jicofo: update to 1.0-877 - Add config samples - Now jicofo daemon is init using jicofo user - Modify pkg-message file PR: 257232 Reported by: grembo --- net-im/jicofo/Makefile | 34 ++++++++++------------- net-im/jicofo/distinfo | 10 +++---- net-im/jicofo/files/jicofo.conf.sample | 21 ++++++++++++++ net-im/jicofo/files/jicofo.in | 51 +++++++++++++++++----------------- net-im/jicofo/files/pkg-message.in | 10 +++++-- net-im/jicofo/pkg-plist | 5 ++++ 6 files changed, 78 insertions(+), 53 deletions(-) diff --git a/net-im/jicofo/Makefile b/net-im/jicofo/Makefile index 2307a54167bb..c0987d08eee1 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,20 +7,24 @@ 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= 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 SUB_LIST+= JAVA=${JAVA} ETCDIR= ${PREFIX}/etc/jitsi/jicofo +USERS= ${PORTNAME} jitsi +GROUPS= ${USERS} + DEV_UPDATE_MODE= no .if (${DEV_UPDATE_MODE} == "yes") @@ -29,7 +32,8 @@ 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/acm/:maven \ + LOCAL/grembo/:maven DISTFILES+= ${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven MAVEN_ARGS= --offline .endif @@ -39,7 +43,7 @@ MAVEN_REPO= -Dmaven.repo.local=${WRKDIR}/m2 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}${ETCDIR} @@ -47,17 +51,9 @@ do-install: cd ${WRKSRC}/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=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 + ${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 .include diff --git a/net-im/jicofo/distinfo b/net-im/jicofo/distinfo index f12f47f24e12..8f212255c0fc 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 = 1653264341 +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 000000000000..1da3a21a2520 --- /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 f2d1bfd50794..0076f7a348c6 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,19 +16,21 @@ 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" +jicofo_user="${name}" 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 @@ -36,51 +39,47 @@ restart_cmd=${name}_restart jicofo_start() { - daemon -p ${pidfile} -o /var/log/${name}.log \ - ${command} -Xmx${MAX_MEMORY} \ + daemon -u ${jicofo_user} -p ${pidfile} -o /var/log/${name}.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} - echo "Started" + ${jicofo_flags} + + echo "Starting ${name}" } jicofo_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 } 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() { - echo "Performing restart" + echo "Performing restart: ${name}" jicofo_stop sleep 5 jicofo_start diff --git a/net-im/jicofo/files/pkg-message.in b/net-im/jicofo/files/pkg-message.in index 8ed474246bdd..d06603a5b3d3 100644 --- a/net-im/jicofo/files/pkg-message.in +++ b/net-im/jicofo/files/pkg-message.in @@ -3,20 +3,24 @@ message: <