upgrade to 1.1.4

3 files changed, 25 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa68caf9b1ac..8804664860c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Aug 19 19:42:17 UTC 2017
+# Mon Sep  4 14:40:00 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.1.3
+	pkgver = 1.1.4
 	pkgrel = 1
 	url = http://gitea.io
 	install = gitea.install
@@ -24,10 +24,10 @@ pkgbase = gitea
 	conflicts = gitea-git
 	conflicts = gitea-git-dev
 	backup = etc/gitea/app.ini
-	source = https://github.com/go-gitea/gitea/archive/v1.1.3.tar.gz
+	source = https://github.com/go-gitea/gitea/archive/v1.1.4.tar.gz
 	source = gitea.service
 	source = app.ini
-	sha512sums = d5ba857ba2c36b4969a2fbd82ce4146f4853629a7ecb8067821455ed2dafd5d6e53e003e8fbf359f1ba709afd902c95600a5677bb9d88f49c77aaebc166bc82a
+	sha512sums = 4427c4c1a588dcf201f707c3e2827fd702a0f8c0add63c6a5eff0d6ef8d21fdaaaf275f8e790017751f161431d563df22f71a6ea046085f9fb1d57da99f20524
 	sha512sums = 692ea79b3195f3222f69b485f8a7905223fa457dc5cb2b480edbac6f480ac4f74075accb04ae0c17b90e98e41f53224e661a85762310d7263921e763cb3fc257
 	sha512sums = f72a6ea944e9f6b55c33a1b8f7bf5ff3c2f6dd6e12e3ab0702c74ec2e4ce6c7190aaf97676c3408004089688b91ead04f8a8054906aa73ebf4034fbf0d9d1104
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ca96041cde2..ef4cf824de66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Frederik Schwan <frederik dot schwan at linux dot com>
 
 pkgname=gitea
-pkgver=1.1.3
+pkgver=1.1.4
 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')
@@ -21,7 +21,7 @@ install=gitea.install
 source=(https://github.com/go-gitea/gitea/archive/v${pkgver}.tar.gz
         gitea.service
         app.ini)
-sha512sums=('d5ba857ba2c36b4969a2fbd82ce4146f4853629a7ecb8067821455ed2dafd5d6e53e003e8fbf359f1ba709afd902c95600a5677bb9d88f49c77aaebc166bc82a'
+sha512sums=('4427c4c1a588dcf201f707c3e2827fd702a0f8c0add63c6a5eff0d6ef8d21fdaaaf275f8e790017751f161431d563df22f71a6ea046085f9fb1d57da99f20524'
             '692ea79b3195f3222f69b485f8a7905223fa457dc5cb2b480edbac6f480ac4f74075accb04ae0c17b90e98e41f53224e661a85762310d7263921e763cb3fc257'
             'f72a6ea944e9f6b55c33a1b8f7bf5ff3c2f6dd6e12e3ab0702c74ec2e4ce6c7190aaf97676c3408004089688b91ead04f8a8054906aa73ebf4034fbf0d9d1104')
 
@@ -36,15 +36,16 @@ build() {
 }
 
 package() {
-  install -o git -g git -d -m 750 "${pkgdir}/var/lib/gitea/"
-  install -o git -g git -d -m 750 "${pkgdir}/var/lib/gitea/"{repos,tmp,attachments,data,indexer,conf}
-  install -o git -g git -d -m 750 "${pkgdir}/var/log/gitea/"
-  install -o root -g git -d -m 775 "${pkgdir}/etc/gitea/"
+  # the ownership is managed in the install script
+  install -dm 750 "${pkgdir}/var/lib/gitea/"
+  install -dm 750 "${pkgdir}/var/lib/gitea/"{repos,tmp,attachments,data,indexer,conf}
+  install -dm 750 "${pkgdir}/var/log/gitea/"
+  install -dm 775 "${pkgdir}/etc/gitea/"
 
   install -Dm755 "${srcdir}/src/code.gitea.io/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
   install -Dm644 "${srcdir}/gitea.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
   install -Dm644 "${srcdir}/src/code.gitea.io/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -o root -g git -Dm644 "${srcdir}/app.ini" "${pkgdir}/etc/gitea/app.ini"
+  install -Dm644 "${srcdir}/app.ini" "${pkgdir}/etc/gitea/app.ini"
 
   cp -r "${srcdir}/src/code.gitea.io/${pkgname}/"{templates,options,public} "${pkgdir}/var/lib/${pkgname}"
   cp -r "${srcdir}/src/code.gitea.io/${pkgname}/options/locale" "${pkgdir}/var/lib/${pkgname}/conf"
diff --git a/gitea.install b/gitea.install
index c5d77eeb670c..6e4db3272582 100644
--- a/gitea.install
+++ b/gitea.install
@@ -1,9 +1,15 @@
-# arg 1:  the new package version
 post_install() {
-  printf "==> To use gitea with openssh:\n"
-  printf "    You may want to\n"
-  printf "    usermod -d /var/lib/gitea/repos git\n"
-  printf "==> To use gitea as SSH server on 22:\n"
-  printf "    You may want to\n"
-  printf "    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/gitea\n"
+    post_upgrade
+    printf "==> To use gitea with openssh:\n"
+    printf "    You may want to\n"
+    printf "    usermod -d /var/lib/gitea/repos git\n"
+    printf "==> To use gitea as SSH server on 22:\n"
+    printf "    You may want to\n"
+    printf "    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/gitea\n"
+}
+
+post_upgrade() {
+    # set permissions indepent of host the package was build on
+    chown -R git:git /var/lib/gitea /var/log/gitea
+    chown -R root:git /etc/gitea
 }