From 2fd0a7b0ae37d8d173b417e4f746a1065b9a48a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pola=C5=84ski?= <michal@polanski.me> Date: Thu, 8 Oct 2020 23:54:59 +0200 Subject: [PATCH] community/gogs: modernize --- community/gogs/APKBUILD | 47 +++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/community/gogs/APKBUILD b/community/gogs/APKBUILD index 8a2428e75a2e..46184e3d556d 100644 --- a/community/gogs/APKBUILD +++ b/community/gogs/APKBUILD @@ -2,11 +2,10 @@ # Maintainer: 7heo <7heo@mail.com> pkgname=gogs pkgver=0.12.2 -pkgrel=0 -pkgdesc="A painless self-hosted Git service" +pkgrel=1 +pkgdesc="Painless self-hosted Git service" url="https://gogs.io/" -# buildmode=pie not available on mips64 -arch="all !mips !mips64" +arch="all !mips !mips64" # limited by go license="MIT" depends="git" makedepends="go perl libcap" @@ -14,8 +13,8 @@ install="$pkgname.pre-install" pkgusers="gogs" pkggroups="www-data" options="!check" # go race fails -subpackages="${pkgname}-openrc" -source="${pkgname}-${pkgver}.tar.gz::https://github.com/gogs/$pkgname/archive/v$pkgver.tar.gz +subpackages="$pkgname-openrc" +source="$pkgname-$pkgver.tar.gz::https://github.com/gogs/gogs/archive/v$pkgver.tar.gz $pkgname.initd $pkgname.confd $pkgname.ini" @@ -23,24 +22,20 @@ builddir="$srcdir/github.com/gogs/$pkgname" prepare() { mkdir -p "$srcdir"/github.com/gogs - mv "$srcdir"/$pkgname-$pkgver "$builddir"/ || return 1 + mv "$srcdir"/$pkgname-$pkgver "$builddir"/ default_prepare } build() { export GOPATH="$startdir" - cd "$builddir" || return 1 - go fix || return 1 + go fix # Note: sqlite causes problems without the pie buildmode - go build -buildmode=pie -v -tags "sqlite redis memcache cert" ||return 1 + go build -buildmode=pie -v -tags "sqlite redis memcache cert" } package() { - cd "$builddir" - - install -d -m 0755 \ - "$pkgdir"/usr/share/webapps/$pkgname || return 1 + install -dm755 "$pkgdir"/usr/share/webapps/$pkgname # TODO: Is it really necessary to be world-readable?! - install -d -m 0755 -o gogs -g www-data \ + install -dm755 -o gogs -g www-data \ "$pkgdir"/var/lib/$pkgname \ "$pkgdir"/var/lib/$pkgname/git \ "$pkgdir"/var/lib/$pkgname/db \ @@ -48,23 +43,19 @@ package() { "$pkgdir"/var/lib/$pkgname/attachements \ "$pkgdir"/var/cache/$pkgname/sessions \ "$pkgdir"/var/log/$pkgname \ - "$pkgdir"/etc/$pkgname/conf || return 1 + "$pkgdir"/etc/$pkgname/conf - install -D -m 0755 $pkgname \ - "$pkgdir"/usr/bin/$pkgname || return 1 - # Allow to bind to port 80. - setcap cap_net_bind_service=+ep \ - "$pkgdir"/usr/bin/$pkgname || return 1 + install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname + # Allow to bind to port 80 + setcap cap_net_bind_service=+ep "$pkgdir"/usr/bin/$pkgname - install -D -m 0664 -o gogs -g www-data "$srcdir"/${pkgname}.ini \ - "$pkgdir"/etc/$pkgname/conf/app.ini || return 1 + install -Dm664 -o gogs -g www-data "$srcdir"/$pkgname.ini \ + "$pkgdir"/etc/$pkgname/conf/app.ini - mv public templates "$pkgdir"/usr/share/webapps/$pkgname/ || return 1 + mv public templates "$pkgdir"/usr/share/webapps/$pkgname/ - install -m755 -D "$srcdir"/$pkgname.initd \ - "$pkgdir"/etc/init.d/$pkgname - install -m644 -D "$srcdir"/$pkgname.confd \ - "$pkgdir"/etc/conf.d/$pkgname + install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } cleanup_srcdir() { -- GitLab