From 1cb5d7ccff7c4b6db25bd3e217ae9be20603ac35 Mon Sep 17 00:00:00 2001 From: fanyx Date: Sun, 16 Oct 2022 14:11:37 +0200 Subject: [PATCH] gitea: update to 1.17.3 --- srcpkgs/gitea/patches/config.patch | 49 +++++++++++++++--------------- srcpkgs/gitea/template | 6 ++-- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch index 1675e7369d11..71e395528d0f 100644 --- a/srcpkgs/gitea/patches/config.patch +++ b/srcpkgs/gitea/patches/config.patch @@ -9,7 +9,7 @@ ;; ;; Application run mode, affects performance and debugging. Either "dev", "prod" or "test", default is "prod" RUN_MODE = ; prod -@@ -58,7 +58,7 @@ RUN_MODE = ; prod +@@ -68,7 +68,7 @@ RUN_MODE = ; prod ;PER_WRITE_PER_KB_TIMEOUT = 30s ;; ;; Permission for unix socket @@ -18,7 +18,7 @@ ;; ;; 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. -@@ -88,7 +88,7 @@ RUN_MODE = ; prod +@@ -101,7 +101,7 @@ RUN_MODE = ; prod ;SSH_LISTEN_PORT = %(SSH_PORT)s ;; ;; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'. @@ -27,7 +27,7 @@ ;; ;; Gitea will create a authorized_keys file by default when it is not using the internal ssh server ;; If you intend to use the AuthorizedKeysCommand functionality then you should turn this off. -@@ -178,7 +178,7 @@ RUN_MODE = ; prod +@@ -221,7 +221,7 @@ RUN_MODE = ; prod ;; ;; Root directory containing templates and static files. ;; default is the path where Gitea is executed @@ -36,16 +36,7 @@ ;; ;; Default path for App data ;APP_DATA_PATH = data -@@ -202,7 +202,7 @@ RUN_MODE = ; prod - ;LFS_START_SERVER = false - ;; - ;; Where your lfs files reside, default is data/lfs. --;LFS_CONTENT_PATH = data/lfs -+LFS_CONTENT_PATH = /var/lib/gitea/lfs - ;; - ;; LFS authentication secret, change this yourself - LFS_JWT_SECRET = -@@ -243,10 +243,10 @@ LFS_JWT_SECRET = +@@ -284,10 +284,10 @@ LFS_JWT_SECRET = ;; ;; MySQL Configuration ;; @@ -60,7 +51,7 @@ ;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 = utf8mb4 ;either "utf8" or "utf8mb4", default is "utf8mb4". -@@ -269,8 +269,8 @@ USER = root +@@ -310,8 +310,8 @@ USER = root ;; ;; SQLite Configuration ;; @@ -71,7 +62,7 @@ ;SQLITE_TIMEOUT = ; Query timeout defaults to: 500 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -@@ -431,7 +431,7 @@ TRUSTED_FACETS = ; e.g. http://localhost:3000/ +@@ -495,7 +495,7 @@ APP_ID = ; e.g. http://localhost:3000/ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Root path for the log files - defaults to %(GITEA_WORK_DIR)/log @@ -80,34 +71,35 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Main Logger -@@ -736,7 +736,7 @@ PATH = - ;[repository] +@@ -818,7 +818,8 @@ ROUTER = console ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;; Root path for storing all repository data. It must be an absolute path. By default, it is stored in a sub-directory of `APP_DATA_PATH`. + ;; Root path for storing all repository data. By default, it is set to %(APP_DATA_PATH)/gitea-repositories. + ;; A relative path is interpreted as %(GITEA_WORK_DIR)/%(ROOT) -;ROOT = +ROOT = /var/lib/gitea/repositories ++ ;; ;; The script type this server supports. Usually this is `bash`, but some users report that only `sh` is available. ;SCRIPT_TYPE = bash -@@ -834,7 +834,7 @@ PATH = +@@ -916,7 +917,7 @@ ROUTER = console ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; - ;; Path for local repository copy. Defaults to `tmp/local-repo` + ;; Path for local repository copy. Defaults to `tmp/local-repo` (content gets deleted on gitea restart) -;LOCAL_COPY_PATH = tmp/local-repo +LOCAL_COPY_PATH = /var/lib/gitea/tmp/local-repo ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -@@ -846,7 +846,7 @@ PATH = +@@ -928,7 +929,7 @@ ROUTER = console ;ENABLED = true ;; - ;; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gitea restart) + ;; Path for uploads. Defaults to `data/tmp/uploads` (content gets deleted on gitea restart) -;TEMP_PATH = data/tmp/uploads +TEMP_PATH = /var/lib/gitea/uploads ;; ;; Comma-separated list of allowed file extensions (`.zip`), mime types (`text/plain`) or wildcard type (`image/*`, `audio/*`, `video/*`). Empty value or `*/*` allows all types. ;ALLOWED_TYPES = -@@ -1172,7 +1172,7 @@ PATH = +@@ -1264,7 +1265,7 @@ ROUTER = console ;ISSUE_INDEXER_TYPE = bleve ;; ;; Issue indexer storage path, available when ISSUE_INDEXER_TYPE is bleve @@ -116,7 +108,7 @@ ;; ;; Issue indexer connection string, available when ISSUE_INDEXER_TYPE is elasticsearch ;ISSUE_INDEXER_CONN_STR = http://elastic:changeme@localhost:9200 -@@ -1543,7 +1543,7 @@ PATH = +@@ -1650,7 +1651,7 @@ ROUTER = console ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; @@ -125,3 +117,12 @@ ;REPOSITORY_AVATAR_UPLOAD_PATH = data/repo-avatars ;; ;; How Gitea deals with missing repository avatars +@@ -2298,7 +2299,7 @@ ROUTER = console + ;STORAGE_TYPE = local + ;; + ;; Where your lfs files reside, default is data/lfs. +-;PATH = data/lfs ++PATH = /var/lib/gitea/lfs + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index 33ed4c7e16a8..8d79650d1aa0 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,8 +1,8 @@ # Template file for 'gitea' pkgname=gitea -version=1.16.8 +version=1.17.3 revision=1 -create_wrksrc=yes +wrksrc=gitea-src-${version} build_style=go go_import_path=code.gitea.io/gitea go_ldflags=" -X main.Version=${version}" @@ -32,7 +32,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=5bf01b45f9c441f9d38d727cc1328414e4e5778ac5b01bc98979d82bc520a23d +checksum=35490480ab793844e8ef9d541dca1c3c7ee510883205fe9197f373d276cd1f78 system_accounts="_gitea" _gitea_homedir="/var/lib/gitea"