upgpkg: gogs 0.9.145

1 files changed, 63 insertions, 79 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f924a762b8bc..16e023a64444 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,105 +1,89 @@
-# Contributor: Thomas Laroche <tho.laroche@gmail.com>
-# Maintainer: Thomas Fanninger <thomas@fanninger.at>
-
+# Maintainer: surefire@cryptomile.net
 pkgname=gogs-git
-_pkgname=gogs
-_branch=master
-pkgver=4256.8059175a
+epoch=2
+pkgver=0.9.145.0213+7+1381f0f2
 pkgrel=1
-epoch=1
-pkgdesc="Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language. This is the current git version from branch ${_branch}."
+pkgdesc="Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://gogs.io/"
 license=('MIT')
+depends=('git' 'sqlite')
+conflicts=('gogs')
 provides=('gogs')
-depends=('git>=1.7.1')
-optdepends=('sqlite: SQLite support'
-            'mariadb: MariaDB support'
+options=('!buildflags')
+optdepends=('mariadb: MariaDB support'
             'postgresql: PostgreSQL support'
             'redis: Redis support'
             'memcached: MemCached support'
-            'openssh: GIT over SSH support'
-            'tidb-git: TiDB support')
-makedepends=('go>=1.3' 'git>=1.7.1' 'patch' 'glide>=0.10')
-conflicts=('gogs-bin' 'gogs' 'gogs-git')
-options=('!strip' '!emptydirs')
-backup=('srv/gogs/conf/app.ini')
-
+            'openssh: GIT over SSH support')
+makedepends=('go' 'git' 'nodejs-less')
+source=('git+https://github.com/gogits/gogs.git#branch=master'
+        'git+https://github.com/jteeuwen/go-bindata.git' #Because сommunity package is very outdated
+        'gogs.service'
+        'gogs.sysusers'
+        'gogs.tmpfiles')
+md5sums=('SKIP'
+         'SKIP'
+         '4ea1610580f7e7de4259025f8980942d'
+         'e919a9b9cfee91e3ff146bc8841d4d28'
+         '0cef7ff4495be24a34178a4f29e803b6')
 install=gogs.install
+_gogsdir="src/github.com/gogits/gogs"
+
+prepare() {
+	export GOPATH="$srcdir"
+
+	mkdir -p ./src/github.com/{gogits,jteeuwen}
 
-_gourl=github.com/gogits/$_pkgname
-source=('gogs.service.patch'
-        'app.ini.patch'
-        "$_pkgname-$pkgver::git+https://${_gourl}.git#branch=${_branch}")
+	mv    -t ./src/github.com/gogits   ./gogs
+	mv    -t ./src/github.com/jteeuwen ./go-bindata
 
-sha512sums=(db36fd44c29de387b066e52a71a61214aa876a27574eb054ec9517a175b5a47db9a7de01be2dd635023a11d5e1224772a66accc4b63b6936f7c58e6314555a66
-            dd88280d0ae028085d5834e7579477257331287f6892ec9489a6ba07f1c1f9f993a2b23513ea128ddf523b69ead2be9c309833ad22901a6a6ec6180720ee81bd
-            'SKIP')
+	cd "$_gogsdir"
 
-_goroot="/usr/lib/go"
+	sed -r -i conf/app.ini \
+		-e '0,             /^\[/ s/^(RUN_USER)\W.*$/\1 = gogs/' \
+		-e '/^\[server\]/, /^\[/ s/^(STATIC_ROOT_PATH)\W.*$/\1 = \/usr\/share\/gogs/' \
+		-e '/^\[log\]/,    /^\[/ s/^(ROOT_PATH)\W.*$/\1 = \/var\/log\/gogs/' \
+	;
 
-pkgver(){
-  cd "$srcdir/../$_pkgname-$pkgver"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+	# Dirty hack
+	sed -i vendor/github.com/go-xorm/xorm/logger.go \
+		-e '/DEFAULT_LOG_LEVEL/ s/core\.LOG_DEBUG/core.LOG_WARNING/' vendor/github.com/go-xorm/xorm/logger.go \
+	;
 }
 
-prepare() {
-  export GOROOT=/usr/lib/go
-  
-  msg2 "Prepare GO build enviroment"
-  rm -rf build
-  mkdir -p build/go
-  cd build/go
-
-  for f in "$GOROOT/"*; do
-    ln -s "$f"
-  done
-
-  rm pkg
-  mkdir pkg
-  cd pkg
-
-  for f in "$GOROOT/pkg/"*; do
-    ln -s "$f"
-  done
-
-  export GOROOT="$srcdir/build/go"
-  export GOPATH="$srcdir/build"
-  
-  mkdir -p "$GOPATH/src/github.com/gogits"
-
-  mv "$srcdir/$_pkgname-$pkgver" $GOPATH/src/${_gourl}
-
-  # Glide
-  msg2 "Download dependencies via Glide"
-  cd $GOPATH/src/${_gourl}
-  glide cc
-  glide update
-  glide install
-
-  # Execute patch
-  msg2 "Execute patches"
-  patch -Np1 -i "$srcdir/app.ini.patch" "$GOPATH/src/${_gourl}/conf/app.ini"
-  patch -Np1 -i "$srcdir/gogs.service.patch" "$GOPATH/src/${_gourl}/scripts/systemd/gogs.service"
+pkgver() {
+	cd "$_gogsdir"
+	printf '%s+%s+%s' \
+		$(<templates/.VERSION) \
+		$(git rev-list --count HEAD...$(git log --pretty=format:%H -n 1 -- templates/.VERSION)) \
+		$(git rev-parse --short HEAD) \
+	;
 }
 
 build() {
-  cd $GOPATH/src/${_gourl}
+	export GOPATH="$srcdir"
+
+	cd "$srcdir/src/github.com/jteeuwen/go-bindata/go-bindata"
+	go install -v
+
+	cd "$srcdir/$_gogsdir"
 
-  msg2 "Build program"
-  go fix
-  go build -x -tags='sqlite pam cert'
+	make PATH="$GOPATH/bin:$PATH" TAGS='libsqlite3 sqlite pam cert' build
 }
 
 package() {
-  install -Dm0755 "$srcdir/build/src/${_gourl}/$_pkgname" "$pkgdir/usr/share/$_pkgname/$_pkgname"
+	cd "$_gogsdir"
+
+	rm -rf ./public/{less,config.codekit}
+
+	install -d "$pkgdir/usr/share/gogs"
+	cp     -rt "$pkgdir/usr/share/gogs" ./{templates,public}
 
-  cp -r "$srcdir/build/src/${_gourl}/conf" "$pkgdir/usr/share/$_pkgname"
-  mkdir -p "$pkgdir/usr/share/themes/gogs/default/"
-  cp -r "$srcdir/build/src/${_gourl}/public" "$pkgdir/usr/share/themes/gogs/default"
-  cp -r "$srcdir/build/src/${_gourl}/templates" "$pkgdir/usr/share/themes/gogs/default"
+	install -Dm0755 -t "$pkgdir/usr/bin"                 ./gogs
+	install -Dm0644 -t "$pkgdir/usr/share/licenses/gogs" ./LICENSE
+	install -Dm0644 -t "$pkgdir/usr/lib/systemd/system"  "$srcdir/gogs.service"
 
-  install -Dm0644 "$pkgdir/usr/share/$_pkgname/conf/app.ini" "$pkgdir/srv/$_pkgname/conf/app.ini"
-  install -Dm0644 "$srcdir/build/src/${_gourl}/scripts/systemd/gogs.service" "$pkgdir/usr/lib/systemd/system/gogs.service"
-  install -Dm0644 "$srcdir/build/src/${_gourl}/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname"
+	install -Dm0644 "$srcdir/gogs.sysusers" "$pkgdir/usr/lib/sysusers.d/gogs.conf"
+	install -Dm0644 "$srcdir/gogs.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/gogs.conf"
 }