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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 40213158064 for ; Wed, 8 May 2024 09:48:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15704E2A1A; Wed, 8 May 2024 09:48:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0051E2A1A for ; Wed, 8 May 2024 09:48:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 33D4E3431A8 for ; Wed, 8 May 2024 09:48:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C63EF1A3F for ; Wed, 8 May 2024 09:48:27 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1715161436.d80ada651034920c317d64112e23a681ed6f4925.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, media-video/unifi-video/, media-video/unifi-video/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/unifi-video/Manifest media-video/unifi-video/files/commons-daemon-move.patch media-video/unifi-video/files/unifi-video.initd media-video/unifi-video/files/unifi-video.service media-video/unifi-video/metadata.xml media-video/unifi-video/unifi-video-3.10.13-r5.ebuild profiles/package.mask X-VCS-Directories: profiles/ media-video/unifi-video/ media-video/unifi-video/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d80ada651034920c317d64112e23a681ed6f4925 X-VCS-Branch: master Date: Wed, 8 May 2024 09:48:27 +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: 27e760a2-fb2d-4fcf-a5d8-08dcfe283497 X-Archives-Hash: b706b7e23ef07d35ea4ff913c6fa239c commit: d80ada651034920c317d64112e23a681ed6f4925 Author: Michał Górny gentoo org> AuthorDate: Wed May 8 09:43:46 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 8 09:43:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d80ada65 media-video/unifi-video: Remove last-rited pkg Closes: https://bugs.gentoo.org/928881 Signed-off-by: Michał Górny gentoo.org> media-video/unifi-video/Manifest | 1 - .../unifi-video/files/commons-daemon-move.patch | 12 --- media-video/unifi-video/files/unifi-video.initd | 20 ----- media-video/unifi-video/files/unifi-video.service | 11 --- media-video/unifi-video/metadata.xml | 8 -- .../unifi-video/unifi-video-3.10.13-r5.ebuild | 92 ---------------------- profiles/package.mask | 9 --- 7 files changed, 153 deletions(-) diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest deleted file mode 100644 index 2604e02e7ae4..000000000000 --- a/media-video/unifi-video/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST unifi-video.Ubuntu18.04_amd64.v3.10.13.deb 178800688 BLAKE2B b35f91e77514fcf0165298473be503f6d977cb9f8f53e88f5bb700a2c76a3636e2f475c93c395eab6af4a215074521e47e1dc2d868695c1de83968b64e157cc8 SHA512 58d03b1004ba6da58b52c20720137639167647539c135c71c6abb36b80e37c4f33f0d0ae4092f98858bed8fcb4a3c9f05cc2a0a25e96fee957da176b9b6801d2 diff --git a/media-video/unifi-video/files/commons-daemon-move.patch b/media-video/unifi-video/files/commons-daemon-move.patch deleted file mode 100644 index 448f77249e82..000000000000 --- a/media-video/unifi-video/files/commons-daemon-move.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/usr/sbin/unifi-video -+++ b/usr/sbin/unifi-video -@@ -271,7 +271,7 @@ - JSVC_OPTS="${JSVC_OPTS} \ - -user ${PKGUSER} \ - -home ${JAVA_HOME} \ -- -cp /usr/share/java/commons-daemon.jar:${MAINJAR} \ -+ -cp /usr/share/commons-daemon/lib/commons-daemon.jar:${MAINJAR} \ - -pidfile ${PIDFILE} \ - -procname ${NAME} \ - ${JSVC_EXTRA_OPTS} \ - diff --git a/media-video/unifi-video/files/unifi-video.initd b/media-video/unifi-video/files/unifi-video.initd deleted file mode 100644 index 55d6e805453d..000000000000 --- a/media-video/unifi-video/files/unifi-video.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -PID_FILE="/run/unifi-video.pid" - -start() { - ebegin "Starting unifi-video" - start-stop-daemon --start --quiet -b \ - --pidfile "${PID_FILE}" -m \ - --exec /usr/sbin/unifi-video start - eend $? - #--user nobody --group nobody \ -} - -stop() { - ebegin "Stopping unifi-video" - start-stop-daemon --quiet --stop -R 20 --pidfile "${PID_FILE}" - eend $? -} diff --git a/media-video/unifi-video/files/unifi-video.service b/media-video/unifi-video/files/unifi-video.service deleted file mode 100644 index 6587be4f1cac..000000000000 --- a/media-video/unifi-video/files/unifi-video.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=UniFi Video Server -Requires=network.target -After=network.target - -[Service] -ExecStart=/usr/sbin/unifi-video -D start -ExecStop=/usr/sbin/unifi-video -D stop - -[Install] -WantedBy=network.target diff --git a/media-video/unifi-video/metadata.xml b/media-video/unifi-video/metadata.xml deleted file mode 100644 index aa20bff17b1d..000000000000 --- a/media-video/unifi-video/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - bkohler@gentoo.org - Ben Kohler - - diff --git a/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild deleted file mode 100644 index 09f2a37096a3..000000000000 --- a/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd - -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.Ubuntu18.04_amd64.v${MY_PV}.deb" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -RESTRICT="mirror" - -DEPEND="acct-group/unifi-video - acct-user/unifi-video - app-arch/zip" -RDEPEND="${DEPEND} - dev-db/mongodb - dev-java/commons-daemon - sys-apps/lsb-release - sys-apps/util-linux - sys-libs/libcap - virtual/jre:1.8" - -S=${WORKDIR} -QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*" - -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 - #delete problematic class in bundled log4j - zip -q -d \ - usr/lib/unifi-video/lib/log4j-core-2.1.jar \ - org/apache/logging/log4j/core/lookup/JndiLookup.class || die -} - -src_install() { - export CODEPATH=/usr/lib/${PN} - export DATAPATH=/var/lib/${PN} - LOGPATH=${DATAPATH}/logs - VARLOGPATH=/var/log/${PN} - - insinto /usr/lib - doins -r .${CODEPATH} - into /usr - dosbin usr/sbin/unifi-video - - keepdir ${LOGPATH} - dodir ${DATAPATH} - 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} - 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 ../../../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/profiles/package.mask b/profiles/package.mask index 8fc7477c0507..9761b5ec5178 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -321,15 +321,6 @@ dev-java/validation-api # Removal on 2024-05-07. Bug #928881 acct-group/unifi-video acct-user/unifi-video -media-video/unifi-video - -# Ben Kohler (2024-04-07) -# Long ago forked to and obsoleted by sys-apps/memtest86+. Upstream has -# abandoned this for their proprietary UEFI-based one (packaged in gentoo as -# as sys-apps/memtest86-bin). -# Removal on 2024-05-07. Bug #502464, #607494, #628528, #750677, #887003, -# #912973, #920109 -sys-apps/memtest86 # Sam James (2024-03-28) # Newer 5.4.x releases were signed by a potentially compromised upstream maintainer.