Import latest changes from PKGBUILDs repo

* Set shell to /bin/bash
* Add tmpfiles configuration for Gogs/Gitea

2 files changed, 29 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7603b3005753..4bb824e67100 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gogs
 	pkgdesc = Self Hosted Git Service written in Go
 	pkgver = 0.11.53
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://gogs.io
 	arch = i686
@@ -11,8 +11,6 @@ pkgbase = gogs
 	arch = aarch64
 	license = MIT
 	makedepends = go>=1.3
-	makedepends = patch
-	makedepends = gcc
 	depends = git>=1.7.1
 	depends = pam
 	optdepends = sqlite: SQLite support
diff --git a/PKGBUILD b/PKGBUILD
index 1530f5beec42..d16389048f5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,12 @@ _pkgname=gogs
 _orga=gogs
 _gourl=github.com/$_orga/$_pkgname
 _userid=511
+_confdir=conf
+_scriptsdir=scripts
 
 pkgname=$_pkgname
 pkgver=0.11.53
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Self Hosted Git Service written in Go'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -22,7 +24,7 @@ optdepends=('sqlite: SQLite support'
             'redis: Redis support'
             'memcached: MemCached support'
             'openssh: GIT over SSH support')
-makedepends=('go>=1.3' 'patch' 'gcc')
+makedepends=('go>=1.3')
 conflicts=("$_pkgname-bin" "$_pkgname-git" "$_pkgname-dev-git")
 options=('!strip')
 backup=("etc/$_pkgname/app.ini")
@@ -72,32 +74,50 @@ build() {
   go fix
   go build -x -ldflags="-s -w" -tags='sqlite pam cert'
 
-  echo "u $_pkgname $_userid \"$_pkgname user\" /var/lib/$_pkgname" > "$srcdir/$_pkgname.sysusers"
-  echo "#!/usr/bin/bash
+  # build sysusers file
+  echo "u $_pkgname $_userid \"$_pkgname user\" /var/lib/$_pkgname /bin/bash" > "$srcdir/$_pkgname.sysusers"
+
+  # build tmpfiles file
+  echo "d /var/lib/$_pkgname 0755 $_pkgname $_pkgname
+d /var/log/$_pkgname 0755 $_pkgname $_pkgname
+d /etc/$_pkgname 0775 root $_pkgname" > "$srcdir/$_pkgname.tmpfiles"
+
+  # build wrapper script for Gogs' backup command
+  if [[ $pkgname == 'gogs' ]]; then
+    echo "#!/usr/bin/bash
 if [[ \$USER != $_pkgname ]]; then
     echo \"Must run as user $_pkgname!\"
     exit -1
 fi
 export GOGS_CUSTOM=/var/lib/$_pkgname/custom
 /usr/bin/$_pkgname backup --config /etc/$_pkgname/app.ini \$@" > "$srcdir/$_pkgname-backup.sh"
+  fi
 }
 
 package() {
   install -Dm0755 "$srcdir/build/src/${_gourl}/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
-  install -Dm0755 "$srcdir/$_pkgname-backup.sh" "$pkgdir/usr/bin/$_pkgname-backup"
+  if [[ $pkgname == 'gogs' ]]; then
+    install -Dm0755 "$srcdir/$_pkgname-backup.sh" "$pkgdir/usr/bin/$_pkgname-backup"
+  fi
 
   mkdir -p "$pkgdir/usr/share/${_pkgname}"
-  cp -r "$srcdir/build/src/${_gourl}/conf" "$pkgdir/usr/share/${_pkgname}"
+  cp -r "$srcdir/build/src/${_gourl}/${_confdir}" "$pkgdir/usr/share/${_pkgname}"
   cp -r "$srcdir/build/src/${_gourl}/public" "$pkgdir/usr/share/${_pkgname}"
   cp -r "$srcdir/build/src/${_gourl}/templates" "$pkgdir/usr/share/${_pkgname}"
 
-  install -Dm0664 -g "$_userid" "$pkgdir/usr/share/$_pkgname/conf/app.ini" "$pkgdir/etc/$_pkgname/app.ini"
-  install -Dm0644 "$srcdir/build/src/${_gourl}/scripts/systemd/$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
+  mkdir -p "$pkgdir/etc/$_pkgname"
+  install -Dm0664 -g "$_userid" "$pkgdir/usr/share/$_pkgname/conf/app.ini"* "$pkgdir/etc/$_pkgname"
+  install -Dm0644 "$srcdir/build/src/${_gourl}/${_scriptsdir}/systemd/$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
   install -Dm0644 "$srcdir/build/src/${_gourl}/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname"
   install -Dm0644 "${srcdir}/$_pkgname.sysusers" "${pkgdir}/usr/lib/sysusers.d/$_pkgname.conf"
+  install -Dm0644 "${srcdir}/$_pkgname.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/$_pkgname.conf"
   install -dm0700 -o "$_userid" -g "$_userid" "$pkgdir/var/lib/$_pkgname"
   install -dm0700 -o "$_userid" -g "$_userid" "$pkgdir/var/log/$_pkgname"
   for subdir in avatars repos certs data/sessions data/tmp; do
     install -dm0700 -o "$_userid" -g "$_userid" "$pkgdir/var/lib/$_pkgname/$subdir"
   done
+  if [[ $pkgname == 'gitea' ]]; then
+    install -dm0700 -o "$_userid" -g "$_userid" "$pkgdir/var/lib/$_pkgname/conf"
+    cp -r "$srcdir/build/src/${_gourl}/options/locale" "$pkgdir/var/lib/$_pkgname/conf"
+  fi
 }