Update to 3.3.0

Removed ulimit from start script.

Removed --verbose from service file.

Changed systemd Type to simple, added --no-detach.

4 files changed, 33 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f13041bad404..ed1903bcdcd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Apr 19 05:06:19 UTC 2016
+# Fri Jul 22 17:13:24 UTC 2016
 pkgbase = unifi-video
 	pkgdesc = Centralized management system for Ubiquiti UniFi Surveillance Cameras
-	pkgver = 3.2.2
-	pkgrel = 3
+	pkgver = 3.3.0
+	pkgrel = 1
 	url = https://www.ubnt.com/
 	install = unifi-video.install
 	arch = x86_64
@@ -12,14 +12,14 @@ pkgbase = unifi-video
 	depends = jre8-openjdk-headless
 	depends = java-jsvc
 	depends = lsb-release
-	source = http://dl.ubnt.com/firmwares/unifi-video/3.2.2/unifi-video_3.2.2~Ubuntu14.04_amd64.deb
+	source = http://dl.ubnt.com/firmwares/unifi-video/3.3.0/unifi-video_3.3.0~Ubuntu14.04_amd64.deb
 	source = unifi-video.service
 	source = unifi-video.sysusers
 	source = unifi-video.patch
-	sha256sums = 4dba35c7d948567f098f13f5ac1faff7e4601ae99bc6477b8817a69f0dcfaeb4
-	sha256sums = f5f5244e19aba87884747cee371077bcfa9669806b9b0a8d0e176b9306c7f843
+	sha256sums = 4ffd6f899947b8a581360b6d98eb62469a9889f5ad8df74d6bdc7f2207e043ef
+	sha256sums = 9df948b046347c25e7c83e4837284ef63d9f8d3f28daa20a6c36e203e3ebfdb3
 	sha256sums = 90fb2f826a70d3b7815cd6a2253c2af6754c17504be28ef92ee223bd02093730
-	sha256sums = 26a11592d01ead22dbf2c083aae5cec320917902b516cfc595c12d158876bddb
+	sha256sums = 6908be4aa55e98d358b057bb493bfcbb2e553fbe2e048de36f8cb8cce31a247c
 
 pkgname = unifi-video
 
diff --git a/PKGBUILD b/PKGBUILD
index 380105cd05d7..3cfa5d98309f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Donald Webster (fryfrog@gmail.com)
 
 pkgname=unifi-video
-pkgver=3.2.2
-pkgrel=3
+pkgver=3.3.0
+pkgrel=1
 pkgdesc="Centralized management system for Ubiquiti UniFi Surveillance Cameras"
 arch=('x86_64')
 url="https://www.ubnt.com/"
@@ -13,10 +13,10 @@ source=("http://dl.ubnt.com/firmwares/unifi-video/$pkgver/unifi-video_$pkgver~Ub
         'unifi-video.service'
         'unifi-video.sysusers'
         'unifi-video.patch')
-sha256sums=('4dba35c7d948567f098f13f5ac1faff7e4601ae99bc6477b8817a69f0dcfaeb4'
-            'f5f5244e19aba87884747cee371077bcfa9669806b9b0a8d0e176b9306c7f843'
+sha256sums=('4ffd6f899947b8a581360b6d98eb62469a9889f5ad8df74d6bdc7f2207e043ef'
+            '9df948b046347c25e7c83e4837284ef63d9f8d3f28daa20a6c36e203e3ebfdb3'
             '90fb2f826a70d3b7815cd6a2253c2af6754c17504be28ef92ee223bd02093730'
-            '26a11592d01ead22dbf2c083aae5cec320917902b516cfc595c12d158876bddb')
+            '6908be4aa55e98d358b057bb493bfcbb2e553fbe2e048de36f8cb8cce31a247c')
 
 package() {
     msg2 "Extracting unifi-video..."
diff --git a/unifi-video.patch b/unifi-video.patch
index 8c7c23e0c705..3e638a5669ee 100644
--- a/unifi-video.patch
+++ b/unifi-video.patch
@@ -1,5 +1,5 @@
---- unifi-video.old	2016-04-18 14:14:21.249318503 -0700
-+++ unifi-video	2016-04-18 14:18:30.525974270 -0700
+--- unifi-video.old	2016-06-27 13:00:09.000000000 -0700
++++ unifi-video	2016-07-22 10:03:19.260992444 -0700
 @@ -42,7 +42,7 @@
  is_java7_compat() {
  	local J V
@@ -9,3 +9,19 @@
          case "$V" in
                  1.7*|1.8*) return 0
                  ;;
+@@ -267,7 +267,6 @@
+ case $ACTION in
+ 	start)
+ 		require_root
+-        ulimit -H -c 200
+         echo 0x10 > /proc/self/coredump_filter
+ 		if is_service_running "${PIDFILE}" >/dev/null; then
+ 			log_verbose "${NAME} is already running..."
+@@ -284,7 +283,6 @@
+ 		;;
+ 	stop)
+ 		require_root
+-        ulimit -H -c 200
+         echo 0x10 > /proc/self/coredump_filter
+ 		rc=0
+ 		pid=$(is_service_running ${PIDFILE}) || rc=$?
diff --git a/unifi-video.service b/unifi-video.service
index e225ad9a446e..2663b45db888 100644
--- a/unifi-video.service
+++ b/unifi-video.service
@@ -3,7 +3,7 @@ Description=Ubiquiti UniFi Video Server
 After=network.target
 
 [Service]
-Type=forking
+Type=simple
 WorkingDirectory=/usr/lib/unifi-video
 TimeoutStartSec=300
 TimeoutStopSec=300
@@ -11,8 +11,8 @@ Restart=on-failure
 RestartSec=5
 StartLimitInterval=60s
 StartLimitBurst=3
-ExecStart=/usr/bin/unifi-video --verbose start
-ExecStop=/usr/bin/unifi-video --verbose stop
+ExecStart=/usr/bin/unifi-video --nodetach start
+ExecStop=/usr/bin/unifi-video --nodetach stop
 
 [Install]
 WantedBy=multi-user.target