Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] gitea: update to 1.14.1
@ 2021-04-17 11:54 FollieHiyuki
  2021-04-18  4:13 ` ericonr
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: FollieHiyuki @ 2021-04-17 11:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]

There is a new pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages gitea-update
https://github.com/void-linux/void-packages/pull/30282

gitea: update to 1.14.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Don't know why the patch fails to apply, but the package builds.


A patch file from https://github.com/void-linux/void-packages/pull/30282.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gitea-update-30282.patch --]
[-- Type: text/x-diff, Size: 7763 bytes --]

From 047612c27cea16890a99ee625630f70725d020dd Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 17 Apr 2021 03:40:30 +0300
Subject: [PATCH] gitea: update to 1.14.1

---
 srcpkgs/gitea/files/gitea/run      |  2 +-
 srcpkgs/gitea/patches/config.patch | 42 ++++++++++++++++--------------
 srcpkgs/gitea/template             |  4 +--
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run
index b27946c5b905..591e977e729f 100755
--- a/srcpkgs/gitea/files/gitea/run
+++ b/srcpkgs/gitea/files/gitea/run
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Whe cd here, because builtin SSH won't run without.
+# We cd here, because builtin SSH won't run without.
 cd /var/lib/gitea
 
 # The USER variable is needed here because gitea doesn't actually
diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch
index c5238253ccfd..4c4bc6844f11 100644
--- a/srcpkgs/gitea/patches/config.patch
+++ b/srcpkgs/gitea/patches/config.patch
@@ -1,6 +1,8 @@
---- 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 @@
+diff --git custom/conf/app.example.ini custom/conf/app.example.ini
+index 35f1bfaea..f7ff278ff 100644
+--- custom/conf/app.example.ini
++++ custom/conf/app.example.ini
+@@ -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
@@ -9,16 +11,16 @@
  ; 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
+@@ -20,7 +20,7 @@ PROJECT_BOARD_BUG_TRIAGE_TYPE = Needs Triage, High Priority, Low Priority, Close
  
  [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.
- ; If the charsets have equal confidence, tie-breaking will be done by order in this list
-@@ -81,13 +81,13 @@
+@@ -89,13 +89,13 @@ PREVIEWABLE_FILE_MODES = markdown
  
  [repository.local]
  ; Path for local repository copy. Defaults to `tmp/local-repo`
@@ -34,7 +36,7 @@
  ; 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
-@@ -272,7 +272,7 @@
+@@ -288,7 +288,7 @@ HTTP_PORT = 3000
  REDIRECT_OTHER_PORT = false
  PORT_TO_REDIRECT = 80
  ; Permission for unix socket
@@ -43,7 +45,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.
-@@ -293,7 +293,7 @@
+@@ -309,7 +309,7 @@ SSH_PORT = 22
  ; 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'.
@@ -52,7 +54,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
-@@ -354,7 +354,7 @@
+@@ -374,7 +374,7 @@ CERT_FILE = https/cert.pem
  KEY_FILE = https/key.pem
  ; Root directory containing templates and static files.
  ; default is the path where Gitea is executed
@@ -60,8 +62,8 @@
 +STATIC_ROOT_PATH = /var/lib/gitea
  ; Default path for App data
  APP_DATA_PATH = data
- ; Application level GZIP support
-@@ -371,7 +371,7 @@
+ ; Enable gzip compression for runtime-generated content, static resources excluded
+@@ -391,7 +391,7 @@ LANDING_PAGE = home
  ; Enables git-lfs support. true or false, default is false.
  LFS_START_SERVER = false
  ; Where your lfs files reside, default is data/lfs.
@@ -70,7 +72,7 @@
  ; LFS authentication secret, change this yourself
  LFS_JWT_SECRET =
  ; LFS authentication validity period (in time.Duration), pushes taking longer than this may fail.
-@@ -401,7 +401,7 @@
+@@ -421,7 +421,7 @@ DSA = -1 ; set to 1024 to switch on
  
  [database]
  ; Database to use. Either "mysql", "postgres", "mssql" or "sqlite3".
@@ -79,7 +81,7 @@
  HOST = 127.0.0.1:3306
  NAME = gitea
  USER = root
-@@ -418,7 +418,7 @@
+@@ -438,7 +438,7 @@ SSL_MODE = disable
  ; 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
@@ -88,7 +90,7 @@
  ; For "sqlite3" only. Query timeout
  SQLITE_TIMEOUT = 500
  ; For iterate buffer, default is 50
-@@ -444,7 +444,7 @@
+@@ -464,7 +464,7 @@ ISSUE_INDEXER_CONN_STR = http://elastic:changeme@localhost:9200
  ; 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
@@ -96,9 +98,9 @@
 +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 queue will be saved path,
-@@ -773,7 +773,7 @@
- SESSION_LIFE_TIME = 86400
+ ; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the path where the queue will be saved.
+@@ -838,7 +838,7 @@ SESSION_LIFE_TIME = 86400
+ SAME_SITE=lax
  
  [picture]
 -AVATAR_UPLOAD_PATH = data/avatars
@@ -106,7 +108,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
-@@ -838,7 +838,7 @@
+@@ -903,7 +903,7 @@ FORMAT =
  DEFAULT_UI_LOCATION =
  
  [log]
@@ -115,7 +117,7 @@
  ; Either "console", "file", "conn", "smtp" or "database", default is "console"
  ; Use comma to separate multiple modes, e.g. "console, file"
  MODE = console
-@@ -1132,14 +1132,6 @@
+@@ -1213,14 +1213,6 @@ MAX_TOKEN_LENGTH = 32767
  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,한국어
  
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index ed6d4e9ce104..75abd5c37fdb 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.13.1
+version=1.14.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=b5a87b722abe8e4911389abf57ec8f46d58fb966929dfe612a77639e27ec4187
+checksum=77003949b9ce4b91b08cfd0b2ccddc0751f1311a0f453a1c36d6ae596561fcc2
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: gitea: update to 1.14.1
  2021-04-17 11:54 [PR PATCH] gitea: update to 1.14.1 FollieHiyuki
@ 2021-04-18  4:13 ` ericonr
  2021-04-18 11:27 ` FollieHiyuki
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-04-18  4:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30282#issuecomment-821929108

Comment:
> Don't know why the patch fails to apply, but the package builds.

Locally, you mean?

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: gitea: update to 1.14.1
  2021-04-17 11:54 [PR PATCH] gitea: update to 1.14.1 FollieHiyuki
  2021-04-18  4:13 ` ericonr
@ 2021-04-18 11:27 ` FollieHiyuki
  2021-04-22 12:59 ` [PR PATCH] [Updated] " FollieHiyuki
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: FollieHiyuki @ 2021-04-18 11:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/30282#issuecomment-821976516

Comment:
Sorry that was misleading. What I meant was I could build and install the package without the patch. The patch fails locally too.
But I can apply it within `gitea` repo with no problem (it is generated from git anyways)

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] gitea: update to 1.14.1
  2021-04-17 11:54 [PR PATCH] gitea: update to 1.14.1 FollieHiyuki
  2021-04-18  4:13 ` ericonr
  2021-04-18 11:27 ` FollieHiyuki
@ 2021-04-22 12:59 ` FollieHiyuki
  2021-04-22 13:35 ` FollieHiyuki
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: FollieHiyuki @ 2021-04-22 12:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages gitea-update
https://github.com/void-linux/void-packages/pull/30282

gitea: update to 1.14.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Don't know why the patch fails to apply, but the package builds.


A patch file from https://github.com/void-linux/void-packages/pull/30282.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gitea-update-30282.patch --]
[-- Type: text/x-diff, Size: 7359 bytes --]

From 75a3c9a7a9008dabb5f54ad8267786229ab84868 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 17 Apr 2021 03:40:30 +0300
Subject: [PATCH] gitea: update to 1.14.1

---
 srcpkgs/gitea/files/gitea/run      |  2 +-
 srcpkgs/gitea/patches/config.patch | 40 +++++++++++++++---------------
 srcpkgs/gitea/template             |  4 +--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run
index b27946c5b905..591e977e729f 100755
--- a/srcpkgs/gitea/files/gitea/run
+++ b/srcpkgs/gitea/files/gitea/run
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Whe cd here, because builtin SSH won't run without.
+# We cd here, because builtin SSH won't run without.
 cd /var/lib/gitea
 
 # The USER variable is needed here because gitea doesn't actually
diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch
index c5238253ccfd..269f9e3fb021 100644
--- a/srcpkgs/gitea/patches/config.patch
+++ b/srcpkgs/gitea/patches/config.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- custom/conf/app.example.ini	2021-04-22 15:48:34.959214467 +0300
++++ 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
@@ -9,16 +9,16 @@
  ; 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
+@@ -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 =
 +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.
- ; If the charsets have equal confidence, tie-breaking will be done by order in this list
-@@ -81,13 +81,13 @@
+@@ -89,13 +89,13 @@
  
  [repository.local]
  ; Path for local repository copy. Defaults to `tmp/local-repo`
@@ -34,7 +34,7 @@
  ; 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
-@@ -272,7 +272,7 @@
+@@ -288,7 +288,7 @@
  REDIRECT_OTHER_PORT = false
  PORT_TO_REDIRECT = 80
  ; Permission for unix socket
@@ -43,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.
-@@ -293,7 +293,7 @@
+@@ -309,7 +309,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'.
@@ -52,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
-@@ -354,7 +354,7 @@
+@@ -374,7 +374,7 @@
  KEY_FILE = https/key.pem
  ; Root directory containing templates and static files.
  ; default is the path where Gitea is executed
@@ -60,8 +60,8 @@
 +STATIC_ROOT_PATH = /var/lib/gitea
  ; Default path for App data
  APP_DATA_PATH = data
- ; Application level GZIP support
-@@ -371,7 +371,7 @@
+ ; Enable gzip compression for runtime-generated content, static resources excluded
+@@ -391,7 +391,7 @@
  ; Enables git-lfs support. true or false, default is false.
  LFS_START_SERVER = false
  ; Where your lfs files reside, default is data/lfs.
@@ -70,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.
-@@ -401,7 +401,7 @@
+@@ -421,7 +421,7 @@
  
  [database]
  ; Database to use. Either "mysql", "postgres", "mssql" or "sqlite3".
@@ -79,7 +79,7 @@
  HOST = 127.0.0.1:3306
  NAME = gitea
  USER = root
-@@ -418,7 +418,7 @@
+@@ -438,7 +438,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
@@ -88,7 +88,7 @@
  ; For "sqlite3" only. Query timeout
  SQLITE_TIMEOUT = 500
  ; For iterate buffer, default is 50
-@@ -444,7 +444,7 @@
+@@ -464,7 +464,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
@@ -96,9 +96,9 @@
 +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 queue will be saved path,
-@@ -773,7 +773,7 @@
- SESSION_LIFE_TIME = 86400
+ ; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the path where the queue will be saved.
+@@ -838,7 +838,7 @@
+ SAME_SITE=lax
  
  [picture]
 -AVATAR_UPLOAD_PATH = data/avatars
@@ -106,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
-@@ -838,7 +838,7 @@
+@@ -903,7 +903,7 @@
  DEFAULT_UI_LOCATION =
  
  [log]
@@ -115,7 +115,7 @@
  ; Either "console", "file", "conn", "smtp" or "database", default is "console"
  ; Use comma to separate multiple modes, e.g. "console, file"
  MODE = console
-@@ -1132,14 +1132,6 @@
+@@ -1213,14 +1213,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,한국어
  
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index ed6d4e9ce104..75abd5c37fdb 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.13.1
+version=1.14.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=b5a87b722abe8e4911389abf57ec8f46d58fb966929dfe612a77639e27ec4187
+checksum=77003949b9ce4b91b08cfd0b2ccddc0751f1311a0f453a1c36d6ae596561fcc2
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: gitea: update to 1.14.1
  2021-04-17 11:54 [PR PATCH] gitea: update to 1.14.1 FollieHiyuki
                   ` (2 preceding siblings ...)
  2021-04-22 12:59 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-04-22 13:35 ` FollieHiyuki
  2021-04-22 13:49 ` [PR PATCH] [Updated] " FollieHiyuki
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: FollieHiyuki @ 2021-04-22 13:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/30282#issuecomment-824847263

Comment:
Don't know why that hunk fails
```
❯ patch -Np0 < config.patch 
patching file custom/conf/app.example.ini
Hunk #2 FAILED at 20.
Hunk #3 succeeded at 87 (offset -2 lines).
Hunk #4 succeeded at 282 (offset -6 lines).
Hunk #5 succeeded at 303 (offset -6 lines).
Hunk #6 succeeded at 368 (offset -6 lines).
Hunk #7 succeeded at 385 (offset -6 lines).
Hunk #8 succeeded at 415 (offset -6 lines).
Hunk #9 succeeded at 432 (offset -6 lines).
Hunk #10 succeeded at 458 (offset -6 lines).
Hunk #11 succeeded at 806 (offset -32 lines).
Hunk #12 succeeded at 871 (offset -32 lines).
Hunk #13 succeeded at 1181 (offset -32 lines).
```

Here is the rej:
```diff
@@ -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 =
+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.
```

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] gitea: update to 1.14.1
  2021-04-17 11:54 [PR PATCH] gitea: update to 1.14.1 FollieHiyuki
                   ` (3 preceding siblings ...)
  2021-04-22 13:35 ` FollieHiyuki
@ 2021-04-22 13:49 ` FollieHiyuki
  2021-05-03  0:05 ` FollieHiyuki
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: FollieHiyuki @ 2021-04-22 13:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages gitea-update
https://github.com/void-linux/void-packages/pull/30282

gitea: update to 1.14.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Don't know why the patch fails to apply, but the package builds.


A patch file from https://github.com/void-linux/void-packages/pull/30282.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gitea-update-30282.patch --]
[-- Type: text/x-diff, Size: 7382 bytes --]

From c4f3a71235132d2f6b60d274e4b4743b730401c1 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 17 Apr 2021 03:40:30 +0300
Subject: [PATCH] gitea: update to 1.14.1

---
 srcpkgs/gitea/files/gitea/run      |  2 +-
 srcpkgs/gitea/patches/config.patch | 43 ++++++++++++------------------
 srcpkgs/gitea/template             |  9 +++++--
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run
index b27946c5b905..591e977e729f 100755
--- a/srcpkgs/gitea/files/gitea/run
+++ b/srcpkgs/gitea/files/gitea/run
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Whe cd here, because builtin SSH won't run without.
+# We cd here, because builtin SSH won't run without.
 cd /var/lib/gitea
 
 # The USER variable is needed here because gitea doesn't actually
diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch
index c5238253ccfd..1d85145fa72c 100644
--- a/srcpkgs/gitea/patches/config.patch
+++ b/srcpkgs/gitea/patches/config.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- custom/conf/app.example.ini	2021-04-22 15:48:34.959214467 +0300
++++ 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
@@ -9,16 +9,7 @@
  ; 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
- ; 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 @@
+@@ -89,13 +89,13 @@
  
  [repository.local]
  ; Path for local repository copy. Defaults to `tmp/local-repo`
@@ -34,7 +25,7 @@
  ; 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
-@@ -272,7 +272,7 @@
+@@ -288,7 +288,7 @@
  REDIRECT_OTHER_PORT = false
  PORT_TO_REDIRECT = 80
  ; Permission for unix socket
@@ -43,7 +34,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.
-@@ -293,7 +293,7 @@
+@@ -309,7 +309,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'.
@@ -52,7 +43,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
-@@ -354,7 +354,7 @@
+@@ -374,7 +374,7 @@
  KEY_FILE = https/key.pem
  ; Root directory containing templates and static files.
  ; default is the path where Gitea is executed
@@ -60,8 +51,8 @@
 +STATIC_ROOT_PATH = /var/lib/gitea
  ; Default path for App data
  APP_DATA_PATH = data
- ; Application level GZIP support
-@@ -371,7 +371,7 @@
+ ; Enable gzip compression for runtime-generated content, static resources excluded
+@@ -391,7 +391,7 @@
  ; Enables git-lfs support. true or false, default is false.
  LFS_START_SERVER = false
  ; Where your lfs files reside, default is data/lfs.
@@ -70,7 +61,7 @@
  ; LFS authentication secret, change this yourself
  LFS_JWT_SECRET =
  ; LFS authentication validity period (in time.Duration), pushes taking longer than this may fail.
-@@ -401,7 +401,7 @@
+@@ -421,7 +421,7 @@
  
  [database]
  ; Database to use. Either "mysql", "postgres", "mssql" or "sqlite3".
@@ -79,7 +70,7 @@
  HOST = 127.0.0.1:3306
  NAME = gitea
  USER = root
-@@ -418,7 +418,7 @@
+@@ -438,7 +438,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
@@ -88,7 +79,7 @@
  ; For "sqlite3" only. Query timeout
  SQLITE_TIMEOUT = 500
  ; For iterate buffer, default is 50
-@@ -444,7 +444,7 @@
+@@ -464,7 +464,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
@@ -96,9 +87,9 @@
 +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 queue will be saved path,
-@@ -773,7 +773,7 @@
- SESSION_LIFE_TIME = 86400
+ ; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the path where the queue will be saved.
+@@ -838,7 +838,7 @@
+ SAME_SITE=lax
  
  [picture]
 -AVATAR_UPLOAD_PATH = data/avatars
@@ -106,7 +97,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
-@@ -838,7 +838,7 @@
+@@ -903,7 +903,7 @@
  DEFAULT_UI_LOCATION =
  
  [log]
@@ -115,7 +106,7 @@
  ; Either "console", "file", "conn", "smtp" or "database", default is "console"
  ; Use comma to separate multiple modes, e.g. "console, file"
  MODE = console
-@@ -1132,14 +1132,6 @@
+@@ -1213,14 +1213,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,한국어
  
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index ed6d4e9ce104..d739de478cfd 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.13.1
+version=1.14.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=b5a87b722abe8e4911389abf57ec8f46d58fb966929dfe612a77639e27ec4187
+checksum=77003949b9ce4b91b08cfd0b2ccddc0751f1311a0f453a1c36d6ae596561fcc2
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"
@@ -41,6 +41,11 @@ make_dirs="/var/lib/gitea 0755 _gitea _gitea
  /var/log/gitea 0755 _gitea root"
 conf_files="/etc/gitea.conf"
 
+post_patch() {
+	# Patch fails here
+	vsed -i -e '23s@ROOT =@ROOT = /var/lib/gitea/repositories@' custom/conf/app.example.ini
+}
+
 pre_build() {
 	go mod vendor
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] gitea: update to 1.14.1
  2021-04-17 11:54 [PR PATCH] gitea: update to 1.14.1 FollieHiyuki
                   ` (4 preceding siblings ...)
  2021-04-22 13:49 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-05-03  0:05 ` FollieHiyuki
  2021-05-10  9:46 ` FollieHiyuki
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: FollieHiyuki @ 2021-05-03  0:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages gitea-update
https://github.com/void-linux/void-packages/pull/30282

gitea: update to 1.14.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Don't know why the patch fails to apply, but the package builds.


A patch file from https://github.com/void-linux/void-packages/pull/30282.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gitea-update-30282.patch --]
[-- Type: text/x-diff, Size: 7382 bytes --]

From 822bc52e64ac1703db18740f1b7ec7c02d87d967 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 17 Apr 2021 03:40:30 +0300
Subject: [PATCH] gitea: update to 1.14.1

---
 srcpkgs/gitea/files/gitea/run      |  2 +-
 srcpkgs/gitea/patches/config.patch | 43 ++++++++++++------------------
 srcpkgs/gitea/template             |  9 +++++--
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run
index b27946c5b905..591e977e729f 100755
--- a/srcpkgs/gitea/files/gitea/run
+++ b/srcpkgs/gitea/files/gitea/run
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Whe cd here, because builtin SSH won't run without.
+# We cd here, because builtin SSH won't run without.
 cd /var/lib/gitea
 
 # The USER variable is needed here because gitea doesn't actually
diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch
index c5238253ccfd..1d85145fa72c 100644
--- a/srcpkgs/gitea/patches/config.patch
+++ b/srcpkgs/gitea/patches/config.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- custom/conf/app.example.ini	2021-04-22 15:48:34.959214467 +0300
++++ 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
@@ -9,16 +9,7 @@
  ; 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
- ; 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 @@
+@@ -89,13 +89,13 @@
  
  [repository.local]
  ; Path for local repository copy. Defaults to `tmp/local-repo`
@@ -34,7 +25,7 @@
  ; 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
-@@ -272,7 +272,7 @@
+@@ -288,7 +288,7 @@
  REDIRECT_OTHER_PORT = false
  PORT_TO_REDIRECT = 80
  ; Permission for unix socket
@@ -43,7 +34,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.
-@@ -293,7 +293,7 @@
+@@ -309,7 +309,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'.
@@ -52,7 +43,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
-@@ -354,7 +354,7 @@
+@@ -374,7 +374,7 @@
  KEY_FILE = https/key.pem
  ; Root directory containing templates and static files.
  ; default is the path where Gitea is executed
@@ -60,8 +51,8 @@
 +STATIC_ROOT_PATH = /var/lib/gitea
  ; Default path for App data
  APP_DATA_PATH = data
- ; Application level GZIP support
-@@ -371,7 +371,7 @@
+ ; Enable gzip compression for runtime-generated content, static resources excluded
+@@ -391,7 +391,7 @@
  ; Enables git-lfs support. true or false, default is false.
  LFS_START_SERVER = false
  ; Where your lfs files reside, default is data/lfs.
@@ -70,7 +61,7 @@
  ; LFS authentication secret, change this yourself
  LFS_JWT_SECRET =
  ; LFS authentication validity period (in time.Duration), pushes taking longer than this may fail.
-@@ -401,7 +401,7 @@
+@@ -421,7 +421,7 @@
  
  [database]
  ; Database to use. Either "mysql", "postgres", "mssql" or "sqlite3".
@@ -79,7 +70,7 @@
  HOST = 127.0.0.1:3306
  NAME = gitea
  USER = root
-@@ -418,7 +418,7 @@
+@@ -438,7 +438,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
@@ -88,7 +79,7 @@
  ; For "sqlite3" only. Query timeout
  SQLITE_TIMEOUT = 500
  ; For iterate buffer, default is 50
-@@ -444,7 +444,7 @@
+@@ -464,7 +464,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
@@ -96,9 +87,9 @@
 +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 queue will be saved path,
-@@ -773,7 +773,7 @@
- SESSION_LIFE_TIME = 86400
+ ; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the path where the queue will be saved.
+@@ -838,7 +838,7 @@
+ SAME_SITE=lax
  
  [picture]
 -AVATAR_UPLOAD_PATH = data/avatars
@@ -106,7 +97,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
-@@ -838,7 +838,7 @@
+@@ -903,7 +903,7 @@
  DEFAULT_UI_LOCATION =
  
  [log]
@@ -115,7 +106,7 @@
  ; Either "console", "file", "conn", "smtp" or "database", default is "console"
  ; Use comma to separate multiple modes, e.g. "console, file"
  MODE = console
-@@ -1132,14 +1132,6 @@
+@@ -1213,14 +1213,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,한국어
  
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index ed6d4e9ce104..d739de478cfd 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.13.1
+version=1.14.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=b5a87b722abe8e4911389abf57ec8f46d58fb966929dfe612a77639e27ec4187
+checksum=77003949b9ce4b91b08cfd0b2ccddc0751f1311a0f453a1c36d6ae596561fcc2
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"
@@ -41,6 +41,11 @@ make_dirs="/var/lib/gitea 0755 _gitea _gitea
  /var/log/gitea 0755 _gitea root"
 conf_files="/etc/gitea.conf"
 
+post_patch() {
+	# Patch fails here
+	vsed -i -e '23s@ROOT =@ROOT = /var/lib/gitea/repositories@' custom/conf/app.example.ini
+}
+
 pre_build() {
 	go mod vendor
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] gitea: update to 1.14.1
  2021-04-17 11:54 [PR PATCH] gitea: update to 1.14.1 FollieHiyuki
                   ` (5 preceding siblings ...)
  2021-05-03  0:05 ` FollieHiyuki
@ 2021-05-10  9:46 ` FollieHiyuki
  2021-05-10  9:48 ` FollieHiyuki
  2021-05-20 14:06 ` [PR PATCH] [Merged]: " Gottox
  8 siblings, 0 replies; 10+ messages in thread
From: FollieHiyuki @ 2021-05-10  9:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages gitea-update
https://github.com/void-linux/void-packages/pull/30282

gitea: update to 1.14.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Don't know why the patch fails to apply, but the package builds.


A patch file from https://github.com/void-linux/void-packages/pull/30282.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gitea-update-30282.patch --]
[-- Type: text/x-diff, Size: 7358 bytes --]

From 96447fc27728a5d48ade492fd51494f2f1262e75 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 17 Apr 2021 03:40:30 +0300
Subject: [PATCH] gitea: update to 1.14.2

---
 srcpkgs/gitea/files/gitea/run      |  2 +-
 srcpkgs/gitea/patches/config.patch | 40 +++++++++++++++---------------
 srcpkgs/gitea/template             |  4 +--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run
index b27946c5b905..591e977e729f 100755
--- a/srcpkgs/gitea/files/gitea/run
+++ b/srcpkgs/gitea/files/gitea/run
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Whe cd here, because builtin SSH won't run without.
+# We cd here, because builtin SSH won't run without.
 cd /var/lib/gitea
 
 # The USER variable is needed here because gitea doesn't actually
diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch
index c5238253ccfd..0b8fae003936 100644
--- a/srcpkgs/gitea/patches/config.patch
+++ b/srcpkgs/gitea/patches/config.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- custom/conf/app.example.ini	2021-04-22 15:48:34.959214467 +0300
++++ 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
@@ -9,16 +9,16 @@
  ; 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
+@@ -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 =
 +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.
- ; If the charsets have equal confidence, tie-breaking will be done by order in this list
-@@ -81,13 +81,13 @@
+@@ -87,13 +87,13 @@
  
  [repository.local]
  ; Path for local repository copy. Defaults to `tmp/local-repo`
@@ -34,7 +34,7 @@
  ; 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
-@@ -272,7 +272,7 @@
+@@ -282,7 +282,7 @@
  REDIRECT_OTHER_PORT = false
  PORT_TO_REDIRECT = 80
  ; Permission for unix socket
@@ -43,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.
-@@ -293,7 +293,7 @@
+@@ -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'.
@@ -52,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
-@@ -354,7 +354,7 @@
+@@ -368,7 +368,7 @@
  KEY_FILE = https/key.pem
  ; Root directory containing templates and static files.
  ; default is the path where Gitea is executed
@@ -60,8 +60,8 @@
 +STATIC_ROOT_PATH = /var/lib/gitea
  ; Default path for App data
  APP_DATA_PATH = data
- ; Application level GZIP support
-@@ -371,7 +371,7 @@
+ ; 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.
@@ -70,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.
-@@ -401,7 +401,7 @@
+@@ -415,7 +415,7 @@
  
  [database]
  ; Database to use. Either "mysql", "postgres", "mssql" or "sqlite3".
@@ -79,7 +79,7 @@
  HOST = 127.0.0.1:3306
  NAME = gitea
  USER = root
-@@ -418,7 +418,7 @@
+@@ -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
@@ -88,7 +88,7 @@
  ; For "sqlite3" only. Query timeout
  SQLITE_TIMEOUT = 500
  ; For iterate buffer, default is 50
-@@ -444,7 +444,7 @@
+@@ -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
@@ -96,9 +96,9 @@
 +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 queue will be saved path,
-@@ -773,7 +773,7 @@
- SESSION_LIFE_TIME = 86400
+ ; 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
@@ -106,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
-@@ -838,7 +838,7 @@
+@@ -871,7 +871,7 @@
  DEFAULT_UI_LOCATION =
  
  [log]
@@ -115,7 +115,7 @@
  ; Either "console", "file", "conn", "smtp" or "database", default is "console"
  ; Use comma to separate multiple modes, e.g. "console, file"
  MODE = console
-@@ -1132,14 +1132,6 @@
+@@ -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,한국어
  
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index ed6d4e9ce104..f375d2dcfa17 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.13.1
+version=1.14.2
 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=b5a87b722abe8e4911389abf57ec8f46d58fb966929dfe612a77639e27ec4187
+checksum=d04bca934feba35600aaf739c82b7cbe7d8b911a086d7ac54f0710b689a85ac3
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: gitea: update to 1.14.1
  2021-04-17 11:54 [PR PATCH] gitea: update to 1.14.1 FollieHiyuki
                   ` (6 preceding siblings ...)
  2021-05-10  9:46 ` FollieHiyuki
@ 2021-05-10  9:48 ` FollieHiyuki
  2021-05-20 14:06 ` [PR PATCH] [Merged]: " Gottox
  8 siblings, 0 replies; 10+ messages in thread
From: FollieHiyuki @ 2021-05-10  9:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/30282#issuecomment-836484597

Comment:
The patch now magically works even though it is still the same :) so ready for reviewing.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Merged]: gitea: update to 1.14.1
  2021-04-17 11:54 [PR PATCH] gitea: update to 1.14.1 FollieHiyuki
                   ` (7 preceding siblings ...)
  2021-05-10  9:48 ` FollieHiyuki
@ 2021-05-20 14:06 ` Gottox
  8 siblings, 0 replies; 10+ messages in thread
From: Gottox @ 2021-05-20 14:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1474 bytes --]

There's a merged pull request on the void-packages repository

gitea: update to 1.14.1
https://github.com/void-linux/void-packages/pull/30282

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Don't know why the patch fails to apply, but the package builds.


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-05-20 14:06 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-17 11:54 [PR PATCH] gitea: update to 1.14.1 FollieHiyuki
2021-04-18  4:13 ` ericonr
2021-04-18 11:27 ` FollieHiyuki
2021-04-22 12:59 ` [PR PATCH] [Updated] " FollieHiyuki
2021-04-22 13:35 ` FollieHiyuki
2021-04-22 13:49 ` [PR PATCH] [Updated] " FollieHiyuki
2021-05-03  0:05 ` FollieHiyuki
2021-05-10  9:46 ` FollieHiyuki
2021-05-10  9:48 ` FollieHiyuki
2021-05-20 14:06 ` [PR PATCH] [Merged]: " Gottox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).