Attachment 217985 Details for Bug 249353 – unifi-6.0.20.diff

[patch] unifi-6.0.20.diff

unifi-6.0.20.diff (text/plain), 8.48 KB, created by Greg Fitzgerald on 2020-09-15 23:13:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Fitzgerald

Created: 2020-09-15 23:13:15 UTC

Size: 8.48 KB

patch

obsolete

>Index: unifi5/Makefile
>===================================================================
>--- unifi5/Makefile	(revision 548749)
>+++ unifi5/Makefile	(nonexistent)
>@@ -1,81 +0,0 @@
>-# Created by: Alban MAIRE <a.maire@s2mi.fr>
>-# $FreeBSD$
>-
>-PORTNAME=	unifi5
>-PORTVERSION=	5.14.23
>-PORTREVISION=	0
>-CATEGORIES=	net-mgmt java
>-MASTER_SITES=	http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \
>-		https://repo1.maven.org/maven2/%SUBDIR%/:jax
>-MASTER_SITE_SUBDIR=	${PORTVERSION}/:unifi \
>-			javax/activation/${JAX_DISTNAME}/${JAX_VERSION}/:jax
>-DISTFILES=	unifi_sysvinit_all.deb:unifi \
>-		${JAX_DISTNAME}-${JAX_VERSION}.jar:jax
>-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
>-EXTRACT_ONLY=	unifi_sysvinit_all.deb
>-
>-MAINTAINER=	feld@FreeBSD.org
>-COMMENT=	UniFi Controller v5
>-
>-RUN_DEPENDS=	mongodb36>0:databases/mongodb36 \
>-		snappyjava>0:archivers/snappy-java
>-
>-USES=		cpe
>-
>-SUB_LIST+=	USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR} \
>-		JAVA=${JAVA} JAVA_HOME=${JAVA_HOME}
>-
>-EXTRACT_CMD=	/usr/bin/ar
>-EXTRACT_BEFORE_ARGS=	-p
>-EXTRACT_AFTER_ARGS=	data.tar.xz | ${TAR} -xf -
>-
>-CPE_VENDOR=	ubnt
>-CPE_PRODUCT=	unifi_controller
>-USE_JAVA=	yes
>-JAVA_VERSION=	1.8+
>-JAVA_OS=	native
>-JAVA_VENDOR=	openjdk bsdjava
>-JAVA_RUN=	yes
>-
>-NO_BUILD=	yes
>-NO_ARCH=	yes
>-
>-USE_RC_SUBR=	unifi
>-
>-USERS=		unifi
>-GROUPS=		unifi
>-
>-JAX_DISTNAME=	javax.activation-api
>-JAX_VERSION=	1.2.0
>-
>-NO_WRKSUBDIR=	yes
>-
>-CONFLICTS=	unifi-devel-*
>-
>-DIR_LIST=	conf data logs run work
>-
>-post-extract:
>-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${JAX_DISTNAME}-${JAX_VERSION}.jar \
>-		${WRKSRC}/usr/lib/unifi/lib/
>-
>-post-patch:
>-	(cd ${WRKSRC}/usr/lib/unifi/lib && ${LN} -f -s ${JAVAJARDIR}/snappy-java.jar snappy-java-*.jar)
>-	${RM} -r ${WRKSRC}/usr/lib/unifi/lib/native
>-
>-do-install:
>-	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi
>-	(cd ${WRKSRC}/usr/lib/unifi && ${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/unifi/)
>-	${LN} -sf ${PREFIX}/bin/mongod ${STAGEDIR}${JAVASHAREDIR}/unifi/bin/mongod
>-# Create directories that will be writable by unifi
>-.for i in data logs run work
>-	${MKDIR} ${STAGEDIR}/${JAVASHAREDIR}/unifi/${i}
>-.endfor
>-
>-post-install:
>-	@${FIND} -s ${STAGEDIR}${JAVASHAREDIR}/unifi -not -type d | ${SORT} | \
>-		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
>-.for dir in ${DIR_LIST}
>-	@${ECHO} "@dir(unifi,wheel,) ${JAVASHAREDIR}/unifi/${dir}" >> ${TMPPLIST}
>-.endfor
>-
>-.include <bsd.port.mk>
>
>Property changes on: unifi5/Makefile
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: unifi5/distinfo
>===================================================================
>--- unifi5/distinfo	(revision 548749)
>+++ unifi5/distinfo	(nonexistent)
>@@ -1,5 +0,0 @@
>-TIMESTAMP = 1598371113
>-SHA256 (unifi5-5.14.23/unifi_sysvinit_all.deb) = fb12d448828656523978be9f594f2ce3fb35d524bc80d2c150e58f2a7d0159a9
>-SIZE (unifi5-5.14.23/unifi_sysvinit_all.deb) = 170967014
>-SHA256 (unifi5-5.14.23/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393
>-SIZE (unifi5-5.14.23/javax.activation-api-1.2.0.jar) = 56674
>
>Property changes on: unifi5/distinfo
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: unifi5/files/unifi.in
>===================================================================
>--- unifi5/files/unifi.in	(revision 548749)
>+++ unifi5/files/unifi.in	(nonexistent)
>@@ -1,86 +0,0 @@
>-#!/bin/sh
>-#
>-# Created by: Mark Felder <feld@FreeBSD.org>
>-# $FreeBSD$
>-#
>-
>-# PROVIDE: unifi
>-# REQUIRE: LOGIN
>-# KEYWORD: shutdown
>-
>-#
>-# Add the following line to /etc/rc.conf to enable `unifi':
>-#
>-# unifi_enable="YES"
>-#
>-# Other configuration settings for unifi that can be set in /etc/rc.conf:
>-#
>-# unifi_user (str)
>-#   This is the user that unifi runs as
>-#   Set to %%USERS%% by default
>-#
>-# unifi_group (str)
>-#   This is the group that unifi runs as
>-#   Set to %%GROUPS%% by default
>-#
>-# unifi_chdir (str)
>-#   This is the directory that unifi chdirs into before starting
>-#   Set to %%JAVASHAREDIR%%/unifi by default
>-#
>-# unifi_java_home (str)
>-#   The path to the base directory for the Java to use to run unifi
>-#   Defaults to %%JAVA_HOME%%
>-#
>-# unifi_javaflags (str)
>-#   Flags passed to Java to run unifi
>-#   Set to "-Djava.awt.headless=true -Xmx1024M" by default
>-#
>-
>-. /etc/rc.subr
>-name=unifi
>-
>-rcvar=unifi_enable
>-load_rc_config ${name}
>-
>-: ${unifi_enable:=NO}
>-: ${unifi_user:=%%USERS%%}
>-: ${unifi_group:=%%GROUPS%%}
>-: ${unifi_chdir=%%JAVASHAREDIR%%/unifi}
>-: ${unifi_java_home=%%JAVA_HOME%%}
>-: ${unifi_javaflags="-Djava.awt.headless=true -Xmx1024M"}
>-
>-pidfile="/var/run/unifi/${name}.pid"
>-procname=${unifi_java_home}/bin/java
>-command=/usr/sbin/daemon
>-command_args="-f -p ${pidfile} ${unifi_java_home}/bin/java ${unifi_javaflags} com.ubnt.ace.Launcher start"
>-start_precmd=start_precmd
>-stop_precmd=stop_precmd
>-stop_postcmd=stop_postcmd
>-
>-export CLASSPATH=$(echo ${unifi_chdir}/lib/*.jar | tr ' ' ':')
>-
>-start_precmd()
>-{
>-	if [ ! -e /var/run/unifi ] ; then
>-		install -d -o %%USERS%% -g %%GROUPS%% /var/run/unifi;
>-	fi
>-}
>-
>-stop_precmd()
>-{
>-	if [ -r ${pidfile} ]; then
>-		_UNIFIPID=$(check_pidfile ${pidfile} ${procname})
>-		export _UNIFI_CHILDREN=$(pgrep -P ${_UNIFIPID})
>-	fi
>-}
>-
>-stop_postcmd()
>-{
>-	if ! [ -z ${_UNIFI_CHILDREN} ]; then
>-		echo "Cleaning up leftover child processes."
>-		kill $sig_stop ${_UNIFI_CHILDREN}
>-		wait_for_pids ${_UNIFI_CHILDREN}
>-	fi
>-}
>-
>-run_rc_command "$1"
>
>Property changes on: unifi5/files/unifi.in
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: unifi5/pkg-descr
>===================================================================
>--- unifi5/pkg-descr	(revision 548749)
>+++ unifi5/pkg-descr	(nonexistent)
>@@ -1,4 +0,0 @@
>-The UniFi Controller allows you to manage Wireless, Routing & Switching,
>-VoIP and Video of Ubiquiti Networks.
>-
>-WWW: http://wiki.ubnt.com/UniFi_FAQ
>
>Property changes on: unifi5/pkg-descr
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: unifi6/Makefile
>===================================================================
>--- unifi6/Makefile	(revision 548749)
>+++ unifi6/Makefile	(working copy)
>@@ -1,8 +1,8 @@
> # Created by: Alban MAIRE <a.maire@s2mi.fr>
> # $FreeBSD$
> 
>-PORTNAME=	unifi5
>-PORTVERSION=	5.14.23
>+PORTNAME=	unifi6
>+PORTVERSION=	6.0.20
> PORTREVISION=	0
> CATEGORIES=	net-mgmt java
> MASTER_SITES=	http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \
>@@ -15,7 +15,7 @@
> EXTRACT_ONLY=	unifi_sysvinit_all.deb
> 
> MAINTAINER=	feld@FreeBSD.org
>-COMMENT=	UniFi Controller v5
>+COMMENT=	UniFi Controller v6
> 
> RUN_DEPENDS=	mongodb36>0:databases/mongodb36 \
> 		snappyjava>0:archivers/snappy-java
>Index: unifi6/distinfo
>===================================================================
>--- unifi6/distinfo	(revision 548749)
>+++ unifi6/distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1598371113
>-SHA256 (unifi5-5.14.23/unifi_sysvinit_all.deb) = fb12d448828656523978be9f594f2ce3fb35d524bc80d2c150e58f2a7d0159a9
>-SIZE (unifi5-5.14.23/unifi_sysvinit_all.deb) = 170967014
>-SHA256 (unifi5-5.14.23/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393
>-SIZE (unifi5-5.14.23/javax.activation-api-1.2.0.jar) = 56674
>+TIMESTAMP = 1600211508
>+SHA256 (unifi6-6.0.20/unifi_sysvinit_all.deb) = 5c221397f58bdbba4bb518e7e8bdf4a00e731194d3481d37aa761808cddb8fa3
>+SIZE (unifi6-6.0.20/unifi_sysvinit_all.deb) = 160445426
>+SHA256 (unifi6-6.0.20/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393
>+SIZE (unifi6-6.0.20/javax.activation-api-1.2.0.jar) = 56674
>Index: unifi6/files/unifi.in
>===================================================================
>Index: unifi6/pkg-descr
>===================================================================

Actions: View | Diff

Attachments on bug 249353: 217984 | 217985