From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10AEE138334 for ; Tue, 22 Oct 2019 13:04:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AF68E09E1; Tue, 22 Oct 2019 13:04:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 897EBE09E2 for ; Tue, 22 Oct 2019 13:04:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15A9F34C1F0 for ; Tue, 22 Oct 2019 13:04:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F146D778 for ; Tue, 22 Oct 2019 13:03:57 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1571749058.2ba563619b77dc665184e13a7a10883ad3e48586.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/unifi-video/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/unifi-video/Manifest media-video/unifi-video/unifi-video-3.10.1.ebuild media-video/unifi-video/unifi-video-3.10.10.ebuild media-video/unifi-video/unifi-video-3.10.4.ebuild media-video/unifi-video/unifi-video-3.9.12.ebuild X-VCS-Directories: media-video/unifi-video/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 2ba563619b77dc665184e13a7a10883ad3e48586 X-VCS-Branch: master Date: Tue, 22 Oct 2019 13:03:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5cc013dc-1981-4944-a174-4ed105e98139 X-Archives-Hash: a1ceabb8537b04c3714ccd4ddc849d76 commit: 2ba563619b77dc665184e13a7a10883ad3e48586 Author: Ben Kohler gentoo org> AuthorDate: Tue Oct 22 12:57:01 2019 +0000 Commit: Ben Kohler gentoo org> CommitDate: Tue Oct 22 12:57:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba56361 media-video/unifi-video: bump to 3.10.10, drop old Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Ben Kohler gentoo.org> media-video/unifi-video/Manifest | 4 +- media-video/unifi-video/unifi-video-3.10.1.ebuild | 80 --------------------- ...eo-3.10.4.ebuild => unifi-video-3.10.10.ebuild} | 65 ++++++++++------- media-video/unifi-video/unifi-video-3.9.12.ebuild | 83 ---------------------- 4 files changed, 40 insertions(+), 192 deletions(-) diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest index fe07e1f360a..c6b2b5c720d 100644 --- a/media-video/unifi-video/Manifest +++ b/media-video/unifi-video/Manifest @@ -1,4 +1,2 @@ -DIST unifi-video.Ubuntu16.04_amd64.v3.10.1.deb 162379830 BLAKE2B 8183cf0ea37507059b87f5f51a377a12cb2f5fab31675eac720cffa2f9c60e46e6a8eb68279992703722ba40c3fbe7a9a723596ee20e31ccec0959841851325d SHA512 3ac83e3ff7beb8c765c8908b80c7747807da73e3a9e077a9f5a22aaf3e307c369258c7ea6651e18ca74b570d359fa65b6cbfce0017cb73cb916a2bc8614b374d -DIST unifi-video.Ubuntu16.04_amd64.v3.10.4.deb 161279504 BLAKE2B a9bac456218a1908e67bcebeadd06672ce6de4a24e62cd99dedc6de4e36774047531e8b00429e0dc8eb536e6ad77de236d89da83edfbaef8d7a7feb04df6c482 SHA512 d45f97905078ee6f9911bbea239d72432dda849c5fa16a11c2576e1dac78a0b612e420ae59f11ff7bdfec3c7eca9396a72d249d4fc90f93f9e92c57571f19093 DIST unifi-video.Ubuntu16.04_amd64.v3.10.5.deb 161280194 BLAKE2B ae326fe818261124fb8bd1939e55cc2dfa1bb8bfd3350bb5b94ec74fe9a7ec57853548dfbf8ddf33699e0281a5cb918926a6fb93b6de07339072bca51bab2a46 SHA512 4e431f72e5c51952bb7a1e97d6cab407e03d7a42cfaaed97cbf65dbc0b7ebec2a04675783bebed6d0a3d69b1ef5988f6af4770a9ce680258999c481ccefd0bd2 -DIST unifi-video.Ubuntu16.04_amd64.v3.9.12.deb 117448948 BLAKE2B 83769ec07fccbcd955115493510bcd58b88433b7d7204be29d6329674cf4d6dea7fe4b6aedd0e89f852d89ae9a298a9284386aeb4480f43a91dbe6ea958ab10b SHA512 0e2eaefdee74b6b6c5ae54870673591ce4e2d2e4c07e068987f609597c43a12308aebdce705e316555378e04eeb13aaa0c00b496097123960215773cbfa69348 +DIST unifi-video.Ubuntu18.04_amd64.v3.10.10.deb 162697298 BLAKE2B 6cf3d93916830f781ba075abf222402609c8e9935149fc5729767ff05333c61db22709762a992ff510d4898d9b4860f3d61bd50fe0e2d55522a7eb8be7fc378a SHA512 01927d893e7d258641d38daa3018670cb8913d371a984d8f7595322ea0bb7d1879d9ba16125c8dca927d0a274e52922a5a3d1df60f31f7fc3a09de0cc7cc3766 diff --git a/media-video/unifi-video/unifi-video-3.10.1.ebuild b/media-video/unifi-video/unifi-video-3.10.1.ebuild deleted file mode 100644 index 5a297606ef6..00000000000 --- a/media-video/unifi-video/unifi-video-3.10.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd user - -MY_PV="${PV/_beta/-beta.}" -DESCRIPTION="UniFi Video Server" -HOMEPAGE="https://www.ubnt.com/download/unifi-video/" -SRC_URI="https://dl.ubnt.com/firmwares/unifi-video/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -RESTRICT="mirror" - -DEPEND="" -RDEPEND="dev-db/mongodb - dev-java/commons-daemon - sys-apps/lsb-release - sys-libs/libcap - virtual/jre:1.8" - -S=${WORKDIR} -QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*" - -pkg_setup() { - enewuser ${PN} - enewgroup ${PN} -} - -src_unpack() { - default - unpack "${WORKDIR}"/data.tar.gz -} - -src_prepare() { - eapply "${FILESDIR}"/commons-daemon-move.patch - sed -i usr/sbin/${PN} \ - -e '/require_root$/d' \ - -e '/update_limits$/d' \ - -e '/ulimit/d' \ - -e '/coredump_filter/d' || die - default -} - -src_install() { - static_dir="/usr/$(get_libdir)/${PN}" - #install static data - insinto ${static_dir} - doins -r usr/lib/${PN}/* - fperms -R +x ${static_dir}/bin - fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/ - - #prepare runtime-data dirs which live in /var but are symlinked from static - #data dir, and are writable by non-root user - dodir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - dosym ../../../var/log/${PN} ${static_dir}/logs - - dodir /var/lib/${PN}/work - fowners ${PN}:${PN} /var/lib/${PN}/work - dosym ../../../var/lib/${PN}/work ${static_dir}/work - - keepdir /var/lib/${PN}/data - fowners ${PN}:${PN} /var/lib/${PN}/data - dosym ../../../var/lib/${PN}/data ${static_dir}/data - - echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN} - doenvd "${T}"/99${PN} - - into /usr - dosbin usr/sbin/${PN} - dosym ../../../bin/mongod ${static_dir}/bin/mongod - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service -} diff --git a/media-video/unifi-video/unifi-video-3.10.4.ebuild b/media-video/unifi-video/unifi-video-3.10.10.ebuild similarity index 50% rename from media-video/unifi-video/unifi-video-3.10.4.ebuild rename to media-video/unifi-video/unifi-video-3.10.10.ebuild index c975418c3dc..3bcb6327156 100644 --- a/media-video/unifi-video/unifi-video-3.10.4.ebuild +++ b/media-video/unifi-video/unifi-video-3.10.10.ebuild @@ -8,7 +8,7 @@ inherit systemd user MY_PV="${PV/_beta/-beta.}" DESCRIPTION="UniFi Video Server" HOMEPAGE="https://www.ubnt.com/download/unifi-video/" -SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb" +SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb" LICENSE="GPL-3" SLOT="0" @@ -20,6 +20,7 @@ DEPEND="" RDEPEND="dev-db/mongodb dev-java/commons-daemon sys-apps/lsb-release + sys-apps/util-linux sys-libs/libcap virtual/jre:1.8" @@ -47,34 +48,46 @@ src_prepare() { } src_install() { - static_dir="/usr/$(get_libdir)/${PN}" - #install static data - insinto ${static_dir} - doins -r usr/lib/${PN}/* - fperms -R +x ${static_dir}/bin - fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/ - - #prepare runtime-data dirs which live in /var but are symlinked from static - #data dir, and are writable by non-root user - dodir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - dosym ../../../var/log/${PN} ${static_dir}/logs - - dodir /var/lib/${PN}/work - fowners ${PN}:${PN} /var/lib/${PN}/work - dosym ../../../var/lib/${PN}/work ${static_dir}/work - - keepdir /var/lib/${PN}/data - fowners ${PN}:${PN} /var/lib/${PN}/data - dosym ../../../var/lib/${PN}/data ${static_dir}/data - - echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN} - doenvd "${T}"/99${PN} + export CODEPATH=/usr/lib/${PN} + export DATAPATH=/var/lib/${PN} + LOGPATH=${DATAPATH}/logs + VARLOGPATH=/var/log/${PN} + + rm .${CODEPATH}/bin/ubnt.updater + rm .${CODEPATH}/tools/updater + insinto /usr/lib + doins -r .${CODEPATH} into /usr - dosbin usr/sbin/${PN} - dosym ../../../bin/mongod ${static_dir}/bin/mongod + dosbin usr/sbin/unifi-video + + dodir ${LOGPATH} + fowners -R ${PN}:${PN} ${DATAPATH} + dosym ${LOGPATH} ${VARLOGPATH} + dosym ${LOGPATH} ${CODEPATH}/logs + + dosym ${DATAPATH} ${CODEPATH}/data + + fperms 500 ${CODEPATH}/bin/ubnt.avtool + fperms 500 ${CODEPATH}/bin/evostreamms + fperms 500 /usr/sbin/${PN} + fperms 500 ${CODEPATH}/tools/ufvtools + fowners -R ${PN}:${PN} ${CODEPATH} + fperms -R 0400 ${CODEPATH}/lib/ + fperms 500 ${CODEPATH}/lib/ + + echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN} + doenvd "${T}"/99${PN} + + dosym /usr/bin/mongod ${CODEPATH}/bin/mongod newinitd "${FILESDIR}"/${PN}.initd ${PN} systemd_dounit "${FILESDIR}"/${PN}.service } + +pkg_postinst() { + if [[ ! -f ${DATAPATH}/system.properties ]]; then + cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties + echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties + fi +} diff --git a/media-video/unifi-video/unifi-video-3.9.12.ebuild b/media-video/unifi-video/unifi-video-3.9.12.ebuild deleted file mode 100644 index c90d0eb2957..00000000000 --- a/media-video/unifi-video/unifi-video-3.9.12.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd user - -MY_PV="${PV/_beta/-beta.}" -DESCRIPTION="UniFi Video Server" -HOMEPAGE="https://www.ubnt.com/download/unifi-video/" -SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -RESTRICT="mirror" - -DEPEND="" -RDEPEND="dev-db/mongodb - dev-java/commons-daemon - sys-apps/lsb-release - sys-libs/libcap - virtual/jre:1.8" - -S=${WORKDIR} -QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*" - -pkg_setup() { - enewuser ${PN} - enewgroup ${PN} -} - -src_unpack() { - default - unpack "${WORKDIR}"/data.tar.gz -} - -src_prepare() { - eapply "${FILESDIR}"/commons-daemon-move.patch - sed -i usr/sbin/${PN} \ - -e '/require_root$/d' \ - -e '/update_limits$/d' \ - -e '/ulimit/d' \ - -e '/coredump_filter/d' || die - default -} - -src_install() { - static_dir="/usr/$(get_libdir)/${PN}" - #install static data - insinto ${static_dir} - doins -r usr/lib/${PN}/* - fperms -R +x ${static_dir}/bin - fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/ - - #wrapper to work around mongodb-3.6 compat issue - exeinto ${static_dir}/bin/ - newexe "${FILESDIR}"/mongod-wrapper mongod - - #prepare runtime-data dirs which live in /var but are symlinked from static - #data dir, and are writable by non-root user - dodir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - dosym ../../../var/log/${PN} ${static_dir}/logs - - dodir /var/lib/${PN}/work - fowners ${PN}:${PN} /var/lib/${PN}/work - dosym ../../../var/lib/${PN}/work ${static_dir}/work - - keepdir /var/lib/${PN}/data - fowners ${PN}:${PN} /var/lib/${PN}/data - dosym ../../../var/lib/${PN}/data ${static_dir}/data - - echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN} - doenvd "${T}"/99${PN} - - into /usr - dosbin usr/sbin/${PN} - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service -}