diff options
| author |   Ben Kohler <bkohler@gentoo.org> | 2018-06-27 06:48:13 -0500 |
|---|---|---|
| committer | Ben Kohler <bkohler@gentoo.org> | 2018-06-27 06:48:38 -0500 |
| commit | 4a927a8c3ce5061438a42a3c9280f9c5195115d5 (patch) | |
| tree | 824079a3da2e6fca14b25e21e3053809be13a39c /net-wireless | |
| parent | app-admin/vault: Version bump to 0.10.3 (diff) | |
| download | gentoo-4a927a8c3ce5061438a42a3c9280f9c5195115d5.tar.gz gentoo-4a927a8c3ce5061438a42a3c9280f9c5195115d5.tar.bz2 gentoo-4a927a8c3ce5061438a42a3c9280f9c5195115d5.zip | |
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
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/unifi/files/unifi.initd | 2 | ||||
| -rw-r--r-- | net-wireless/unifi/files/unifi.service | 4 | ||||
| -rw-r--r-- | net-wireless/unifi/unifi-5.6.39.ebuild | 1 | ||||
| -rw-r--r-- | net-wireless/unifi/unifi-5.7.28.ebuild | 1 | ||||
| -rw-r--r-- | net-wireless/unifi/unifi-5.8.23.ebuild | 1 | ||||
| -rw-r--r-- | net-wireless/unifi/unifi-5.9.4.ebuild | 1 |
6 files changed, 3 insertions, 7 deletions
diff --git a/net-wireless/unifi/files/unifi.initd b/net-wireless/unifi/files/unifi.initd index 959aa58a42ce..87c798b5ecd3 100644 --- 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 cee05d4d1536..00c00d7f3c9e 100644 --- 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 e29f1cfaaff9..287559a717f1 100644 --- 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 4e04e71d2475..bc8c89abc804 100644 --- 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 52486d7e0356..265ecf2d858d 100644 --- 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 4977e94cf0dd..9ca7b2b27c36 100644 --- 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" |