fix SIGSEGV on some systems by building gitea by hand

3 files changed, 43 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fca45c434f4..51f834d1e7c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 # Generated by mksrcinfo v8
-# Sun Mar 12 14:29:11 UTC 2017
+# Mon May  1 19:04:01 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.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://gitea.io
 	install = gitea.install
-	arch = x86_64
-	arch = i686
-	arch = arm
-	arch = armv6h
-	arch = armv7h
+	arch = any
 	license = MIT
+	makedepends = git
+	makedepends = go-bindata
 	optdepends = sqlite: SQLite support
 	optdepends = mariadb: MariaDB support
 	optdepends = postgresql: PostgreSQL support
@@ -22,20 +20,12 @@ pkgbase = gitea
 	conflicts = gitea-git
 	conflicts = gitea-git-dev
 	backup = etc/gitea/app.ini
+	source = v1.1.0::git://github.com/go-gitea/gitea.git
 	source = gitea.service
 	source = app.ini
+	sha512sums = SKIP
 	sha512sums = 692ea79b3195f3222f69b485f8a7905223fa457dc5cb2b480edbac6f480ac4f74075accb04ae0c17b90e98e41f53224e661a85762310d7263921e763cb3fc257
 	sha512sums = dfeaad31e2a1286d4399627587b827096e5f79411423caecde16f07684b03b18b57023c8e2c4da1045a706098ed887ab4b43d2de197d910f585f7779f1efe500
-	source_x86_64 = gitea-1.1.0::https://github.com/go-gitea/gitea/releases/download/v1.1.0/gitea-1.1.0-linux-amd64
-	sha512sums_x86_64 = 8e3638f678a9a78d02bbc9bb284de03c98ceb2fe2e4a6c2cfa0f2b1dc5cf19eb6d4618c34661f0df430b1c5a64534d3e7f03d933a709b53dd18993b0547fa7d4
-	source_i686 = gitea-1.1.0::https://github.com/go-gitea/gitea/releases/download/v1.1.0/gitea-1.1.0-linux-amd64
-	sha512sums_i686 = 8e3638f678a9a78d02bbc9bb284de03c98ceb2fe2e4a6c2cfa0f2b1dc5cf19eb6d4618c34661f0df430b1c5a64534d3e7f03d933a709b53dd18993b0547fa7d4
-	source_arm = gitea-1.1.0::https://github.com/go-gitea/gitea/releases/download/v1.1.0/gitea-1.1.0-linux-arm-5
-	sha512sums_arm = e2778aa50bd943cdabe50d282e9a43e9b4e8ec72b3fc742d6a4eaa32b075955d0cb950754d97ba73a5f8b6debfe8caa9ab9263c1463c8751f85379f57725cc7d
-	source_armv6h = gitea-1.1.0::https://github.com/go-gitea/gitea/releases/download/v1.1.0/gitea-1.1.0-linux-arm-6
-	sha512sums_armv6h = 8585944cf243e8a43559befe68fe2651ae08af7127c8f5e6928e69b2910a3b9942c510f82a5d25a88f279560a45e268dd29e432c630c48a5e501700484919349
-	source_armv7h = gitea-1.1.0::https://github.com/go-gitea/gitea/releases/download/v1.1.0/gitea-1.1.0-linux-arm-7
-	sha512sums_armv7h = 361e3fe1876859045c34e3d0a2758c9301572b6073f8e42902d832e390ff5b802df129e95b06b46d440ffdcae5c07a8f03f5ed05b7face20edb8f9e8d560d788
 
 pkgname = gitea
 
diff --git a/PKGBUILD b/PKGBUILD
index 45504a42b8a2..f3e0444a4b1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,12 @@
 
 pkgname=gitea
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 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')
+arch=('any')
 url='http://gitea.io'
 license=('MIT')
+makedepends=('git' 'go-bindata')
 optdepends=('sqlite: SQLite support'
             'mariadb: MariaDB support'
             'postgresql: PostgreSQL support'
@@ -17,29 +18,34 @@ optdepends=('sqlite: SQLite support'
 conflicts=('gitea-git' 'gitea-git-dev')
 install=gitea.install
 backup=('etc/gitea/app.ini')
-source=(gitea.service
+source=(v${pkgver}::git://github.com/go-gitea/gitea.git
+        gitea.service
         app.ini)
-source_x86_64=(${pkgname}-${pkgver}::https://github.com/go-gitea/gitea/releases/download/v${pkgver}/gitea-${pkgver}-linux-amd64)
-source_i686=(${pkgname}-${pkgver}::https://github.com/go-gitea/gitea/releases/download/v${pkgver}/gitea-${pkgver}-linux-amd64)
-source_arm=(${pkgname}-${pkgver}::https://github.com/go-gitea/gitea/releases/download/v${pkgver}/gitea-${pkgver}-linux-arm-5)
-source_armv6h=(${pkgname}-${pkgver}::https://github.com/go-gitea/gitea/releases/download/v${pkgver}/gitea-${pkgver}-linux-arm-6)
-source_armv7h=(${pkgname}-${pkgver}::https://github.com/go-gitea/gitea/releases/download/v${pkgver}/gitea-${pkgver}-linux-arm-7)
-
-sha512sums=('692ea79b3195f3222f69b485f8a7905223fa457dc5cb2b480edbac6f480ac4f74075accb04ae0c17b90e98e41f53224e661a85762310d7263921e763cb3fc257'
+sha512sums=('SKIP'
+            '692ea79b3195f3222f69b485f8a7905223fa457dc5cb2b480edbac6f480ac4f74075accb04ae0c17b90e98e41f53224e661a85762310d7263921e763cb3fc257'
             'dfeaad31e2a1286d4399627587b827096e5f79411423caecde16f07684b03b18b57023c8e2c4da1045a706098ed887ab4b43d2de197d910f585f7779f1efe500')
-sha512sums_x86_64=('8e3638f678a9a78d02bbc9bb284de03c98ceb2fe2e4a6c2cfa0f2b1dc5cf19eb6d4618c34661f0df430b1c5a64534d3e7f03d933a709b53dd18993b0547fa7d4')
-sha512sums_i686=('8e3638f678a9a78d02bbc9bb284de03c98ceb2fe2e4a6c2cfa0f2b1dc5cf19eb6d4618c34661f0df430b1c5a64534d3e7f03d933a709b53dd18993b0547fa7d4')
-sha512sums_arm=('e2778aa50bd943cdabe50d282e9a43e9b4e8ec72b3fc742d6a4eaa32b075955d0cb950754d97ba73a5f8b6debfe8caa9ab9263c1463c8751f85379f57725cc7d')
-sha512sums_armv6h=('8585944cf243e8a43559befe68fe2651ae08af7127c8f5e6928e69b2910a3b9942c510f82a5d25a88f279560a45e268dd29e432c630c48a5e501700484919349')
-sha512sums_armv7h=('361e3fe1876859045c34e3d0a2758c9301572b6073f8e42902d832e390ff5b802df129e95b06b46d440ffdcae5c07a8f03f5ed05b7face20edb8f9e8d560d788')
+
+prepare() {
+  mkdir -p "${srcdir}/src/code.gitea.io"
+  ln -s "${srcdir}/v${pkgver}" "${srcdir}/src/code.gitea.io/gitea"
+}
+
+build() {
+  cd ${srcdir}/src/code.gitea.io/${pkgname}
+  GOPATH="${srcdir}" make DESTDIR="${pkgdir}" clean generate 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,sessions,attachments,public,data,indexer}
-  install -o git -g git -d -m 750 ${pkgdir}/var/log/gitea/
-  install -d -m 755 ${pkgdir}/etc/gitea/
+  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,sessions,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/"
+
+  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 -Dm755 ${srcdir}/${pkgname}-${pkgver} ${pkgdir}/usr/bin/${pkgname}
-  install -Dm644 ${srcdir}/gitea.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -o root -g git -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/app.ini b/app.ini
index 25c6f83898b3..e873f5f36123 100644
--- a/app.ini
+++ b/app.ini
@@ -6,7 +6,7 @@ RUN_USER = git
 RUN_MODE = prod
 
 [repository]
-ROOT = /var/lib/gitea/repos
+ROOT = /var/lib/gitea/repos/
 SCRIPT_TYPE = bash
 ; Default ANSI charset
 ANSI_CHARSET =
@@ -36,7 +36,7 @@ PREVIEWABLE_FILE_MODES = markdown
 ; 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 = /var/lib/gitea/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
@@ -131,9 +131,9 @@ CERT_FILE = custom/https/cert.pem
 KEY_FILE = custom/https/key.pem
 ; Upper level of template and static file path
 ; default is the path where Gitea is executed
-STATIC_ROOT_PATH = /var/lib/gitea/public
+STATIC_ROOT_PATH = /var/lib/gitea/
 ; Default path for App data
-APP_DATA_PATH = /var/lib/gitea/data
+APP_DATA_PATH = /var/lib/gitea/data/
 ; Application level GZIP support
 ENABLE_GZIP = false
 ; Landing page for non-logged users, can be "home" or "explore"
@@ -267,7 +267,7 @@ PROVIDER = memory
 ; file: session file path, e.g. `data/sessions`
 ; redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
 ; mysql: go-sql-driver/mysql dsn config string, e.g. `root:password@/session_table`
-PROVIDER_CONFIG = /var/lib/gitea/sessions
+PROVIDER_CONFIG = /var/lib/gitea/data/sessions/
 ; Session cookie name
 COOKIE_NAME = i_like_gitea
 ; If you use session in https only, default is false
@@ -280,7 +280,7 @@ GC_INTERVAL_TIME = 86400
 SESSION_LIFE_TIME = 86400
 
 [picture]
-AVATAR_UPLOAD_PATH = /var/lib/gitea/data/avatars
+AVATAR_UPLOAD_PATH = /var/lib/gitea/data/avatars/
 ; Chinese users can choose "duoshuo"
 ; or a custom avatar source, like: http://cn.gravatar.com/avatar/
 GRAVATAR_SOURCE = gravatar
@@ -295,7 +295,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 = /var/lib/gitea/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
@@ -310,7 +310,7 @@ MAX_FILES = 5
 FORMAT =
 
 [log]
-ROOT_PATH = /var/log/gitea
+ROOT_PATH = /var/log/gitea/
 ; Either "console", "file", "conn", "smtp" or "database", default is "console"
 ; Use comma to separate multiple modes, e.g. "console, file"
 MODE = console