version bump www-apps/gitea-1.15.2

www-apps/gitea/Manifest

@@ -1,8 +1,5 @@
-AUX 1.12-fix-vendoring.patch 430 BLAKE2B 897214736e27f49023c8de9da5e7caa3612947f381d10e1bfd9fca2a6f4cfdcefb7fd6a70fb972e9db1c8a84deb592f585d0c6beda66b551b6e65cdce33e73d6 SHA512 9b2678c373dfb18e53be53b99e2cebdb656f777f850c6f9b67e29d52011edc320fb7d14045fef08b0b3b70959784070264f1cdfae70937097977b2865c8c71b5
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
-AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
+AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0ce0a2d8affabaadcb6aaf271b1402c7ac127b80d534f4f72b888ccdce7aa5f7a7cf86a0efe0e719e0 SHA512 7c8aa33dcea56b6fccac23095f7b84225f1c85541cd5eb3536d2901e638c391e025bd9db28bd10c26ef91e5a8fe2d12a878040cf21d4b983858a19f2cac7d1b0
-DIST gitea-1.12.5.tar.gz 135163038 BLAKE2B b3194cd02faed429f447c52e48534b0e6ce348bfe5c226b5064b00517a708f69e2044ebec79cf6b0ea24e7da361a3f1303795b8ce821fd73dd285c9014d218d7 SHA512 7e546cafe7406206a4a7e3a65df5cf2a1ff149be94196f813cb9021dbd267672804e4752608a1148ec98b39840a51efa5010a44812ae31260882a5114a0d880c
+DIST gitea-1.15.2.tar.gz 48648887 BLAKE2B 5bd5800e4c967946dad918d57318831cc7a55cdeedd46e8efb74cd47940eefde1212b85f43b77f1ba443d2c09997a5dd1dd29fd9c7bbc404cf2943048e42225c SHA512 47332f07882c2bef26f9417f0617801518c0448cbe84c2a70b140f38dbe18c17cfe9bb077da49536663066b8d09a566a423256430f954beafc53d746b5bfd578
-DIST gitea-1.13.0.tar.gz 150897624 BLAKE2B b09d3a695a399bfff813f45faf7435eb0b512d448e8329142d8131be786e0dee822a8491c58c8537545350162c89db39cbaaa0ba58c467f2494137f1313a9fec SHA512 bdcc1d3f53ba2b8a6c9964bc15449d3ea237853dfeb2f1da1e4c9f68fb5f09188b3fcef9a1c004ea774003181a85758eb95cff909cc39f6caa611b0505628739
+EBUILD gitea-1.15.2.ebuild 3473 BLAKE2B 175c9d1fae643267886b30e9f7b78bf8b83824f9409a2514414b475f41ee7da8d1c63637593fbf0aeec8935bfc6be22f09d3bd37eff917803b1cd7f4038c5aab SHA512 9d39084665983334d48c76df11d824ee7cedbc30651de29c6f7186c19abe5bd63abbf44d6237d96f91a7352485c06c4fa83b32647d3f10a96c41716a80d7c0fb
-EBUILD gitea-1.12.5.ebuild 3625 BLAKE2B e7f8ffd05f79982a5b8a7e2d44e1a25c702e1b32ab7993a083ade16b06be5723920014adace64212e96f43a93108b5f6c8b6524351c2f35de5c63e9395bbd461 SHA512 840e3737d07ee8be438e22bb1b4781715ed439fcd9eeda598d06c4793505b6caacf58e49bccdf1677a9d363b63aedc78705541238ac386175a76b657dd7f6909
-EBUILD gitea-1.13.0.ebuild 3577 BLAKE2B 85172bcb4d4c85325bcdccbbaadbfe99a212b68dc7e9ee834cbb35351c120ff1ce070484bda03cf3d989f47c8e439b34cdd527334a63137603b955eb1ceffd58 SHA512 f9f561e358b70335b97be4ba7c32adc6e74b1beca6008546729b84b4837018866190437f8a53823ec6da21a1dfb4fe246eae2c1e6674e32cae5fc1fb69346467

www-apps/gitea/files/1.12-fix-vendoring.patch

@@ -1,13 +0,0 @@
-diff --git a/vendor/modules.txt b/vendor/modules.txt
-index efbc866..1c34104 100644
---- a/vendor/modules.txt
-+++ b/vendor/modules.txt
-@@ -845,6 +845,8 @@ gopkg.in/yaml.v2
- # mvdan.cc/xurls/v2 v2.1.0
- ## explicit
- mvdan.cc/xurls/v2
-+# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056
-+## explicit
- # strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
- ## explicit
- strk.kbt.io/projects/go/libravatar

www-apps/gitea/files/gitea.service-r3

@@ -8,13 +8,13 @@ AssertPathIsReadWrite=/var/lib/gitea
 After=network.target
 Requires=network.target
 After=mysqld.service
-After=postgresql-9.3.service
-After=postgresql-9.4.service
 After=postgresql-9.5.service
 After=postgresql-9.6.service
 After=postgresql-10.service
 After=postgresql-11.service
 After=postgresql-12.service
+After=postgresql-13.service
+After=postgresql-14.service
 After=memcached.service
 After=redis.service
 

www-apps/gitea/gitea-1.12.5.ebuild

@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit fcaps go-module tmpfiles systemd
-MY_PV="${PV/_rc/-rc}"
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io"
-
-if [[ ${PV} != 9999* ]] ; then
-	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-	S="${WORKDIR}"
-else
-	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-fi
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+acct build-client pam sqlite"
-
-BDEPEND="build-client? ( >=net-libs/nodejs-10[npm] )"
-COMMON_DEPEND="
-	acct? (
-		acct-group/git
-		acct-user/git[gitea] )
-	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	dev-vcs/git"
-
-DOCS=(
-	custom/conf/app.ini.sample CONTRIBUTING.md README.md
-)
-FILECAPS=(
-	cap_net_bind_service+ep usr/bin/gitea
-)
-PATCHES=(
-	"${FILESDIR}/1.12-fix-vendoring.patch"
-)
-
-RESTRICT="test"
-QA_PRESTRIPPED="usr/bin/gitea"
-
-src_prepare() {
-	default
-
-	local sedcmds=(
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
-		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
-		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
-		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
-		-e "s#^MODE = console#MODE = file#"
-		-e "s#^LEVEL = Trace#LEVEL = Info#"
-		-e "s#^LOG_SQL = true#LOG_SQL = false#"
-		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-		-e "s#^APP_ID =#;APP_ID =#"
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
-	)
-
-	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
-	if use sqlite ; then
-		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
-	fi
-
-	einfo "Remove tests which are known to fail with network-sandbox enabled."
-	rm ./modules/migrations/github_test.go || die
-
-	einfo "Remove tests which depend on gitea git-repo."
-	rm ./modules/git/blob_test.go || die
-	rm ./modules/git/repo_test.go || die
-
-	# Remove already build assets (like frontend part)
-	use build-client && emake clean-all
-}
-
-src_compile() {
-	local gitea_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
-	)
-	local makeenv=(
-		TAGS="${gitea_tags[@]}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
-	)
-	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
-
-	if use build-client; then
-		# -j1 as Makefile doesn't handle dependancy correctly, and is not
-		# useful as golang compiler don't use this info.
-		env "${makeenv[@]}" emake -j1 build
-	else
-		env "${makeenv[@]}" emake backend
-	fi
-}
-
-src_install() {
-	dobin gitea
-
-	einstalldocs
-
-	newconfd "${FILESDIR}/gitea.confd-r1" gitea
-	newinitd "${FILESDIR}/gitea.initd-r3" gitea
-	newtmpfiles - gitea.conf <<-EOF
-		d /run/gitea 0755 git git
-	EOF
-	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
-
-	insinto /etc/gitea
-	newins custom/conf/app.ini.sample app.ini
-	if use acct ; then
-		fowners root:git /etc/gitea/{,app.ini}
-		fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
-		diropts -m0750 -o git -g git
-		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
-		keepdir /var/log/gitea
-	fi
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	go-module_pkg_postinst
-	tmpfiles_process gitea.conf
-}

www-apps/gitea/gitea-1.15.2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,9 +20,8 @@ fi
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
-IUSE="+acct build-client pam sqlite"
+IUSE="+acct pam sqlite"
 
-BDEPEND="build-client? ( >=net-libs/nodejs-10[npm] )"
 COMMON_DEPEND="
 	acct? (
 		acct-group/git
@@ -46,7 +45,6 @@ src_prepare() {
 	default
 
 	local sedcmds=(
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
 		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
 		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
 		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
@@ -55,8 +53,6 @@ src_prepare() {
 		-e "s#^LEVEL = Trace#LEVEL = Info#"
 		-e "s#^LOG_SQL = true#LOG_SQL = false#"
 		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-		-e "s#^APP_ID =#;APP_ID =#"
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
 	)
 
 	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
@@ -70,9 +66,6 @@ src_prepare() {
 	einfo "Remove tests which depend on gitea git-repo."
 	rm ./modules/git/blob_test.go || die
 	rm ./modules/git/repo_test.go || die
-
-	# Remove already build assets (like frontend part)
-	use build-client && emake clean-all
 }
 
 src_compile() {
@@ -87,18 +80,12 @@ src_compile() {
 		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
 	)
 	local makeenv=(
-		TAGS="${gitea_tags[@]}"
+		TAGS="${gitea_tags[*]}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
 	)
 	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
 
-	if use build-client; then
+	env "${makeenv[@]}" emake backend
-		# -j1 as Makefile doesn't handle dependancy correctly, and is not
-		# useful as golang compiler don't use this info.
-		env "${makeenv[@]}" emake -j1 build
-	else
-		env "${makeenv[@]}" emake backend
-	fi
 }
 
 src_install() {
@@ -111,7 +98,7 @@ src_install() {
 	newtmpfiles - gitea.conf <<-EOF
 		d /run/gitea 0755 git git
 	EOF
-	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
+	systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
 
 	insinto /etc/gitea
 	newins custom/conf/app.example.ini app.ini
@@ -129,4 +116,9 @@ pkg_postinst() {
 	fcaps_pkg_postinst
 	go-module_pkg_postinst
 	tmpfiles_process gitea.conf
+
+	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"
+	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
+	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
 }