Attachment 184046 Details for Bug 220461 – Upgrade to 5.5.19

[patch] Upgrade to 5.5.19

0001-Upgrade-to-5.5.19.patch (text/plain), 7.45 KB, created by Derek Schrock on 2017-07-04 03:42:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Schrock

Created: 2017-07-04 03:42:29 UTC

Size: 7.45 KB

patch

obsolete

>From 1fa7c40b44d34eb12afbfc1ff60737b17db260d1 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Mon, 3 Jul 2017 23:23:42 -0400
>Subject: [PATCH] Upgrade to 5.5.19
>
>- Upgrade to 5.5.19
>- New bundled firmware
>- New bundled snappy-java 1.1.2.6
>---
> net-mgmt/unifi5/Makefile  |  8 ++++----
> net-mgmt/unifi5/distinfo  |  6 +++---
> net-mgmt/unifi5/pkg-plist | 29 +++++++++++++++++++----------
> 3 files changed, 26 insertions(+), 17 deletions(-)
>
>diff --git a/net-mgmt/unifi5/Makefile b/net-mgmt/unifi5/Makefile
>index bc788d21f1..20dd4a3da0 100644
>--- a/net-mgmt/unifi5/Makefile
>+++ b/net-mgmt/unifi5/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	unifi5
>-PORTVERSION=	5.4.15
>+PORTVERSION=	5.5.19
> PORTREVISION=	0
> CATEGORIES=	net-mgmt java
> MASTER_SITES=	https://www.ubnt.com/downloads/unifi/${PORTVERSION}/ \
>@@ -17,7 +17,7 @@ RUN_DEPENDS=	mongodb>0:databases/mongodb \
> 		snappyjava>0:archivers/snappy-java
> 
> BUILD=		0
>-BUNDLEDFW=	3.7.51.6230
>+BUNDLEDFW=	3.8.3.6587
> #UNIFI_TAG=	6cbeae59e7
> 
> SUB_LIST+=	USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR} \
>@@ -47,8 +47,8 @@ RESTRICTED=	Redistribution of bundled firmware images is not permitted
> CONFLICTS=	unifi2-* unifi3-* unifi4-*
> 
> post-patch:
>-	${RM} ${WRKSRC}/lib/snappy-java-1.0.5.jar
>-	(cd ${WRKSRC}/lib && ${LN} -s ${JAVAJARDIR}/snappy-java.jar snappy-java-1.0.5.jar)
>+	${RM} ${WRKSRC}/lib/snappy-java-1.1.2.6.jar
>+	(cd ${WRKSRC}/lib && ${LN} -s ${JAVAJARDIR}/snappy-java.jar snappy-java-1.1.2.6.jar)
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi
>diff --git a/net-mgmt/unifi5/distinfo b/net-mgmt/unifi5/distinfo
>index f2b04a0486..56eec24214 100644
>--- a/net-mgmt/unifi5/distinfo
>+++ b/net-mgmt/unifi5/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1494421234
>-SHA256 (unifi5-5.4.15/UniFi.unix.zip) = 6056d5a94e5297e08a7ba20e4a1a6dfa9963d8cdb8f97ecef4091342e0fd2bd2
>-SIZE (unifi5-5.4.15/UniFi.unix.zip) = 161172532
>+TIMESTAMP = 1499128581
>+SHA256 (unifi5-5.5.19/UniFi.unix.zip) = bb8dd69ca65419b5f9c844c230839529725cff20b7a9349eb7658ec82f92cb4e
>+SIZE (unifi5-5.5.19/UniFi.unix.zip) = 176617525
>diff --git a/net-mgmt/unifi5/pkg-plist b/net-mgmt/unifi5/pkg-plist
>index 69fdf0e298..e483e4b32c 100644
>--- a/net-mgmt/unifi5/pkg-plist
>+++ b/net-mgmt/unifi5/pkg-plist
>@@ -7,6 +7,7 @@
> %%JAVASHAREDIR%%/unifi/dl/firmware/U7HD/%%BUNDLEDFW%%/firmware.bin
> %%JAVASHAREDIR%%/unifi/dl/firmware/U7P/%%BUNDLEDFW%%/firmware.bin
> %%JAVASHAREDIR%%/unifi/dl/firmware/U7PG2/%%BUNDLEDFW%%/firmware.bin
>+%%JAVASHAREDIR%%/unifi/dl/firmware/US24PL2/%%BUNDLEDFW%%/firmware.bin
> %%JAVASHAREDIR%%/unifi/dl/firmware/US24P250/%%BUNDLEDFW%%/firmware.bin
> %%JAVASHAREDIR%%/unifi/dl/firmware/USXG/%%BUNDLEDFW%%/firmware.bin
> %%JAVASHAREDIR%%/unifi/dl/firmware/bundles.json
>@@ -51,24 +52,26 @@
> %%JAVASHAREDIR%%/unifi/lib/mongo-java-driver-2.14.3.jar
> @comment %%JAVASHAREDIR%%/unifi/lib/native/Linux/amd64/libubnt_webrtc_jni.so
> @comment %%JAVASHAREDIR%%/unifi/lib/native/Linux/armhf/libubnt_webrtc_jni.so
>+@comment %%JAVASHAREDIR%%/unifi/lib/native/Linux/x86_64/libubnt_webrtc_jni.so
> @comment %%JAVASHAREDIR%%/unifi/lib/native/Mac/x86_64/libubnt_webrtc_jni.jnilib
> @comment %%JAVASHAREDIR%%/unifi/lib/native/Windows/amd64/ubnt_webrtc_jni.dll
>+@comment %%JAVASHAREDIR%%/unifi/lib/native/Windows/x86_64/ubnt_webrtc_jni.dll
> %%JAVASHAREDIR%%/unifi/lib/servo-core-0.9.4.jar
> %%JAVASHAREDIR%%/unifi/lib/servo-graphite-0.9.4.jar
> %%JAVASHAREDIR%%/unifi/lib/slf4j-api-1.7.6.jar
> %%JAVASHAREDIR%%/unifi/lib/slf4j-log4j12-1.7.6.jar
>-%%JAVASHAREDIR%%/unifi/lib/snappy-java-1.0.5.jar
>+%%JAVASHAREDIR%%/unifi/lib/snappy-java-1.1.2.6.jar
> %%JAVASHAREDIR%%/unifi/lib/spring-beans-3.2.8.RELEASE.jar
> %%JAVASHAREDIR%%/unifi/lib/spring-context-3.2.8.RELEASE.jar
> %%JAVASHAREDIR%%/unifi/lib/spring-core-3.2.8.RELEASE.jar
> %%JAVASHAREDIR%%/unifi/lib/spring-expression-3.2.8.RELEASE.jar
> %%JAVASHAREDIR%%/unifi/lib/spring-test-3.2.8.RELEASE.jar
> %%JAVASHAREDIR%%/unifi/lib/sshj-0.9.0.jar
>-%%JAVASHAREDIR%%/unifi/lib/tomcat-embed-core-7.0.75.jar
>-%%JAVASHAREDIR%%/unifi/lib/tomcat-embed-el-7.0.75.jar
>-%%JAVASHAREDIR%%/unifi/lib/tomcat-embed-jasper-7.0.75.jar
>-%%JAVASHAREDIR%%/unifi/lib/tomcat-embed-logging-juli-7.0.75.jar
>-%%JAVASHAREDIR%%/unifi/lib/tomcat-embed-logging-log4j-7.0.75.jar
>+%%JAVASHAREDIR%%/unifi/lib/tomcat-embed-core-7.0.78.jar
>+%%JAVASHAREDIR%%/unifi/lib/tomcat-embed-el-7.0.78.jar
>+%%JAVASHAREDIR%%/unifi/lib/tomcat-embed-jasper-7.0.78.jar
>+%%JAVASHAREDIR%%/unifi/lib/tomcat-embed-logging-juli-7.0.78.jar
>+%%JAVASHAREDIR%%/unifi/lib/tomcat-embed-logging-log4j-7.0.78.jar
> %%JAVASHAREDIR%%/unifi/lib/urlrewritefilter-4.0.4.jar
> %%JAVASHAREDIR%%/unifi/readme.txt
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/WEB-INF/resourcerewrite.xml
>@@ -207,6 +210,12 @@
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IW/static@2x.png
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IW/success.png
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IW/success@2x.png
>+%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/danger.png
>+%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/danger@2x.png
>+%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/static.png
>+%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/static@2x.png
>+%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/success.png
>+%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7IWP/success@2x.png
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7MSH/danger.png
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7MSH/danger@2x.png
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/devices/uap/U7MSH/static.png
>@@ -306,6 +315,9 @@
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/diagrams/port-poe-plus.svg
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/diagrams/port-poe.svg
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/diagrams/port-spacer.png
>+%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/diagrams/port-spacer-round.png
>+%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/diagrams/port-uplink.svg
>+%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/diagrams/port-warning.svg
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/dpi/amazon.com/favicon.ico
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/dpi/aol.com/favicon.ico
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/images/dpi/apple.com/favicon.ico
>@@ -366,10 +378,6 @@
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/js/main.manage.js
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/js/main.overview.js
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/js/main.wizard.js
>-%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/js/vendor.hotspot.js
>-%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/js/vendor.manage.js
>-%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/js/vendor.overview.js
>-%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/js/vendor.wizard.js
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/locales/ca/account.json
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/locales/ca/alerts.json
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/locales/ca/clients.json
>@@ -811,6 +819,7 @@
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/locales/zh_CN/transactions.json
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/locales/zh_CN/vouchers.json
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/locales/zh_CN/wizard.json
>+%%JAVASHAREDIR%%/unifi/webapps/ROOT/app-unifi/migration.html
> %%JAVASHAREDIR%%/unifi/webapps/ROOT/pages/voucher.jsp
> @dir %%JAVASHAREDIR%%/unifi/conf
> @dir(unifi,,) %%JAVASHAREDIR%%/unifi/data
>-- 
>2.13.2
>

Actions: View | Diff

Attachments on bug 220461: 184046 | 184047