version bump www-apps/gitea-1.12.3
This commit is contained in:
13
www-apps/gitea/files/1.12-fix-vendoring.patch
Normal file
13
www-apps/gitea/files/1.12-fix-vendoring.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/vendor/modules.txt b/vendor/modules.txt
|
||||
index efbc866..1c34104 100644
|
||||
--- a/vendor/modules.txt
|
||||
+++ b/vendor/modules.txt
|
||||
@@ -845,6 +845,8 @@ gopkg.in/yaml.v2
|
||||
# mvdan.cc/xurls/v2 v2.1.0
|
||||
## explicit
|
||||
mvdan.cc/xurls/v2
|
||||
+# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056
|
||||
+## explicit
|
||||
# strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
|
||||
## explicit
|
||||
strk.kbt.io/projects/go/libravatar
|
@@ -1,5 +1,8 @@
|
||||
|
||||
#Patch to make gitea logging less verbose.
|
||||
|
||||
diff --git a/modules/log/flags.go b/modules/log/flags.go
|
||||
index 992fc62..5578a1b 100644
|
||||
index 992fc62dd..5578a1b6b 100644
|
||||
--- a/modules/log/flags.go
|
||||
+++ b/modules/log/flags.go
|
||||
@@ -31,7 +31,7 @@ const (
|
||||
@@ -11,3 +14,126 @@ index 992fc62..5578a1b 100644
|
||||
)
|
||||
|
||||
var flagFromString = map[string]int{
|
||||
|
||||
|
||||
#Just patching the tests to keep working with the patch above (avoid using LstdFlags)
|
||||
|
||||
diff --git a/modules/log/conn_test.go b/modules/log/conn_test.go
|
||||
index cc3d758fa..295bee37f 100644
|
||||
--- a/modules/log/conn_test.go
|
||||
+++ b/modules/log/conn_test.go
|
||||
@@ -40,7 +40,7 @@ func TestConnLogger(t *testing.T) {
|
||||
|
||||
prefix := "TestPrefix "
|
||||
level := INFO
|
||||
- flags := LstdFlags | LUTC | Lfuncname
|
||||
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
|
||||
|
||||
logger := NewConn()
|
||||
connLogger := logger.(*ConnLogger)
|
||||
@@ -112,7 +112,7 @@ func TestConnLoggerCloseBeforeSend(t *testing.T) {
|
||||
|
||||
prefix := "TestPrefix "
|
||||
level := INFO
|
||||
- flags := LstdFlags | LUTC | Lfuncname
|
||||
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
|
||||
|
||||
logger := NewConn()
|
||||
|
||||
@@ -126,7 +126,7 @@ func TestConnLoggerFailConnect(t *testing.T) {
|
||||
|
||||
prefix := "TestPrefix "
|
||||
level := INFO
|
||||
- flags := LstdFlags | LUTC | Lfuncname
|
||||
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
|
||||
|
||||
logger := NewConn()
|
||||
|
||||
@@ -169,7 +169,7 @@ func TestConnLoggerClose(t *testing.T) {
|
||||
|
||||
prefix := "TestPrefix "
|
||||
level := INFO
|
||||
- flags := LstdFlags | LUTC | Lfuncname
|
||||
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
|
||||
|
||||
logger := NewConn()
|
||||
connLogger := logger.(*ConnLogger)
|
||||
diff --git a/modules/log/console_test.go b/modules/log/console_test.go
|
||||
index a028b5b87..e4fec760a 100644
|
||||
--- a/modules/log/console_test.go
|
||||
+++ b/modules/log/console_test.go
|
||||
@@ -33,7 +33,7 @@ func TestConsoleLoggerMinimalConfig(t *testing.T) {
|
||||
},
|
||||
}
|
||||
prefix := ""
|
||||
- flags := LstdFlags
|
||||
+ flags := LstdFlags
|
||||
|
||||
cw := NewConsoleLogger()
|
||||
realCW := cw.(*ConsoleLogger)
|
||||
@@ -64,7 +64,7 @@ func TestConsoleLogger(t *testing.T) {
|
||||
}
|
||||
prefix := "TestPrefix "
|
||||
level := INFO
|
||||
- flags := LstdFlags | LUTC | Lfuncname
|
||||
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
|
||||
|
||||
cw := NewConsoleLogger()
|
||||
realCW := cw.(*ConsoleLogger)
|
||||
diff --git a/modules/log/file_test.go b/modules/log/file_test.go
|
||||
index 38279315a..dc8d291ed 100644
|
||||
--- a/modules/log/file_test.go
|
||||
+++ b/modules/log/file_test.go
|
||||
@@ -24,7 +24,7 @@ func TestFileLoggerFails(t *testing.T) {
|
||||
|
||||
prefix := "TestPrefix "
|
||||
level := INFO
|
||||
- flags := LstdFlags | LUTC | Lfuncname
|
||||
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
|
||||
//filename := filepath.Join(tmpDir, "test.log")
|
||||
|
||||
fileLogger := NewFileLogger()
|
||||
@@ -52,7 +52,7 @@ func TestFileLogger(t *testing.T) {
|
||||
|
||||
prefix := "TestPrefix "
|
||||
level := INFO
|
||||
- flags := LstdFlags | LUTC | Lfuncname
|
||||
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
|
||||
filename := filepath.Join(tmpDir, "test.log")
|
||||
|
||||
fileLogger := NewFileLogger()
|
||||
@@ -155,7 +155,7 @@ func TestCompressFileLogger(t *testing.T) {
|
||||
|
||||
prefix := "TestPrefix "
|
||||
level := INFO
|
||||
- flags := LstdFlags | LUTC | Lfuncname
|
||||
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
|
||||
filename := filepath.Join(tmpDir, "test.log")
|
||||
|
||||
fileLogger := NewFileLogger()
|
||||
diff --git a/modules/log/smtp_test.go b/modules/log/smtp_test.go
|
||||
index 216d55521..15075dd41 100644
|
||||
--- a/modules/log/smtp_test.go
|
||||
+++ b/modules/log/smtp_test.go
|
||||
@@ -17,7 +17,7 @@ import (
|
||||
func TestSMTPLogger(t *testing.T) {
|
||||
prefix := "TestPrefix "
|
||||
level := INFO
|
||||
- flags := LstdFlags | LUTC | Lfuncname
|
||||
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
|
||||
username := "testuser"
|
||||
password := "testpassword"
|
||||
host := "testhost"
|
||||
diff --git a/modules/log/writer_test.go b/modules/log/writer_test.go
|
||||
index 886dd58fb..df2f6e698 100644
|
||||
--- a/modules/log/writer_test.go
|
||||
+++ b/modules/log/writer_test.go
|
||||
@@ -41,7 +41,7 @@ func TestBaseLogger(t *testing.T) {
|
||||
b := WriterLogger{
|
||||
out: c,
|
||||
Level: INFO,
|
||||
- Flags: LstdFlags | LUTC,
|
||||
+ Flags: Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC,
|
||||
Prefix: prefix,
|
||||
}
|
||||
location, _ := time.LoadLocation("EST")
|
||||
|
Reference in New Issue
Block a user