diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch index 410dd1145f51a5..1881be2164afc3 100644 --- a/srcpkgs/gitea/patches/config.patch +++ b/srcpkgs/gitea/patches/config.patch @@ -1,17 +1,17 @@ diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini -index a7476ad..d8cc405 100644 +index ef276e4..5795308 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -44,7 +44,7 @@ - APP_NAME = ; Gitea: Git with a cup of tea + ;APP_NAME = Gitea: Git with a cup of tea ;; ;; RUN_USER will automatically detect the current user - but you can set it here change it if you run locally --RUN_USER = ; git +-;RUN_USER = +RUN_USER = _gitea ;; ;; Application run mode, affects performance and debugging: "dev" or "prod", default is "prod" ;; Mode "dev" makes Gitea easier to develop and debug, values other than "dev" are treated as "prod" which is for production use. -@@ -129,7 +129,7 @@ RUN_USER = ; git +@@ -129,7 +129,7 @@ ;PER_WRITE_PER_KB_TIMEOUT = 30s ;; ;; Permission for unix socket @@ -20,16 +20,16 @@ index a7476ad..d8cc405 100644 ;; ;; Local (DMZ) URL for Gitea workers (such as SSH update) accessing web service. In ;; most cases you do not need to change the default value. Alter it only if -@@ -176,7 +176,7 @@ RUN_USER = ; git - ;SSH_LISTEN_PORT = +@@ -177,7 +177,7 @@ ;; - ;; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'. + ;; Root path of SSH user directory for the system's standalone SSH server if Gitea is not using its builtin SSH server. + ;; Default is the '.ssh' directory in the run user's home directory. -;SSH_ROOT_PATH = +SSH_ROOT_PATH = /var/lib/gitea/.ssh ;; - ;; Gitea will create a authorized_keys file by default when it is not using the internal ssh server + ;; Gitea will create an authorized_keys file by default when it is not using the builtin SSH server ;; If you intend to use the AuthorizedKeysCommand functionality then you should turn this off. -@@ -288,7 +288,7 @@ RUN_USER = ; git +@@ -282,7 +282,7 @@ ;; ;; Root directory containing templates and static files. ;; default is the path where Gitea is executed @@ -38,7 +38,7 @@ index a7476ad..d8cc405 100644 ;; ;; Default path for App data ;APP_DATA_PATH = data ; relative paths will be made absolute with _`AppWorkPath`_ -@@ -363,10 +363,10 @@ RUN_USER = ; git +@@ -357,10 +357,10 @@ ;; ;; MySQL Configuration ;; @@ -53,7 +53,7 @@ index a7476ad..d8cc405 100644 ;PASSWD = ;Use PASSWD = `your password` for quoting if you use special characters in the password. ;SSL_MODE = false ; either "false" (default), "true", or "skip-verify" ;CHARSET_COLLATION = ; Empty as default, Gitea will try to find a case-sensitive collation. Don't change it unless you clearly know what you need. -@@ -387,8 +387,8 @@ USER = root +@@ -381,8 +381,8 @@ USER = root ;; ;; SQLite Configuration ;; @@ -64,7 +64,7 @@ index a7476ad..d8cc405 100644 ;SQLITE_TIMEOUT = ; Query timeout defaults to: 500 ;SQLITE_JOURNAL_MODE = ; defaults to sqlite database default (often DELETE), can be used to enable WAL mode. https://www.sqlite.org/pragma.html#pragma_journal_mode ;; -@@ -595,7 +595,7 @@ ENABLED = true +@@ -599,7 +599,7 @@ ENABLED = true ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Root path for the log files - defaults to "{AppWorkPath}/log" @@ -73,7 +73,7 @@ index a7476ad..d8cc405 100644 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Main Logger -@@ -984,11 +984,11 @@ LEVEL = Info +@@ -988,11 +988,11 @@ LEVEL = Info ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -87,7 +87,7 @@ index a7476ad..d8cc405 100644 ;; ;; The script type this server supports. Usually this is `bash`, but some users report that only `sh` is available. ;SCRIPT_TYPE = bash -@@ -1099,7 +1099,7 @@ LEVEL = Info +@@ -1103,7 +1103,7 @@ LEVEL = Info ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -96,7 +96,7 @@ index a7476ad..d8cc405 100644 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; -@@ -1474,7 +1474,7 @@ LEVEL = Info +@@ -1504,7 +1504,7 @@ LEVEL = Info ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -105,7 +105,7 @@ index a7476ad..d8cc405 100644 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; -@@ -1485,7 +1485,7 @@ LEVEL = Info +@@ -1515,7 +1515,7 @@ LEVEL = Info ;ISSUE_INDEXER_TYPE = bleve ;; ;; Issue indexer storage path, available when ISSUE_INDEXER_TYPE is bleve @@ -114,7 +114,7 @@ index a7476ad..d8cc405 100644 ;; ;; Issue indexer connection string, available when ISSUE_INDEXER_TYPE is elasticsearch (e.g. http://elastic:password@localhost:9200) or meilisearch (e.g. http://:apikey@localhost:7700) ;ISSUE_INDEXER_CONN_STR = -@@ -1924,11 +1924,11 @@ LEVEL = Info +@@ -1954,11 +1954,11 @@ LEVEL = Info ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -128,7 +128,7 @@ index a7476ad..d8cc405 100644 ;REPOSITORY_AVATAR_UPLOAD_PATH = data/repo-avatars ;; ;; How Gitea deals with missing repository avatars -@@ -2702,11 +2702,11 @@ LEVEL = Info +@@ -2841,11 +2841,11 @@ LEVEL = Info ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; lfs storage will override storage ;; diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index ca41d46158ff29..d0cafc53e023db 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,6 +1,6 @@ # Template file for 'gitea' pkgname=gitea -version=1.25.4 +version=1.26.1 revision=1 build_style=go go_import_path=code.gitea.io/gitea @@ -29,7 +29,7 @@ license="MIT" homepage="https://gitea.io" changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md" distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz" -checksum=2c067547343c5c0763d3370d82c81ef4c6e511fe342b300e5a687f664f3b405e +checksum=6c673dfd26c6e22dfba000c6dd1e3eaad905176ee7c80a5f458bdbe54caba248 system_accounts="_gitea" _gitea_homedir="/var/lib/gitea" @@ -39,6 +39,7 @@ make_dirs="/var/lib/gitea 0755 _gitea _gitea conf_files="/etc/gitea.conf" do_check() { + git init # some tests expect to be in a git repo make test-backend }