2 files changed, 23 insertions, 5 deletions
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index b6dcc42a16be..aa9efe2bb90d 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -6,10 +6,10 @@ AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
 AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
 AUX i2pd-2.6.0-r3.service 638 BLAKE2B 881b5e680af0dbb674766b4cc0a234e0a49db66f1f4a8ce762326f9bb8fb7437177d9c80988f514c34dd2ba2bab1909a10ee5ef912eee4711ea4ed9c5a6a4423 SHA512 8e35123ea30325e9f1de3d488d96a35b6e983e006084e983ab116aa5febd64feacb7643f3d9c3c7c7865375518e1acef060b4b02e9b052036f8d42f9dcc47a87
+DIST i2pd-2.25.0.tar.gz 1068786 BLAKE2B 80e5e6de2ffaad86c0c3ad4a89cfa12cf3ac8cf61ae856f4647af4e06b56594f39e9d75d798d5429b372fba718f4e92ea4ea94b802929ab22d8850ba46b2827e SHA512 e45318236b7a4e23c8dc83423f4cbc62e622a6f6346a67d56af09b805a82f1d1bf4174c9785078292ad07fc7e5e75f15d3fcc801e44fddcbd8c30d6c7bd6975e
 DIST i2pd-2.26.0.tar.gz 1073024 BLAKE2B 21a59b140c0a21dec5a5b57c08ddc81530f5a2662e53d6a028ba9fd2d6c7bc89de1a49aa0f2981b6dd6dadc2ec0d84542419e100d86fcb407d3f0ae7c66e3f76 SHA512 1f0b2ca059daa9238a9bc2959a559636266252ad0858e4e941918bb195906c817de54b2379ae95d0b9813b7cae8697db335f9d6d15d0cf919e6f687a282e528c
 DIST i2pd-2.27.0.tar.gz 1073766 BLAKE2B 331407c6bed3ed49e2438590a814ce91301bfe318d45f0726568877a966fee217b94a37152206652672b221e62d41dc252b8cacdac3e96117c896f4de00c39d4 SHA512 260cef32503bb459f3e7e07940f303b542bead54c9b6faf63f61e8d76250155c375fa75ce80ce3862d8eb2445e106e3c99ed829c9acbc9eb728364082f938f96
-DIST i2pd-2.28.0.tar.gz 1079208 BLAKE2B 2cc84ff156c05395ce13fd0cbabb667d44d88df252c02775dee3af0ea2715487ea35614175a4dcd6f4af8a2f8fc071857beb67e85620d32e952341db04b3be7d SHA512 9bcae8dfb5a2c77b03e4c4d4816b1666f2a0d95e0c806f952a095182dfc62bdc142f5cde6a9643f7a3c6d385f906c00011b4d291fe53ab177d36d63b6a698599
+EBUILD i2pd-2.25.0-r1.ebuild 3225 BLAKE2B 5056da1dddef8151fb6117b173c7e97f91ea5ce5ed8a026926542abe863d13002b1282b819dbf87a724074a44edf8e260dff4fc2dbfe89f27a97cdeda72f4b03 SHA512 91b3e132cd61c4f06ac4c6fea8621e1ea7ac91a191908e9a5edc8e1a08fabb9cd26235736c76b65de424738f454ddd6c662ed449a22a2efcf9bfea0eebe33510
 EBUILD i2pd-2.26.0.ebuild 3132 BLAKE2B 9ebf7f1c1046cf3c3793a51ac5a1c23b133e2a082fd4b60e678776bd4c5edeb0e1112c46cef57c4e646f5c83e10857a95d4a3d3b9140efcf1aae13895e56d8b8 SHA512 9ce758d0d2166d7a146cde4755a4854ed2881feba1e0b86ddb02445c20ab6f4ac51bcb36a2b1aa5e7988b3f5e1ce598d126ebd5fcebb462d2bd393cd3353e572
 EBUILD i2pd-2.27.0.ebuild 2768 BLAKE2B 6c08929e7a01c02e7eefe9c264c2784d2ee250d9b4fe0152fd81357df611d8d93e9095be7c97347b03668157ef40e236876abdacdb5d7569f08cd74ee291364c SHA512 5b22c670e45988103cdb92c8262986ef45afac858b19a4be78662e481ded61653a4898fc612c40cb6f067e1feabefc9af04a3de5d8df3bf3877c2024bb02e8a0
-EBUILD i2pd-2.28.0.ebuild 2768 BLAKE2B 6c08929e7a01c02e7eefe9c264c2784d2ee250d9b4fe0152fd81357df611d8d93e9095be7c97347b03668157ef40e236876abdacdb5d7569f08cd74ee291364c SHA512 5b22c670e45988103cdb92c8262986ef45afac858b19a4be78662e481ded61653a4898fc612c40cb6f067e1feabefc9af04a3de5d8df3bf3877c2024bb02e8a0
 MISC metadata.xml 746 BLAKE2B 19ce9011646f5793a21b6b8a87b5a6b13d91d367498ba7b6ed206f86c4b90e3e2209dcecca50ba4ea8e2897e238dcb82fd022f67f09ad3bb6be1ae8ce58cfd50 SHA512 768ec384eecda39dab6987a896218970f8dd5daf20923b346b079c154b1f1dc8cb6d055b2128d7baea4f9c269344ec957071028c5e449a6c7429f931b8c0fdd8
diff --git a/net-vpn/i2pd/i2pd-2.28.0.ebuild b/net-vpn/i2pd/i2pd-2.25.0-r1.ebuild
index e00594467145..43a6b4401bdf 100644
--- a/net-vpn/i2pd/i2pd-2.28.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.25.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit systemd cmake-utils toolchain-funcs
+inherit systemd user cmake-utils toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -15,8 +15,6 @@ IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp we
 
 # if using libressl, require >=boost-1.65, see #597798
 RDEPEND="
-	acct-user/i2pd
-	acct-group/i2pd
 	!static? (
 		dev-libs/boost:=[threads]
 		!libressl? ( dev-libs/openssl:0=[-bindist] )
@@ -39,11 +37,15 @@ DEPEND="${RDEPEND}
 	)
 	websocket? ( dev-cpp/websocketpp )"
 
+I2PD_USER=i2pd
+I2PD_GROUP=i2pd
+
 CMAKE_USE_DIR="${S}/build"
 
 DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
 
 PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch"
+	"${FILESDIR}/i2pd-2.25.0-link.patch"
 	"${FILESDIR}/i2pd-2.25.0-lib-path.patch" )
 
 pkg_pretend() {
@@ -78,9 +80,20 @@ src_install() {
 	doins contrib/i2pd.conf
 	doins contrib/tunnels.conf
 
+	# grant i2pd group read and write access to config files
+	fowners "root:${I2PD_GROUP}" \
+		/etc/i2pd/i2pd.conf \
+		/etc/i2pd/tunnels.conf
+	fperms 660 \
+		/etc/i2pd/i2pd.conf \
+		/etc/i2pd/tunnels.conf
+
 	# working directory
+	keepdir /var/lib/i2pd
 	insinto /var/lib/i2pd
 	doins -r contrib/certificates
+	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
+	fperms 700 /var/lib/i2pd/
 
 	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
 	doenvd "${FILESDIR}/99i2pd"
@@ -95,6 +108,11 @@ src_install() {
 	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
 }
 
+pkg_setup() {
+	enewgroup "${I2PD_GROUP}"
+	enewuser "${I2PD_USER}" -1 -1 /var/lib/run/i2pd "${I2PD_GROUP}"
+}
+
 pkg_postinst() {
 	if [[ -f ${EROOT%/}/etc/i2pd/subscriptions.txt ]]; then
 		ewarn