[arch-commits] Commit in gitea/trunk (3 files)

[Bruno Pagani]

    Date: Sunday, April 21, 2019 @ 15:55:34
  Author: archange
Revision: 452825

upgpkg: gitea 1.8.0-1

Modified:
  gitea/trunk/PKGBUILD
  gitea/trunk/gitea-arch-defaults.patch
  gitea/trunk/gitea-ldflags.patch

---------------------------+
 PKGBUILD                  |   12 ++++--------
 gitea-arch-defaults.patch |   12 ++++++------
 gitea-ldflags.patch       |    6 +++---
 3 files changed, 13 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-21 13:32:52 UTC (rev 452824)
+++ PKGBUILD	2019-04-21 15:55:34 UTC (rev 452825)
@@ -3,7 +3,7 @@
 # Contributor: Frederik Schwan <frederik dot schwan at linux dot com>
 
 pkgname=gitea
-pkgver=1.7.6
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="Painless self-hosted Git service. Community managed fork of Gogs."
 arch=(x86_64)
@@ -21,9 +21,8 @@
   'sqlite: SQLite support'
 )
 backup=('etc/gitea/app.ini')
-_tag=c09c44ae48a6b0eaca937c4888ce2bb041a8a91f # git rev-parse v${pkgver}
+_tag=d4da1e304c3c343df1d6dcf2bc6a5f0fb0e383bf # git rev-parse v${pkgver}
 source=("git+https://github.com/go-gitea/gitea.git#tag=${_tag}?signed"
-        gitea-disable-u2f.patch::"https://patch-diff.githubusercontent.com/raw/go-gitea/gitea/pull/5994.patch"
         gitea.tmpfiles
         gitea.service
         gitea.sysusers
@@ -30,12 +29,11 @@
         gitea-arch-defaults.patch
         gitea-ldflags.patch)
 sha256sums=('SKIP'
-            '08915e2456d0c20bf786559ba316b49c03de11bfc4b37f8f0ad4e577baf0e3df'
             '1521fd7edc3830c695698ffe9835709f1408040b5ec989f07410972c894fa8ba'
             '7789b3f6699b9e111fa080226047cdc765e55ff49a3f72aac989c11c06c3e7e0'
             '2abc51ccd0086bb996194bb7fb241a3f26d84f518417c872b66a3db8970da7e4'
-            '913a28110d2fbdabcfd2d19366aad8c645813b512f4591882efb47795ad8472f'
-            'c552a5adb4058530d67176713240cc435b7b974747ec51e972c37d8834e32b3f')
+            'ab0183aeee92d127819b033cbe0b9eab2e1072fb67a0a20e838d911138799b70'
+            '2dd05c2ec8d5b17332525fe176e40df9893aa632f48525f9d5df98e05027aebf')
 validpgpkeys=(8C4033A23895237CB27D52D9D9B5613BEB813F99  # Matti Ranta <matti at mdranta.net>, retrieved from https://github.com/techknowlogick.gpg
               ED810FD31FBE67F406ED71BDD4F1E9B6493ED946  # Jonas Franz <info at jonasfranz.software>
               9C5BCD799B3CDB124147A748E0DDFEC24C48784C) # Lauris Bukšis-Haberkorns <lauris at nix.lv> 
@@ -51,8 +49,6 @@
   patch -Np1 -i ../gitea-arch-defaults.patch
   # Fix LDFLAGS not being respected by Go
   patch -Np1 -i ../gitea-ldflags.patch
-  # https://github.com/go-gitea/gitea/issues/4692
-  patch -Np1 -i ../gitea-disable-u2f.patch
 
   cd $GOPATH/src/code.gitea.io/gitea
   dep ensure

Modified: gitea-arch-defaults.patch
===================================================================
--- gitea-arch-defaults.patch	2019-04-21 13:32:52 UTC (rev 452824)
+++ gitea-arch-defaults.patch	2019-04-21 15:55:34 UTC (rev 452825)
@@ -16,16 +16,16 @@
  SCRIPT_TYPE = bash
  ; Default ANSI charset
  ANSI_CHARSET =
-@@ -236,7 +236,7 @@ SQLITE_TIMEOUT = 500
+@@ -247,7 +247,7 @@ SQLITE_TIMEOUT = 500
  ; For iterate buffer, default is 50
  ITERATE_BUFFER_SIZE = 50
  ; Show the database generated SQL
 -LOG_SQL = true
 +LOG_SQL = false
- 
- [indexer]
- ISSUE_INDEXER_PATH = indexers/issues.bleve
-@@ -473,10 +473,10 @@ MAX_FILES = 5
+ ; Maximum number of DB Connect retries
+ DB_RETRIES = 10
+ ; Backoff time per DB retry (time.Duration)
+@@ -510,10 +510,10 @@ MAX_FILES = 5
  FORMAT =
  
  [log]
@@ -38,7 +38,7 @@
  ; Buffer length of the channel, keep it as it is if you don't know what it is.
  BUFFER_LEN = 10000
  ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
-@@ -484,7 +484,7 @@ LEVEL = Trace
+@@ -522,7 +522,7 @@ LEVEL = Trace
  
  ; For "console" mode only
  [log.console]

Modified: gitea-ldflags.patch
===================================================================
--- gitea-ldflags.patch	2019-04-21 13:32:52 UTC (rev 452824)
+++ gitea-ldflags.patch	2019-04-21 15:55:34 UTC (rev 452825)
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -33,6 +33,7 @@ else
+@@ -36,6 +36,7 @@ else
  	GITEA_VERSION := $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
  endif
  
@@ -7,8 +7,8 @@
 +EXTLDFLAGS := ${LDFLAGS}
  LDFLAGS := -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
  
- PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/))
-@@ -263,7 +264,7 @@ install: $(wildcard *.go)
+ PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/)))
+@@ -312,7 +313,7 @@ install: $(wildcard *.go)
  build: $(EXECUTABLE)
  
  $(EXECUTABLE): $(SOURCES)