summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Webster2017-10-30 20:09:15 -0700
committerDonald Webster2017-10-30 20:09:15 -0700
commitb989368dc2228c8de5f0e146c760981a4e083306 (patch)
treed02787ba36152991a9754c9842a4d6cd2036c98d
parent521d75bc715eb9a9b1e6621ec4fa792281e58a12 (diff)
downloadaur-b989368dc2228c8de5f0e146c760981a4e083306.tar.gz
Fixing server.xml patching by nuking it entirely.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rw-r--r--server.xml.patch20
3 files changed, 6 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4fc973801e5..103e5de7dbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Oct 31 03:04:20 UTC 2017
+# Tue Oct 31 03:08:01 UTC 2017
pkgbase = unifi-video
pkgdesc = Centralized management system for Ubiquiti UniFi Surveillance Cameras
pkgver = 3.8.5
- pkgrel = 1
+ pkgrel = 2
url = https://www.ubnt.com/
install = unifi-video.install
arch = x86_64
@@ -17,12 +17,10 @@ pkgbase = unifi-video
source = unifi-video.service
source = unifi-video.sysusers
source = unifi-video.patch
- source = server.xml.patch
sha256sums = b28a9ae03b408aec00fec03c79316d1c0f8868fbde7543754dc1d7968dd60e41
sha256sums = 9df948b046347c25e7c83e4837284ef63d9f8d3f28daa20a6c36e203e3ebfdb3
sha256sums = 90fb2f826a70d3b7815cd6a2253c2af6754c17504be28ef92ee223bd02093730
sha256sums = 6f52396de7f587372c66b4f269fa3ed51c9c230dc4ca1c4c83f56d8cfb714990
- sha256sums = 4e0d86bbbe8d836862fe5dd9f2a7a3bea9f37a375507d8a6bc2dde9f374219c5
pkgname = unifi-video
diff --git a/PKGBUILD b/PKGBUILD
index 2a13d7a89c5..5e77ab650b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=unifi-video
pkgver=3.8.5
-pkgrel=1
+pkgrel=2
pkgdesc="Centralized management system for Ubiquiti UniFi Surveillance Cameras"
arch=('x86_64')
url="https://www.ubnt.com/"
@@ -13,15 +13,13 @@ install=unifi-video.install
source=("${pkgname}-${pkgver}.deb::https://dl.ubnt.com/firmwares/ufv/v${pkgver}/${pkgname}.Ubuntu16.04_amd64.v${pkgver}.deb"
'unifi-video.service'
'unifi-video.sysusers'
- 'unifi-video.patch'
- 'server.xml.patch')
+ 'unifi-video.patch')
sha256sums=('b28a9ae03b408aec00fec03c79316d1c0f8868fbde7543754dc1d7968dd60e41'
'9df948b046347c25e7c83e4837284ef63d9f8d3f28daa20a6c36e203e3ebfdb3'
'90fb2f826a70d3b7815cd6a2253c2af6754c17504be28ef92ee223bd02093730'
- '6f52396de7f587372c66b4f269fa3ed51c9c230dc4ca1c4c83f56d8cfb714990'
- '4e0d86bbbe8d836862fe5dd9f2a7a3bea9f37a375507d8a6bc2dde9f374219c5')
-
+ '6f52396de7f587372c66b4f269fa3ed51c9c230dc4ca1c4c83f56d8cfb714990')
+
package() {
tar xf "${srcdir}/data.tar.gz" -C "${pkgdir}"/
rm -r "${pkgdir}/etc"
@@ -31,9 +29,6 @@ package() {
cd "${pkgdir}/usr/bin"
patch -N < "${srcdir}/unifi-video.patch"
- cd "${pkgdir}/usr/lib/unifi-video/conf"
- patch -N < "${srcdir}/server.xml.patch"
-
install -D -m 644 "${srcdir}/unifi-video.service" "${pkgdir}/usr/lib/systemd/system/unifi-video.service"
install -D -m 644 "${srcdir}/unifi-video.sysusers" "${pkgdir}/usr/lib/sysusers.d/unifi-video.conf"
diff --git a/server.xml.patch b/server.xml.patch
deleted file mode 100644
index 62e44a686e3..00000000000
--- a/server.xml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- server.xml.orig 2017-09-18 13:11:15.000000000 -0700
-+++ server.xml 2017-09-20 14:09:44.138185987 -0700
-@@ -39,7 +39,7 @@
- connectionTimeout="20000"
- redirectPort="${app.https.port}"
- enableLookups="false"
-- compression="on"
-+ compression="off"
- compressableMimeType="text/css,text/html,text/javascript,application/json"
- socket.rxBufSize="65535"
- socket.txBufSize="65535"
-@@ -54,7 +54,7 @@
- protocol="org.apache.coyote.http11.Http11NioProtocol"
- enableLookups="false"
- disableUploadTimeout="true"
-- compression="on"
-+ compression="off"
- compressableMimeType="text/css,text/html,text/javascript,application/json"
- scheme="https"
- secure="true"