aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author6543 <6543@obermui.de>2021-04-11 15:11:19 +0200
committerLeo <thinkabit.ukim@gmail.com>2021-04-11 15:06:56 +0000
commit2e6240db7388435655965d4f742cf3407a6d7183 (patch)
tree6669c9185c4f81b1d30fc9eabb8568f46e8e188b
parent67c8541be2224c7b9996a1b2dfd3b60cdb8c1de2 (diff)
downloadaports-2e6240db7388435655965d4f742cf3407a6d7183.tar.gz
aports-2e6240db7388435655965d4f742cf3407a6d7183.tar.bz2
aports-2e6240db7388435655965d4f742cf3407a6d7183.tar.xz
community/gitea: upgrade to 1.14.0
-rw-r--r--community/gitea/0001-use-repo1_bare-to-test-against.patch81
-rw-r--r--community/gitea/APKBUILD9
2 files changed, 86 insertions, 4 deletions
diff --git a/community/gitea/0001-use-repo1_bare-to-test-against.patch b/community/gitea/0001-use-repo1_bare-to-test-against.patch
new file mode 100644
index 0000000000..8e239782cf
--- /dev/null
+++ b/community/gitea/0001-use-repo1_bare-to-test-against.patch
@@ -0,0 +1,81 @@
+From 62c6f47040e038868b6f4030b9bf5baabe352701 Mon Sep 17 00:00:00 2001
+From: 6543 <6543@obermui.de>
+Date: Sun, 11 Apr 2021 15:39:31 +0200
+Subject: [PATCH] use repo1_bare to test against
+
+---
+ modules/git/blob_test.go | 37 +++++++++++--------------------------
+ 1 file changed, 11 insertions(+), 26 deletions(-)
+
+diff --git a/modules/git/blob_test.go b/modules/git/blob_test.go
+index 9043de595..d02251ed9 100644
+--- a/modules/git/blob_test.go
++++ b/modules/git/blob_test.go
+@@ -7,6 +7,7 @@ package git
+
+ import (
+ "io/ioutil"
++ "path/filepath"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+@@ -14,32 +15,15 @@ import (
+ )
+
+ func TestBlob_Data(t *testing.T) {
+- output := `Copyright (c) 2016 The Gitea Authors
+-Copyright (c) 2015 The Gogs Authors
+-
+-Permission is hereby granted, free of charge, to any person obtaining a copy
+-of this software and associated documentation files (the "Software"), to deal
+-in the Software without restriction, including without limitation the rights
+-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-copies of the Software, and to permit persons to whom the Software is
+-furnished to do so, subject to the following conditions:
+-
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-THE SOFTWARE.
+-`
+- repo, err := OpenRepository("../../.git")
+- assert.NoError(t, err)
++ output := "file2\n"
++ bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
++ repo, err := OpenRepository(bareRepo1Path)
++ if !assert.NoError(t, err) {
++ t.Fatal()
++ }
+ defer repo.Close()
+
+- testBlob, err := repo.GetBlob("a8d4b49dd073a4a38a7e58385eeff7cc52568697")
++ testBlob, err := repo.GetBlob("6c493ff740f9380390d5c9ddef4af18697ac9375")
+ assert.NoError(t, err)
+
+ r, err := testBlob.DataAsync()
+@@ -53,13 +37,14 @@ THE SOFTWARE.
+ }
+
+ func Benchmark_Blob_Data(b *testing.B) {
+- repo, err := OpenRepository("../../.git")
++ bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
++ repo, err := OpenRepository(bareRepo1Path)
+ if err != nil {
+ b.Fatal(err)
+ }
+ defer repo.Close()
+
+- testBlob, err := repo.GetBlob("a8d4b49dd073a4a38a7e58385eeff7cc52568697")
++ testBlob, err := repo.GetBlob("6c493ff740f9380390d5c9ddef4af18697ac9375")
+ if err != nil {
+ b.Fatal(err)
+ }
+--
+2.31.1
+
diff --git a/community/gitea/APKBUILD b/community/gitea/APKBUILD
index 8185c93fbb..0cf992fc26 100644
--- a/community/gitea/APKBUILD
+++ b/community/gitea/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: 6543 <6543@obermui.de>
# Maintainer: 6543 <6543@obermui.de>
pkgname=gitea
-pkgver=1.13.7
+pkgver=1.14.0
pkgrel=0
pkgdesc="A self-hosted Git service written in Go"
url="https://gitea.io"
@@ -21,6 +21,7 @@ subpackages="$pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/go-gitea/gitea/archive/v$pkgver.tar.gz
$pkgname.initd
$pkgname.ini
+ 0001-use-repo1_bare-to-test-against.patch
"
builddir="$srcdir/src/code.gitea.io/$pkgname"
@@ -60,8 +61,7 @@ check() {
PACKAGES=$(go list ./... | grep -v /vendor/ | \
grep -v 'code.gitea.io/gitea/modules/migrations' | \
grep -v 'code.gitea.io/gitea/modules/charset' | \
- grep -v 'code.gitea.io/gitea/integrations' | \
- grep -v 'code.gitea.io/gitea/modules/git')
+ grep -v 'code.gitea.io/gitea/integrations')
GO111MODULE=on go test -mod=vendor -tags='sqlite sqlite_unlock_notify' $PACKAGES
export GITEA_WORK_DIR=$(pwd)
@@ -93,6 +93,7 @@ package() {
"$pkgdir"/etc/init.d/$pkgname
}
-sha512sums="868432b54829c04abce2ac7f0ad3c741c463dbfcbe70c4eb51a3999ae29dfd7a76199c1e4af35f5b92d9317360ee9535312f5e7db444a24df19478d717d1693e gitea-1.13.7.tar.gz
+sha512sums="6394e21906322f73615a9ecac6b9ccb210cc7f9e489d61f522233f4628f23d449db692087e657ef57026a7cb680c3d823464ba386484b3ed1680b520b57387a9 gitea-1.14.0.tar.gz
+307f49dfd156ec05d480977cc98e68883356fb789d556076d8ea5c4c27a764163e5c0c9a8cb6db04e6bd298bbe7301423be432eb88d11dadf4f00c71673c9d4d 0001-use-repo1_bare-to-test-against.patch
2497e6f2a18e3ceb65352cd220eab2c1c0893d0e731600462a60397de2b70d7c1de7db2af2769b25fe708b0822c811bb20dc797b59b9dd93efb376bea1c35796 gitea.initd
431184faffa8996873d92d7b0d16bc4b1a0178d264cd2928d1f49b13ad3e6470d9ede7a18c12112deeeb38f0647ccc0b012e98bcbd96e7b8496a3dc18f5b1fb7 gitea.ini"