gentoo auto-resync : 21:11:2023 - 17:12:48

5 files changed, 60 insertions, 9 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 7563d3d3e4f5..695a524243ef 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 4955cebeb45c..42a0216ec132 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -5,7 +5,7 @@ AUX gitea.service-r4 730 BLAKE2B 0a1f799bf341f1a067f417aa21c1ce5c3168fe523081ef1
 DIST gitea-1.20.4.tar.gz 50489949 BLAKE2B 1c14ec9f784cbbe3f67872b5344df209009bd32dc624b8e0351c2050ffa90657556ec6bd77b69acdb7a7506918aafbbb72a97839d92c2b39241c308ebeb4e565 SHA512 5e08959e0ff421898aebcb7640ab0869c1cabd82c84254c94024d2da16f91755e183b477a190a7b1987a5ab9ae7787c85d37fb9db990bddda937a4200777ed7c
 DIST gitea-1.20.5.tar.gz 50448780 BLAKE2B d8a1dc6bc147a06adc9280ea5d75d8cf039d447d96b4cd4ca6b35b11af5ed71df73d36b4c102f5b8ded2ba85efaea6104b31a4f39ab66c8a0c98cd36e826b734 SHA512 360a7a7bf0a51ea6d1fbcdfb35c5c3492b4fc6e29a9b60d0e6c6d01257d4743c580cf907293df8a4244750c5afe9ba1b33b2a898a18dd9e13947c58116ba3021
 DIST gitea-1.21.0.tar.gz 53744981 BLAKE2B 45c6172260fe616927ae03795245db7d15fc0a09f93d2fe974bb040d940e495bbed10710c643a8f9e85f156ccff9a2e34c905a26d4dcdf6317654ed5cda9ce2f SHA512 b3b5a72d7ebe119c975f0e7fcb4b4174582b866bdf4775181975a0b10904b5b54f8b6a1d865c75554e6d6998fe9f6d7846c3ebf5552926f1919f8cf986e798e6
-EBUILD gitea-1.20.4.ebuild 2875 BLAKE2B aa6c8b9a42b7586d88f831e2195d6249ed81123b71e392326bf957ebfe46a83144c67c0ca441b7e27d4892ddfd5807d885c372e8f49a4eccb288480e6f50d1ec SHA512 1d46cf5da23f784fcb915ea8cc40faaa8c7238e5938c9dbb82ca9ed7aa9bf23c2ff8a8d28c647658529a462e601f8c81c75bfd9a353218be1f55370d17ad11b8
-EBUILD gitea-1.20.5.ebuild 2876 BLAKE2B d9d4521eb5950b607882c8ed9cf1b04108839c9f23be019013cf3428796a26f45b1ae0a80a716962b09fedc244977ccae23de94c694e52a9ae70837664af8c02 SHA512 9ff3ff99e9890bbf3aea8a4c199dfe41711ae8d7b001ba6b7014d5ff36403182bd386cada2ddab844237dab2afd9917acc1c3ce7c064a8cb5503c57ad7aea0cd
-EBUILD gitea-1.21.0.ebuild 3622 BLAKE2B 2e8b5bd63196bfb1aac6959aca5f0a6cd603a95be91a5410a326fe2905ecdbac1fa4d52c6f6ee2dc00134fba664970506ac619dfa498dc07b72e07e72638f251 SHA512 03af4dece0f479291097ea5e5fa8cd550ed916d6dde35af6910fbb05104ee270d81efae197c257f88261ab67d2eaef79767f4621473dd48b6a0a230fd31582dd
+EBUILD gitea-1.20.4.ebuild 3897 BLAKE2B f0d12238da4a5f6bab896d4779c26dd19ffc6f576c09566d18794d373ce8862e5b7078ddb6a7c28e1f287503720fd20f18853a827c6d7051b88023d19b94c84a SHA512 89f4f5ee549c1253c73073363487efb85bfb4001e1736209ce1c7e4d1f629332312b409737618f239bf7d0b1fc05061f66e58e4f1841e2f6fe962cc1648b70c9
+EBUILD gitea-1.20.5.ebuild 3898 BLAKE2B 7767888696a8d6f1ea5ae2a6c2559ca47e0a6766af5de2bf2c14db32652f595c9f705852534192cdad7bc515643df5ca6d8cd93e0b69eb558691e2db3efa26d4 SHA512 812e826a70d179a2b91666ece15f68a76c7e0a2724c90307f5dbf453f66eea603cb1e35dc86a79704bac8e3e9bcda3100483b70fdde0348273ef9eb6a1bc5c8e
+EBUILD gitea-1.21.0.ebuild 4644 BLAKE2B 43e8639715c141be0991942e0e8e72fc9e6bc9b029de8734414b7ad8eb3a9160bda353d0272739367617a854944973cc90361d6ca15cf4ce9acefdd9c8b31d90 SHA512 75e4f0db51a2de579b8cc464c8e3af68707b5910f4de13992a1212548d5b9597ee633cb86edc6e6067988d9894f02a86d32e3ff1b789bde73e6a7946f4b6d781
 MISC metadata.xml 674 BLAKE2B ef13e93b317da43177365b0b0378aec52a1c7cbdc57b69815520d4dc4e1f98c043dc3eee059d06990dcb7c6549ad2db7150786e542486e957ba1ab63e21118fa SHA512 a4eb5d192dff7967c2ff5f94135c60d13ff52a7dffbf42c9d3c50efd3df0833d129580e895caed9148cb2d9df85da17d94d0cbdc43341d05df8917ea238a87eb
diff --git a/www-apps/gitea/gitea-1.20.4.ebuild b/www-apps/gitea/gitea-1.20.4.ebuild
index d9f75b9674ad..528d3b3a10f7 100644
--- a/www-apps/gitea/gitea-1.20.4.ebuild
+++ b/www-apps/gitea/gitea-1.20.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit fcaps go-module tmpfiles systemd flag-o-matic
+inherit fcaps go-module tmpfiles systemd flag-o-matic user-info
 
 DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.com https://github.com/go-gitea/gitea"
@@ -105,7 +105,24 @@ src_install() {
 
 pkg_postinst() {
 	fcaps_pkg_postinst
-	tmpfiles_process gitea.conf
+
+	# It is not guaranteed that the git user and group always exist (due to the acct USE Flag),
+	# but for convenience, the tmpfile uses the git user and group by default.
+	# To avoid installation errors, a condition needs to be added here:
+	#   if there is no git user or group, the installation of tmpfile will be skipped
+	#   and the user will be notified to handle it by themselves.
+	if egetent passwd git &>/dev/null && \
+		egetent group git &>/dev/null; then
+		tmpfiles_process gitea.conf
+	else
+		eerror "Unable to install the tmpfile for gitea due to the git user or group is missing,"
+		eerror "please install tmpfile manually or rebuild this package with USE flag 'acct'."
+		eerror "You can simply copy the default tmpfile from '/usr/lib/tmpfiles.d/gitea.conf'"
+		eerror "to higher priority path '/etc/tmpfiles.d/gitea.conf', and correct it with"
+		eerror "the right User and Group value (see tmpfiles.d(5) for details), then execute:"
+		eerror "  # systemd-tmpfiles --create /etc/tmpfiles.d/gitea.conf"
+		eerror "to install it."
+	fi
 
 	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
 	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
diff --git a/www-apps/gitea/gitea-1.20.5.ebuild b/www-apps/gitea/gitea-1.20.5.ebuild
index 916258630180..907a990c4862 100644
--- a/www-apps/gitea/gitea-1.20.5.ebuild
+++ b/www-apps/gitea/gitea-1.20.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit fcaps go-module tmpfiles systemd flag-o-matic
+inherit fcaps go-module tmpfiles systemd flag-o-matic user-info
 
 DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.com https://github.com/go-gitea/gitea"
@@ -105,7 +105,24 @@ src_install() {
 
 pkg_postinst() {
 	fcaps_pkg_postinst
-	tmpfiles_process gitea.conf
+
+	# It is not guaranteed that the git user and group always exist (due to the acct USE Flag),
+	# but for convenience, the tmpfile uses the git user and group by default.
+	# To avoid installation errors, a condition needs to be added here:
+	#   if there is no git user or group, the installation of tmpfile will be skipped
+	#   and the user will be notified to handle it by themselves.
+	if egetent passwd git &>/dev/null && \
+		egetent group git &>/dev/null; then
+		tmpfiles_process gitea.conf
+	else
+		eerror "Unable to install the tmpfile for gitea due to the git user or group is missing,"
+		eerror "please install tmpfile manually or rebuild this package with USE flag 'acct'."
+		eerror "You can simply copy the default tmpfile from '/usr/lib/tmpfiles.d/gitea.conf'"
+		eerror "to higher priority path '/etc/tmpfiles.d/gitea.conf', and correct it with"
+		eerror "the right User and Group value (see tmpfiles.d(5) for details), then execute:"
+		eerror "  # systemd-tmpfiles --create /etc/tmpfiles.d/gitea.conf"
+		eerror "to install it."
+	fi
 
 	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
 	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
diff --git a/www-apps/gitea/gitea-1.21.0.ebuild b/www-apps/gitea/gitea-1.21.0.ebuild
index fce72a8ba35f..15ca9f045d07 100644
--- a/www-apps/gitea/gitea-1.21.0.ebuild
+++ b/www-apps/gitea/gitea-1.21.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit fcaps go-module tmpfiles systemd flag-o-matic
+inherit fcaps go-module tmpfiles systemd flag-o-matic user-info
 
 DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.com https://github.com/go-gitea/gitea"
@@ -117,7 +117,24 @@ src_install() {
 
 pkg_postinst() {
 	fcaps_pkg_postinst
-	tmpfiles_process gitea.conf
+
+	# It is not guaranteed that the git user and group always exist (due to the acct USE Flag),
+	# but for convenience, the tmpfile uses the git user and group by default.
+	# To avoid installation errors, a condition needs to be added here:
+	#   if there is no git user or group, the installation of tmpfile will be skipped
+	#   and the user will be notified to handle it by themselves.
+	if egetent passwd git &>/dev/null && \
+		egetent group git &>/dev/null; then
+		tmpfiles_process gitea.conf
+	else
+		eerror "Unable to install the tmpfile for gitea due to the git user or group is missing,"
+		eerror "please install tmpfile manually or rebuild this package with USE flag 'acct'."
+		eerror "You can simply copy the default tmpfile from '/usr/lib/tmpfiles.d/gitea.conf'"
+		eerror "to higher priority path '/etc/tmpfiles.d/gitea.conf', and correct it with"
+		eerror "the right User and Group value (see tmpfiles.d(5) for details), then execute:"
+		eerror "  # systemd-tmpfiles --create /etc/tmpfiles.d/gitea.conf"
+		eerror "to install it."
+	fi
 
 	ewarn "Since 1.21.0:"
 	ewarn "  1. The built-in SSH server will now only accept SSH user"