rejiggle the unifi branches again giving a clearer indication of what's what,

5.6 -> rename to lts (supported until oct 2018)
5.7 -> now eol, remove/autoupdate to 5.8
5.8 -> rename to stable
This commit is contained in:
sthen 2018-06-28 18:15:19 +00:00
parent 767d61b960
commit c751df60bf
26 changed files with 35 additions and 1320 deletions

View File

@ -1,12 +0,0 @@
This package contains controller software for Ubiquiti UniFi access points,
switches, gateways and phones.
This is version 5.6, a maintenance release which maintains support for
the Broadcom-based first generation of 802.11ac access points (UAP-AC,
UAP-ACv2, UAP-AC-Outdoor) and the Atheros-based but limited-memory
Picostation M2.
This 5.6 branch will be supported upstream until November 2018.
The other earlier 11n access points (Atheros-based) are still supported
in the normal versions of the controller.

View File

@ -1,10 +0,0 @@
# $OpenBSD: Makefile,v 1.8 2018/06/25 21:05:09 sthen Exp $
V= 5.7.28
SNAPPY_V= 1.1.4
REVISION= 1
# for beta/stable-candidate versions; beta URLs in UniFi-Beta-Blog if you have access
BUILD_V= -5c442c6b54
.include <bsd.port.mk>

View File

@ -1,10 +0,0 @@
SHA256 (UBNT-MIB) = 4Ar6EHXTLLq/9a93slrup9AL7Arp5CF3yCXsTbHCEco=
SHA256 (UBNT-UniFi-MIB) = zwR4LSXFy2Wjb9Sorkdmbi7MM74U2e14TlOyKsWqfDg=
SHA256 (snappy-java-1.1.4.jar) = rHGrHdI8ftLGkZ1v3Wg2O4k59jqMQecltJRuR60huow=
SHA256 (unifi-5.7.28.zip) = cGC4ZVA8GgWoZ3AbjltAB6dkoSgZgMdHUCzfzJb5U3M=
SHA256 (unifi_sh_api-5.7.28) = W6+Y3EW32sf1RE9/TjbiZgKQh1X7bWaLbkfAcTXtLes=
SIZE (UBNT-MIB) = 4001
SIZE (UBNT-UniFi-MIB) = 13520
SIZE (snappy-java-1.1.4.jar) = 1945636
SIZE (unifi-5.7.28.zip) = 79362245
SIZE (unifi_sh_api-5.7.28) = 5167

View File

@ -1,22 +0,0 @@
#!/bin/sh
# $OpenBSD: unifi.sh,v 1.1 2018/02/23 10:10:06 sthen Exp $
# Optionally symlink to things like unifi-discover
cmd=${0##*unifi-}
[ "$cmd" = "$0" ] && cmd=
name=${0##*/}
if [ "$cmd" = "" -o "$cmd" = "discover" -o "$cmd" = "info" ]; then
defines="$defines -Dlog4j.configuration=/dev/null"
fi
daemon="${TRUEPREFIX}/share/unifi/lib/ace.jar"
java="$(${LOCALBASE}/bin/javaPathHelper -c unifi)"
# with some filehandle trickery to do substition on stderr
# 3>&1 - fh3 -> fh1 (stdout)
# 1>&2 - fh1 -> fh2 (stderr)
# 2>&3 - fh2 -> fh3 (stdout)
# 3>&- - fh3 -> close
(${java} ${defines} -jar ${daemon} $cmd "$@" 3>&1 1>&2 2>&3 |
sed -e "s,java -jar lib/ace.jar,$name,") 3>&1 1>&2 2>&3 3>&-

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-unifi_sh_api,v 1.1 2018/02/23 10:10:06 sthen Exp $
Index: unifi_sh_api
--- unifi_sh_api.orig Thu Nov 9 13:37:02 2017
+++ unifi_sh_api Thu Nov 9 13:37:02 2017
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ksh
#username=ubnt
#password=ubnt
@@ -53,7 +53,7 @@ unifi_api() {
fi
uri=$1
shift
- [ "${uri:0:1}" != "/" ] && uri="/$uri"
+ [ $(echo $uri | cut -c1) != "/" ] && uri="/$uri"
json="$@"
[ "$json" = "" ] && json="{}"
${curl_cmd} --data "$json" $baseurl/api/s/$site$uri

File diff suppressed because it is too large Load Diff

View File

@ -1,25 +0,0 @@
$OpenBSD: README,v 1.2 2018/04/03 08:27:37 sthen Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
+-----------------------------------------------------------------------
If using UniFi on a system with other threaded programs, it is likely that
sysctl kern.maxthread would need to be increased from the default (usually
done in /etc/sysctl.conf).
WARNING: UniFi admin password is available without authentication to localhost.
$ echo 'db.admin.find()' | mongo --quiet 127.0.0.1:27117/ace
To import your own signed SSL key/certificate:
# rcctl stop unifi
# cd ${TRUEPREFIX}/share/unifi/data
# openssl pkcs12 -export -in /etc/ssl/server.crt \
-inkey /etc/ssl/private/server.key \
-certfile /etc/ssl/intermediate.crt -out unifi.p12 \
-name unifi -password pass:aircontrolenterprise
# $JAVAHOME/bin/keytool -importkeystore -srckeystore unifi.p12 \
-srcstoretype PKCS12 -srcstorepass aircontrolenterprise \
-destkeystore keystore.new -storepass aircontrolenterprise
# rcctl start unifi

View File

@ -1,25 +0,0 @@
#!/bin/ksh
#
# $OpenBSD: unifi.rc,v 1.2 2018/06/25 21:05:09 sthen Exp $
daemon="${TRUEPREFIX}/share/unifi/lib/ace.jar"
daemon_user="_unifi"
. /etc/rc.d/rc.subr
java="$(${LOCALBASE}/bin/javaPathHelper -c unifi)"
pexp="${java}${daemon_flags:+ ${daemon_flags}} -jar ${daemon} start"
rc_bg=YES
rc_reload=NO
rc_start() {
cd ${LOCALBASE}/share/unifi
${rcexec} "${java} ${daemon_flags} -jar ${daemon} start"
}
rc_stop() {
${java} -jar ${daemon} stop
}
rc_cmd $1

View File

@ -1,2 +0,0 @@
This package contains controller software for Ubiquiti UniFi access points,
switches, gateways and phones.

View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.59 2018/05/31 21:04:09 sthen Exp $
# $OpenBSD: Makefile,v 1.60 2018/06/28 18:15:19 sthen Exp $
SUBDIR =
SUBDIR += 5.6
SUBDIR += 5.7
SUBDIR += 5.8
SUBDIR += lts
SUBDIR += stable
.include <bsd.port.subdir.mk>

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2018/06/25 21:03:35 sthen Exp $
# $OpenBSD: Makefile,v 1.1 2018/06/28 18:15:19 sthen Exp $
V= 5.6.39
SNAPPY_V= 1.1.2.6
REVISION= 1
REVISION= 2
# for beta/stable-candidate versions; beta URLs in UniFi-Beta-Blog if you have access
BUILD_V=
#BUILD_V= xx
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: unifi.sh,v 1.1 2018/05/31 21:04:09 sthen Exp $
# $OpenBSD: unifi.sh,v 1.1 2018/06/28 18:15:19 sthen Exp $
# Optionally symlink to things like unifi-discover
cmd=${0##*unifi-}

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-unifi_sh_api,v 1.1 2018/05/31 21:04:09 sthen Exp $
$OpenBSD: patch-unifi_sh_api,v 1.1 2018/06/28 18:15:19 sthen Exp $
Index: unifi_sh_api
--- unifi_sh_api.orig Thu Nov 9 13:37:02 2017
+++ unifi_sh_api Thu Nov 9 13:37:02 2017

12
net/unifi/lts/pkg/DESCR Normal file
View File

@ -0,0 +1,12 @@
This package contains controller software for Ubiquiti UniFi access points,
switches, gateways and phones.
This package is from the 5.6 LTS branch, which continues to have support
for the Broadcom-based first generation of 802.11ac access points (UAP-AC,
UAP-ACv2, UAP-AC-Outdoor) and the Atheros-based but limited-memory
Picostation M2.
For other devices (including the older Atheros-based 802.11n access points)
the stable branch is recommended instead.
This branch will receive security updates until November 2018.

View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.6 2018/05/31 21:04:09 sthen Exp $
@comment $OpenBSD: PLIST,v 1.1 2018/06/28 18:15:19 sthen Exp $
@option is-branch
@pkgpath net/unifi/5.6
@newgroup _unifi:732
@newuser _unifi:732:_unifi:daemon:unifi user:${PREFIX}/share/unifi:/sbin/nologin
@rcscript ${RCDIR}/unifi

View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.2 2018/04/03 08:27:37 sthen Exp $
$OpenBSD: README,v 1.1 2018/06/28 18:15:19 sthen Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD

View File

@ -1,6 +1,6 @@
#!/bin/ksh
#
# $OpenBSD: unifi.rc,v 1.2 2018/06/25 21:03:35 sthen Exp $
# $OpenBSD: unifi.rc,v 1.1 2018/06/28 18:15:19 sthen Exp $
daemon="${TRUEPREFIX}/share/unifi/lib/ace.jar"
daemon_user="_unifi"

View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2018/06/27 12:31:19 sthen Exp $
# $OpenBSD: Makefile,v 1.1 2018/06/28 18:15:19 sthen Exp $
V= 5.8.23
SNAPPY_V= 1.1.4
REVISION= 0
# for beta/stable-candidate versions; beta URLs in UniFi-Beta-Blog if you have access
#BUILD_V= -d5a5bbfda4

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: unifi.sh,v 1.1 2018/02/23 10:10:06 sthen Exp $
# $OpenBSD: unifi.sh,v 1.1 2018/06/28 18:15:19 sthen Exp $
# Optionally symlink to things like unifi-discover
cmd=${0##*unifi-}

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-unifi_sh_api,v 1.1 2018/02/23 10:10:06 sthen Exp $
$OpenBSD: patch-unifi_sh_api,v 1.1 2018/06/28 18:15:20 sthen Exp $
Index: unifi_sh_api
--- unifi_sh_api.orig Thu Nov 9 13:37:02 2017
+++ unifi_sh_api Thu Nov 9 13:37:02 2017

View File

@ -1,5 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1 2018/05/31 21:04:09 sthen Exp $
@comment $OpenBSD: PLIST,v 1.1 2018/06/28 18:15:20 sthen Exp $
@option is-branch
@pkgpath net/unifi
@pkgpath net/unifi/5.7
@pkgpath net/unifi/5.8
@newgroup _unifi:732
@newuser _unifi:732:_unifi:daemon:unifi user:${PREFIX}/share/unifi:/sbin/nologin
@rcscript ${RCDIR}/unifi

View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.1 2018/05/31 21:04:09 sthen Exp $
$OpenBSD: README,v 1.1 2018/06/28 18:15:20 sthen Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD

View File

@ -1,6 +1,6 @@
#!/bin/ksh
#
# $OpenBSD: unifi.rc,v 1.2 2018/06/19 11:33:42 sthen Exp $
# $OpenBSD: unifi.rc,v 1.1 2018/06/28 18:15:20 sthen Exp $
daemon="${TRUEPREFIX}/share/unifi/lib/ace.jar"
daemon_user="_unifi"