Backported patch for log4go

2 files changed, 11 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67e28f68751c..8a2a1cb66173 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Jan 15 11:02:17 UTC 2016
+# Fri Jan 29 11:07:04 UTC 2016
 pkgbase = mattermost
 	pkgdesc = Open source Slack-alternative in Golang and React
 	pkgver = 1.4.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://mattermost.org
 	install = mattermost.install
 	arch = i686
@@ -24,9 +24,11 @@ pkgbase = mattermost
 	source = https://github.com/mattermost/platform/archive/v1.4.0/mattermost-1.4.0.tar.gz
 	source = mattermost.service
 	source = mattermost-user.conf
+	source = log4go.patch::https://github.com/mattermost/platform/commit/b1251b93932adf616a996725448d0b77fad0d3c1.patch
 	sha256sums = 8cfcb69ac5801a8323d71a270daac1c4a3cd0d920f812894e92e5a75a551d47c
 	sha256sums = b02a0bdbffd17a3a02b6d0098d2a10363ad595070ce6985513b7e6496f9b655a
 	sha256sums = 7cd154ed034a09f6671cab68bc9c30a7fd84e777e801e2aaf93a567cfa0dccfd
+	sha256sums = 1823acf3e6eeafac5c94c9092678803f87d5d6418b8acdf5ca367ded4bca2968
 
 pkgname = mattermost
 
diff --git a/PKGBUILD b/PKGBUILD
index 249f5c70b732..86095f3549a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=mattermost
 pkgver=1.4.0
 _pkgver=${pkgver/rc/-rc}
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source Slack-alternative in Golang and React"
 arch=('i686' 'x86_64')
 url="http://mattermost.org"
@@ -17,10 +17,12 @@ optdepends=('mariadb: SQL server storage'
 install=mattermost.install
 source=(https://github.com/mattermost/platform/archive/v$_pkgver/$pkgname-$_pkgver.tar.gz
         mattermost.service
-        mattermost-user.conf)
+        mattermost-user.conf
+        log4go.patch::https://github.com/mattermost/platform/commit/b1251b93932adf616a996725448d0b77fad0d3c1.patch)
 sha256sums=('8cfcb69ac5801a8323d71a270daac1c4a3cd0d920f812894e92e5a75a551d47c'
             'b02a0bdbffd17a3a02b6d0098d2a10363ad595070ce6985513b7e6496f9b655a'
-            '7cd154ed034a09f6671cab68bc9c30a7fd84e777e801e2aaf93a567cfa0dccfd')
+            '7cd154ed034a09f6671cab68bc9c30a7fd84e777e801e2aaf93a567cfa0dccfd'
+            '1823acf3e6eeafac5c94c9092678803f87d5d6418b8acdf5ca367ded4bca2968')
 
 prepare() {
 	mkdir -p src/github.com/mattermost
@@ -32,6 +34,8 @@ prepare() {
 	sed "s|_BUILD_DATE_|$(date -u)|g" -i model/version.go
 	sed "s|_BUILD_NUMBER_|$_pkgver-$pkgrel|g" -i model/version.go
 	sed "s|_BUILD_HASH_|-|g" -i model/version.go
+
+	patch -p1 -i "$srcdir"/log4go.patch
 }
 
 build() {