pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
unifi: Sync with net/, in preparation for next update.
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Sat Dec 11 15:02:06 2021 -0500
Changeset: 122c0db99682d8dc8e1a5b0ea9d32d99adb2efee
Modified Files:
unifi/Makefile
unifi/PLIST
unifi/distinfo
Added Files:
unifi/files/README.mongodb
unifi/options.mk
Removed Files:
unifi/COMMIT_MESSAGE
Log Message:
unifi: Sync with net/, in preparation for next update.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=122c0db99682d8dc8e1a5b0ea9d32d99adb2efee
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
unifi/COMMIT_MESSAGE | 145 ---------------------------------------------
unifi/Makefile | 12 ++--
unifi/PLIST | 3 +-
unifi/distinfo | 2 +-
unifi/files/README.mongodb | 20 +++++++
unifi/options.mk | 20 +++++++
6 files changed, 49 insertions(+), 153 deletions(-)
diffs:
diff --git a/unifi/COMMIT_MESSAGE b/unifi/COMMIT_MESSAGE
deleted file mode 100644
index ff147abe87..0000000000
--- a/unifi/COMMIT_MESSAGE
+++ /dev/null
@@ -1,145 +0,0 @@
-NOMERGE: UPDATE IS NOT TESTED
-
-net/unifi: Update to 6.5.54
-
-Overview
-
- Fix for log4j
- Notification re-work.
- Real-time traffic updates from Gateway (UDM/UXG).
- Improve system performance.
- Improve application latency.
-
-Improvements
-
- Add "Optimize IoT WiFi connectivity" field for WiFi configuration.
- Add WiFi interference chart.
- Add WiFi settings to the Hotspot form.
- Add WPA3 support for UDM Base. (Requires 1.11 or newer UDM FW)
- Add status section to display options in Topology.
- Add default firewall rule to allow UniFi Talk traffic. (only when the application is configured)
- Add local gateway domain name as DNS entry.
- Add power source options to the USW-Flex property panel.
- Allow enabling VPN on existing networks.
- Adjust property panel table column styling.
- Adjust displaying wired experience.
- Improve WAN failover notifications.
- Improve application (startup) stability.
- Improve dashboard AP dropdown styling for smaller screens.
- Improve clients table sorting.
- Disable WiFi Legacy Support if Auto-optimize is enabled.
- Disable edit for default Switch Ports.
- Disable WiFi Data Rate settings if Network Auto-Optimize is enabled.
- Enable multicast block if Auto-optimize is enabled, and there are more than 10 APs assigned to SSID.
- Clean up daily DPI statistics based on statistics data retention setting.
- Show correct memory usage values in the device panel.
- Display device name in forget device modal title.
- Non-network devices will report pending adoption status.
- Change Data Rate Control slider color if minimum is selected.
- Preload Time-Series data from DB to reduce Latency of Dashboard API.
- Update settings app name and version copy.
- Update Traffic & Security main page.
- Update Adopt button and property-panel tabs.
- Update translations across the Application to match UniFi terminology.
- Update default DTIM period to 1 for 2.4GHz Radio.
- Remove "Disable CCK Rates" and "Send beacons at 1Mbps" from minimum rate controls.
- Remove PoE Detection/Duplex from property side panels.
- Remove Tags from the application.
- Hide speed test on WAN2 for USG.
- Change “Beta” to “UniFi Labs”.
- Clean up Notifications based on Statistics Data Retention settings.
- Consolidate multiple device firmware update notifications into one.
- Check device status more frequently during active admin sessions.
- Provide client usage over the last 24 hours in the endpoint.
- Implement UniFi Device Client property panel.
- Rename field translation for UniFi Device property panel.
-
-Bugfixes
-
- Add missing profile radius toast messages.
- Add missing UniFi clients in the clients page.
- Add missing device statuses to device filters.
- Add missing translation for USG Secondary Internet form.
- Add migration to update invalid hostname from UniFi OS.
- Fix issue where Peak Upload / Download Usage was reversed in Internet Settings.
- Fix device Isolation feature not working on UDM-Pro-SE consoles.
- Fix Backup is not respecting retention settings for Notifications and DPI statistics.
- Fix network selection modal during U-LTE-Pro adoption process.
- Fix adoption issues for U-LTE devices.
- Fix issue where user could see "Trouble Page" when going to WiFi AI.
- Fix unable to remove an administrator from sites on self-hosted applications.
- Fix issue when USP-Plug physical toggle couldn’t be switched.
- Fix issue where device uptime was incorrect.
- Fix client count not reflected correctly on the dashboard.
- Fix backup import from SD card on Cloud Key G2 Plus console.
- Fix cyclical device disconnecting/reconnecting.
- Fix devices with special states are not shown on the device page.
- Fix sorting issues in various locations.
- Fix device identification information not updated.
- Fix configuration error when static WAN does not specify router address.
- Fix WiFi experience feedback form cannot be submitted without comment.
- Fix graph missing when opening ISP panel.
- Fix timeout delay when deleting objects from the remote access portal.
- Fix restoring from backup.
- Fix MAC ID Filter list crashing.
- Fix topology property panel crash.
- Fix Display ISP name instead of the port name.
- Fix “Copy Configuration” options.
- Fix AP Groups Validation.
- Fix USG speed test not working.
- Fix newly adopted switches not having default night mode configuration.
- Fix issue with duplicated VPN clients.
- Fix Uplink Monitor Type selection indicator.
- Fix Device Firmware Schedule list.
- Fix typos in Settings.
- Fix dashboard ISP text and clients table styling issues.
- Fix styling for device manage section.
- Fix download logs not working on self-installed Applications.
- Fix logging to Ubiquiti Account in Settings.
- Fix dropdown labels in Firewall Rules form.
- Fix page crash in Threat Management when selecting specific dates.
- Fix scrolling for scrollable tables.
- Fix Display Option "Restore Default" functionality.
- Fix WiFi Band validation if some Devices have reached the SSID limit.
- Fix WAN form validation - Router field is required for Static connection.
- Fix false-positive WAN failover notifications.
- Fix which ethernet port is being advertised in UDM discovery.
- Fix showing offline devices as wireless on Topology.
- Fix page crash when opening WiFiman results.
- Fix WiFi Scan table SSID's.
- Fix navigation issue from device ports overview.
- Fix text overflowing in topology.
- Fix issue where WAN1's IP was used instead of active WAN.
- Fix DHCP AutoScale feature on UXG.
- Fix MAC Authorization form.
- Fix DNS resolution not working on LTE failover with Content Filtering enabled
- Fix missing IPS/VPN translations.
- Fix the product line URL in the property panel.
- Fix background color for UniFi Device Application link.
- Fix style for Client page display options, list only APs for device options.
- Remove disabled property from Fast Roaming toggle in WiFi settings.
- Log only new connections in Port Forward firewall rules.
- Disable logging in the default WAN_OUT firewall rules.
- Show correct version in device identification.
- Omit LTE IP from IP/subnet check in the network form.
- Dashboard side panel styling updates.
- No blocked_sta provisioned for low-resource models.
- Email notification does not have Adopt button.
- Tweak USW-Flex topology image.
- Client property panel styling fixes.
- Correct AP list for link aggregation.
- Create correct links for the port edit form.
- Show correct client status in grid view.
- Show only relevant fields for the USG dashboard.
- Show correct traffic amount in the dashboard for USG.
- Sync client icons for Table and Property Panel.
- Truncate actionable text that exceeds 30 characters.
- Do not display negative uptime.
- Update time format when changing 24/12h setting.
- Update Table headers to correctly display GHz.
- Use preferred time zone for AP Client history.
- Prevent dashboard WAN tabs stretching.
- Prevent Remote Access from being enabled on 32-bit systems where it is unsupported.
- Load UniFi translations in Topology.
- Clean up obsolete unsupported devices toast message.
- Remove debug terminal & jumbo frames/flow control from UDM.
diff --git a/unifi/Makefile b/unifi/Makefile
index d7048647e7..32ab5e0565 100644
--- a/unifi/Makefile
+++ b/unifi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2021/05/31 17:11:33 gdt Exp $
+# $NetBSD: Makefile,v 1.32 2021/12/11 17:30:07 gdt Exp $
-# Please do not drop this; a new update cycle is likely very soon.
+# Please do not drop this; a new update cycle is likely soon.
DISTNAME= unifi-6.5.54
CATEGORIES= net
MASTER_SITES= -http://dl.ubnt.com/unifi/${PKGVERSION_NOREV}/UniFi.unix.zip
@@ -25,6 +25,7 @@ NO_SRC_ON_FTP= ${RESTRICTED}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DEFAULT_DISTFILES}
+
# Unifi bundles snappy-java-1.0.5.jar, which contains native code.
# We can use the bundled snappy-java but we must recompile the native portion
# because it only ship linux binaries. The rcd script takes care of loading the
@@ -43,7 +44,7 @@ DISTFILES+= ${SNAPPY}.tar.gz
EXTRACT_ONLY+= ${SNAPPY}.tar.gz
CHECK_SHLIBS_SKIP= unifi/lib/native/*
-INSTALLATION_DIRS= unifi
+INSTALLATION_DIRS= unifi share/doc/unifi
# Emulated JDK doesn't work due to epoll issues. Also, would require
# matching emulated native libraries, and we only compile actual
@@ -55,9 +56,7 @@ USE_LANGUAGES= c c++ # for snappy JNI library
USE_TOOLS+= gmake pax
WRKSRC= ${WRKDIR}
-# Upstream documents 3.4.15, but 3.4.4 actually works. Avoid mongodb4 because it
-# has a problematic license.
-DEPENDS+= mongodb>=3.4.4:../../databases/mongodb3
+.include "options.mk"
FILES_SUBST+= UNIFI_USER=${UNIFI_USER:Q} UNIFI_GROUP=${UNIFI_GROUP:Q}
FILES_SUBST+= JAVA=${PKG_JAVA_HOME}/bin/java
@@ -114,6 +113,7 @@ do-build:
do-install:
cd ${WRKSRC}/UniFi && pax -rw . ${DESTDIR}${PREFIX}/unifi
${INSTALL_LIB} ${WRKDIR}/${SNAPPY_JAVA}/target/snappy-1.0.5-Default/libsnappyjava.so ${DESTDIR}${PREFIX}/unifi/lib
+ ${INSTALL_DATA} ${FILESDIR}/README.mongodb ${DESTDIR}${PREFIX}/share/doc/unifi
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/unifi/PLIST b/unifi/PLIST
index 820b6eebb1..9f0aba2207 100644
--- a/unifi/PLIST
+++ b/unifi/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2021/05/31 17:11:33 gdt Exp $
+@comment $NetBSD: PLIST,v 1.16 2021/12/11 19:14:17 gdt Exp $
+share/doc/unifi/README.mongodb
unifi/bin/mongod
unifi/dl/firmware/bundles.json
unifi/lib/ace.jar
diff --git a/unifi/distinfo b/unifi/distinfo
index 740920c8c7..558fd98a7f 100644
--- a/unifi/distinfo
+++ b/unifi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2021/05/31 17:11:34 gdt Exp $
+$NetBSD: distinfo,v 1.20 2021/12/11 17:28:25 gdt Exp $
BLAKE2s (snappy-1.0.5.tar.gz) = 956b30e6d0dd96ce2002ac4aa112a813e184969cebcfbf532802d0ed2d3bab36
SHA512 (snappy-1.0.5.tar.gz) = 4f772673dd1bf482f13db0f09299b46d0ee47b7052c43e69c2c5361d352031152f3132c25faf86ffcf1bfbe0e68625d7eef8fa669be873b568adfc160a82f25b
diff --git a/unifi/files/README.mongodb b/unifi/files/README.mongodb
new file mode 100644
index 0000000000..3d54f293a4
--- /dev/null
+++ b/unifi/files/README.mongodb
@@ -0,0 +1,20 @@
+Ubiquiti recommends using mongodb 3.6 with Unifi.
+
+Unifi in pkgsrc can use either mongodb3 or mongodb4
+- mongodb3 (the default, and the last 3.4 version of mongodb before
+ the switch to server-side-public-license)
+- mongodb4 (requires the 'new' server-side-public-license, and
+ is not officially supported by Ubiquiti)
+
+Recommended process of switching between them:
+- Login to unifi, and download a full backup
+- Shut down unifi
+- Install new unifi version
+- Rename away the old unifi/data directory (this also provides
+ a rollback option if you need to revert) & create new empty data
+ directory
+- Start up unifi
+- If you have customised data/system.properties for unifi.http.port
+ and similar, shut down unifi (now that a new data/system.properties
+ is present), merge the changes across in an editor then start unifi
+- Go to the web interface and select upload backup
diff --git a/unifi/options.mk b/unifi/options.mk
new file mode 100644
index 0000000000..8efe63406b
--- /dev/null
+++ b/unifi/options.mk
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2021/12/06 15:33:27 abs Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.unifi
+PKG_OPTIONS_GROUP.mongodb= mongodb3 mongodb4
+PKG_OPTIONS_REQUIRED_GROUPS= mongodb
+PKG_SUGGESTED_OPTIONS= mongodb3
+
+.include "../../mk/bsd.options.mk"
+
+# Upstream recommends 3.6, but 3.4.4 is the last version before the
+# switch to server-side-public-license, and works fine
+.if !empty(PKG_OPTIONS:Mmongodb3)
+DEPENDS+= mongodb>=3.4.4:../../databases/mongodb3
+.endif
+
+# For those happy with server-side-public-license
+# Note a backup/restore is required when switching versions
+.if !empty(PKG_OPTIONS:Mmongodb4)
+DEPENDS+= mongodb>=4.0:../../databases/mongodb
+.endif
Home |
Main Index |
Thread Index |
Old Index