[gentoo-commits] repo/gentoo:master commit in: net-wireless/unifi/files/, net-wireless/unifi/

2022-04-13 Thread Conrad Kostecki 
commit: 372e0e11f3768b2f50eb844f5ae430498bc73fc5
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Apr 13 13:39:39 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Apr 13 13:39:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=372e0e11

net-wireless/unifi: fix systemd unit

Closes: https://bugs.gentoo.org/837908
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-wireless/unifi/files/{unifi.service-r1 => unifi.service-r2}   | 4 ++--
 net-wireless/unifi/{unifi-6.5.55-r1.ebuild => unifi-6.5.55-r2.ebuild} | 2 +-
 net-wireless/unifi/{unifi-7.0.25-r1.ebuild => unifi-7.0.25-r2.ebuild} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-wireless/unifi/files/unifi.service-r1 
b/net-wireless/unifi/files/unifi.service-r2
similarity index 78%
rename from net-wireless/unifi/files/unifi.service-r1
rename to net-wireless/unifi/files/unifi.service-r2
index a9b98e25de41..40fff6c81797 100644
--- a/net-wireless/unifi/files/unifi.service-r1
+++ b/net-wireless/unifi/files/unifi.service-r2
@@ -1,6 +1,6 @@
 [Unit]
 Description=UniFi Controller
-After=network-online.target
+After=network.target
 
 [Service]
 Type=simple
@@ -11,4 +11,4 @@ ExecStart=/usr/bin/unifi start
 ExecStop=/usr/bin/unifi stop
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.target

diff --git a/net-wireless/unifi/unifi-6.5.55-r1.ebuild 
b/net-wireless/unifi/unifi-6.5.55-r2.ebuild
similarity index 97%
rename from net-wireless/unifi/unifi-6.5.55-r1.ebuild
rename to net-wireless/unifi/unifi-6.5.55-r2.ebuild
index aea001cc7e1f..248cfb5a 100644
--- a/net-wireless/unifi/unifi-6.5.55-r1.ebuild
+++ b/net-wireless/unifi/unifi-6.5.55-r2.ebuild
@@ -85,7 +85,7 @@ src_install() {
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
+   systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
 
newconfd "${FILESDIR}"/unifi.confd unifi
 

diff --git a/net-wireless/unifi/unifi-7.0.25-r1.ebuild 
b/net-wireless/unifi/unifi-7.0.25-r2.ebuild
similarity index 97%
rename from net-wireless/unifi/unifi-7.0.25-r1.ebuild
rename to net-wireless/unifi/unifi-7.0.25-r2.ebuild
index 24936b556d77..3466b4b1d3b2 100644
--- a/net-wireless/unifi/unifi-7.0.25-r1.ebuild
+++ b/net-wireless/unifi/unifi-7.0.25-r2.ebuild
@@ -85,7 +85,7 @@ src_install() {
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
+   systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
 
newconfd "${FILESDIR}"/unifi.confd unifi

[gentoo-commits] repo/gentoo:master commit in: net-wireless/unifi/files/, net-wireless/unifi/

2022-04-10 Thread Conrad Kostecki 
commit: eeaac5e6063359e940fd8599bea9cd130b68c4c5
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Apr 10 15:15:19 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Apr 10 15:24:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeaac5e6

net-wireless/unifi: force java8

Closes: https://bugs.gentoo.org/792279
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-wireless/unifi/files/unifi.initd-r1| 25 --
 net-wireless/unifi/files/unifi.service | 14 
 ...{unifi-6.5.55.ebuild => unifi-6.5.55-r1.ebuild} | 15 +
 3 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/net-wireless/unifi/files/unifi.initd-r1 
b/net-wireless/unifi/files/unifi.initd-r1
deleted file mode 100644
index 2db36571dac0..
--- 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..
--- 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.ebuild 
b/net-wireless/unifi/unifi-6.5.55-r1.ebuild
similarity index 84%
rename from net-wireless/unifi/unifi-6.5.55.ebuild
rename to net-wireless/unifi/unifi-6.5.55-r1.ebuild
index 707826628a0b..aea001cc7e1f 100644
--- a/net-wireless/unifi/unifi-6.5.55.ebuild
+++ b/net-wireless/unifi/unifi-6.5.55-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 # Set this var for any releases except stable
 RC_SUFFIX="-1d0581c00d"
 
-inherit systemd
+inherit java-pkg-2 systemd
 
 DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com;
@@ -65,6 +65,10 @@ src_prepare() {
default
 }
 
+src_compile() {
+   :;
+}
+
 src_install() {
insinto /usr/lib/unifi
doins -r bin dl lib webapps
@@ -77,8 +81,11 @@ src_install() {
done
dosym ../../../var/log/unifi /usr/lib/unifi/logs
 
-   newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-   systemd_dounit "${FILESDIR}"/unifi.service
+   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

[gentoo-commits] repo/gentoo:master commit in: net-wireless/unifi/files/, net-wireless/unifi/

2022-02-09 Thread Conrad Kostecki 
commit: f66b68c65f82d22b0d23ecf007e01acb5a0c2a7d
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Feb  9 22:53:46 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Feb  9 22:56:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66b68c6

net-wireless/unifi: force java8

As UniFi needs Java8, we need to force Java8, even, when user-vm or
system-vm is set to a higher version.

This is accompilshed by creating a launcher with java-pkg_dolauncher.

Bug: https://bugs.gentoo.org/792279
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-wireless/unifi/files/unifi.initd-r2   | 22 +++
 net-wireless/unifi/files/unifi.service-r1 | 14 +
 net-wireless/unifi/unifi-7.0.21-r1.ebuild | 96 +++
 3 files changed, 132 insertions(+)

diff --git a/net-wireless/unifi/files/unifi.initd-r2 
b/net-wireless/unifi/files/unifi.initd-r2
new file mode 100644
index ..ccab8df7fd7a
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.initd-r2
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+unifi_exec="/usr/bin/unifi"
+unifi_path="/usr/lib/unifi"
+
+unifi_user="unifi"
+unifi_group="unifi"
+
+name="UniFi Controller"
+
+start_stop_daemon_args="--chdir ${unifi_path}"
+
+command="${unifi_exec}"
+command_args="start"
+command_background=true
+command_progress=true
+command_user="${unifi_user}:${unifi_group}"
+
+pidfile="/run/${RC_SVCNAME}.pid"
+retry=TERM/60

diff --git a/net-wireless/unifi/files/unifi.service-r1 
b/net-wireless/unifi/files/unifi.service-r1
new file mode 100644
index ..a9b98e25de41
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.service-r1
@@ -0,0 +1,14 @@
+[Unit]
+Description=UniFi Controller
+After=network-online.target
+
+[Service]
+Type=simple
+User=unifi
+Group=unifi
+WorkingDirectory=/usr/lib/unifi
+ExecStart=/usr/bin/unifi start
+ExecStop=/usr/bin/unifi stop
+
+[Install]
+WantedBy=network.target

diff --git a/net-wireless/unifi/unifi-7.0.21-r1.ebuild 
b/net-wireless/unifi/unifi-7.0.21-r1.ebuild
new file mode 100644
index ..cd05b6851cd0
--- /dev/null
+++ b/net-wireless/unifi/unifi-7.0.21-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="-ebd087e2ad"
+
+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
+

[gentoo-commits] repo/gentoo:master commit in: net-wireless/unifi/files/, net-wireless/unifi/

2021-01-06 Thread Ben Kohler 
commit: 389b3d146db0951a7ed6bad911fc03c3c4519b3a
Author: Ben Kohler  gentoo  org>
AuthorDate: Wed Jan  6 15:47:17 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Wed Jan  6 15:47:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389b3d14

net-wireless/unifi: drop EOL 5.6 series

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ben Kohler  gentoo.org>

 net-wireless/unifi/Manifest   |  1 -
 net-wireless/unifi/files/mongod-wrapper   | 11 -
 net-wireless/unifi/unifi-5.6.42-r1.ebuild | 69 ---
 3 files changed, 81 deletions(-)

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 07147f59e95..255ffd401ab 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,3 +1,2 @@
-DIST unifi-5.6.42.zip 63581448 BLAKE2B 
dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819
 SHA512 
467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 DIST unifi-6.0.43.zip 136844666 BLAKE2B 
fb330f9ba8c2d22dacd5e37fbeccc411101e388525cdf7ae76fd2ade629c8230d10a5098d01453fcd9e091d581961b556c7f86d1625baff735fa76a2896b2d94
 SHA512 
16cfec8f12aa31c146ebd38b946a51730f7ca600f36f16058e06ec20d6d3597a34fa8fa8efef1bad1980b73a15c13d5c6458f03d08cee6eda5cedf62ef17a6b8
 DIST unifi-6.1.26.zip 243498936 BLAKE2B 
72a17f02279ecedd8f876df85167824a03abebb2816e68fcbfff11923b00c1e0b80b7357e48a4e044f0835e3e0054bd0ab034bd8fb3d67289bf61b4804ce9a87
 SHA512 
9ea5a7307ad507f08e4d39805bdf776eaa50895513e4c086d94527e28ae93b1f97e3d1b23ff314ed03ea560638b8cb44fc16bf4ff8f7746035e8b5de9b31321b

diff --git a/net-wireless/unifi/files/mongod-wrapper 
b/net-wireless/unifi/files/mongod-wrapper
deleted file mode 100644
index e8d65bb8aec..000
--- a/net-wireless/unifi/files/mongod-wrapper
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# Remove --nohttpinterface argument, since it does not exist on MongoDB >= 
3.6.x anymore
-# See 
https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-for arg do
-   shift
-   [ "${arg}" = "--nohttpinterface" ] && continue
-   set -- "$@" "${arg}"
-done
-
-exec /usr/bin/mongod "$@"

diff --git a/net-wireless/unifi/unifi-5.6.42-r1.ebuild 
b/net-wireless/unifi/unifi-5.6.42-r1.ebuild
deleted file mode 100644
index 33839d8b5a9..000
--- a/net-wireless/unifi/unifi-5.6.42-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this var for any releases except stable
-# RC_SUFFIX=""
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com;
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> 
${P}.zip"
-
-KEYWORDS="amd64"
-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/5.6"
-
-RDEPEND="
-   acct-group/unifi
-   acct-user/unifi
-   dev-db/mongodb
-   virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-   # Remove unneeded files Linux, Mac and Windows
-   rm -r lib/native/Linux/armhf lib/native/{Mac,Windows} || die
-
-   default
-}
-
-src_install() {
-   # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-   # See 
https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-   exeinto /usr/lib/unifi/bin
-   newexe "${FILESDIR}"/mongod-wrapper mongod
-
-   insinto /usr/lib/unifi
-   doins -r 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
-}

[gentoo-commits] repo/gentoo:master commit in: net-wireless/unifi/files/, net-wireless/unifi/

2018-06-29 Thread Ben Kohler 
commit: 7751ceea39908447f08e3c87522158bd87212897
Author: Ben Kohler  gentoo  org>
AuthorDate: Fri Jun 29 13:58:30 2018 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Fri Jun 29 14:12:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7751ceea

net-wireless/unifi: revbumps for revised init script

This new init script should handle stop & restart much more nicely.
Also it's been simplified a bit, moving much of the long s-s-d command
into relevant variables.  Thanks ConiKost.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-wireless/unifi/files/unifi.initd-r1   | 25 +++
 net-wireless/unifi/unifi-5.6.39-r1.ebuild | 70 +++
 net-wireless/unifi/unifi-5.7.28-r1.ebuild | 70 +++
 net-wireless/unifi/unifi-5.8.23-r1.ebuild | 70 +++
 net-wireless/unifi/unifi-5.9.4-r1.ebuild  | 69 ++
 5 files changed, 304 insertions(+)

diff --git a/net-wireless/unifi/files/unifi.initd-r1 
b/net-wireless/unifi/files/unifi.initd-r1
new file mode 100644
index 000..2db36571dac
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.initd-r1
@@ -0,0 +1,25 @@
+#!/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/unifi-5.6.39-r1.ebuild 
b/net-wireless/unifi/unifi-5.6.39-r1.ebuild
new file mode 100644
index 000..b96d147f49c
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.6.39-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Used, when it's an unstable, beta or release candidate
+RC_SUFFIX=""
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com;
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> 
${P}.zip"
+
+KEYWORDS="~amd64 ~x86"
+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/5.6"
+
+RDEPEND="dev-db/mongodb
+   virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+   enewgroup unifi
+   enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+   # Remove unneeded files Linux, Mac and Windows
+   rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+
+   default
+}
+
+src_install() {
+   # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+   # See 
https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+   exeinto /usr/lib/unifi/bin
+   newexe "${FILESDIR}"/mongod-wrapper mongod
+
+   insinto /usr/lib/unifi
+   doins -r 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
+}

diff --git a/net-wireless/unifi/unifi-5.7.28-r1.ebuild 
b/net-wireless/unifi/unifi-5.7.28-r1.ebuild
new file mode 100644
index 000..c164485244d
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.7.28-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Used, when it's an unstable, beta or release candidate
+RC_SUFFIX="-5c442c6b54"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com;
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> 
${P}.zip"
+
+KEYWORDS="~amd64 ~x86"
+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/5.7"
+
+RDEPEND="dev-db/mongodb
+   virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+

[gentoo-commits] repo/gentoo:master commit in: net-wireless/unifi/files/, net-wireless/unifi/

2018-06-26 Thread Ben Kohler 
commit: 611a7f7c61652de2ca70421ef08685faf0e6971b
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Tue Jun 26 17:40:28 2018 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Jun 26 19:00:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611a7f7c

net-wireless/unifi: eBuilds reworked

Closes: https://bugs.gentoo.org/634518
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/unifi/files/mongod-wrapper |  9 ++-
 net-wireless/unifi/files/unifi.confd|  6 +-
 net-wireless/unifi/files/unifi.initd| 23 ---
 net-wireless/unifi/files/unifi.service  |  8 +--
 net-wireless/unifi/files/unifi.service.conf |  4 --
 net-wireless/unifi/metadata.xml | 15 -
 net-wireless/unifi/unifi-5.6.39.ebuild  | 97 -
 net-wireless/unifi/unifi-5.7.28.ebuild  | 97 -
 net-wireless/unifi/unifi-5.8.23.ebuild  | 88 ++
 net-wireless/unifi/unifi-5.9.4.ebuild   | 87 ++
 10 files changed, 245 insertions(+), 189 deletions(-)

diff --git a/net-wireless/unifi/files/mongod-wrapper 
b/net-wireless/unifi/files/mongod-wrapper
index f2eb2a43752..21637de50a0 100755
--- a/net-wireless/unifi/files/mongod-wrapper
+++ b/net-wireless/unifi/files/mongod-wrapper
@@ -1,3 +1,6 @@
-#!/bin/bash
-cleaned_args=$(echo $* | sed -e 's/--nohttpinterface//')
-/usr/bin/mongod ${cleaned_args}
+#!/bin/sh
+
+# Remove --nohttpinterface argument, since it does not exist on MongoDB >= 
3.6.x anymore
+# See 
https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+remove_nohttpinterface_arg=$(echo $* | sed -e 's/--nohttpinterface//')
+/usr/bin/mongod ${remove_nohttpinterface_arg}

diff --git a/net-wireless/unifi/files/unifi.confd 
b/net-wireless/unifi/files/unifi.confd
index 78a59910ac4..580c18d332b 100644
--- a/net-wireless/unifi/files/unifi.confd
+++ b/net-wireless/unifi/files/unifi.confd
@@ -1,6 +1,6 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# /etc/conf.d/unifi.conf
-
-#JAVA_HOME="/usr"
+# Specifies the path of an used Java runtime,
+# if it's not set, the system default is being used.
+# JAVA_HOME=""

diff --git a/net-wireless/unifi/files/unifi.initd 
b/net-wireless/unifi/files/unifi.initd
index 7aded2123df..959aa58a42c 100644
--- a/net-wireless/unifi/files/unifi.initd
+++ b/net-wireless/unifi/files/unifi.initd
@@ -2,22 +2,25 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-PID_FILE="/run/unifi.pid"
-DAEMON="${JAVA_HOME-/usr}"/bin/java
+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"
+UNIFI_GROUP="unifi"
 UNIFI_PATH="/usr/lib/unifi"
+UNIFI_USER="unifi"
+
+depend() {
+   need net
+}
 
 start() {
-   ebegin "Starting unifi"
-   cd "${UNIFI_PATH}"
-   start-stop-daemon --start --quiet -b \
-   --pidfile "${PID_FILE}" -m \
-   --exec ${DAEMON} -- -jar lib/ace.jar start
+   ebegin "Starting UniFi Controller"
+   cd "${UNIFI_PATH}" && start-stop-daemon --start --quiet --background 
--user ${UNIFI_USER} --group ${UNIFI_GROUP} --chdir ${UNIFI_PATH} --exec 
${DAEMON} -- ${JAVA_OPTS} -jar ${ACE_LIB} start
eend $?
-   #--user nobody --group nobody \
 }
 
 stop() {
-   ebegin "Stopping unifi"
-   start-stop-daemon --quiet --stop -R 20 --pidfile "${PID_FILE}"
+   ebegin "Stopping UniFi Controller"
+   start-stop-daemon --start --quiet --background --user ${UNIFI_USER} 
--group ${UNIFI_GROUP} --chdir ${UNIFI_PATH} --exec ${DAEMON} -- ${JAVA_OPTS} 
-jar ${ACE_LIB} stop
eend $?
 }

diff --git a/net-wireless/unifi/files/unifi.service 
b/net-wireless/unifi/files/unifi.service
index 11385a0e913..cee05d4d153 100644
--- a/net-wireless/unifi/files/unifi.service
+++ b/net-wireless/unifi/files/unifi.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=UniFi Controller
-Requires=network.target
-After=network.target
+After=network-online.target
 
 [Service]
-ExecStart=/usr/bin/java -jar /usr/lib/unifi/lib/ace.jar start
-ExecStop=/usr/bin/java -jar /usr/lib/unifi/lib/ace.jar stop
+Type=simple
 User=unifi
 Group=unifi
 WorkingDirectory=/usr/lib/unifi
+ExecStart=/usr/bin/java -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar 
/usr/lib/unifi/lib/ace.jar start
+ExecStop=/usr/bin/java -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/files/unifi.service.conf 
b/net-wireless/unifi/files/unifi.service.conf
deleted file mode 100644
index 0ef221d3b73..000
--- a/net-wireless/unifi/files/unifi.service.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Service] 
-RuntimeDirectory=unifi
-User=unifi
-Group=unifi

diff --git a/net-wireless/unifi/metadata.xml

[gentoo-commits] repo/gentoo:master commit in: net-wireless/unifi/files/, net-wireless/unifi/

2018-06-25 Thread Ben Kohler 
commit: 6d09f5cde33491d5505b27b088bce0306b1c1040
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue Jun 26 00:02:29 2018 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Jun 26 00:03:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d09f5cd

net-wireless/unifi: new package

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/unifi/Manifest |  4 ++
 net-wireless/unifi/files/mongod-wrapper |  3 ++
 net-wireless/unifi/files/unifi.confd|  6 +++
 net-wireless/unifi/files/unifi.initd| 23 +++
 net-wireless/unifi/files/unifi.service  | 14 +++
 net-wireless/unifi/files/unifi.service.conf |  4 ++
 net-wireless/unifi/metadata.xml |  9 +
 net-wireless/unifi/unifi-5.6.39.ebuild  | 58 ++
 net-wireless/unifi/unifi-5.7.28.ebuild  | 58 ++
 net-wireless/unifi/unifi-5.8.23.ebuild  | 63 +
 net-wireless/unifi/unifi-5.9.4.ebuild   | 63 +
 11 files changed, 305 insertions(+)

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
new file mode 100644
index 000..7b86edb3788
--- /dev/null
+++ b/net-wireless/unifi/Manifest
@@ -0,0 +1,4 @@
+DIST unifi-5.6.39.zip 63559153 BLAKE2B 
377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216
 SHA512 
456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
+DIST unifi-5.7.28.zip 79362245 BLAKE2B 
5edb7b92d602ba780b0fa7613360ada39f09b347b247945761af80d0180d4653b19cb5cd1d7bd11332a85de8481c4981b111e572cb755a83b676362494a5505c
 SHA512 
f6ba667a2f0b5959ed715a190fdbdfe308ea256c2d485f96d43fe797912dfe6992cbaed95add5899293fabdd371c1814572bf1189a4ce93c632743dca40b87e3
+DIST unifi-5.8.23.zip 80086708 BLAKE2B 
ea7aec61d74132a47843084f1987e6e016c4fb1ec96d077dac2a9b122003274b0314927404468669a5d7cc0bdb6a307c97bca09f663b180d15bf18436b35408b
 SHA512 
2b42df2a84574ac9e282c7ff59eb86ce29170ea7ef5957690dec8772c90acda3c08c633b3bceeac08bb73ff1460143207a64d2405de19436faf20a042849231b
+DIST unifi-5.9.4.zip 102808708 BLAKE2B 
3b1479bd65837667f2abff594426ecc3491475d1cf6d842d07cdc8868cabf59facc857263fcfb1ef30fdb8dbb4c0a037b7e04736b8debf0f4f795494fc62ee26
 SHA512 
01e2d8c2d48a552e3b5d03cb97b0241e0561a4c88e52f13ec2d2a8a8b7d75ba7d9eb7878e37876efe5581e439afaac359ae6e3e7b2bb3d0719ebdbb10b06778c

diff --git a/net-wireless/unifi/files/mongod-wrapper 
b/net-wireless/unifi/files/mongod-wrapper
new file mode 100755
index 000..f2eb2a43752
--- /dev/null
+++ b/net-wireless/unifi/files/mongod-wrapper
@@ -0,0 +1,3 @@
+#!/bin/bash
+cleaned_args=$(echo $* | sed -e 's/--nohttpinterface//')
+/usr/bin/mongod ${cleaned_args}

diff --git a/net-wireless/unifi/files/unifi.confd 
b/net-wireless/unifi/files/unifi.confd
new file mode 100644
index 000..78a59910ac4
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.confd
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# /etc/conf.d/unifi.conf
+
+#JAVA_HOME="/usr"

diff --git a/net-wireless/unifi/files/unifi.initd 
b/net-wireless/unifi/files/unifi.initd
new file mode 100644
index 000..7aded2123df
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PID_FILE="/run/unifi.pid"
+DAEMON="${JAVA_HOME-/usr}"/bin/java
+UNIFI_PATH="/usr/lib/unifi"
+
+start() {
+   ebegin "Starting unifi"
+   cd "${UNIFI_PATH}"
+   start-stop-daemon --start --quiet -b \
+   --pidfile "${PID_FILE}" -m \
+   --exec ${DAEMON} -- -jar lib/ace.jar start
+   eend $?
+   #--user nobody --group nobody \
+}
+
+stop() {
+   ebegin "Stopping unifi"
+   start-stop-daemon --quiet --stop -R 20 --pidfile "${PID_FILE}"
+   eend $?
+}

diff --git a/net-wireless/unifi/files/unifi.service 
b/net-wireless/unifi/files/unifi.service
new file mode 100644
index 000..11385a0e913
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=UniFi Controller
+Requires=network.target
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/java -jar /usr/lib/unifi/lib/ace.jar start
+ExecStop=/usr/bin/java -jar /usr/lib/unifi/lib/ace.jar stop
+User=unifi
+Group=unifi
+WorkingDirectory=/usr/lib/unifi
+
+[Install]
+WantedBy=network.target

diff --git a/net-wireless/unifi/files/unifi.service.conf 
b/net-wireless/unifi/files/unifi.service.conf
new file mode 100644
index 000..0ef221d3b73
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.service.conf
@@ -0,0 +1,4 @@
+[Service] 
+RuntimeDirectory=unifi
+User=unifi
+Group=unifi

diff --git a/net-wireless/unifi/metadata.xml b/net-wireless/unifi/metadata.xml
new