[gentoo-commits] repo/gentoo:master commit in: www-apps/gitea/files/

[gentoo-commits] repo/gentoo:master commit in: www-apps/gitea/files/

[Manuel Rüger]

commit:     b255b7ea7c7f52b40e3012daf5530d7c1152274f
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 21:14:28 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 21:14:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b255b7ea

www-apps/gitea: Fix initscript

Package-Manager: portage-2.3.3

 www-apps/gitea/files/gitea.initd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/www-apps/gitea/files/gitea.initd b/www-apps/gitea/files/gitea.initd
index a9aaac7..44cb542 100644
--- a/www-apps/gitea/files/gitea.initd
+++ b/www-apps/gitea/files/gitea.initd
@@ -5,13 +5,14 @@
 
 description="Gitea, a self-hosted Git service"
 pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-${SVCNAME}}
-group=${group:-${SVCNAME}}
+user=${user:-git}
+group=${group:-git}
 
 command="/usr/bin/gitea web"
 command_args="${command_args:--config /var/lib/gitea/conf/app.ini}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
+	-e GITEA_CUSTOM=/var/lib/gitea
 	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
 	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
 

[gentoo-commits] repo/gentoo:master commit in: www-apps/gitea/files/

[Aaron Bauman]

commit:     1f671a7d8f670deb3562ee1d6119c6d509d1e7ed
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jan 11 18:00:30 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 20:12:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f671a7d

www-apps/gitea: remove unused file

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 www-apps/gitea/files/gitea.logrotated | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/www-apps/gitea/files/gitea.logrotated b/www-apps/gitea/files/gitea.logrotated
deleted file mode 100644
index ec6ddfe606b..00000000000
--- a/www-apps/gitea/files/gitea.logrotated
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/gitea/* {
-	su git git
-	missingok
-	size 5M
-	rotate 3
-	compress
-	copytruncate
-}

[gentoo-commits] repo/gentoo:master commit in: www-apps/gitea/files/

[Aaron Bauman]

commit:     01bebbd953869c6c153166f2a07c74693f2e2f70
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Apr 24 17:30:48 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 03:33:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bebbd9

www-apps/gitea: remove unused files

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11815
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 www-apps/gitea/files/gitea.confd    |  2 --
 www-apps/gitea/files/gitea.initd-r1 | 26 --------------------------
 www-apps/gitea/files/gitea.service  | 28 ----------------------------
 3 files changed, 56 deletions(-)

diff --git a/www-apps/gitea/files/gitea.confd b/www-apps/gitea/files/gitea.confd
deleted file mode 100644
index 8b1710b06fb..00000000000
--- a/www-apps/gitea/files/gitea.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for gitea
-command_args="--config /var/lib/gitea/conf/app.ini"

diff --git a/www-apps/gitea/files/gitea.initd-r1 b/www-apps/gitea/files/gitea.initd-r1
deleted file mode 100644
index 6f957d426c0..00000000000
--- a/www-apps/gitea/files/gitea.initd-r1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Gitea, a self-hosted Git service"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-git}
-group=${group:-git}
-
-command="/usr/bin/gitea web"
-command_args="${command_args:--config /var/lib/gitea/conf/app.ini}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	-e GITEA_WORK_DIR=${GITEA_WORK_DIR:-/var/lib/gitea} \
-	-e GITEA_CUSTOM=${GITEA_CUSTOM:-/var/lib/gitea} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
-
-depend() {
-	need net
-	after net
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
-}

diff --git a/www-apps/gitea/files/gitea.service b/www-apps/gitea/files/gitea.service
deleted file mode 100644
index 733e05ea1ed..00000000000
--- a/www-apps/gitea/files/gitea.service
+++ /dev/null
@@ -1,28 +0,0 @@
-[Unit]
-Description=Gitea service
-Documentation=https://docs.gitea.io/
-
-AssertPathIsDirectory=/var/lib/gitea
-AssertPathIsReadWrite=/var/lib/gitea
-
-After=network.target
-Requires=network.target
-After=mysqld.service
-After=postgresql.service
-After=memcached.service
-After=redis.service
-
-[Service]
-User=git
-Group=git
-
-Environment="GITEA_WORK_DIR=/var/lib/gitea GITEA_CUSTOM=/var/lib/gitea"
-WorkingDirectory=/var/lib/gitea
-ExecStart=/usr/bin/gitea web -c /var/lib/gitea/conf/app.ini
-
-Restart=always
-PrivateTmp=true
-Nice=5
-
-[Install]
-WantedBy=multi-user.target

[gentoo-commits] repo/gentoo:master commit in: www-apps/gitea/files/

[Joonas Niilola]

commit:     88010994eb35de749f07f031fa9159641fd9d8e3
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jan 10 08:48:12 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 06:09:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88010994

www-apps/gitea: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14297
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-apps/gitea/files/gitea-mod-vendor.patch | 46 -----------------------------
 1 file changed, 46 deletions(-)

diff --git a/www-apps/gitea/files/gitea-mod-vendor.patch b/www-apps/gitea/files/gitea-mod-vendor.patch
deleted file mode 100644
index c501e20adb9..00000000000
--- a/www-apps/gitea/files/gitea-mod-vendor.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 796a0e3..2c6a6ef 100644
---- a/Makefile
-+++ b/Makefile
-@@ -97,7 +97,7 @@ vet:
- 
- .PHONY: generate
- generate:
--	GO111MODULE=on $(GO) generate $(PACKAGES)
-+	GO111MODULE=on $(GO) generate -mod=vendor $(PACKAGES)
- 
- .PHONY: generate-swagger
- generate-swagger:
-diff --git a/modules/options/options.go b/modules/options/options.go
-index 723dd54..62e8c04 100644
---- a/modules/options/options.go
-+++ b/modules/options/options.go
-@@ -5,7 +5,6 @@
- package options
- 
- //go:generate go run -mod=vendor main.go
--//go:generate go fmt bindata.go
- 
- type directorySet map[string][]string
- 
-diff --git a/modules/public/public.go b/modules/public/public.go
-index 8362b42..df70275 100644
---- a/modules/public/public.go
-+++ b/modules/public/public.go
-@@ -18,7 +18,6 @@ import (
- )
- 
- //go:generate go run -mod=vendor main.go
--//go:generate go fmt bindata.go
- 
- // Options represents the available options to configure the macaron handler.
- type Options struct {
-diff --git a/modules/templates/templates.go b/modules/templates/templates.go
-index e7fe3b2..af6bf01 100644
---- a/modules/templates/templates.go
-+++ b/modules/templates/templates.go
-@@ -5,4 +5,3 @@
- package templates
- 
- //go:generate go run -mod=vendor main.go
--//go:generate go fmt bindata.go

[gentoo-commits] repo/gentoo:master commit in: www-apps/gitea/files/

[Conrad Kostecki]

commit:     ea944925e61ade3eeef0017f87ae3b9841362812
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Sep 12 16:24:47 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 14:38:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea944925

www-apps/gitea: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/17507
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 www-apps/gitea/files/gitea-logflags.patch | 139 ------------------------------
 1 file changed, 139 deletions(-)

diff --git a/www-apps/gitea/files/gitea-logflags.patch b/www-apps/gitea/files/gitea-logflags.patch
deleted file mode 100644
index bbe6e5501c8..00000000000
--- a/www-apps/gitea/files/gitea-logflags.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-
-#Patch to make gitea logging less verbose.
-
-diff --git a/modules/log/flags.go b/modules/log/flags.go
-index 992fc62dd..5578a1b6b 100644
---- a/modules/log/flags.go
-+++ b/modules/log/flags.go
-@@ -31,7 +31,7 @@ const (
- 	Lmedfile = Lshortfile | Llongfile
- 
- 	// LstdFlags is the initial value for the standard logger
--	LstdFlags = Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial
-+	LstdFlags = Ldate | Ltime | Llevelinitial
- )
- 
- 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")