From eeaac5e6063359e940fd8599bea9cd130b68c4c5 Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Sun, 10 Apr 2022 17:15:19 +0200 Subject: net-wireless/unifi: force java8 Closes: https://bugs.gentoo.org/792279 Signed-off-by: Conrad Kostecki --- net-wireless/unifi/files/unifi.initd-r1 | 25 -------- net-wireless/unifi/files/unifi.service | 14 ----- net-wireless/unifi/unifi-6.5.55-r1.ebuild | 96 +++++++++++++++++++++++++++++++ net-wireless/unifi/unifi-6.5.55.ebuild | 89 ---------------------------- 4 files changed, 96 insertions(+), 128 deletions(-) delete mode 100644 net-wireless/unifi/files/unifi.initd-r1 delete mode 100644 net-wireless/unifi/files/unifi.service create mode 100644 net-wireless/unifi/unifi-6.5.55-r1.ebuild delete mode 100644 net-wireless/unifi/unifi-6.5.55.ebuild (limited to 'net-wireless') diff --git a/net-wireless/unifi/files/unifi.initd-r1 b/net-wireless/unifi/files/unifi.initd-r1 deleted file mode 100644 index 2db36571dac0..000000000000 --- a/net-wireless/unifi/files/unifi.initd-r1 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -ACE_LIB="lib/ace.jar" -DAEMON="${JAVA_HOME-/etc/java-config-2/current-system-vm}"/bin/java -JAVA_OPTS="-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=" -UNIFI_PATH="/usr/lib/unifi" - -UNIFI_USER="unifi" -UNIFI_GROUP="unifi" - -name="UniFi Controller" - -start_stop_daemon_args="--chdir ${UNIFI_PATH}" - -command="${DAEMON}" -command_args="${JAVA_OPTS} -jar ${ACE_LIB} start" -command_background=true -pidfile="/run/${RC_SVCNAME}.pid" - -command_user="${UNIFI_USER}:${UNIFI_GROUP}" - -command_progress=true -retry=TERM/60 diff --git a/net-wireless/unifi/files/unifi.service b/net-wireless/unifi/files/unifi.service deleted file mode 100644 index 00c00d7f3c9e..000000000000 --- a/net-wireless/unifi/files/unifi.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=UniFi Controller -After=network-online.target - -[Service] -Type=simple -User=unifi -Group=unifi -WorkingDirectory=/usr/lib/unifi -ExecStart=/usr/bin/java -Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar start -ExecStop=/usr/bin/java -Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar stop - -[Install] -WantedBy=network.target diff --git a/net-wireless/unifi/unifi-6.5.55-r1.ebuild b/net-wireless/unifi/unifi-6.5.55-r1.ebuild new file mode 100644 index 000000000000..aea001cc7e1f --- /dev/null +++ b/net-wireless/unifi/unifi-6.5.55-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Set this var for any releases except stable +RC_SUFFIX="-1d0581c00d" + +inherit java-pkg-2 systemd + +DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" +HOMEPAGE="https://www.ubnt.com" +SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" +S="${WORKDIR}/UniFi" + +KEYWORDS="-* amd64 ~arm64" +LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" +SLOT="0/$(ver_cut 1-2)" +IUSE="systemd" +RESTRICT="bindist mirror" + +RDEPEND=" + acct-group/unifi + acct-user/unifi + dev-db/mongodb + virtual/jre:1.8 +" + +BDEPEND="app-arch/unzip" + +DOCS=( "readme.txt" ) + +QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" + +src_prepare() { + # Remove unneeded files Mac and Windows + rm -r lib/native/{Mac,Windows} || die + + if [[ ${CHOST} != aarch64* ]]; then + rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries" + fi + if [[ ${CHOST} != armv7* ]]; then + rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries" + fi + if [[ ${CHOST} != x86_64* ]]; then + rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries" + fi + + if [[ ${CHOST} == aarch64* ]]; then + if ! use systemd; then + rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == armv7* ]]; then + if ! use systemd; then + rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == x86_64* ]]; then + if ! use systemd; then + rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die + fi + fi + + default +} + +src_compile() { + :; +} + +src_install() { + insinto /usr/lib/unifi + doins -r bin dl lib webapps + + diropts -o unifi -g unifi + keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi + + for symlink in conf data run tmp work; do + dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} + done + dosym ../../../var/log/unifi /usr/lib/unifi/logs + + java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar + java-pkg_dolauncher unifi --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' --jar ace.jar --pwd '/usr/lib/unifi' + + newinitd "${FILESDIR}"/unifi.initd-r2 unifi + systemd_newunit "${FILESDIR}"/unifi.service-r1 unifi.service + + newconfd "${FILESDIR}"/unifi.confd unifi + + echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die + doenvd "${T}"/99unifi + + einstalldocs +} diff --git a/net-wireless/unifi/unifi-6.5.55.ebuild b/net-wireless/unifi/unifi-6.5.55.ebuild deleted file mode 100644 index 707826628a0b..000000000000 --- a/net-wireless/unifi/unifi-6.5.55.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Set this var for any releases except stable -RC_SUFFIX="-1d0581c00d" - -inherit systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" -S="${WORKDIR}/UniFi" - -KEYWORDS="-* amd64 ~arm64" -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/$(ver_cut 1-2)" -IUSE="systemd" -RESTRICT="bindist mirror" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -BDEPEND="app-arch/unzip" - -DOCS=( "readme.txt" ) - -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" - -src_prepare() { - # Remove unneeded files Mac and Windows - rm -r lib/native/{Mac,Windows} || die - - if [[ ${CHOST} != aarch64* ]]; then - rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries" - fi - if [[ ${CHOST} != armv7* ]]; then - rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries" - fi - if [[ ${CHOST} != x86_64* ]]; then - rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries" - fi - - if [[ ${CHOST} == aarch64* ]]; then - if ! use systemd; then - rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die - fi - fi - if [[ ${CHOST} == armv7* ]]; then - if ! use systemd; then - rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die - fi - fi - if [[ ${CHOST} == x86_64* ]]; then - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - fi - - default -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - newinitd "${FILESDIR}"/unifi.initd-r1 unifi - systemd_dounit "${FILESDIR}"/unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} -- cgit v1.2.3-65-gdbad