net-wireless/unifi: don't use tomcat-native anymore

Using tomcat-native seems to cause SSL problems on most unifi versions.
Removing dep and also adjusting the service start commands to hide the
system copy of tomcat-native in case it's already installed for other
reasons.

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

diff --git a/net-wireless/unifi/files/unifi.initd b/net-wireless/unifi/files/unifi.initd
index 959aa58a42ceced751fc73a9fa0581da983a59e4..87c798b5ecd38439eb565e3b65dc9ad1bdf6f786 100644 (file)
--- a/net-wireless/unifi/files/unifi.initd
+++ b/net-wireless/unifi/files/unifi.initd
@@ -4,7 +4,7 @@
 
 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"
+JAVA_OPTS="-Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp"
 UNIFI_GROUP="unifi"
 UNIFI_PATH="/usr/lib/unifi"
 UNIFI_USER="unifi"

diff --git a/net-wireless/unifi/files/unifi.service b/net-wireless/unifi/files/unifi.service
index cee05d4d1536620111cd9e0b37edb69c81f25740..00c00d7f3c9ebd1c25f73ac389821d3dfe767f1d 100644 (file)
--- a/net-wireless/unifi/files/unifi.service
+++ b/net-wireless/unifi/files/unifi.service
@@ -7,8 +7,8 @@ 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
+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-5.6.39.ebuild b/net-wireless/unifi/unifi-5.6.39.ebuild
index e29f1cfaaff9bb03de2e07caf3a084c38d8ebd95..287559a717f1684e84fdb565659f4f4eb7773efa 100644 (file)
--- a/net-wireless/unifi/unifi-5.6.39.ebuild
+++ b/net-wireless/unifi/unifi-5.6.39.ebuild
@@ -17,7 +17,6 @@ LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-
 SLOT="0/5.6"
 
 RDEPEND="dev-db/mongodb
-       dev-java/tomcat-native
        virtual/jre:1.8"
 
 DEPEND="app-arch/unzip"

diff --git a/net-wireless/unifi/unifi-5.7.28.ebuild b/net-wireless/unifi/unifi-5.7.28.ebuild
index 4e04e71d24757e12ebcb4ba698bbbf6f513ae758..bc8c89abc8048af879d7f565bf9cbf813999afdb 100644 (file)
--- a/net-wireless/unifi/unifi-5.7.28.ebuild
+++ b/net-wireless/unifi/unifi-5.7.28.ebuild
@@ -17,7 +17,6 @@ LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-
 SLOT="0/5.7"
 
 RDEPEND="dev-db/mongodb
-       dev-java/tomcat-native
        virtual/jre:1.8"
 
 DEPEND="app-arch/unzip"

diff --git a/net-wireless/unifi/unifi-5.8.23.ebuild b/net-wireless/unifi/unifi-5.8.23.ebuild
index 52486d7e03568b4522ba8c1265ef6e595208d051..265ecf2d858d905cb1828fe5d575f1fbb19bc872 100644 (file)
--- a/net-wireless/unifi/unifi-5.8.23.ebuild
+++ b/net-wireless/unifi/unifi-5.8.23.ebuild
@@ -17,7 +17,6 @@ LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-
 SLOT="0/5.8"
 
 RDEPEND="dev-db/mongodb
-       dev-java/tomcat-native
        virtual/jre:1.8"
 
 DEPEND="app-arch/unzip"

diff --git a/net-wireless/unifi/unifi-5.9.4.ebuild b/net-wireless/unifi/unifi-5.9.4.ebuild
index 4977e94cf0dd67e91f6c6429e9827e45a87e5a75..9ca7b2b27c36165a22ddcbb2426824887646138e 100644 (file)
--- a/net-wireless/unifi/unifi-5.9.4.ebuild
+++ b/net-wireless/unifi/unifi-5.9.4.ebuild
@@ -16,7 +16,6 @@ LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-
 SLOT="0/5.9"
 
 RDEPEND="dev-db/mongodb
-       dev-java/tomcat-native
        virtual/jre:1.8"
 
 DEPEND="app-arch/unzip"