Update gitea 1.13.1 -> 1.13.2

Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.13.2
This commit is contained in:
pvk 2021-02-08 21:34:45 +00:00
parent 5042508860
commit a43e3b4d2e
4 changed files with 5 additions and 50 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.46 2021/01/17 21:07:41 pvk Exp $
# $OpenBSD: Makefile,v 1.47 2021/02/08 21:34:45 pvk Exp $
COMMENT = compact self-hosted Git service
VERSION = 1.13.1
VERSION = 1.13.2
DISTNAME = gitea-src-${VERSION}
PKGNAME = gitea-${VERSION}

View File

@ -1,2 +1,2 @@
SHA256 (gitea-src-1.13.1.tar.gz) = tah7ciq+jkkROJq/V+yPRtWPuWaSnf5hKndjnifsQYc=
SIZE (gitea-src-1.13.1.tar.gz) = 150940437
SHA256 (gitea-src-1.13.2.tar.gz) = uezg8GdNqgKVHgJj9rTqHFLWuLdyDp63fzr7DMslOII=
SIZE (gitea-src-1.13.2.tar.gz) = 150862119

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-custom_conf_app_example_ini,v 1.1 2021/01/17 21:07:41 pvk Exp $
$OpenBSD: patch-custom_conf_app_example_ini,v 1.2 2021/02/08 21:34:45 pvk Exp $
Index: custom/conf/app.example.ini
--- custom/conf/app.example.ini.orig
@ -331,15 +331,6 @@ Index: custom/conf/app.example.ini
; Buffer length of the channel, keep it as it is if you don't know what it is.
BUFFER_LEN = 10000
REDIRECT_MACARON_LOG = false
@@ -850,7 +850,7 @@ MACARON = file
ROUTER_LOG_LEVEL = Info
ROUTER = console
ENABLE_ACCESS_LOG = false
-ACCESS_LOG_TEMPLATE = {{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"
+ACCESS_LOG_TEMPLATE = {{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"
ACCESS = file
; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
LEVEL = Info
@@ -1132,7 +1132,7 @@ MAX_TOKEN_LENGTH=32767
LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pt-PT,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR
NAMES = English,简体中文,繁體中文(香港),繁體中文(台灣),Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,Português de Portugal,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어

View File

@ -1,36 +0,0 @@
$OpenBSD: patch-routers_routes_routes_go,v 1.1 2021/01/17 21:07:41 pvk Exp $
Use Request.URL.RequestURI() for fcgi #14347
https://github.com/go-gitea/gitea/pull/14347/commits/3cf18c7f1b0be823ca5c41bafbc6f4572e183ed3
Index: routers/routes/routes.go
--- routers/routes/routes.go.orig
+++ routers/routes/routes.go
@@ -121,11 +121,11 @@ func storageHandler(storageSetting setting.Storage, pr
return
}
- if !strings.HasPrefix(req.RequestURI, "/"+prefix) {
+ if !strings.HasPrefix(req.URL.RequestURI(), "/"+prefix) {
return
}
- rPath := strings.TrimPrefix(req.RequestURI, "/"+prefix)
+ rPath := strings.TrimPrefix(req.URL.RequestURI(), "/"+prefix)
u, err := objStore.URL(rPath, path.Base(rPath))
if err != nil {
if os.IsNotExist(err) || errors.Is(err, os.ErrNotExist) {
@@ -152,11 +152,11 @@ func storageHandler(storageSetting setting.Storage, pr
return
}
- if !strings.HasPrefix(req.RequestURI, "/"+prefix) {
+ if !strings.HasPrefix(req.URL.RequestURI(), "/"+prefix) {
return
}
- rPath := strings.TrimPrefix(req.RequestURI, "/"+prefix)
+ rPath := strings.TrimPrefix(req.URL.RequestURI(), "/"+prefix)
rPath = strings.TrimPrefix(rPath, "/")
//If we have matched and access to release or issue
fr, err := objStore.Open(rPath)