cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rearrange net/unifi again, upstream now seem to be making fewer "end user"

Browse Source 
releases from a branch so there seems little point in keeping multiple
"new" branches, only when they make a major change that means some users
will want to stick to an older version.

update the new "main" dir to 6.4.54 which was tested by Brad.
This commit is contained in:
sthen 2021-11-01 09:58:57 +00:00
parent fcdff030ab
commit 93266fa58f
19 changed files with 4083 additions and 10771 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/unifi/6.1/Makefile
View File

@ -1,9 +0,0 @@
# $OpenBSD: Makefile,v 1.5 2021/06/26 11:35:08 sthen Exp $
V= 6.1.71
BUILD_V= -de70ef60fe
SNAPPY_V= 1.1.8.4
SNAPPY_S= -libc++.8.0
REVISION= 1
.include <bsd.port.mk>

22
net/unifi/6.1/files/unifi.sh
View File

@ -1,22 +0,0 @@
#!/bin/sh
# $OpenBSD: unifi.sh,v 1.1 2021/03/20 19:00:35 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>&-

20
net/unifi/6.1/patches/patch-unifi_sh_api
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-unifi_sh_api,v 1.1 2021/03/20 19:00:35 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
@@ -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

4
net/unifi/6.1/pkg/DESCR
View File

@ -1,4 +0,0 @@
This package contains controller software for Ubiquiti UniFi access points,
switches, gateways and phones.
This branch introduces WPA3 support, but loses support for a range of devices.

6569
net/unifi/6.1/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff

7
net/unifi/6.2/Makefile
View File

@ -1,7 +0,0 @@
# $OpenBSD: Makefile,v 1.1 2021/06/27 10:43:42 sthen Exp $
V= 6.2.26
SNAPPY_V= 1.1.8.4
SNAPPY_S= -libc++.8.0
.include <bsd.port.mk>

10
net/unifi/6.2/distinfo
View File

@ -1,10 +0,0 @@
SHA256 (UBNT-MIB) = 4Ar6EHXTLLq/9a93slrup9AL7Arp5CF3yCXsTbHCEco=
SHA256 (UBNT-UniFi-MIB) = zwR4LSXFy2Wjb9Sorkdmbi7MM74U2e14TlOyKsWqfDg=
SHA256 (snappy-java-1.1.8.4-libc++.8.0.jar) = bfmldHygGSXB7q5J8UtNXVbneFBBEXRAK7GB3evmB6A=
SHA256 (unifi-6.2.26.zip) = bmQPNkQLqc/pP8Bs4/yGl5nQ1b4BNIsZAZ8CyCY8Lis=
SHA256 (unifi_sh_api-6.2.26) = F5FoUDnqeVlwvMemHuyFQFjj5vwTxSdw4x4g8762Ius=
SIZE (UBNT-MIB) = 4001
SIZE (UBNT-UniFi-MIB) = 13520
SIZE (snappy-java-1.1.8.4-libc++.8.0.jar) = 1992619
SIZE (unifi-6.2.26.zip) = 152767218
SIZE (unifi_sh_api-6.2.26) = 5174

4
net/unifi/6.2/pkg/DESCR
View File

@ -1,4 +0,0 @@
This package contains controller software for Ubiquiti UniFi access points,
switches, gateways and phones.
This branch introduces WPA3 support, but loses support for a range of devices.

25
net/unifi/6.2/pkg/README
View File

@ -1,25 +0,0 @@
$OpenBSD: README,v 1.1 2021/06/27 10:43:42 sthen Exp $
+-----------------------------------------------------------------------
| Running ${PKGSTEM} 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).
After installing and starting UniFi, connect to https://localhost:8443/ to
configure. (Additional ports are used for AP<>controller communications).
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

21
net/unifi/6.2/pkg/unifi.rc
View File

@ -1,21 +0,0 @@
#!/bin/ksh
#
# $OpenBSD: unifi.rc,v 1.1 2021/06/27 10:43:42 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}} -cp .* com/ubnt/ace/Launcher start"
rc_bg=YES
rc_reload=NO
rc_start() {
cd ${LOCALBASE}/share/unifi
${rcexec} "${java} ${daemon_flags} -cp 'lib/*' com/ubnt/ace/Launcher start"
}
rc_cmd $1

5
net/unifi/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.72 2021/06/27 10:43:42 sthen Exp $
# $OpenBSD: Makefile,v 1.73 2021/11/01 09:58:57 sthen Exp $
SUBDIR =
SUBDIR += 5.6
SUBDIR += 5.14
SUBDIR += 6.0
SUBDIR += 6.1
SUBDIR += 6.2
SUBDIR += main
.include <bsd.port.subdir.mk>

7
net/unifi/main/Makefile Normal file
View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2021/11/01 09:58:57 sthen Exp $
V= 6.4.54
SNAPPY_V= 1.1.8.4
SNAPPY_S= -libc++.8.0
.include <bsd.port.mk>

8
net/unifi/6.1/distinfo → net/unifi/main/distinfo
View File

@ -1,10 +1,10 @@
SHA256 (UBNT-MIB) = 4Ar6EHXTLLq/9a93slrup9AL7Arp5CF3yCXsTbHCEco=
SHA256 (UBNT-UniFi-MIB) = zwR4LSXFy2Wjb9Sorkdmbi7MM74U2e14TlOyKsWqfDg=
SHA256 (snappy-java-1.1.8.4-libc++.8.0.jar) = bfmldHygGSXB7q5J8UtNXVbneFBBEXRAK7GB3evmB6A=
SHA256 (unifi-6.1.71.zip) = +tntvQOS9yLDeajBBEiAOs6yOqcw2E133JVhi6Z/fn8=
SHA256 (unifi_sh_api-6.1.71) = F5FoUDnqeVlwvMemHuyFQFjj5vwTxSdw4x4g8762Ius=
SHA256 (unifi-6.4.54.zip) = IDBmjogoPVImdapIdU/gd1YJEYsJvnG/hMDRP+O2DNc=
SHA256 (unifi_sh_api-6.4.54) = F5FoUDnqeVlwvMemHuyFQFjj5vwTxSdw4x4g8762Ius=
SIZE (UBNT-MIB) = 4001
SIZE (UBNT-UniFi-MIB) = 13520
SIZE (snappy-java-1.1.8.4-libc++.8.0.jar) = 1992619
SIZE (unifi-6.1.71.zip) = 152149341
SIZE (unifi_sh_api-6.1.71) = 5174
SIZE (unifi-6.4.54.zip) = 158992649
SIZE (unifi_sh_api-6.4.54) = 5174

2
net/unifi/6.2/files/unifi.sh → net/unifi/main/files/unifi.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: unifi.sh,v 1.1 2021/06/27 10:43:42 sthen Exp $
# $OpenBSD: unifi.sh,v 1.1 2021/11/01 09:58:57 sthen Exp $
# Optionally symlink to things like unifi-discover
cmd=${0##*unifi-}

2
net/unifi/6.2/patches/patch-unifi_sh_api → net/unifi/main/patches/patch-unifi_sh_api
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-unifi_sh_api,v 1.1 2021/06/27 10:43:42 sthen Exp $
$OpenBSD: patch-unifi_sh_api,v 1.1 2021/11/01 09:58:57 sthen Exp $
Index: unifi_sh_api
--- unifi_sh_api.orig

12
net/unifi/main/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 a newer
branch which no longer works with older devices.
If you have any of the following devices, use an earlier branch:
UAP-AC, UAP-AC-Outdoor, UAP-Outdoor-5 5.6
UAP-Outdoor, UAP-Outdoor+, UAP-Pro, UAP-IW, UAP (v1+v2), 6.0
UAP-LR (v1+v2), UAP-AC-EDU, UAP-AC-IW-PRO
https://help.ui.com/hc/en-us/articles/1500001268521-Ubiquiti-s-Vintage-and-Obsolete-Products

8123
net/unifi/6.2/pkg/PLIST → net/unifi/main/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff

2
net/unifi/6.1/pkg/README → net/unifi/main/pkg/README
View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.1 2021/03/20 19:00:35 sthen Exp $
$OpenBSD: README,v 1.1 2021/11/01 09:58:58 sthen Exp $
+-----------------------------------------------------------------------
| Running ${PKGSTEM} on OpenBSD

2
net/unifi/6.1/pkg/unifi.rc → net/unifi/main/pkg/unifi.rc
View File

@ -1,6 +1,6 @@
#!/bin/ksh
#
# $OpenBSD: unifi.rc,v 1.1 2021/03/20 19:00:35 sthen Exp $
# $OpenBSD: unifi.rc,v 1.1 2021/11/01 09:58:58 sthen Exp $
daemon="${TRUEPREFIX}/share/unifi/lib/ace.jar"
daemon_user="_unifi"