From 19d986a2cae9ce73d32552ddb62443b5e7fa13e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sun, 14 Nov 2021 04:26:41 -0300 Subject: [PATCH] gitea: update to 1.15.6. --- srcpkgs/gitea/patches/config.patch | 247 ++++++++++++++--------------- srcpkgs/gitea/template | 4 +- 2 files changed, 123 insertions(+), 128 deletions(-) diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch index 77168cb393..1675e7369d 100644 --- a/srcpkgs/gitea/patches/config.patch +++ b/srcpkgs/gitea/patches/config.patch @@ -1,132 +1,127 @@ ---- a/custom/conf/app.example.ini 2021-04-22 15:48:34.959214467 +0300 -+++ b/custom/conf/app.example.ini 2021-04-22 15:48:25.414266118 +0300 -@@ -9,7 +9,7 @@ - ; App name that shows in every page title - APP_NAME = Gitea: Git with a cup of tea - ; Change it if you run locally --RUN_USER = git +--- a/custom/conf/app.example.ini ++++ b/custom/conf/app.example.ini +@@ -15,7 +15,7 @@ + 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 = _gitea - ; Application run mode, affects performance and debugging. Either "dev", "prod" or "test", default is "prod" - RUN_MODE = prod - -@@ -20,7 +20,7 @@ - - [repository] - ; 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 = + ;; + ;; 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 + ;PER_WRITE_PER_KB_TIMEOUT = 30s + ;; + ;; Permission for unix socket +-;UNIX_SOCKET_PERMISSION = 666 ++UNIX_SOCKET_PERMISSION = 660 + ;; + ;; 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 + ;SSH_LISTEN_PORT = %(SSH_PORT)s + ;; + ;; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'. +-;SSH_ROOT_PATH = ++SSH_ROOT_PATH = /var/lib/gitea + ;; + ;; 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 + ;; + ;; Root directory containing templates and static files. + ;; default is the path where Gitea is executed +-;STATIC_ROOT_PATH = ++STATIC_ROOT_PATH = /var/lib/gitea + ;; + ;; 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 = + ;; + ;; MySQL Configuration + ;; +-DB_TYPE = mysql +-HOST = 127.0.0.1:3306 ; can use socket e.g. /var/run/mysqld/mysqld.sock +-NAME = gitea +-USER = root ++;DB_TYPE = mysql ++;HOST = 127.0.0.1:3306 ; can use socket e.g. /var/run/mysqld/mysqld.sock ++;NAME = gitea ++;USER = root + ;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 + ;; + ;; SQLite Configuration + ;; +-;DB_TYPE = sqlite3 +-;PATH= ; defaults to data/gitea.db ++DB_TYPE = sqlite3 ++PATH = /var/lib/gitea/data/gitea.db + ;SQLITE_TIMEOUT = ; Query timeout defaults to: 500 + ;; + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +@@ -431,7 +431,7 @@ TRUSTED_FACETS = ; e.g. http://localhost:3000/ + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; Root path for the log files - defaults to %(GITEA_WORK_DIR)/log +-;ROOT_PATH = ++ROOT_PATH = /var/log/gitea + ;; + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; Main Logger +@@ -736,7 +736,7 @@ PATH = + ;[repository] + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; 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 = +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 - ; DETECTED_CHARSETS_ORDER tie-break order for detected charsets. -@@ -87,13 +87,13 @@ - - [repository.local] - ; Path for local repository copy. Defaults to `tmp/local-repo` --LOCAL_COPY_PATH = tmp/local-repo + ;; + ;; 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 = + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; + ;; Path for local repository copy. Defaults to `tmp/local-repo` +-;LOCAL_COPY_PATH = tmp/local-repo +LOCAL_COPY_PATH = /var/lib/gitea/tmp/local-repo - [repository.upload] - ; Whether repository file uploads are enabled. Defaults to `true` - ENABLED = true - ; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gitea restart) --TEMP_PATH = data/tmp/uploads -+TEMP_PATH = /var/lib/gitea/tmp/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 = - ; Max size of each file in megabytes. Defaults to 3MB -@@ -282,7 +282,7 @@ - REDIRECT_OTHER_PORT = false - PORT_TO_REDIRECT = 80 - ; Permission for unix socket --UNIX_SOCKET_PERMISSION = 666 -+UNIX_SOCKET_PERMISSION = 660 - ; 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 your SSH server node is not the same as HTTP node. -@@ -303,7 +303,7 @@ - ; The port number the builtin SSH server should listen on - SSH_LISTEN_PORT = %(SSH_PORT)s - ; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'. --SSH_ROOT_PATH = -+SSH_ROOT_PATH = /var/lib/gitea - ; 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. - SSH_CREATE_AUTHORIZED_KEYS_FILE = true -@@ -368,7 +368,7 @@ - KEY_FILE = https/key.pem - ; Root directory containing templates and static files. - ; default is the path where Gitea is executed --STATIC_ROOT_PATH = -+STATIC_ROOT_PATH = /var/lib/gitea - ; Default path for App data - APP_DATA_PATH = data - ; Enable gzip compression for runtime-generated content, static resources excluded -@@ -385,7 +385,7 @@ - ; Enables git-lfs support. true or false, default is false. - 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 = - ; LFS authentication validity period (in time.Duration), pushes taking longer than this may fail. -@@ -415,7 +415,7 @@ - - [database] - ; Database to use. Either "mysql", "postgres", "mssql" or "sqlite3". --DB_TYPE = mysql -+DB_TYPE = sqlite3 - HOST = 127.0.0.1:3306 - NAME = gitea - USER = root -@@ -432,7 +432,7 @@ - ; NOTICE: for "utf8mb4" you must use MySQL InnoDB > 5.6. Gitea is unable to check this. - CHARSET = utf8mb4 - ; For "sqlite3" and "tidb", use an absolute path when you start gitea as service --PATH = data/gitea.db -+PATH = /var/lib/gitea/data/gitea.db - ; For "sqlite3" only. Query timeout - SQLITE_TIMEOUT = 500 - ; For iterate buffer, default is 50 -@@ -458,7 +458,7 @@ - ; Issue indexer name, available when ISSUE_INDEXER_TYPE is elasticsearch - ISSUE_INDEXER_NAME = gitea_issues - ; Issue indexer storage path, available when ISSUE_INDEXER_TYPE is bleve --ISSUE_INDEXER_PATH = indexers/issues.bleve + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +@@ -846,7 +846,7 @@ PATH = + ;ENABLED = true + ;; + ;; Path for uploads. Defaults to `data/tmp/uploads` (tmp 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 = + ;ISSUE_INDEXER_TYPE = bleve + ;; + ;; Issue indexer storage path, available when ISSUE_INDEXER_TYPE is bleve +-;ISSUE_INDEXER_PATH = indexers/issues.bleve +ISSUE_INDEXER_PATH = /var/lib/gitea/indexers/issues.bleve - ; Issue indexer queue, currently support: channel, levelqueue or redis, default is levelqueue - ISSUE_INDEXER_QUEUE_TYPE = levelqueue - ; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the path where the queue will be saved. -@@ -806,7 +806,7 @@ - SAME_SITE=lax - - [picture] --AVATAR_UPLOAD_PATH = data/avatars + ;; + ;; 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 = + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; +-;AVATAR_UPLOAD_PATH = data/avatars +AVATAR_UPLOAD_PATH = /var/lib/gitea/data/avatars - REPOSITORY_AVATAR_UPLOAD_PATH = data/repo-avatars - ; How Gitea deals with missing repository avatars - ; none = no avatar will be displayed; random = random avatar will be displayed; image = default image will be used -@@ -871,7 +871,7 @@ - DEFAULT_UI_LOCATION = - - [log] --ROOT_PATH = -+ROOT_PATH = /var/log/gitea - ; Either "console", "file", "conn", "smtp" or "database", default is "console" - ; Use comma to separate multiple modes, e.g. "console, file" - MODE = console -@@ -1181,14 +1181,6 @@ - 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,한국어 - --[U2F] --; NOTE: THE DEFAULT VALUES HERE WILL NEED TO BE CHANGED --; Two Factor authentication with security keys --; https://developers.yubico.com/U2F/App_ID.html --;APP_ID = http://localhost:3000/ --; Comma separated list of trusted facets --;TRUSTED_FACETS = http://localhost:3000/ -- - ; Extension mapping to highlight class - ; e.g. .toml=ini - [highlight.mapping] + ;REPOSITORY_AVATAR_UPLOAD_PATH = data/repo-avatars + ;; + ;; How Gitea deals with missing repository avatars diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index f375d2dcfa..1e8fe62836 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,6 +1,6 @@ # Template file for 'gitea' pkgname=gitea -version=1.14.2 +version=1.15.6 revision=1 create_wrksrc=yes build_style=go @@ -32,7 +32,7 @@ license="MIT" homepage="https://gitea.io" changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md" distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz" -checksum=d04bca934feba35600aaf739c82b7cbe7d8b911a086d7ac54f0710b689a85ac3 +checksum=14c33f89003125cca6bf88d80736815c6d14cbc5311e1f6015607983357d727d system_accounts="_gitea" _gitea_homedir="/var/lib/gitea"