From 14df5040058c197d97dd00b1bf1db45caa8ae54e Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 4 Sep 2019 18:55:08 +0200 Subject: [PATCH 1/3] * Push version * Update sha512 of new source archive * Delete patch because it was merged with the project. * Add aarch64 again - Issue was cloesd (https://github.com/go-gitea/gitea/issues/5324) --- community/gitea/APKBUILD | 13 ++++++------- community/gitea/allow-to-set-version.patch | 11 ----------- 2 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 community/gitea/allow-to-set-version.patch diff --git a/community/gitea/APKBUILD b/community/gitea/APKBUILD index bae09d2c3deb..b336d062eb9f 100644 --- a/community/gitea/APKBUILD +++ b/community/gitea/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Carlo Landmeter # Maintainer: Carlo Landmeter pkgname=gitea -pkgver=1.8.3 -pkgrel=1 +pkgver=1.9.3 +pkgrel=0 pkgdesc="A self-hosted Git service written in Go" url="https://gitea.io" -arch="all !aarch64" # https://github.com/go-gitea/gitea/issues/5324 +arch="all" license="MIT" [ "$CARCH" = x86 ] && options="!check" # git-lfs is currently not available depends="git" @@ -18,7 +18,6 @@ subpackages="$pkgname-openrc" source="${pkgname}-${pkgver}.tar.gz::https://github.com/go-gitea/$pkgname/archive/v$pkgver.tar.gz $pkgname.initd $pkgname.ini - allow-to-set-version.patch " builddir="$srcdir/src/code.gitea.io/$pkgname" @@ -43,6 +42,7 @@ build() { check() { make test + timeout -s ABRT 20m make test-sqlite } @@ -71,7 +71,6 @@ package() { "$pkgdir"/etc/init.d/$pkgname } -sha512sums="f6019fbfc056e4c7176222ccaca1cf638bd1f52323de54fcddc618129aeb778674f6e305de60e7d17b69505ad65439445ee6b5e368afdf0a6fbace7407acb495 gitea-1.8.3.tar.gz +sha512sums="331a719cfec73f64650525c17d035c3df1ff23703196a8b0d4495693eecac7cced1f103012b694e8b37b9ee4ebf16f252f303a7525c06512c3124bed66043e27 gitea-1.9.3.tar.gz 2497e6f2a18e3ceb65352cd220eab2c1c0893d0e731600462a60397de2b70d7c1de7db2af2769b25fe708b0822c811bb20dc797b59b9dd93efb376bea1c35796 gitea.initd -27a202006d6e8d4146659f6356eaa99437f9f596dd369e9430d64b859bc6a1ad16091eef09232aa385fe1bf8ca94bbdf31b94975068220ad10338cded384f726 gitea.ini -4eee3ab54c6e44327a1f7e68a5de320204dd46852a7eee7d6652397f03f9af72fb28455dcaec9b6498439360c6c9699ce5a7c17b9e9b0b568c6840bf1e4d13e6 allow-to-set-version.patch" +27a202006d6e8d4146659f6356eaa99437f9f596dd369e9430d64b859bc6a1ad16091eef09232aa385fe1bf8ca94bbdf31b94975068220ad10338cded384f726 gitea.ini" diff --git a/community/gitea/allow-to-set-version.patch b/community/gitea/allow-to-set-version.patch deleted file mode 100644 index 3e2d62a39933..000000000000 --- a/community/gitea/allow-to-set-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -33,7 +33,7 @@ - else - VERSION ?= master - endif -- GITEA_VERSION := $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') -+ GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') - endif - - LDFLAGS := -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" From 18905d8033d485bed1aa4e964bcda424d580661f Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 8 Oct 2019 23:17:03 +0200 Subject: [PATCH 2/3] push to version 1.9.4 --- community/gitea/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/gitea/APKBUILD b/community/gitea/APKBUILD index b336d062eb9f..4c9c22013da9 100644 --- a/community/gitea/APKBUILD +++ b/community/gitea/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter # Maintainer: Carlo Landmeter pkgname=gitea -pkgver=1.9.3 +pkgver=1.9.4 pkgrel=0 pkgdesc="A self-hosted Git service written in Go" url="https://gitea.io" @@ -71,6 +71,6 @@ package() { "$pkgdir"/etc/init.d/$pkgname } -sha512sums="331a719cfec73f64650525c17d035c3df1ff23703196a8b0d4495693eecac7cced1f103012b694e8b37b9ee4ebf16f252f303a7525c06512c3124bed66043e27 gitea-1.9.3.tar.gz +sha512sums="a885567ffcc21ef821348be0b698b5f101bfc46b746603679441bee4c6abe34ea062bd0a2d5fb5c029ce26caa3b70a51c6d9088fdccebb44be74f1e523faf711 gitea-1.9.4.tar.gz 2497e6f2a18e3ceb65352cd220eab2c1c0893d0e731600462a60397de2b70d7c1de7db2af2769b25fe708b0822c811bb20dc797b59b9dd93efb376bea1c35796 gitea.initd 27a202006d6e8d4146659f6356eaa99437f9f596dd369e9430d64b859bc6a1ad16091eef09232aa385fe1bf8ca94bbdf31b94975068220ad10338cded384f726 gitea.ini" From 8cf1e7712be3f227bb44e9e81d811c882fcc85c1 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 9 Oct 2019 00:12:32 +0200 Subject: [PATCH 3/3] test --- community/gitea/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/gitea/APKBUILD b/community/gitea/APKBUILD index 4c9c22013da9..f658dfb6929e 100644 --- a/community/gitea/APKBUILD +++ b/community/gitea/APKBUILD @@ -8,9 +8,9 @@ url="https://gitea.io" arch="all" license="MIT" [ "$CARCH" = x86 ] && options="!check" # git-lfs is currently not available -depends="git" +depends="git bash git-lfs gnupg openssh openssh-keygen sqlite" makedepends="go libcap" -checkdepends="bash git-lfs gnupg openssh openssh-keygen sqlite" +checkdepends="" install="$pkgname.pre-install" pkgusers="gitea" pkggroups="www-data"