update to unifi-5.4.17. this one is a stable candidate rather than an
actual stable release, but upstream has updated to a newer version of snappy-java that no longer includes the openbsd .so files that are needed, so I've switched to a local-built version and would like to get this in early to get potential feedback.
This commit is contained in:
sthen
parent
8d473532b2
commit
01a60b3c2b
@ -1,16 +1,20 @@
|
||||
# $OpenBSD: Makefile,v 1.38 2017/05/27 19:57:08 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.39 2017/06/02 16:12:38 sthen Exp $
|
||||
|
||||
COMMENT= controller for Ubiquiti uniFi (AP/routing/switching/voip)
|
||||
COMMENT= controller for Ubiquiti uniFi (wifi/routing/switching/voip)
|
||||
|
||||
VERSION= 5.4.16
|
||||
VERSION= 5.4.17-426d275ce8
|
||||
MASTER_SITES= http://dl.ubnt.com/unifi/${VERSION}/
|
||||
REL_V= 5.4.16.0
|
||||
REL_V= 5.4.17.0
|
||||
|
||||
V= ${VERSION:C/-.*//}
|
||||
DISTFILES= unifi-$V{UniFi.unix}.zip unifi_sh_api-$V{unifi_sh_api}
|
||||
EXTRACT_ONLY= unifi-$V.zip
|
||||
PKGNAME= unifi-$V
|
||||
REVISION= 1
|
||||
|
||||
# newer unifi uses newer snappy-java, but upstream stopped distributing
|
||||
# openbsd .so's. use a locally built one to replace.
|
||||
MASTER_SITES0= https://spacehopper.org/mirrors/
|
||||
SUPDISTFILES= snappy-java-1.1.2.6.jar:0
|
||||
|
||||
CATEGORIES= net
|
||||
|
||||
@ -39,6 +43,7 @@ SUBST_VARS= REL_V
|
||||
|
||||
post-extract:
|
||||
cp ${FULLDISTDIR}/unifi_sh_api-$V ${WRKSRC}/unifi_sh_api
|
||||
cp ${FULLDISTDIR}/snappy-java-1.1.2.6.jar ${WRKSRC}/lib/
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${INSTDIR}{,/backup,/data,/run,/work}
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
SHA256 (unifi-5.4.16.zip) = MugCT21dAyPzZXkMoVdZfHHw2+ClQOz7bovGEG44HeU=
|
||||
SHA256 (unifi_sh_api-5.4.16) = MTh1YgS2sTGkSX5/t4deoUIV03iy2iHwrMb1jJCtISk=
|
||||
SIZE (unifi-5.4.16.zip) = 161185559
|
||||
SIZE (unifi_sh_api-5.4.16) = 4873
|
||||
SHA256 (snappy-java-1.1.2.6.jar) = G/fzZ7i+ML2YVj5hKUY7Z993l4emCy/Cd8QlTwiyqtg=
|
||||
SHA256 (unifi-5.4.17.zip) = QYuvz0O782Ov462q0Prr5CNBwVdbfX9XOTJNcqo0gj8=
|
||||
SHA256 (unifi_sh_api-5.4.17) = 0/MJklIBDNhtSsA6gm43HOtyAmcyRupqZigzSArsVeA=
|
||||
SIZE (snappy-java-1.1.2.6.jar) = 1276143
|
||||
SIZE (unifi-5.4.17.zip) = 161499639
|
||||
SIZE (unifi_sh_api-5.4.17) = 4865
|
||||
|
||||
@ -1,22 +1,14 @@
|
||||
$OpenBSD: patch-unifi_sh_api,v 1.2 2015/06/25 13:50:52 sthen Exp $
|
||||
--- unifi_sh_api.orig Thu Jun 25 14:19:49 2015
|
||||
+++ unifi_sh_api Thu Jun 25 14:20:21 2015
|
||||
$OpenBSD: patch-unifi_sh_api,v 1.3 2017/06/02 16:12:38 sthen Exp $
|
||||
Index: unifi_sh_api
|
||||
--- unifi_sh_api.orig
|
||||
+++ unifi_sh_api
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/ksh
|
||||
|
||||
#username=ubnt
|
||||
#password=ubnt
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
[ -f ./unifi_sh_env ] && . ./unifi_sh_env
|
||||
|
||||
-cookie=/tmp/unifi_cookie
|
||||
+cookie=${cookie:-'/tmp/unifi_cookie'}
|
||||
|
||||
curl_cmd="curl --tlsv1 --silent --cookie ${cookie} --cookie-jar ${cookie} --insecure "
|
||||
|
||||
@@ -54,7 +54,7 @@ unifi_api() {
|
||||
@@ -53,7 +53,7 @@ unifi_api() {
|
||||
fi
|
||||
uri=$1
|
||||
shift
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.26 2017/05/16 11:02:44 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.27 2017/06/02 16:12:38 sthen Exp $
|
||||
@newgroup _unifi:732
|
||||
@newuser _unifi:732:_unifi:daemon:unifi user:/usr/local/share/unifi:/sbin/nologin
|
||||
bin/unifi
|
||||
@ -17,35 +17,35 @@ share/unifi/data/
|
||||
share/unifi/dl/
|
||||
share/unifi/dl/firmware/
|
||||
share/unifi/dl/firmware/BZ2/
|
||||
share/unifi/dl/firmware/BZ2/3.7.51.6230/
|
||||
share/unifi/dl/firmware/BZ2/3.7.51.6230/firmware.bin
|
||||
share/unifi/dl/firmware/BZ2/3.7.58.6385/
|
||||
share/unifi/dl/firmware/BZ2/3.7.58.6385/firmware.bin
|
||||
share/unifi/dl/firmware/U2HSR/
|
||||
share/unifi/dl/firmware/U2HSR/3.7.51.6230/
|
||||
share/unifi/dl/firmware/U2HSR/3.7.51.6230/firmware.bin
|
||||
share/unifi/dl/firmware/U2HSR/3.7.58.6385/
|
||||
share/unifi/dl/firmware/U2HSR/3.7.58.6385/firmware.bin
|
||||
share/unifi/dl/firmware/U2IW/
|
||||
share/unifi/dl/firmware/U2IW/3.7.51.6230/
|
||||
share/unifi/dl/firmware/U2IW/3.7.51.6230/firmware.bin
|
||||
share/unifi/dl/firmware/U2IW/3.7.58.6385/
|
||||
share/unifi/dl/firmware/U2IW/3.7.58.6385/firmware.bin
|
||||
share/unifi/dl/firmware/U2Sv2/
|
||||
share/unifi/dl/firmware/U2Sv2/3.7.51.6230/
|
||||
share/unifi/dl/firmware/U2Sv2/3.7.51.6230/firmware.bin
|
||||
share/unifi/dl/firmware/U2Sv2/3.7.58.6385/
|
||||
share/unifi/dl/firmware/U2Sv2/3.7.58.6385/firmware.bin
|
||||
share/unifi/dl/firmware/U7E/
|
||||
share/unifi/dl/firmware/U7E/3.7.51.6230/
|
||||
share/unifi/dl/firmware/U7E/3.7.51.6230/firmware.bin
|
||||
share/unifi/dl/firmware/U7E/3.7.58.6385/
|
||||
share/unifi/dl/firmware/U7E/3.7.58.6385/firmware.bin
|
||||
share/unifi/dl/firmware/U7HD/
|
||||
share/unifi/dl/firmware/U7HD/3.7.51.6230/
|
||||
share/unifi/dl/firmware/U7HD/3.7.51.6230/firmware.bin
|
||||
share/unifi/dl/firmware/U7HD/3.7.58.6385/
|
||||
share/unifi/dl/firmware/U7HD/3.7.58.6385/firmware.bin
|
||||
share/unifi/dl/firmware/U7P/
|
||||
share/unifi/dl/firmware/U7P/3.7.51.6230/
|
||||
share/unifi/dl/firmware/U7P/3.7.51.6230/firmware.bin
|
||||
share/unifi/dl/firmware/U7P/3.7.58.6385/
|
||||
share/unifi/dl/firmware/U7P/3.7.58.6385/firmware.bin
|
||||
share/unifi/dl/firmware/U7PG2/
|
||||
share/unifi/dl/firmware/U7PG2/3.7.51.6230/
|
||||
share/unifi/dl/firmware/U7PG2/3.7.51.6230/firmware.bin
|
||||
share/unifi/dl/firmware/U7PG2/3.7.58.6385/
|
||||
share/unifi/dl/firmware/U7PG2/3.7.58.6385/firmware.bin
|
||||
share/unifi/dl/firmware/US24P250/
|
||||
share/unifi/dl/firmware/US24P250/3.7.51.6230/
|
||||
share/unifi/dl/firmware/US24P250/3.7.51.6230/firmware.bin
|
||||
share/unifi/dl/firmware/US24P250/3.7.58.6385/
|
||||
share/unifi/dl/firmware/US24P250/3.7.58.6385/firmware.bin
|
||||
share/unifi/dl/firmware/USXG/
|
||||
share/unifi/dl/firmware/USXG/3.7.51.6230/
|
||||
share/unifi/dl/firmware/USXG/3.7.51.6230/firmware.bin
|
||||
share/unifi/dl/firmware/USXG/3.7.58.6385/
|
||||
share/unifi/dl/firmware/USXG/3.7.58.6385/firmware.bin
|
||||
share/unifi/dl/firmware/bundles.json
|
||||
share/unifi/dl/firmware/p2N/
|
||||
share/unifi/dl/firmware/p2N/3.3.22.4024/
|
||||
@ -94,7 +94,7 @@ share/unifi/lib/servo-core-0.9.4.jar
|
||||
share/unifi/lib/servo-graphite-0.9.4.jar
|
||||
share/unifi/lib/slf4j-api-1.7.6.jar
|
||||
share/unifi/lib/slf4j-log4j12-1.7.6.jar
|
||||
share/unifi/lib/snappy-java-1.0.5.jar
|
||||
share/unifi/lib/snappy-java-1.1.2.6.jar
|
||||
share/unifi/lib/spring-beans-3.2.8.RELEASE.jar
|
||||
share/unifi/lib/spring-context-3.2.8.RELEASE.jar
|
||||
share/unifi/lib/spring-core-3.2.8.RELEASE.jar
|
||||
@ -276,6 +276,13 @@ share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IW/static.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IW/static@2x.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IW/success.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IW/success@2x.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/danger.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/danger@2x.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/static.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/static@2x.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/success.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/success@2x.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7MSH/
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7MSH/danger.png
|
||||
share/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7MSH/danger@2x.png
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user