Update to current version and fix patches

5 files changed, 26 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf344fb435d1..7cfc6fac8d11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitea-git
 	pkgdesc = Painless self-hosted Git service. Community managed fork of Gogs.
-	pkgver = v1.7.0_dev_131_gf9d4bd53e6ac
+	pkgver = v1.11.0_dev_43_g05e437f8f
 	pkgrel = 1
 	url = https://gitea.io/
 	install = gitea.install
@@ -30,14 +30,12 @@ pkgbase = gitea-git
 	source = gitea.sysusers
 	source = gitea-arch-defaults.patch
 	source = gitea-ldflags.patch
-	source = gitea-disable-u2f.patch
 	sha512sums = SKIP
 	sha512sums = 89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103
 	sha512sums = 0b93ddbb88ff843014f583a36c00156c011cca568cb69b61eb4c576c557b21ecdab1b105815a5dfdd08349e4e3b0976c8bdf87c8d3b201edae95de9070200352
 	sha512sums = 77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1
-	sha512sums = 479fe43cfbb3d8f27e371ff528a6ed9970c415bbeca0521aa8a9a4526564c5ea42ea3841b52215455804e068e2688b334c7f6d52a3616aa198b7acea73f72bf0
-	sha512sums = 8d3024a17c8faae80b2af349457701c45695f70e2e5c5bf43f33c277bde8241f5e01ee08c534902fd5be976b49d85d0112bda7a2e6fb940179a99029d9e404fb
-	sha512sums = 779869c10bcb37581cde6df38f0905618099d604f29b0281abc4fa4c2302b8063063d0e8b0efdd99897b127c45103d376ba4a121e66edd51944abaf0235ab834
+	sha512sums = 6de71c0f3895764a227673fc8d96b6fd588150d9fe70652a4e62e9247ae654e2bd63de5d4b609e82941f6aa2d836f229ebb376c009ebc03296ae80526b9e5758
+	sha512sums = e75b6ec09471da6cbb8dc3df3ec8ccafd19618b60b724fda8fb1a88bf8ee4e98ff9ab8e20f8be57c394477f8c50d36842e403c8c0f9a2c90bcc7e3ef842b2aca
 
 pkgname = gitea-git
 
diff --git a/PKGBUILD b/PKGBUILD
index aefb9e666652..28c2a814c7af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer: kageru <kageru@encode.moe>
 # Maintainer: Sam Whited <sam@samwhited.com>
 # Contributor: Francois Menning <f.menning@pm.me>
 # Contributor: Anton Kudryavtsev <anton@anibit.ru>
@@ -8,7 +9,7 @@
 
 _pkgname='gitea'
 pkgname=gitea-git
-pkgver=v1.7.0_dev_131_gf9d4bd53e6ac
+pkgver=v1.11.0_dev_43_g05e437f8f
 pkgrel=1
 pkgdesc='Painless self-hosted Git service. Community managed fork of Gogs.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -32,15 +33,13 @@ source=(git+https://github.com/go-gitea/gitea.git
         gitea.service
         gitea.sysusers
         gitea-arch-defaults.patch
-        gitea-ldflags.patch
-        gitea-disable-u2f.patch)
+        gitea-ldflags.patch)
 sha512sums=('SKIP'
             '89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103'
             '0b93ddbb88ff843014f583a36c00156c011cca568cb69b61eb4c576c557b21ecdab1b105815a5dfdd08349e4e3b0976c8bdf87c8d3b201edae95de9070200352'
             '77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1'
-            '479fe43cfbb3d8f27e371ff528a6ed9970c415bbeca0521aa8a9a4526564c5ea42ea3841b52215455804e068e2688b334c7f6d52a3616aa198b7acea73f72bf0'
-            '8d3024a17c8faae80b2af349457701c45695f70e2e5c5bf43f33c277bde8241f5e01ee08c534902fd5be976b49d85d0112bda7a2e6fb940179a99029d9e404fb'
-            '779869c10bcb37581cde6df38f0905618099d604f29b0281abc4fa4c2302b8063063d0e8b0efdd99897b127c45103d376ba4a121e66edd51944abaf0235ab834')
+            '6de71c0f3895764a227673fc8d96b6fd588150d9fe70652a4e62e9247ae654e2bd63de5d4b609e82941f6aa2d836f229ebb376c009ebc03296ae80526b9e5758'
+            'e75b6ec09471da6cbb8dc3df3ec8ccafd19618b60b724fda8fb1a88bf8ee4e98ff9ab8e20f8be57c394477f8c50d36842e403c8c0f9a2c90bcc7e3ef842b2aca')
 install=gitea.install
 
 pkgver() {
@@ -52,10 +51,8 @@ prepare() {
   cd ${srcdir}/${_pkgname}
   # Change default repos path for ArchLinux
   patch -Np1 -i ../../gitea-arch-defaults.patch
-  # Fix LDFLAGS not being respected by Go
+  # Fix LDFLAGS not being passed correctly
   patch -Np1 -i ../../gitea-ldflags.patch
-  # https://github.com/go-gitea/gitea/issues/4692
-  patch -Np1 -i ../../gitea-disable-u2f.patch
 
   # Make sure we rebuild the mod file from Gopkg.toml to pick up any changes.
   rm -f go.mod
diff --git a/gitea-arch-defaults.patch b/gitea-arch-defaults.patch
index cf0c97d66eee..1379325acb54 100644
--- a/gitea-arch-defaults.patch
+++ b/gitea-arch-defaults.patch
@@ -1,6 +1,6 @@
 --- a/custom/conf/app.ini.sample
 +++ b/custom/conf/app.ini.sample
-@@ -7,12 +7,12 @@
+@@ -8,12 +8,12 @@
  ; App name that shows in every page title
  APP_NAME = Gitea: Git with a cup of tea
  ; Change it if you run locally
@@ -16,7 +16,7 @@
  SCRIPT_TYPE = bash
  ; Default ANSI charset
  ANSI_CHARSET =
-@@ -241,7 +241,7 @@
+@@ -312,7 +312,7 @@
  ; For iterate buffer, default is 50
  ITERATE_BUFFER_SIZE = 50
  ; Show the database generated SQL
@@ -25,8 +25,8 @@
  ; Maximum number of DB Connect retries
  DB_RETRIES = 10
  ; Backoff time per DB retry (time.Duration)
-@@ -485,10 +485,10 @@
- FORMAT =
+@@ -615,10 +615,10 @@
+ DEFAULT_UI_LOCATION =
  
  [log]
 -ROOT_PATH =
@@ -37,13 +37,13 @@
 +MODE = console, file
  ; 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"
-@@ -496,7 +496,7 @@
+ REDIRECT_MACARON_LOG = false
+@@ -643,7 +643,7 @@
  
  ; For "console" mode only
  [log.console]
 -LEVEL =
 +LEVEL = Info
+ STDERR = false
  
  ; For "file" mode only
- [log.file]
diff --git a/gitea-disable-u2f.patch b/gitea-disable-u2f.patch
deleted file mode 100644
index c87913121cd4..000000000000
--- a/gitea-disable-u2f.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/custom/conf/app.ini.sample
-+++ b/custom/conf/app.ini.sample
-@@ -628,13 +628,6 @@ sr-SP = sr
- sv-SE = sv
- ko-KR = ko
- 
--[U2F]
--; Two Factor authentication with security keys
--; https://developers.yubico.com/U2F/App_ID.html
--APP_ID = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
--; Comma seperated list of truisted facets
--TRUSTED_FACETS = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
--
- ; Extension mapping to highlight class
- ; e.g. .toml=ini
- [highlight.mapping]
diff --git a/gitea-ldflags.patch b/gitea-ldflags.patch
index b9aefcda289a..be6906b7d933 100644
--- a/gitea-ldflags.patch
+++ b/gitea-ldflags.patch
@@ -1,19 +1,21 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -33,6 +33,7 @@ else
- 	GITEA_VERSION := $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
+@@ -39,7 +39,8 @@
+ 	GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
  endif
  
-+EXTLDFLAGS := ${LDFLAGS}
- LDFLAGS := -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
+-LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
++EXTLDFLAGS := $(LDFLAGS)
++LDFLAGS := -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
  
- PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/))
-@@ -240,7 +241,7 @@ install: $(wildcard *.go)
+ PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell GO111MODULE=on $(GO) list -mod=vendor ./... | grep -v /vendor/)))
+ SOURCES ?= $(shell find . -name "*.go" -type f)
+@@ -358,7 +359,7 @@
  build: $(EXECUTABLE)
  
  $(EXECUTABLE): $(SOURCES)
--	$(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
-+	$(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-linkmode external -extldflags "$(EXTLDFLAGS)" -s -w $(LDFLAGS)' -o $@
+-	GO111MODULE=on $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
++	GO111MODULE=on $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-extldflags $(EXTLDFLAGS) -s -w $(LDFLAGS)' -o $@
  
  .PHONY: release
  release: release-dirs release-windows release-linux release-darwin release-copy release-compress release-check