gentoo (valentine's day) resync : 14.02.2021

3 files changed, 36 insertions, 51 deletions

diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 19421e96c639..33d8d8bb69f3 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,12 +1,12 @@
 AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8dfc3e9eab968008ad681a8b9f353bff4951bba8023d5c04affda6b58fde5db8232d0f1f9ae3e470424f0 SHA512 99163776104f2f27a585332004221fac16a9fbf9c8930b0603b5f33aca4c5ac13bdded4d5917143796b3893a19d2f709b0c4d4d635d85bd681f643b3b59131f5
-DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
 DIST unrealircd-5.0.6.tar.gz 4975195 BLAKE2B 3ba459e0ec932e9f240825ba9f1fa40e300fe7958f999de86d5653f2e6e4940be8b8da9c885c97bd738abefef601d61da6c4e6c7199c7052d29a74fcf5048828 SHA512 7532e9ab2e039f21796ae813881aec9d34b502ab64efc4323c938232c8901ce882dbcce497ad93df270e4b5fa2e9633c0971f2a6b3213ad458756aea92aa1612
 DIST unrealircd-5.0.7.tar.gz 4995220 BLAKE2B a2996f62b3fe943f9af2cd570866101a501d24f7966378d8e651cf84b9b9d0981fad441b785c6293f4a0668a914cdf191dec52cc6b1e86aac2a51640ca32dbfe SHA512 0b851af26da2ea5d3a04d2ef324d7bd3d3fc820f24d7dfd7e975d6bf1f3954884eb98dc348d291a118d98a214922d3ca1132800381e6f025264856aa06498779
-EBUILD unrealircd-4.2.4.1.ebuild 5452 BLAKE2B 356dfc371b2c8757cd710ba93401f4a34e069b545cc77573b9942ac1672e0a4367be3fb1a47fdf9ef7cdee3a1ba40bc57d0ae0366c16262665a03cdc63fae242 SHA512 b875c731c0712ab570b1d18fe0ca30abe5ed235d24a3beafa169f98d94cc6f52130d935d21ba732bbf74b368adfd9754283e61688339b1a2599523fd3e3d3d98
+DIST unrealircd-5.0.8.tar.gz 5013231 BLAKE2B 57365a06b8108239ab10f6cff7d4553b08aa428acb5c635c4b9241c3f82459a5aac18c916a4534f3a8fc9ac1fd4c1d9418c7395233603e576eda40c56d81b110 SHA512 45fc0758a870dbb9c3ff55fc7029d1ecff9dcf65680f31ff331f012efbf9c9bffa60a6fe27b9bab69302d26b8293a1089cfaf1c550a3f2802a549f25e4644770
 EBUILD unrealircd-5.0.6.ebuild 5087 BLAKE2B 82341a54c9c04c7a1e91a53d14979520ce02b0b3824fe7e3bc124a4bff054a43e1124c5b9205c776ff7961a10ab88461c4fc11e28008a19dc32996bc92edc7e3 SHA512 c97b8b352b8f927ab9ada81f75903a0bb47f3882da8630a3bfd55cfc4a66b4e518418bbffef2b011535a47795d2d9024cf6619d446be55bcb146c1ea7ca66625
 EBUILD unrealircd-5.0.7-r1.ebuild 5174 BLAKE2B 94854576a6ae38be7c2568babd85dc37bd1dab4f5934aab626c3969da56c4f22434b305297d9ab774b19b05835a1cd59e322472ee542c9371d3a0f57bafb550a SHA512 e8808c6bf41df9161fb33877cc759c4b25fd234d549e3d6d09fb6f04933966f4101ca39921b7ab721ff1e2ff6643f46abdd47ffeed5229506fa70a14fa785635
 EBUILD unrealircd-5.0.7-r2.ebuild 5145 BLAKE2B dc8ae03291fc7c0074ea0c145144a202e855f0c59f0eb75a2ab6657c19b7e9c06cad6aed431719588510451603486e51d4a12943482b07ec015466c5d568e4fb SHA512 7bc2414949d06f35cc14dec06d18b46747c68851319be26e2d33e24811f2828cd81c58f69410c67d1975b2a7edd49e94df653c85ca3b14b04d78faa6dfcd99ec
 EBUILD unrealircd-5.0.7.ebuild 5171 BLAKE2B 2dfd5fbbcee70f11ebd9bd36b9a74b068d06512c042f7abae6d22302c7f16daf440896000b315c5183834dd6da08f6e50a9a1fe424ea8dbede5990c246a27279 SHA512 e614737149ea7a6ad3128ced1716d841c0f0996a6eb7ed9d644afdb7cd0b837344bdf89d1f9f22eb152f34815844721cd5be74da1dd48478599455e8de99a696
-MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
+EBUILD unrealircd-5.0.8.ebuild 5145 BLAKE2B 90f498b72e65ebd231c0f65f9e98bb5684715db56ee4e79365987e211369aba68dcdd9c75fbca2344b354ac7240c81cb030066c6c6af0346858513c25be71796 SHA512 9c400a49c29b79b5f54dff15a93e3a29554be8ac63a7f14b6c834d13bc04ab5f955c438106263ae72f918aa5c4007087d75dcfbebe75f36aaeba9d15c1a399c1
+MISC metadata.xml 759 BLAKE2B 5194eba7f1cb19272370b3d6d54a316201e52cfe79fa3a4a250feae84cfc37c00ee5882a352a13516924dbb393422c8052146309a5e2af888b7e1385d25dc5cb SHA512 30291788f7a41dd006eff3b2edffb2814f4ea27a16eadfb5126bc24f9013fbe76fd175b1ae1720b2d9ecb627d11a4a744cfcdac14cd1dc1c20b56a426bc8997a
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index 71258eb2874c..a265e93f2b47 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -6,12 +6,9 @@
 	</maintainer>
 	<use>
 		<flag name="class-nofakelag">Enable an unsupported class::options flag called “nofakelag” allowing you to grant fakelag exemption to normal user (instead of just opers).</flag>
-		<flag name="extban-stacking">Enable extended channel bans (such as +b ~c: and +b ~n:) to contain other extended bans instead of just hostmasks.</flag>
 		<flag name="prefixaq">Enable chanadmin and chanowner prefixes</flag>
 		<flag name="showlistmodes">Display channel modes in /LIST (only configured at compiletime)</flag>
 		<flag name="operoverride-verify">Enable requiring opers to invite themselves to +s/+p channels</flag>
 		<flag name="operoverride">Enable OperOverride extension</flag>
-		<flag name="usermod">Enable /set* and /chg* commands</flag>
-		<flag name="shunnotices">Enable notifying a user when un-shunned</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-irc/unrealircd/unrealircd-4.2.4.1.ebuild b/net-irc/unrealircd/unrealircd-5.0.8.ebuild
index 368e8f269796..48b03f3e0792 100644
--- a/net-irc/unrealircd/unrealircd-4.2.4.1.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.0.8.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 SSL_CERT_MANDATORY=1
-inherit eapi7-ver ssl-cert
+inherit ssl-cert systemd
 
 DESCRIPTION="An advanced Internet Relay Chat daemon"
 HOMEPAGE="https://www.unrealircd.org/"
-SRC_URI="https://www.unrealircd.org/${PN}$(ver_cut 1)/${P}.tar.gz"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux"
-IUSE="class-nofakelag curl +extban-stacking libressl +operoverride operoverride-verify
-	+prefixaq showlistmodes shunnotices +usermod"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
 
 RDEPEND="
 	acct-group/unrealircd
@@ -22,42 +21,29 @@ RDEPEND="
 	>=app-crypt/argon2-20171227-r1:=
 	dev-libs/libpcre2
 	>=net-dns/c-ares-1.7:=
-	net-libs/libnsl:=
-	sys-libs/zlib
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	curl? ( net-misc/curl[adns] )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( doc/{Authors,Donation,RELEASE-NOTES{,.old},tao.of.irc,technical/,translations.txt} )
-
-pkg_pretend() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test "${v}" -ge 4 && continue
-		ewarn "The configuration file format has changed since ${v}."
-		ewarn "Please be prepared to manually update them and visit:"
-		ewarn "https://www.unrealircd.org/docs/Upgrading_from_3.2.x"
-		break
-	done
-}
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
 
 src_prepare() {
 	# QA check against bundled pkgs
 	rm -r extras || die
 
+	# building third-party modules (which we don't do) cause a sandbox violation
+	# bug 704444
+	echo "" > src/buildmod || die
+
+	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
+
 	if use class-nofakelag; then
-		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+		sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
 	fi
 
-	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
-	# that to look for ca-certificates-provided file instead. %s is
-	# CONFDIR. #618066
-	sed -i -e 's:%s/ssl/curl-ca-bundle.crt:%s/../ssl/certs/ca-certificates.crt:' src/s_conf.c || die
-
 	eapply_user
 }
 
@@ -76,22 +62,17 @@ src_configure() {
 		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
 		--with-maxconnections=1024 \
 		--with-nick-history=2000 \
-		--with-sendq=3000000 \
 		--with-permissions=0640 \
 		--with-system-argon2 \
 		--with-system-cares \
 		--with-system-pcre2 \
-		--without-tre \
 		--enable-dynamic-linking \
 		--enable-ssl="${EPREFIX}"/usr \
 		$(use_enable curl libcurl "${EPREFIX}"/usr) \
 		$(use_enable prefixaq) \
 		$(use_with showlistmodes) \
-		$(use_with shunnotices) \
 		$(use_with !operoverride no-operoverride) \
-		$(use_with operoverride-verify) \
-		$(use_with !usermod disableusermod) \
-		$(use_with !extban-stacking disable-extendedban-stacking)
+		$(use_with operoverride-verify)
 }
 
 src_install() {
@@ -117,7 +98,7 @@ src_install() {
 	doins -r doc/conf/{aliases,help}
 	doins doc/conf/*.conf
 	newins doc/conf/examples/example.conf ${PN}.conf
-	keepdir /etc/${PN}/ssl
+	keepdir /etc/${PN}/tls
 
 	einstalldocs
 
@@ -127,32 +108,39 @@ src_install() {
 	# config should be read-only
 	fperms -R 0640 /etc/${PN}
 	fperms 0750 /etc/${PN}{,/aliases,/help}
-	fperms 0750 /etc/${PN}/ssl
+	fperms 0750 /etc/${PN}/tls
 	# state is editable but not owned by unrealircd directly
 	fperms 0770 /var/log/${PN}
 	fperms 0770 /var/lib/${PN}{,/tmp}
 	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+
+	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+	# that to look for ca-certificates-provided file instead. %s is
+	# CONFDIR. #618066
+	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
 }
 
 pkg_postinst() {
 	# Move docert call from src_install() to install_cert in pkg_postinst for
 	# bug #201682
-	if [[ ! -f "${EROOT}"etc/${PN}/ssl/server.cert.key ]]; then
-		if [[ -f "${EROOT}"etc/${PN}/server.cert.key ]]; then
+	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
+		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
 			ewarn "The location ${PN} looks for SSL certificates has changed"
-			ewarn "from ${EROOT}etc/${PN} to ${EROOT}etc/${PN}/ssl."
+			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
 			ewarn "Please move your existing certificates."
 		else
 			(
 				umask 0037
-				install_cert /etc/${PN}/ssl/server.cert
-				chown unrealircd "${EROOT}"etc/${PN}/ssl/server.cert.*
-				ln -snf server.cert.key "${EROOT}"etc/${PN}/ssl/server.key.pem
+				install_cert /etc/${PN}/tls/server.cert
+				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
+				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
 			)
 		fi
 	fi
 
-	local unrealircd_conf="${EROOT}"etc/${PN}/${PN}.conf
+	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
 	# Fix up the default cloak keys.
 	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
 		ebegin "Generating cloak-keys"