diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2017-03-10 00:16:40 +0100 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2017-03-10 00:17:26 +0100 |
| commit | 7852dbe781671abbe17bb633ffa2956fdd270716 (patch) | |
| tree | 8311ebf9c4a3a9653b0a6b1b78e511e8a816a5b1 | |
| parent | 46736e7b8040becc9f69ad6d2c2d317a52d5485b (diff) | |
| download | aports-7852dbe781671abbe17bb633ffa2956fdd270716.tar.bz2 aports-7852dbe781671abbe17bb633ffa2956fdd270716.tar.xz | |
testing/gitea: upgrade to 1.1.0
| -rw-r--r-- | testing/gitea/APKBUILD | 31 | ||||
| -rw-r--r-- | testing/gitea/aarch64-go-log-fix.patch | 10 | ||||
| -rw-r--r-- | testing/gitea/allow-to-set-version.patch | 10 |
3 files changed, 15 insertions, 36 deletions
diff --git a/testing/gitea/APKBUILD b/testing/gitea/APKBUILD index 52d74b5959..0b0f36ba70 100644 --- a/testing/gitea/APKBUILD +++ b/testing/gitea/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: 7heo <7heo@mail.com> pkgname=gitea -pkgver=1.0.1 -pkgrel=5 +pkgver=1.1.0 +pkgrel=0 pkgdesc="A self-hosted Git service written in Go" url="http://gitea.io/" arch="all" license="MIT" depends="git" -makedepends="govendor go-tools perl libcap" +makedepends="go libcap" install="$pkgname.pre-install" pkgusers="gitea" pkggroups="www-data" @@ -16,7 +16,6 @@ source="${pkgname}-${pkgver}.tar.gz::https://github.com/go-gitea/$pkgname/archiv $pkgname.initd $pkgname.confd $pkgname.ini - aarch64-go-log-fix.patch allow-to-set-version.patch " builddir="$srcdir/src/code.gitea.io/$pkgname" @@ -25,8 +24,6 @@ prepare() { mkdir -p ${builddir%/*} mv "$srcdir"/$pkgname-$pkgver "$builddir"/ || return 1 cd "$builddir" - export GOPATH="$srcdir" - govendor sync -v || return 1 default_prepare } @@ -77,21 +74,13 @@ package() { "$pkgdir"/etc/conf.d/$pkgname || return 1 } -md5sums="c031c1d3745e95afbb93309f76f9897c gitea-1.0.1.tar.gz -41eaec7f58dd872c1df9cf523b7595ae gitea.initd -fc039e2eb200d020867a3105c227b267 gitea.confd -b7a9ab6bf9a1c995c1edef73f6aaf374 gitea.ini -91caa13a896c29ec9bc52a259769ee7a aarch64-go-log-fix.patch -9ac908812a0cb38c367fb699f48ac13f allow-to-set-version.patch" -sha256sums="79df6391bdf9d7833dd16f312ec8ab998f18671f3a3d889875b4fa81cc010a17 gitea-1.0.1.tar.gz -c5236c76d1db76390ec9c0c4e670916e64f4ea64ee856ad191098a55f644e8f7 gitea.initd -749340849d1066c04295267a013107d8517cce53a460e81eb448a2b6e5d45539 gitea.confd -c9248a706c9c0c96b07304b2c03ba662473e5beaa0e1cb501dcaf1bb3ba40cbe gitea.ini -cd088148e2786c8c720e856d9d518568ea4e6dd7764c72eb86d06ff6eb47fa2f aarch64-go-log-fix.patch -f9e8942321b5c7028c96af140fcfd443a411e3e4e2379127275094c7eedf0a26 allow-to-set-version.patch" -sha512sums="bde94f503ff7df33b0f891bfa726546d07c35c3731ed300dc9be50ee778229a0a358c22fc8206b0f0f4da5085a63bb196748968ed37b9310be9b1cab1c743ce4 gitea-1.0.1.tar.gz +check() { + # basic check to see if the app works + "$builddir"/$pkgname help > /dev/null 2>&1 || return 1 +} + +sha512sums="206b3b3b2af13634573bb956f7a7db11a45dba36b73a48fb2561018b445b9f7d215d77af6ed1b985d8098d835502544347974223d3892a75abfdce7f5769cbba gitea-1.1.0.tar.gz 5cd3144d040139ff27fb5acef9b09406f7acbdda2779638ba20fcf8a7739697351502a26a30020a42c84b9146fdc96b9943b85099819a86facf0d53a4f000078 gitea.initd ea4a771652871a6aefd5f236c6cd96bf0b17abb46a016e60fe1ae96b88df972e014be438f52dc9c0f8a35e50f5897d48b8a413a6aeaf54adf8ed1e1005e472c1 gitea.confd 07d31133712675cdef326da95bf6ea24d7312c58b126a160cf28a64a5548dbe72b9d64f99d25aaa052f08c7ae4d8a74425d8307a6f41a58bd74f34c8fdb08d8f gitea.ini -c5762d3c06a5b9f5a40f15945f57963ebb114a4ccf40ab188fc379dfc8a077f478ef54b88561ee1f316423bd30d8bf8c12527acbddda50b884354374683c843b aarch64-go-log-fix.patch -a2ad261c38310788b6d5bd2ff936930f13f58477c4ff6a3210d4824b3f3a696403ca66641c4a5ec7977e27b4b7f96e9d3a8415f6833ee8ace62eb7cb8528954e allow-to-set-version.patch" +e38a701faed6749cbb897536d9ec7e723dc258c01b43daea7e19f3bd56dda4d69cd3be2b0813c24bef902f0b82c734120e36276b4e72899d2d2b3be54dc4574e allow-to-set-version.patch" diff --git a/testing/gitea/aarch64-go-log-fix.patch b/testing/gitea/aarch64-go-log-fix.patch deleted file mode 100644 index c3e54e6b81..0000000000 --- a/testing/gitea/aarch64-go-log-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./vendor/github.com/ngaut/log/crash_unix.go.orig -+++ ./vendor/github.com/ngaut/log/crash_unix.go -@@ -13,6 +13,6 @@ - if err != nil { - log.Println(err.Error()) - } else { -- syscall.Dup2(int(f.Fd()), 2) -+ syscall.Dup3(int(f.Fd()), 2, 0) - } - } diff --git a/testing/gitea/allow-to-set-version.patch b/testing/gitea/allow-to-set-version.patch index 3e698d787a..4be917c846 100644 --- a/testing/gitea/allow-to-set-version.patch +++ b/testing/gitea/allow-to-set-version.patch @@ -1,15 +1,15 @@ --- ./Makefile.orig +++ ./Makefile -@@ -6,7 +6,11 @@ +@@ -11,7 +11,11 @@ STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less) JAVASCRIPTS := --LDFLAGS += -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" +-LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" -X "main.Tags=$(TAGS)" +ifeq ($(origin VERSION), undefined) -+ VERSION=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') ++ VERSION=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') +endif + +LDFLAGS += -X "main.Version=$(VERSION)" - TARGETS ?= linux/*,darwin/*,windows/* - PACKAGES ?= $(shell go list ./... | grep -v /vendor/) + PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations,$(shell go list ./... | grep -v /vendor/)) + SOURCES ?= $(shell find . -name "*.go" -type f) |