Package refactoring

5 files changed, 41 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe82ca2dda12..0d8fa58a9e43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,25 @@
 pkgbase = gitea-git
 	pkgdesc = A painless self-hosted Git service.
-	pkgver = v1.1.0.r803.g0c69b768
-	pkgrel = 3
+	pkgver = r5926.b82519ca
+	pkgrel = 1
 	url = https://gitea.io/
 	install = gitea.install
-	arch = i686
 	arch = x86_64
+	arch = i686
+	arch = arm
 	arch = armv6h
 	arch = armv7h
+	arch = aarch64
 	license = MIT
 	makedepends = go
 	depends = git
 	optdepends = sqlite: SQLite support
 	optdepends = mariadb: MariaDB support
 	optdepends = postgresql: PostgreSQL support
-	optdepends = mssql-server: MSSQL support
+	optdepends = pam: Authentication via PAM support
 	optdepends = redis: Redis support
 	optdepends = memcached: MemCached support
 	optdepends = openssh: GIT over SSH support
-	optdepends = pam: Authentication via PAM support
 	provides = gitea
 	conflicts = gitea
 	options = !strip
@@ -27,9 +28,9 @@ pkgbase = gitea-git
 	source = git://github.com/go-gitea/gitea.git
 	source = 0001-Adjust-config-for-Arch-Linux-package.patch
 	source = 0002-Adjust-service-file-for-Arch-Linux-package.patch
-	sha256sums = SKIP
-	sha256sums = a41f10f85d4ea0e91a0da5b6450845afa4e1ddb39032c37c0ee2abb746ce6cc8
-	sha256sums = 6cd1daa666659a68c98376f8bfae55402b5ffc39c1bf42b5ae0ee700249a3b73
+	sha512sums = SKIP
+	sha512sums = d80d9bb906337d89f09edfc4e958ee75213d957e386ae8f420098e4d6a5b79ed6834ac1be28e69d8b99cb6614a36c87de1880ac262134273020e4f031c38f5cd
+	sha512sums = db4ad287cfc9f42495bd20771135e140656271b3678827e3e751ec023c1e90b99bfd097d57562b19fc8fa983bd8be877350ef7dcb071c14c310800a7485e9896
 
 pkgname = gitea-git
 
diff --git a/0001-Adjust-config-for-Arch-Linux-package.patch b/0001-Adjust-config-for-Arch-Linux-package.patch
index c605ee49cc3e..38eae2ad100c 100644
--- a/0001-Adjust-config-for-Arch-Linux-package.patch
+++ b/0001-Adjust-config-for-Arch-Linux-package.patch
@@ -1,11 +1,8 @@
 --- app.ini.sample
-+++ app.ini.sample	2017-11-28 15:33:05.569999999 +0300
-@@ -5,12 +5,12 @@
- ; App name that shows on every page title
- APP_NAME = Gitea: Git with a cup of tea
++++ app.ini.sample	2017-12-11 15:07:54.936666668 +0300
+@@ -7,10 +7,10 @@
  ; Change it if you run locally
--RUN_USER = git
-+RUN_USER = gitea
+ RUN_USER = git
  ; Either "dev", "prod" or "test", default is "dev"
 -RUN_MODE = dev
 +RUN_MODE = prod
diff --git a/0002-Adjust-service-file-for-Arch-Linux-package.patch b/0002-Adjust-service-file-for-Arch-Linux-package.patch
index 8ebc6a43a9d4..cb297229f78f 100644
--- a/0002-Adjust-service-file-for-Arch-Linux-package.patch
+++ b/0002-Adjust-service-file-for-Arch-Linux-package.patch
@@ -1,20 +1,16 @@
 --- gitea.service
-+++ gitea.service	2017-10-02 23:31:14.000000000 +0300
-@@ -15,12 +15,12 @@
- #LimitMEMLOCK=infinity
- #LimitNOFILE=65535
++++ gitea.service	2017-12-11 15:10:35.090000002 +0300
+@@ -18,10 +18,10 @@
  Type=simple
--User=git
--Group=git
+ User=git
+ Group=git
 -WorkingDirectory=/home/git/gitea
 -ExecStart=/home/git/gitea/gitea web
-+User=gitea
-+Group=gitea
 +WorkingDirectory=/var/lib/gitea
 +ExecStart=/usr/bin/gitea web --config /etc/gitea/app.ini
  Restart=always
 -Environment=USER=git HOME=/home/git
-+Environment=USER=gitea HOME=/var/lib/gitea
++Environment=USER=git HOME=/var/lib/gitea
  
  [Install]
  WantedBy=multi-user.target
diff --git a/PKGBUILD b/PKGBUILD
index 89e53d0d2bc8..a91077d463a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,22 +9,21 @@ _pkgname="gitea"
 _gourl="code.gitea.io"
 
 pkgname=gitea-git
-pkgrel=3
-pkgver=v1.1.0.r803.g0c69b768
+pkgrel=1
+pkgver=r5926.b82519ca
 pkgdesc="A painless self-hosted Git service."
 url="https://gitea.io/"
 license=("MIT")
-arch=("i686" "x86_64" "armv6h" "armv7h")
+arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 depends=("git")
 makedepends=("go")
-optdepends=("sqlite: SQLite support"
-            "mariadb: MariaDB support"
-            "postgresql: PostgreSQL support"
-            "mssql-server: MSSQL support"
-            "redis: Redis support"
-            "memcached: MemCached support"
-            "openssh: GIT over SSH support"
-            "pam: Authentication via PAM support")
+optdepends=('sqlite: SQLite support'
+            'mariadb: MariaDB support'
+            'postgresql: PostgreSQL support'
+            'pam: Authentication via PAM support'
+            'redis: Redis support'
+            'memcached: MemCached support'
+            'openssh: GIT over SSH support')
 conflicts=("gitea")
 provides=("gitea")
 options=("!strip" "emptydirs")
@@ -33,16 +32,13 @@ install=gitea.install
 source=("git://github.com/go-gitea/gitea.git"
         "0001-Adjust-config-for-Arch-Linux-package.patch"
         "0002-Adjust-service-file-for-Arch-Linux-package.patch")
-sha256sums=('SKIP'
-            'a41f10f85d4ea0e91a0da5b6450845afa4e1ddb39032c37c0ee2abb746ce6cc8'
-            '6cd1daa666659a68c98376f8bfae55402b5ffc39c1bf42b5ae0ee700249a3b73')
+sha512sums=('SKIP'
+            'd80d9bb906337d89f09edfc4e958ee75213d957e386ae8f420098e4d6a5b79ed6834ac1be28e69d8b99cb6614a36c87de1880ac262134273020e4f031c38f5cd'
+            'db4ad287cfc9f42495bd20771135e140656271b3678827e3e751ec023c1e90b99bfd097d57562b19fc8fa983bd8be877350ef7dcb071c14c310800a7485e9896')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
-  ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
@@ -61,17 +57,17 @@ build() {
 }
 
 package() {
-  install -Dm0755 "${srcdir}/src/${_gourl}/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+  install -dm 750 "${pkgdir}/var/log/${_pkgname}/"
+  install -dm 750 "${pkgdir}/var/lib/${_pkgname}/"
+  install -dm 755 "${pkgdir}/usr/share/${_pkgname}/"
+  install -dm 775 "${pkgdir}/etc/gitea/"
 
-  install -dm0700 "${pkgdir}/var/log/${_pkgname}/"
-  install -dm0700 "${pkgdir}/var/lib/${_pkgname}/"
-
-  install -dm0755 "${pkgdir}/usr/share/${_pkgname}/"
   cp -r "${srcdir}/src/${_gourl}/${_pkgname}/custom" "${pkgdir}/usr/share/${_pkgname}"
   cp -r "${srcdir}/src/${_gourl}/${_pkgname}/public" "${pkgdir}/usr/share/${_pkgname}"
   cp -r "${srcdir}/src/${_gourl}/${_pkgname}/templates" "${pkgdir}/usr/share/${_pkgname}"
 
-  install -Dm0644 "${pkgdir}/usr/share/${_pkgname}/custom/conf/app.ini.sample" "${pkgdir}/etc/${_pkgname}/app.ini"
-  install -Dm0644 "${srcdir}/src/${_gourl}/${_pkgname}/contrib/systemd/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
-  install -Dm0644 "${srcdir}/src/${_gourl}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}"
+  install -Dm755 "${srcdir}/src/${_gourl}/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+  install -Dm644 "${pkgdir}/src/${_gourl}/${_pkgname}/custom/conf/app.ini.sample" "${pkgdir}/etc/${_pkgname}/app.ini"
+  install -Dm644 "${srcdir}/src/${_gourl}/${_pkgname}/contrib/systemd/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
+  install -Dm644 "${srcdir}/src/${_gourl}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}"
 }
diff --git a/gitea.install b/gitea.install
index 26a9e757fcb9..b50031e6b03e 100644
--- a/gitea.install
+++ b/gitea.install
@@ -1,25 +1,9 @@
-pre_install() {
-  if ! getent group gitea >/dev/null; then
-    groupadd --system gitea
-  fi
-  if ! getent passwd gitea >/dev/null; then
-    useradd -m --system -c 'gitea daemon users' -g gitea -s /bin/false gitea -d /var/lib/gitea
-  fi
-  chsh gitea -s /bin/bash
-}
-
 post_install(){
-  chown -R gitea:gitea /var/log/gitea
-  chown -R gitea:gitea /var/lib/gitea
-  chown -R gitea:gitea /etc/gitea
-
+  chown -R git:git /var/lib/gitea /var/log/gitea
+  chown -R root:git /etc/gitea
   systemctl daemon-reload
 }
 
-pre_upgrade(){
-  pre_install $1
-}
-
 post_upgrade() {
   post_install $1
 }
@@ -28,12 +12,3 @@ pre_remove() {
   systemctl stop gitea.service
   systemctl disable gitea.service
 }
-
-post_remove() {
-  if getent passwd gitea >/dev/null; then
-    userdel -r gitea
-  fi
-  if getent group gitea >/dev/null; then
-    groupdel gitea
-  fi
-}