Skip to content

Commit 682d96c

Browse files
TinfoilSubmarineTinfoilSubmarine
committed
gitea: update to 1.24.6.
1 parent 59310c4 commit 682d96c

File tree

2 files changed

+40
-56
lines changed

2 files changed

+40
-56
lines changed

‎srcpkgs/gitea/patches/config.patch‎

Lines changed: 28 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
--- gitea-1.20.0/custom/conf/app.example.ini.orig 2023-07-16 21:24:12.000000000 +0200
2-
+++ gitea-1.20.0/custom/conf/app.example.ini 2023-07-19 18:51:01.186945949 +0200
3-
@@ -47,7 +47,7 @@
1+
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
2+
index a7476ad..d8cc405 100644
3+
--- a/custom/conf/app.example.ini
4+
+++ b/custom/conf/app.example.ini
5+
@@ -44,7 +44,7 @@
46
APP_NAME = ; Gitea: Git with a cup of tea
57
;;
68
;; RUN_USER will automatically detect the current user - but you can set it here change it if you run locally
@@ -9,25 +11,25 @@
911
;;
1012
;; Application run mode, affects performance and debugging: "dev" or "prod", default is "prod"
1113
;; Mode "dev" makes Gitea easier to develop and debug, values other than "dev" are treated as "prod" which is for production use.
12-
@@ -117,7 +117,7 @@
14+
@@ -129,7 +129,7 @@ RUN_USER = ; git
1315
;PER_WRITE_PER_KB_TIMEOUT = 30s
1416
;;
1517
;; Permission for unix socket
1618
-;UNIX_SOCKET_PERMISSION = 666
1719
+UNIX_SOCKET_PERMISSION = 660
1820
;;
19-
;; Local (DMZ) URL for Gitea workers (such as SSH update) accessing web service.
20-
;; In most cases you do not need to change the default value.
21-
@@ -156,7 +156,7 @@
22-
;SSH_LISTEN_PORT = %(SSH_PORT)s
21+
;; Local (DMZ) URL for Gitea workers (such as SSH update) accessing web service. In
22+
;; most cases you do not need to change the default value. Alter it only if
23+
@@ -176,7 +176,7 @@ RUN_USER = ; git
24+
;SSH_LISTEN_PORT =
2325
;;
2426
;; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
2527
-;SSH_ROOT_PATH =
2628
+SSH_ROOT_PATH = /var/lib/gitea/.ssh
2729
;;
2830
;; Gitea will create a authorized_keys file by default when it is not using the internal ssh server
2931
;; If you intend to use the AuthorizedKeysCommand functionality then you should turn this off.
30-
@@ -275,7 +275,7 @@
32+
@@ -288,7 +288,7 @@ RUN_USER = ; git
3133
;;
3234
;; Root directory containing templates and static files.
3335
;; default is the path where Gitea is executed
@@ -36,7 +38,7 @@
3638
;;
3739
;; Default path for App data
3840
;APP_DATA_PATH = data ; relative paths will be made absolute with _`AppWorkPath`_
39-
@@ -338,10 +338,10 @@
41+
@@ -363,10 +363,10 @@ RUN_USER = ; git
4042
;;
4143
;; MySQL Configuration
4244
;;
@@ -50,8 +52,8 @@
5052
+;USER = root
5153
;PASSWD = ;Use PASSWD = `your password` for quoting if you use special characters in the password.
5254
;SSL_MODE = false ; either "false" (default), "true", or "skip-verify"
53-
;CHARSET = utf8mb4 ;either "utf8" or "utf8mb4", default is "utf8mb4".
54-
@@ -364,8 +364,8 @@
55+
;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.
56+
@@ -387,8 +387,8 @@ USER = root
5557
;;
5658
;; SQLite Configuration
5759
;;
@@ -62,41 +64,30 @@
6264
;SQLITE_TIMEOUT = ; Query timeout defaults to: 500
6365
;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
6466
;;
65-
@@ -545,7 +545,7 @@
67+
@@ -595,7 +595,7 @@ ENABLED = true
6668
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
6769
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
68-
;; Root path for the log files - defaults to %(GITEA_WORK_DIR)/log
70+
;; Root path for the log files - defaults to "{AppWorkPath}/log"
6971
-;ROOT_PATH =
7072
+ROOT_PATH = /var/log/gitea
7173
;;
7274
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
7375
;; Main Logger
74-
@@ -873,11 +873,11 @@
76+
@@ -984,11 +984,11 @@ LEVEL = Info
7577
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
7678

7779
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
7880
-;[repository]
7981
+[repository]
8082
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
81-
;; Root path for storing all repository data. By default, it is set to %(APP_DATA_PATH)s/gitea-repositories.
82-
;; A relative path is interpreted as _`AppWorkPath`_/%(ROOT)s
83+
;; Root path for storing all repository data. By default, it is set to "{APP_DATA_PATH}/gitea-repositories".
84+
;; A relative path is interpreted as "{AppWorkPath}/{ROOT}" (use AppWorkPath as base path).
8385
-;ROOT =
8486
+ROOT = /var/lib/gitea/repositories
8587
;;
8688
;; The script type this server supports. Usually this is `bash`, but some users report that only `sh` is available.
8789
;SCRIPT_TYPE = bash
88-
@@ -970,16 +970,16 @@
89-
90-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
91-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
92-
-;[repository.local]
93-
+[repository.local]
94-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
95-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
96-
;;
97-
;; Path for local repository copy. Defaults to `tmp/local-repo` (content gets deleted on gitea restart)
98-
-;LOCAL_COPY_PATH = tmp/local-repo
99-
+LOCAL_COPY_PATH = /var/lib/gitea/tmp/local-repo
90+
@@ -1099,7 +1099,7 @@ LEVEL = Info
10091

10192
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10293
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -105,16 +96,7 @@
10596
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10697
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10798
;;
108-
@@ -987,7 +987,7 @@
109-
;ENABLED = true
110-
;;
111-
;; Path for uploads. Defaults to `data/tmp/uploads` (content gets deleted on gitea restart)
112-
-;TEMP_PATH = data/tmp/uploads
113-
+TEMP_PATH = /var/lib/gitea/uploads
114-
;;
115-
;; Comma-separated list of allowed file extensions (`.zip`), mime types (`text/plain`) or wildcard type (`image/*`, `audio/*`, `video/*`). Empty value or `*/*` allows all types.
116-
;ALLOWED_TYPES =
117-
@@ -1324,7 +1324,7 @@
99+
@@ -1474,7 +1474,7 @@ LEVEL = Info
118100

119101
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
120102
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -123,16 +105,16 @@
123105
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
124106
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
125107
;;
126-
@@ -1335,7 +1335,7 @@
108+
@@ -1485,7 +1485,7 @@ LEVEL = Info
127109
;ISSUE_INDEXER_TYPE = bleve
128110
;;
129111
;; Issue indexer storage path, available when ISSUE_INDEXER_TYPE is bleve
130112
-;ISSUE_INDEXER_PATH = indexers/issues.bleve ; Relative paths will be made absolute against _`AppWorkPath`_.
131113
+ISSUE_INDEXER_PATH = /var/lib/gitea/indexers/issues.bleve
132114
;;
133-
;; Issue indexer connection string, available when ISSUE_INDEXER_TYPE is elasticsearch or meilisearch
134-
;ISSUE_INDEXER_CONN_STR = http://elastic:changeme@localhost:9200
135-
@@ -1738,11 +1738,11 @@
115+
;; 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)
116+
;ISSUE_INDEXER_CONN_STR =
117+
@@ -1924,11 +1924,11 @@ LEVEL = Info
136118

137119
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
138120
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -146,7 +128,7 @@
146128
;REPOSITORY_AVATAR_UPLOAD_PATH = data/repo-avatars
147129
;;
148130
;; How Gitea deals with missing repository avatars
149-
@@ -2483,11 +2483,11 @@
131+
@@ -2702,11 +2702,11 @@ LEVEL = Info
150132
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
151133
;; lfs storage will override storage
152134
;;
@@ -158,5 +140,5 @@
158140
-;PATH = data/lfs
159141
+PATH = /var/lib/gitea/lfs
160142
;;
161-
;; override the minio base path if storage type is minio
162-
;MINIO_BASE_PATH = lfs/
143+
;; Allows the storage driver to redirect to authenticated URLs to serve files directly
144+
;; Currently, only `minio` and `azureblob` is supported.

‎srcpkgs/gitea/template‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'gitea'
22
pkgname=gitea
3-
version=1.22.1
4-
revision=2
3+
version=1.24.6
4+
revision=1
55
build_style=go
66
go_import_path=code.gitea.io/gitea
77
go_ldflags=" -X main.Version=${version}"
@@ -11,27 +11,25 @@ go_ldflags=" -X main.Version=${version}"
1111
# supported distribution format by the gitea upstream developers.
1212
# That mode is only supported for development of gitea within the
1313
# source tree
14-
# * sqlite: this is likely the database that everyone will use. Only
15-
# particularly large installations will want to go through the
16-
# effort of setting up a real database server.
14+
# * sqlite sqlite_unlock_notify: this is likely the database that everyone
15+
# will use. Only particularly large installations will want to go through
16+
# the effort of setting up a real database server.
1717
# * pam: PAM allows for authentication to varied external sources.
1818
# Internal authentication supports the local database, OpenID, and
1919
# LDAP, but basic other auth sources such as Kerberos and more
2020
# exotic authenticators require PAM support to be useable.
21-
# * tidb: This is an alternate database engine for users who would
22-
# rather not use SQLite3 for some reason. It is also potentially
23-
# more resiliant to corrupted writes.
24-
go_build_tags="bindata sqlite pam tidb"
21+
go_build_tags="bindata sqlite sqlite_unlock_notify pam"
2522
hostmakedepends="go-bindata"
2623
makedepends="sqlite-devel pam-devel"
2724
depends="git bash"
25+
checkdepends="git nodejs"
2826
short_desc="Git with a cup of Tea"
2927
maintainer="fosslinux <[email protected]>"
3028
license="MIT"
3129
homepage="https://gitea.io"
3230
changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md"
3331
distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"
34-
checksum=f17299ad5051190b8e8b4e36e7daf2a7246a779430f5c3810370f1eb978c340c
32+
checksum=92ed113cb30687d734a0cc93a29e95227fdab7977020cfda0a5db72b6ca6c12b
3533

3634
system_accounts="_gitea"
3735
_gitea_homedir="/var/lib/gitea"
@@ -40,6 +38,10 @@ make_dirs="/var/lib/gitea 0755 _gitea _gitea
4038
/var/log/gitea 0755 _gitea root"
4139
conf_files="/etc/gitea.conf"
4240

41+
do_check() {
42+
make test-backend
43+
}
44+
4345
post_install() {
4446
vlicense LICENSE
4547
vsv gitea

0 commit comments

Comments
 (0)