go->git for sources + misc

3 files changed, 16 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9fa6df8e012..25a852ac6494 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitea-git
 	pkgdesc = A painless self-hosted Git service.
-	pkgver = r5659.a79af9cf
+	pkgver = r5666.6b62f042
 	pkgrel = 1
 	url = https://gitea.io/
 	install = gitea.install
@@ -24,9 +24,12 @@ pkgbase = gitea-git
 	options = !strip
 	options = emptydirs
 	backup = etc/gitea/app.ini
+	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 = 5dd56905a3641d7094964a69030fda4d79565a87ccd6dcc4a714b423ccfce9af
 	sha256sums = 6cd1daa666659a68c98376f8bfae55402b5ffc39c1bf42b5ae0ee700249a3b73
 
 pkgname = gitea-git
+
diff --git a/0001-Adjust-config-for-Arch-Linux-package.patch b/0001-Adjust-config-for-Arch-Linux-package.patch
index 924ce2205ac1..e5e35fbd7fd0 100644
--- a/0001-Adjust-config-for-Arch-Linux-package.patch
+++ b/0001-Adjust-config-for-Arch-Linux-package.patch
@@ -1,5 +1,5 @@
 --- app.ini
-+++ app.ini	2017-10-04 10:39:12.000000000 +0300
++++ app.ini	2017-10-05 18:08:31.000000000 +0300
 @@ -1,12 +1,12 @@
  ; App name that shows on every page title
  APP_NAME = Gitea: Git with a cup of tea
@@ -95,8 +95,8 @@
  USE_CERTIFICATE = false
 -CERT_FILE = custom/mailer/cert.pem
 -KEY_FILE = custom/mailer/key.pem
-+CERT_FILE = /var/lib/gitea/custom/mailer/cert.pem
-+KEY_FILE = /var/lib/gitea/custom/mailer/key.pem
++CERT_FILE = /var/lib/gitea/cert/cert.pem
++KEY_FILE = /var/lib/gitea/cert/key.pem
  ; Mail from address, RFC 5322. This can be just an email address, or the `"Name" <email@example.com>` format
  FROM =
  ; Mailer user name and password
diff --git a/PKGBUILD b/PKGBUILD
index 86b8ae9cebac..d28b92f5e812 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _gourl="code.gitea.io"
 
 pkgname=$_pkgname-git
 pkgrel=1
-pkgver=r5659.a79af9cf
+pkgver=r5666.6b62f042
 pkgdesc="A painless self-hosted Git service."
 url="https://gitea.io/"
 license=("MIT")
@@ -30,17 +30,19 @@ provides=("gitea")
 options=("!strip" "emptydirs")
 backup=("etc/gitea/app.ini")
 install=${_pkgname}.install
-source=("0001-Adjust-config-for-Arch-Linux-package.patch"
+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=("5dd56905a3641d7094964a69030fda4d79565a87ccd6dcc4a714b423ccfce9af"
+sha256sums=("SKIP"
+            "5dd56905a3641d7094964a69030fda4d79565a87ccd6dcc4a714b423ccfce9af"
             "6cd1daa666659a68c98376f8bfae55402b5ffc39c1bf42b5ae0ee700249a3b73")
 
 prepare() {
-  msg2 "Retrieving bindata"
-  GOPATH="${srcdir}" go get -v -u github.com/go-macaron/bindata
+  mkdir -p "${srcdir}/src/${_gourl}/${_pkgname}"
+  cp -r "${srcdir}/${_pkgname}" "${srcdir}/src/${_gourl}"
 
-  msg2 "Retrieving source files"
-  GOPATH="${srcdir}" go get -v -d -u ${_gourl}/${_pkgname}
+  msg2 "Retrieve bindata"
+  GOPATH="${srcdir}" go get -v -u github.com/go-macaron/bindata
 
   msg2 "Patch config and service file"
   patch -Np1 -i "${srcdir}/0001-Adjust-config-for-Arch-Linux-package.patch" "${srcdir}/src/${_gourl}/${_pkgname}/conf/app.ini"