upgrade to 1.3.1

4 files changed, 19 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41db219ef7e9..dfe70bc0d975 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Nov 29 23:42:20 UTC 2017
+# Sun Dec 10 13:53:54 UTC 2017
 pkgbase = gitea
 	pkgdesc = Git with a cup of tea, forked from Gogs. Is a Self Hosted Git Service in the Go Programming Language.
-	pkgver = 1.3.0
+	pkgver = 1.3.1
 	pkgrel = 1
 	url = http://gitea.io
 	install = gitea.install
@@ -25,12 +25,12 @@ pkgbase = gitea
 	conflicts = gitea-git
 	conflicts = gitea-git-dev
 	backup = etc/gitea/app.ini
-	source = https://github.com/go-gitea/gitea/archive/v1.3.0.tar.gz
+	source = https://github.com/go-gitea/gitea/archive/v1.3.1.tar.gz
 	source = gitea.service
 	source = app.ini
-	sha512sums = 51cfcb53a039ce8c7995748bd54ea34b88b404de35ef6c9c5742b220fee814fe81670634aa272bbd0002431e70e757b0e460d159e41b7378c93cd5aa820d45f4
-	sha512sums = 692ea79b3195f3222f69b485f8a7905223fa457dc5cb2b480edbac6f480ac4f74075accb04ae0c17b90e98e41f53224e661a85762310d7263921e763cb3fc257
-	sha512sums = 47dbc47c7f54c9793749542fd8de1a2b56db8349019b67313d956450a36413abf9457fa1a9082c088c97aca4afa4b121077967247dd1547f142c9646b9479783
+	sha512sums = 45161e089d5437b5aacc9589a50a61da3a8f4c88edb33fe3605eb49f36f67cb0a8a80f261016745a6c5131755f7963b1b61df62e47aab2bcd43a6932dceadd0f
+	sha512sums = 90c034a73ea192dd18a423608ddc6b4237e530326d70a1055072ba766d4dca323ec877632a7425b6c3be93f1f7acdce81e6a21c9df9e0c06c1ffea6aeea3e4e9
+	sha512sums = 1c5c61259cabfb6f3ef41298ec964102d1062692a3d2c24916e7034df1b9d0aadcccb24c7032d6a0cd889ef49236edca38f185726f2df45b2b9621f5e94c3b96
 
 pkgname = gitea
 
diff --git a/PKGBUILD b/PKGBUILD
index 8fa195ff1118..ae1f2577b7b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Frederik Schwan <frederik dot schwan at linux dot com>
 
 pkgname=gitea
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc='Git with a cup of tea, forked from Gogs. Is a Self Hosted Git Service in the Go Programming Language.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -21,13 +21,14 @@ install=gitea.install
 source=(https://github.com/go-gitea/gitea/archive/v${pkgver}.tar.gz
         gitea.service
         app.ini)
-sha512sums=('51cfcb53a039ce8c7995748bd54ea34b88b404de35ef6c9c5742b220fee814fe81670634aa272bbd0002431e70e757b0e460d159e41b7378c93cd5aa820d45f4'
-            '692ea79b3195f3222f69b485f8a7905223fa457dc5cb2b480edbac6f480ac4f74075accb04ae0c17b90e98e41f53224e661a85762310d7263921e763cb3fc257'
-            '47dbc47c7f54c9793749542fd8de1a2b56db8349019b67313d956450a36413abf9457fa1a9082c088c97aca4afa4b121077967247dd1547f142c9646b9479783')
+sha512sums=('45161e089d5437b5aacc9589a50a61da3a8f4c88edb33fe3605eb49f36f67cb0a8a80f261016745a6c5131755f7963b1b61df62e47aab2bcd43a6932dceadd0f'
+            '90c034a73ea192dd18a423608ddc6b4237e530326d70a1055072ba766d4dca323ec877632a7425b6c3be93f1f7acdce81e6a21c9df9e0c06c1ffea6aeea3e4e9'
+            '1c5c61259cabfb6f3ef41298ec964102d1062692a3d2c24916e7034df1b9d0aadcccb24c7032d6a0cd889ef49236edca38f185726f2df45b2b9621f5e94c3b96')
 
 prepare() {
   mkdir -p "${srcdir}/src/code.gitea.io"
   ln -s "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/src/code.gitea.io/${pkgname}"
+  sed -i -e "s/\"main.Version.*$/\"main.Version=${pkgver}\"/" "${srcdir}/${pkgname}-${pkgver}/Makefile"
 }
 
 build() {
diff --git a/app.ini b/app.ini
index d081eedb0d5e..a65d62b7fe3a 100644
--- a/app.ini
+++ b/app.ini
@@ -36,13 +36,13 @@ PREVIEWABLE_FILE_MODES = markdown
 
 [repository.local]
 ; Path for uploads. Defaults to `tmp/local-repo`
-LOCAL_COPY_PATH = /var/lib/gitea/tmp/local-repo/
+LOCAL_COPY_PATH = tmp/local-repo/
 
 [repository.upload]
 ; Whether repository file uploads are enabled. Defaults to `true`
 ENABLED = true
 ; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gitea restart)
-TEMP_PATH = /var/lib/gitea/tmp/uploads/
+TEMP_PATH = tmp/uploads/
 ; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type
 ALLOWED_TYPES =
 ; Max size of each file in MB. Defaults to 3MB
@@ -161,7 +161,7 @@ KEY_FILE = custom/https/key.pem
 ; default is the path where Gitea is executed
 STATIC_ROOT_PATH = /var/lib/gitea/
 ; Default path for App data
-APP_DATA_PATH = /var/lib/gitea/data/
+APP_DATA_PATH = data/
 ; Application level GZIP support
 ENABLE_GZIP = false
 ; Landing page for non-logged users, can be "home" or "explore"
@@ -197,10 +197,10 @@ SQLITE_TIMEOUT = 500
 ITERATE_BUFFER_SIZE = 50
 
 [indexer]
-ISSUE_INDEXER_PATH = /var/lib/gitea/indexer/issues.bleve
+ISSUE_INDEXER_PATH = indexer/issues.bleve
 ; repo indexer by default disabled, since it uses a lot of disk space
 REPO_INDEXER_ENABLED = false
-REPO_INDEXER_PATH = /var/lib/gitea/indexer/repos.bleve
+REPO_INDEXER_PATH = indexer/repos.bleve
 UPDATE_BUFFER_LEN = 20
 MAX_FILE_SIZE = 1048576
 
@@ -374,7 +374,7 @@ GC_INTERVAL_TIME = 86400
 SESSION_LIFE_TIME = 86400
 
 [picture]
-AVATAR_UPLOAD_PATH = /var/lib/gitea/data/avatars/
+AVATAR_UPLOAD_PATH = data/avatars/
 ; Chinese users can choose "duoshuo"
 ; or a custom avatar source, like: http://cn.gravatar.com/avatar/
 GRAVATAR_SOURCE = gravatar
@@ -389,7 +389,7 @@ ENABLE_FEDERATED_AVATAR = false
 ; Whether attachments are enabled. Defaults to `true`
 ENABLE = true
 ; Path for attachments. Defaults to `data/attachments`
-PATH = /var/lib/gitea/attachments/
+PATH = attachments/
 ; One or more allowed types, e.g. image/jpeg|image/png
 ALLOWED_TYPES = image/jpeg|image/png|application/zip|application/gzip
 ; Max size of each file. Defaults to 32MB
diff --git a/gitea.service b/gitea.service
index 84679f32c910..b03f471ee349 100644
--- a/gitea.service
+++ b/gitea.service
@@ -20,7 +20,7 @@ Group=git
 WorkingDirectory=/var/lib/gitea
 ExecStart=/usr/bin/gitea web --config /etc/gitea/app.ini
 Restart=always
-Environment=USER=git HOME=/var/lib/gitea/repos
+Environment=USER=git HOME=/var/lib/gitea/repos GITEA_WORK_DIR=/var/lib/gitea
 
 [Install]
 WantedBy=multi-user.target