From 88e3d43f0a91af72a6fc61949e2dcc8d471d4c6d Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 4 Jan 2021 21:38:11 +1100 Subject: [PATCH] gitea: update to 1.13.1. --- srcpkgs/gitea/patches/config.patch | 58 ++++++++++++++---------------- srcpkgs/gitea/template | 6 ++-- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch index e5833d9a31b..c5238253ccf 100644 --- a/srcpkgs/gitea/patches/config.patch +++ b/srcpkgs/gitea/patches/config.patch @@ -1,33 +1,29 @@ ---- custom/conf/app.ini.sample.orig 2020-06-22 08:49:03.000000000 +1000 -+++ custom/conf/app.ini.sample 2020-07-10 10:53:31.047000000 +1000 -@@ -7,12 +7,12 @@ +--- custom/conf/app.example.ini 2020-12-29 05:19:36.000000000 +1100 ++++ custom/conf/app.example.ini 2021-01-04 20:50:52.849861177 +1100 +@@ -7,7 +7,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 +RUN_USER = _gitea - ; Either "dev", "prod" or "test", default is "dev" --RUN_MODE = dev -+RUN_MODE = prod + ; Application run mode, affects performance and debugging. Either "dev", "prod" or "test", default is "prod" + RUN_MODE = prod + +@@ -17,7 +17,7 @@ + PROJECT_BOARD_BUG_TRIAGE_TYPE = Needs Triage, High Priority, Low Priority, Closed [repository] -ROOT = +ROOT = /var/lib/gitea/repositories SCRIPT_TYPE = bash - ; Default ANSI charset - ANSI_CHARSET = -@@ -62,16 +62,16 @@ - PREVIEWABLE_FILE_MODES = markdown + ; DETECTED_CHARSETS_ORDER tie-break order for detected charsets. + ; If the charsets have equal confidence, tie-breaking will be done by order in this list +@@ -81,13 +81,13 @@ [repository.local] --; Path for local repository copy. Defaults to `tmp/local-repo` + ; Path for local repository copy. Defaults to `tmp/local-repo` -LOCAL_COPY_PATH = tmp/local-repo --; Path for local wiki copy. Defaults to `tmp/local-wiki` --LOCAL_WIKI_PATH = tmp/local-wiki -+; Path for local repository copy. Defaults to `/var/lib/gitea/tmp/local-repo` +LOCAL_COPY_PATH = /var/lib/gitea/tmp/local-repo -+; Path for local wiki copy. Defaults to `/var/lib/gitea/tmp/local-wiki` -+LOCAL_WIKI_PATH = /var/lib/gitea/tmp/local-wiki [repository.upload] ; Whether repository file uploads are enabled. Defaults to `true` @@ -35,10 +31,10 @@ ; 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 - ; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type + ; 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 -@@ -248,7 +248,7 @@ +@@ -272,7 +272,7 @@ REDIRECT_OTHER_PORT = false PORT_TO_REDIRECT = 80 ; Permission for unix socket @@ -47,7 +43,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. ; Alter it only if your SSH server node is not the same as HTTP node. -@@ -269,7 +269,7 @@ +@@ -293,7 +293,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'. @@ -56,7 +52,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. SSH_CREATE_AUTHORIZED_KEYS_FILE = true -@@ -308,7 +308,7 @@ +@@ -354,7 +354,7 @@ KEY_FILE = https/key.pem ; Root directory containing templates and static files. ; default is the path where Gitea is executed @@ -65,7 +61,7 @@ ; Default path for App data APP_DATA_PATH = data ; Application level GZIP support -@@ -325,7 +325,7 @@ +@@ -371,7 +371,7 @@ ; Enables git-lfs support. true or false, default is false. LFS_START_SERVER = false ; Where your lfs files reside, default is data/lfs. @@ -74,7 +70,7 @@ ; LFS authentication secret, change this yourself LFS_JWT_SECRET = ; LFS authentication validity period (in time.Duration), pushes taking longer than this may fail. -@@ -355,7 +355,7 @@ +@@ -401,7 +401,7 @@ [database] ; Database to use. Either "mysql", "postgres", "mssql" or "sqlite3". @@ -83,16 +79,16 @@ HOST = 127.0.0.1:3306 NAME = gitea USER = root -@@ -372,7 +372,7 @@ +@@ -418,7 +418,7 @@ ; NOTICE: for "utf8mb4" you must use MySQL InnoDB > 5.6. Gitea is unable to check this. - CHARSET = utf8 + 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 -@@ -398,7 +398,7 @@ +@@ -444,7 +444,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 @@ -101,7 +97,7 @@ ; 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 queue will be saved path, -@@ -706,7 +706,7 @@ +@@ -773,7 +773,7 @@ SESSION_LIFE_TIME = 86400 [picture] @@ -110,7 +106,7 @@ 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 -@@ -751,7 +751,7 @@ +@@ -838,7 +838,7 @@ DEFAULT_UI_LOCATION = [log] @@ -119,16 +115,16 @@ ; Either "console", "file", "conn", "smtp" or "database", default is "console" ; Use comma to separate multiple modes, e.g. "console, file" MODE = console -@@ -968,14 +968,6 @@ - sv-SE = sv - ko-KR = ko +@@ -1132,14 +1132,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 seperated list of trusted facets +-; Comma separated list of trusted facets -;TRUSTED_FACETS = http://localhost:3000/ - ; Extension mapping to highlight class diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index e96ecf7d08b..ed6d4e9ce10 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,6 +1,6 @@ # Template file for 'gitea' pkgname=gitea -version=1.12.6 +version=1.13.1 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=98486d15c58b52177e58af300e1ac6afa46f2f85f61b8d96eacbbf73ccf1191e +checksum=b5a87b722abe8e4911389abf57ec8f46d58fb966929dfe612a77639e27ec4187 system_accounts="_gitea" _gitea_homedir="/var/lib/gitea" @@ -48,5 +48,5 @@ pre_build() { post_install() { vlicense LICENSE vsv gitea - vinstall custom/conf/app.ini.sample 0640 /etc gitea.conf + vinstall custom/conf/app.example.ini 0640 /etc gitea.conf }