gentoo resync : 03.11.2019

4 files changed, 41 insertions, 195 deletions

diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index 6e134a7d3fe6..fa84fcc06437 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -2,12 +2,8 @@ AUX commons-daemon-move.patch 337 BLAKE2B 79e847ce6e1c32c3cfbe192d8dce33175e2c0e
 AUX mongod-wrapper 101 BLAKE2B cc52f011b065322fb7ebec982c5d0b188f4c72859770dec98bf002d6bcc9c43d520e0845ceaf1458efc4ed07bbccfb5c723ece61298bf6f2bfdebd363bebe4e7 SHA512 5895a2113cc165275587e9683a2e3a7de20ac5db75fc26b00bf55a619bc8ff18ead3f5465cefe0a02bea996d2d178a4954cc7fba84df76e27ea699d2be9ecc96
 AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2becd9569c8086b568e5c84508f2cc71c81605cc124bc17cd42c884d477b15181dba73544fc254610c1 SHA512 1cd4345daf09a27dcb8528abd076e920e30b6ff7a505acad74fdc291164c94569946cd493563331c5e52cb95c45e18522520aee47555db438fa87c46d07e35c5
 AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
-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
-EBUILD unifi-video-3.10.1.ebuild 1905 BLAKE2B 616c32a1b7dba5b882a1cf4d6dc573a55e050a88e73d4b8da653b00be06ce700f7458d8a3417ce5fe24eefae1407d704784cba627de9ad386f04870b0da07534 SHA512 a1bfb97ea0f0a9244e6d654e352998cf602dce124c30b7669b971cd34a990d650f2ed2fcdfbaba2af8233bb521155bbbe9b06cdabc5bc2e826f5bb6fc137a73e
-EBUILD unifi-video-3.10.4.ebuild 1897 BLAKE2B e182a17a1b8d00350eb48c384a926f56b705493cee74950a92ccac416540e4d5faf9efb2046f33bde5cd8b4ed2435e19f111c59824c5a2818a68e675415ab691 SHA512 7058a3267310542459a9675d9e0ce0793e6f46d2075f9ce4f860c1387d249d4a2736411afdd7062f4af677e49717a8a78be04731ca0e4b672227eddbf94748e9
+DIST unifi-video.Ubuntu18.04_amd64.v3.10.10.deb 162697298 BLAKE2B 6cf3d93916830f781ba075abf222402609c8e9935149fc5729767ff05333c61db22709762a992ff510d4898d9b4860f3d61bd50fe0e2d55522a7eb8be7fc378a SHA512 01927d893e7d258641d38daa3018670cb8913d371a984d8f7595322ea0bb7d1879d9ba16125c8dca927d0a274e52922a5a3d1df60f31f7fc3a09de0cc7cc3766
+EBUILD unifi-video-3.10.10.ebuild 2065 BLAKE2B 9d3cb1f004b187bb6ca76de8e163f94e1d0a84f23372ab2553b72d6877e88e172a567d782994a2e63fe9dcbf2698c7612d89d575b52fd0ff2ddbc9d83576e054 SHA512 b7c7efd2e4217dd5aa2db083b259be912eb42114011ceeff355719a33c82e473043c296e4e47d2058d1448a4c435cfc8f729516bdb08f032855ccb19a6c60fe0
 EBUILD unifi-video-3.10.5.ebuild 1897 BLAKE2B e182a17a1b8d00350eb48c384a926f56b705493cee74950a92ccac416540e4d5faf9efb2046f33bde5cd8b4ed2435e19f111c59824c5a2818a68e675415ab691 SHA512 7058a3267310542459a9675d9e0ce0793e6f46d2075f9ce4f860c1387d249d4a2736411afdd7062f4af677e49717a8a78be04731ca0e4b672227eddbf94748e9
-EBUILD unifi-video-3.9.12.ebuild 1968 BLAKE2B 8d4f0bceb418e49bcb75cd63b9d1d9caa1f9cb8b90a44aba0646fc50ca72d68d741dda153f1ee20b2f540d0aee99c744933560319b103a55c61e008cb77a63e8 SHA512 d3c8d2208e22daf7fc2bb2ad5a28d88c08c624c3253e8ffc1d9317a74d4f6f3333b66b92ca7c0a5cb1ea3659b0cda68f1c92371b34bad13f4508af956a4ffdcb
 MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c
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 5a297606ef6b..000000000000
--- 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
index c975418c3dcd..3bcb6327156f 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 c90d0eb2957a..000000000000
--- 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
-}