[arch-commits] Commit in gitea/trunk (5 files)
Bruno Pagani
archange at gemini.archlinux.org
Mon Oct 11 23:14:56 UTC 2021
Date: Monday, October 11, 2021 @ 23:14:56
Author: archange
Revision: 1029648
upgpkg: gitea 1.15.4-1
Also fixes FS#71690.
Added:
gitea/trunk/gitea.install
Modified:
gitea/trunk/PKGBUILD
gitea/trunk/gitea.service
gitea/trunk/gitea.tmpfiles
Deleted:
gitea/trunk/gitea-arch-defaults.patch
---------------------------+
PKGBUILD | 24 ++++++++------------
gitea-arch-defaults.patch | 51 --------------------------------------------
gitea.install | 8 ++++++
gitea.service | 3 +-
gitea.tmpfiles | 4 +--
5 files changed, 22 insertions(+), 68 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-10-11 23:14:49 UTC (rev 1029647)
+++ PKGBUILD 2021-10-11 23:14:56 UTC (rev 1029648)
@@ -3,8 +3,8 @@
# Contributor: Frederik Schwan <frederik dot schwan at linux dot com>
pkgname=gitea
-pkgver=1.14.5
-pkgrel=2
+pkgver=1.15.4
+pkgrel=1
pkgdesc="Painless self-hosted Git service, community managed."
arch=(x86_64)
url="https://gitea.io"
@@ -20,18 +20,15 @@
'redis: Redis support'
'sqlite: SQLite support'
)
-backup=('etc/gitea/app.ini')
-_tag=7da5c8ff95a0ed5877a4a54014fdca432ed0adf7 # git rev-parse v${pkgver}
+_tag=d2bddf294c98da0e88822dfcd972e01e564d17f4 # git rev-parse v${pkgver}
source=("git+https://github.com/go-gitea/gitea.git#tag=${_tag}?signed"
gitea.tmpfiles
gitea.service
- gitea.sysusers
- gitea-arch-defaults.patch)
+ gitea.sysusers)
sha256sums=(SKIP
- 1521fd7edc3830c695698ffe9835709f1408040b5ec989f07410972c894fa8ba
- 0c4ebf8a458eee277740a5febb8b976a8a63e83679587410c1c0801efa046545
- 7e7b798b8ce035c1fb55993ece41c5efb6cad5922708866804fa50ada0cf9fa5
- 912b5c41a6ca0b5be948a4eff0475e596cdc685bfd3da2aa914b5f762aaf272c)
+ 9f63a517e8da6865fa6d9e87f6b08fe25ea56285304115e052809663c48dc3d7
+ b16d02a9f32a17cc14dfa46a980bad795a4ed744627e6342248f60236dc2be43
+ 7e7b798b8ce035c1fb55993ece41c5efb6cad5922708866804fa50ada0cf9fa5)
validpgpkeys=(
8C4033A23895237CB27D52D9D9B5613BEB813F99 # Matti Ranta <matti at mdranta.net> old RSA2048, retrieved from https://github.com/techknowlogick.gpg
B56E3C7437A49E136862F5DE9D8A57ADAA232E95 # Matti Ranta <matti at mdranta.net> new RSA4096, retrieved from https://github.com/techknowlogick.gpg
@@ -42,11 +39,10 @@
B5F0915813554C32C1D599C2C99B82E40B027BAE # '6543' <6543 at obermui.de>
D2CF76DA95F201E9901532AB3CDE74631F13A748 # Andrew Thornton <art27 at cantab.net>, retrieved from https://github.com/zeripath.gpg
)
+install=gitea.install
prepare() {
cd ${pkgname}
- # Change some defaults for ArchLinux
- patch -Np1 -i ../gitea-arch-defaults.patch
# Fetch dependency using go mod
make vendor
}
@@ -63,7 +59,7 @@
export CGO_CXXFLAGS="${CXXFLAGS}"
export CGO_LDFLAGS="${LDFLAGS}"
export EXTRA_GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
- export LDFLAGS="-X 'code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/gitea/'"
+ export LDFLAGS="-X 'code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/gitea/' -X 'code.gitea.io/gitea/modules/setting.CustomConf=/etc/gitea/app.ini'"
export TAGS="bindata sqlite sqlite_unlock_notify pam"
make -j1
}
@@ -74,5 +70,5 @@
install -Dm644 ${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
install -Dm644 ${pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
install -Dm644 ${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
- install -D ${pkgname}/custom/conf/app.example.ini "${pkgdir}"/etc/gitea/app.ini
+ install -D ${pkgname}/custom/conf/app.example.ini -t "${pkgdir}"/etc/gitea/
}
Deleted: gitea-arch-defaults.patch
===================================================================
--- gitea-arch-defaults.patch 2021-10-11 23:14:49 UTC (rev 1029647)
+++ gitea-arch-defaults.patch 2021-10-11 23:14:56 UTC (rev 1029648)
@@ -1,51 +0,0 @@
---- a/custom/conf/app.example.ini
-+++ b/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
--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 @@ 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/repos
- ; 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.
-@@ -442,7 +442,7 @@ SQLITE_TIMEOUT = 500
- ; For iterate buffer, default is 50
- ITERATE_BUFFER_SIZE = 50
- ; Show the database generated SQL
--LOG_SQL = true
-+LOG_SQL = false
- ; Maximum number of DB Connect retries
- DB_RETRIES = 10
- ; Backoff time per DB retry (time.Duration)
-@@ -875,10 +875,10 @@ FORMAT =
- 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
-+MODE = console, file
- ; Buffer length of the channel, keep it as it is if you don't know what it is.
- BUFFER_LEN = 10000
- ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Info"
-@@ -901,7 +901,7 @@ COLORIZE = false
-
- ; For "console" mode only
- [log.console]
--LEVEL =
-+LEVEL = Info
- STDERR = false
-
- ; For "file" mode only
Added: gitea.install
===================================================================
--- gitea.install (rev 0)
+++ gitea.install 2021-10-11 23:14:56 UTC (rev 1029648)
@@ -0,0 +1,8 @@
+post_upgrade() {
+ if [ "$(vercmp "$2" "1.15.0")" -le 0 ]; then
+ echo "The app.ini configuration file is not prefilled anymore. The current"
+ echo "one has been saved to .pacsave, you need to at least rename it before"
+ echo "restarting gitea. The app.example.ini file is provided for a reference"
+ echo "of settings."
+ fi
+}
Modified: gitea.service
===================================================================
--- gitea.service 2021-10-11 23:14:49 UTC (rev 1029647)
+++ gitea.service 2021-10-11 23:14:56 UTC (rev 1029648)
@@ -23,7 +23,8 @@
AmbientCapabilities=
CapabilityBoundingSet=
LockPersonality=true
-MemoryDenyWriteExecute=true
+#Required by commit search
+#MemoryDenyWriteExecute=true
NoNewPrivileges=True
#SecureBits=noroot-locked
PrivateDevices=true
Modified: gitea.tmpfiles
===================================================================
--- gitea.tmpfiles 2021-10-11 23:14:49 UTC (rev 1029647)
+++ gitea.tmpfiles 2021-10-11 23:14:56 UTC (rev 1029648)
@@ -6,5 +6,5 @@
d /var/lib/gitea/tmp 0750
Z /var/lib/gitea - gitea gitea
d /var/log/gitea 0750 gitea gitea
-z /etc/gitea 0755 root gitea
-z /etc/gitea/app.ini 0660 root gitea
+z /etc/gitea 0755 gitea gitea
+z /etc/gitea/app.ini 0600 gitea gitea
More information about the arch-commits
mailing list