summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Webster2017-01-22 17:16:09 -0800
committerDonald Webster2017-01-22 17:17:54 -0800
commit5c88eff1bf79377d28b1fa6c336795bae0c0f8d8 (patch)
tree6661864f370783ced96e8dcfbc08a90a4bd11c9a
parentd70b1a973ad0152e6c8fec4ef39cbc41a45ad218 (diff)
downloadaur-5c88eff1bf79377d28b1fa6c336795bae0c0f8d8.tar.gz
Fix patch.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--unifi-video.patch17
3 files changed, 10 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e39f037a53c..18ac62147f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Jan 18 20:51:39 UTC 2017
+# Mon Jan 23 01:17:48 UTC 2017
pkgbase = unifi-video
pkgdesc = Centralized management system for Ubiquiti UniFi Surveillance Cameras
pkgver = 3.6.0
- pkgrel = 2
+ pkgrel = 3
url = https://www.ubnt.com/
install = unifi-video.install
arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = unifi-video
sha256sums = 1c2963fd4071e0f25649c37b833fbaa41f36e51138a6e4eec9228e4737c731bd
sha256sums = 9df948b046347c25e7c83e4837284ef63d9f8d3f28daa20a6c36e203e3ebfdb3
sha256sums = 90fb2f826a70d3b7815cd6a2253c2af6754c17504be28ef92ee223bd02093730
- sha256sums = 6908be4aa55e98d358b057bb493bfcbb2e553fbe2e048de36f8cb8cce31a247c
+ sha256sums = 87f685b8f43a0cf3c03297aa29b7db5a7536f1e245b792370b2b625689d6c69b
pkgname = unifi-video
diff --git a/PKGBUILD b/PKGBUILD
index 3c8bd7f58bb..1d80f79c1d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=unifi-video
pkgver=3.6.0
-pkgrel=2
+pkgrel=3
pkgdesc="Centralized management system for Ubiquiti UniFi Surveillance Cameras"
arch=('x86_64')
url="https://www.ubnt.com/"
@@ -18,7 +18,7 @@ source=("http://dl.ubnt.com/firmwares/unifi-video/${pkgver}/unifi-video_${pkgver
sha256sums=('1c2963fd4071e0f25649c37b833fbaa41f36e51138a6e4eec9228e4737c731bd'
'9df948b046347c25e7c83e4837284ef63d9f8d3f28daa20a6c36e203e3ebfdb3'
'90fb2f826a70d3b7815cd6a2253c2af6754c17504be28ef92ee223bd02093730'
- '6908be4aa55e98d358b057bb493bfcbb2e553fbe2e048de36f8cb8cce31a247c')
+ '87f685b8f43a0cf3c03297aa29b7db5a7536f1e245b792370b2b625689d6c69b')
package() {
msg2 "Extracting unifi-video..."
@@ -33,7 +33,7 @@ package() {
msg2 "Making unifi-video executable..."
chmod +x "${pkgdir}/usr/bin/unifi-video"
- msg2 "Patching java version check..."
+ msg2 "Patching out ulimit..."
cd "${pkgdir}/usr/bin"
patch -N < "${srcdir}/unifi-video.patch"
diff --git a/unifi-video.patch b/unifi-video.patch
index 3e638a5669e..1dcd06f5c86 100644
--- a/unifi-video.patch
+++ b/unifi-video.patch
@@ -1,15 +1,6 @@
---- 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
- J=$1
-- V=$($J -version 2>&1 | sed -e 's/^java version "\([^"]*\)".*/\1/;tz;d;:z')
-+ V=$($J -version 2>&1 | awk -F '"' '/version/ {print $2}')
- case "$V" in
- 1.7*|1.8*) return 0
- ;;
-@@ -267,7 +267,6 @@
+--- unifi-video.orig 2017-01-16 10:42:40.000000000 -0800
++++ unifi-video 2017-01-22 17:14:16.801263396 -0800
+@@ -274,7 +274,6 @@
case $ACTION in
start)
require_root
@@ -17,7 +8,7 @@
echo 0x10 > /proc/self/coredump_filter
if is_service_running "${PIDFILE}" >/dev/null; then
log_verbose "${NAME} is already running..."
-@@ -284,7 +283,6 @@
+@@ -291,7 +290,6 @@
;;
stop)
require_root