From nobody Thu Apr 28 21:42:47 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 5DF2D1AB04CD; Thu, 28 Apr 2022 21:42:47 +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 4Kq8HC1d0fz4SmF; Thu, 28 Apr 2022 21:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651182167; 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=lMuzxJTzpevtA6mTRRQrTHrLJepyIPoN5Wp+hTKvejs=; b=tx4samqRdciEd961qGjTAtlHduID1iXGOVvqENbp6L7FiwKg6k8JBI2rytakMVsUfAzI3H 9CcbDPOTpE7xL5si+e8cWtKK4cx7PAO7NzMGS1Lq+hC/V0162e+YH3YvJGpyk6M7cHL56K yf1TueS/lbUa/01Vd+BNL6RYL2QgpOCh8Nar6WkyNMekGBMy2XXnbntJeY4dkLpLWjlov4 wTBhqS/mY30JEIQfDA6/eWkw34IvJvmBned2rl6xutpuKOiRZHxXCDwMGtP3jl1g7pvidQ uMBV1IG/XM3X+jKUHfI1s6uN8BtHd12Ou9bZbtmm35lwzCyi2MJU+BLBniTzog== 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 1997A20463; Thu, 28 Apr 2022 21:42:47 +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 23SLglbQ080998; Thu, 28 Apr 2022 21:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23SLgl8e080997; Thu, 28 Apr 2022 21:42:47 GMT (envelope-from git) Date: Thu, 28 Apr 2022 21:42:47 GMT Message-Id: <202204282142.23SLgl8e080997@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 32bf8b42bae4 - main - net-mgmt/unifi7: Update to 7.1.61 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: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32bf8b42bae48917c2ff2edd28a78900f8310f47 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651182167; 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=lMuzxJTzpevtA6mTRRQrTHrLJepyIPoN5Wp+hTKvejs=; b=g8jHlzMzdzVFiXrLeCep92BxnzopckfWqBXUhE12dCKptglNgPUXpOSeDntS3IcANY2nCd AEuBjA4Y6guA5ohEqIevZM4coW/FKOV61I3ZMehMzlKyiD8dV3bXDMdIgRtTB6qWFdXX3I BH7hnpa8fY8Y6HzhquPsnieeqE6l+wODJIVho+BvhcVMeiHMeXVRf/KQKduqE9wjJ6MN99 nIPR5EySfvbeGX29PZF4vocdn6+iMgzpY73XnoI5tO0uKdQrNP7PhdSFvXCqmOpGQwd7Cd Uj90bx61rixCEnyCMQl+KbVuh/zRZvr/H0XAZiPWRElaVINMy1Qgo013DZIoEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651182167; a=rsa-sha256; cv=none; b=fn5Oo0ZD4Ng7PGeYdibUTHoq1J6ziodSgN1NUe2ia1cIl28tFxxpROZQE4W+SgukkCPivK s75IW8E2qXoN445NhMwxZdM8zlo7svsAZh8XFGjtJGgGoNGcuJF47HNbDSd3/cyvqeDfYy JBApJQEVL0wKYGGGRPK+Q3obuJ8PfmtCwuyMUxEg4gcga5YfU1HgBiAPngYOb0suQAUsk+ 4FI2S8do7q/4d1T2rpefNQSFblY1iIzUPO6wIB7o7Sq6SahQFlbnjAOdbe50MMiJagU279 4w06nKofZC9H28d8faqoGzBI6Ho5k27QkBXC8YPaGr51S349HcZEghi510oOFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=32bf8b42bae48917c2ff2edd28a78900f8310f47 commit 32bf8b42bae48917c2ff2edd28a78900f8310f47 Author: Juraj Lutter AuthorDate: 2022-04-28 20:34:24 +0000 Commit: Juraj Lutter CommitDate: 2022-04-28 21:41:57 +0000 net-mgmt/unifi7: Update to 7.1.61 - Update to 7.1.61 - And while here, also allow for external MongoDB server (suggested by Peter Kubica ) --- net-mgmt/unifi7/Makefile | 18 +++++++++++++----- net-mgmt/unifi7/distinfo | 10 +++++----- net-mgmt/unifi7/files/pkg-message.extdb.in | 19 +++++++++++++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/net-mgmt/unifi7/Makefile b/net-mgmt/unifi7/Makefile index 2707a4a217bf..fec57d9d76e2 100644 --- a/net-mgmt/unifi7/Makefile +++ b/net-mgmt/unifi7/Makefile @@ -1,5 +1,5 @@ PORTNAME= unifi7 -PORTVERSION= 7.0.23 +PORTVERSION= 7.1.61 CATEGORIES= net-mgmt java MASTER_SITES= http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \ https://repo1.maven.org/maven2/%SUBDIR%/:jax @@ -11,10 +11,9 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= unifi_sysvinit_all.deb MAINTAINER= otis@FreeBSD.org -COMMENT= UniFi Controller v6 +COMMENT= UniFi Controller v7 -RUN_DEPENDS= mongodb36>0:databases/mongodb36 \ - snappyjava>0:archivers/snappy-java +RUN_DEPENDS= snappyjava>0:archivers/snappy-java USES= cpe @@ -46,6 +45,13 @@ NO_WRKSUBDIR= yes USERS= unifi GROUPS= unifi +OPTIONS_DEFINE= EXTERNALDB + +EXTERNALDB_DESC= Use external MongoDB server +EXTERNALDB_VARS= PKGMESSAGE=${WRKSRC}/pkg-message.extdb \ + SUB_FILES+=pkg-message.extdb +EXTERNALDB_VARS_OFF= RUN_DEPENDS+=mongodb36>0:databases/mongodb36 + _DIR_LIST= conf data logs run work _JAX_DISTNAME= javax.activation-api _JAX_VERSION= 1.2.0 @@ -63,12 +69,14 @@ do-install: ${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi (cd ${WRKSRC}/usr/lib/unifi && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/unifi/) - ${LN} -sf ${PREFIX}/bin/mongod ${STAGEDIR}${JAVASHAREDIR}/unifi/bin/mongod # Create directories that will be writable by unifi .for i in data logs run work ${MKDIR} ${STAGEDIR}/${JAVASHAREDIR}/unifi/${i} .endfor +do-install-EXTERNALDB-off: + ${LN} -sf ${PREFIX}/bin/mongod ${STAGEDIR}${JAVASHAREDIR}/unifi/bin/mongod + post-install: @${FIND} -s ${STAGEDIR}${JAVASHAREDIR}/unifi -not -type d | \ ${SORT} | ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} diff --git a/net-mgmt/unifi7/distinfo b/net-mgmt/unifi7/distinfo index 263fe39bbc33..2bdd1b633ecf 100644 --- a/net-mgmt/unifi7/distinfo +++ b/net-mgmt/unifi7/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1646325635 -SHA256 (unifi7-7.0.23/unifi_sysvinit_all.deb) = bcf6abe39f1386a7730204675076ad6b2deeaae97f67c977370aaf4797005ff8 -SIZE (unifi7-7.0.23/unifi_sysvinit_all.deb) = 136272532 -SHA256 (unifi7-7.0.23/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393 -SIZE (unifi7-7.0.23/javax.activation-api-1.2.0.jar) = 56674 +TIMESTAMP = 1651177355 +SHA256 (unifi7-7.1.61/unifi_sysvinit_all.deb) = ec073c0639412c2b25494e8864ad04b6178acf80ad1fbb5c991f09dab50661bb +SIZE (unifi7-7.1.61/unifi_sysvinit_all.deb) = 176429490 +SHA256 (unifi7-7.1.61/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393 +SIZE (unifi7-7.1.61/javax.activation-api-1.2.0.jar) = 56674 diff --git a/net-mgmt/unifi7/files/pkg-message.extdb.in b/net-mgmt/unifi7/files/pkg-message.extdb.in new file mode 100644 index 000000000000..945b333966c7 --- /dev/null +++ b/net-mgmt/unifi7/files/pkg-message.extdb.in @@ -0,0 +1,19 @@ +[ +{ type: install + message: <