gentoo resync : 04.05.2019

4 files changed, 10 insertions, 196 deletions

diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 0d82b620da3d..4c5e54467ac6 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,9 +1,7 @@
 AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
-DIST unrealircd-4.0.18.tar.gz 5317767 BLAKE2B cb71144ce0fce7f719b3081f2da9f85c997dbc372492dfa57354eb51aee122f0e42fdba9e0aca997cd118ed9c75fb6f197ca13e371931fe45709d6b64651336d SHA512 b9541ea83c24963187931938eadbba746175ec1d9449631e799df038bb062625e4b508c2d0d4e9e69a6401158cc23a855cbfbda3d28a4b971fbb249f074d26d3
-DIST unrealircd-4.2.0.tar.gz 5340752 BLAKE2B 12d1ada1d439c6acd692a04dd4ed7ed03ea91c897f9522c0fec853239ba9a21098bddb78c6f5159ed59f1b88cf88f0ecaa774d70aba226b3ac749c935bc18ff5 SHA512 2ee7955c3c6c9af2b74cb68cfa94f8500dddf640f0222888b230f0f46dd0a52fba2c68d795eff00c59a3025affb2becb1dd67ebac037c7f75e77a3a728239750
 DIST unrealircd-4.2.2.tar.gz 6060272 BLAKE2B f45cae6aa85b478e7f667e379b557314fa509c17f150941f84ee80fb328b01de099235b69d3e2710afef01578f5898ba12f21245d6ce5370e7aa7ffdfa49d1f0 SHA512 961947e2286e10cd6032320d57cf3a99d4354f46ae28ad3142d11a0d423f7a0be915f8c09e8fe7b5816829752e4a03776907bb491366f418afc319fd8efb14ad
-EBUILD unrealircd-4.0.18-r1.ebuild 5410 BLAKE2B f4623989c7f2c188b384b3ad01b80f02ef0e50f018411e466821526429f7736ff9907a8c1b32e3fe71e555f19237169c55b06821090bf7680709e933b17acbed SHA512 593840a6d2620a8bd2e80292fdb3d3bbc212312dec559fd6d04607f9c8b6106a79147a63f942271d1d33f11559394a8bd2fb3f424ae18bede975b09739967143
-EBUILD unrealircd-4.2.0.ebuild 5443 BLAKE2B 1a9915411b588b0fab288845a4ac090b531230e0a97d0bc1a1cf7f448ebc2c3a6dd6d2c6f5466e1d12097b96816b2e02b1055c37a88dea9e912f5b726813a512 SHA512 c4cad1fd924400324d65cb56e7f0779ee3f642394e2264094a97c08c5ead678ca917855a00c4d1ae805e8ca995c976b726cfe7b898aef69fccf8cba7ec1af99d
+DIST unrealircd-4.2.3.tar.gz 6086716 BLAKE2B 26eae482b8b5ce599a3672981c5cf32725f0cf7d9dae16cf48c73dfcabbd4b897d8308be0eb1a6b7b44c657dfb66c42115e67c29eefc791da5fc01fc53e22323 SHA512 d71550d71d24f808141d235248600476167b82de089173f0c1814638df636bf999c931827e5952f0233932b2d5412bf2e26573c62cc8a0720f91bd8723867b0a
 EBUILD unrealircd-4.2.2.ebuild 5474 BLAKE2B 9bd2f057b44d155f1347ebd4953f4d047ebee669bd1db35b08065826b31812f17595da7ef1414517e6c313363365fa32b8d6cf81117ef1922cf28c2b2b427c21 SHA512 6486c17f73c3e9c42bad4e587047ba15145f755c5721e4d6699b704877aa940e82f9e672761dcadf4ed411cd01c2dfdcfb5d715a1ff24dcd5c8af15c009f5a8b
-MISC metadata.xml 1133 BLAKE2B 28a4ad6235e9a0ec31202822149d2cdc68ddacc49130b14f960639eaed019654a0d90548201e7e312b33422762a23678f7e3e2c76cc9e004296c93309ebf3f29 SHA512 6066d46bce08535445ff400ded0a93ca6a0bb879771a512e05bc896a85ebaf98a0b80875f3cc4bac5eddb99c28bb7c855da0f577d603fb39d61e517ef69373a7
+EBUILD unrealircd-4.2.3-r1.ebuild 5463 BLAKE2B e2bd7d6874e2c981f4d7e515c27c938a862aacb26df6ee07a4bacbc217b68e76d348bf382ae42a27726a72cf23b6f7880e997e13961159672307d0bed622b48d SHA512 05f628e511835eb4fa103f4de297abae3bc97b712c8a0f644391167836022d4f12915a49d163c6c23063b11dfe9d0df770fd7c3d4b4fffb07472e50c3b007271
+MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index da34a4fb08f4..71258eb2874c 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -13,6 +13,5 @@
 		<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>
-		<flag name="topicisnuhost">Enable displaying nick!user@host as topic setter</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild b/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
deleted file mode 100644
index db75758bc7c4..000000000000
--- a/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-inherit ssl-cert user versionator
-
-DESCRIPTION="An advanced Internet Relay Chat daemon"
-HOMEPAGE="https://www.unrealircd.org/"
-SRC_URI="https://www.unrealircd.org/${PN}$(get_version_component_range 1)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux"
-IUSE="class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq
-	showlistmodes shunnotices topicisnuhost +usermod"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-libs/libpcre2
-	dev-libs/tre
-	>=net-dns/c-ares-1.7:=
-	sys-libs/zlib
-	curl? ( net-misc/curl[adns] )
-"
-DEPEND="${RDEPEND}
-	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
-		version_is_at_least 4 "${v}" && 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
-}
-
-pkg_setup() {
-	enewuser unrealircd
-}
-
-src_prepare() {
-	# QA check against bundled pkgs
-	rm -r extras || die
-
-	if use class-nofakelag; then
-		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
-}
-
-src_configure() {
-	# Default value for privatelibdir adds a build path to -Wl,-rpath.
-	econf \
-		--with-bindir="${EPREFIX}"/usr/bin \
-		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
-		--with-confdir="${EPREFIX}"/etc/${PN} \
-		--with-datadir="${EPREFIX}"/var/lib/${PN} \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-logdir="${EPREFIX}"/var/log/${PN} \
-		--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
-		--without-privatelibdir \
-		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
-		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
-		--with-nick-history=2000 \
-		--with-sendq=3000000 \
-		--with-permissions=0640 \
-		--with-fd-setsize=1024 \
-		--with-system-cares \
-		--with-system-pcre2 \
-		--with-system-tre \
-		--enable-dynamic-linking \
-		--enable-ssl="${EPREFIX}"/usr \
-		$(use_enable curl libcurl "${EPREFIX}"/usr) \
-		$(use_enable prefixaq) \
-		$(use_with showlistmodes) \
-		$(use_with topicisnuhost) \
-		$(use_with shunnotices) \
-		$(use_with !operoverride no-operoverride) \
-		$(use_with operoverride-verify) \
-		$(use_with !usermod disableusermod) \
-		$(use_with !extban-stacking disable-extendedban-stacking)
-}
-
-src_install() {
-	keepdir /var/log/${PN}
-	keepdir /var/lib/${PN}/tmp
-
-	newbin src/ircd ${PN}
-
-	(
-		cd src/modules || die
-		for subdir in $(find . -type d -print); do
-			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
-				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
-				doexe "${subdir}"/*.so
-			fi
-		done
-	)
-
-	insinto /etc/${PN}
-	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
-	# is redundant with app-misc/ca-certificates and examples will all
-	# be in docs anyway.
-	doins -r doc/conf/{aliases,help}
-	doins doc/conf/*.conf
-	newins doc/conf/examples/example.conf ${PN}.conf
-	keepdir /etc/${PN}/ssl
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
-
-	# config should be read-only
-	fperms -R 0640 /etc/${PN}
-	fperms 0750 /etc/${PN}{,/aliases,/help}
-	fperms 0750 /etc/${PN}/ssl
-	# 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}
-}
-
-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
-			ewarn "The location ${PN} looks for SSL certificates has changed"
-			ewarn "from ${EROOT}etc/${PN} to ${EROOT}etc/${PN}/ssl."
-			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
-			)
-		fi
-	fi
-
-	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"
-		local keys=(
-			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
-		)
-		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
-		eend $?
-
-		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
-		sed -i \
-			-e '/cloak-keys/ {
-n
-s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
-n
-s/"and another one";/"'"${keys[1]}"'";/
-n
-s/"and another one";/"'"${keys[2]}"'";/
-}' \
-			"${unrealircd_conf}"
-		eend $?
-	fi
-
-	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
-	elog
-	elog "You can also configure ${PN} start at boot with rc-update(1)."
-	elog "It is recommended to run unrealircd as an unprivileged user."
-	elog "The provided init.d script does this for you."
-}
diff --git a/net-irc/unrealircd/unrealircd-4.2.0.ebuild b/net-irc/unrealircd/unrealircd-4.2.3-r1.ebuild
index 9f2dfabd3812..1cca46256153 100644
--- a/net-irc/unrealircd/unrealircd-4.2.0.ebuild
+++ b/net-irc/unrealircd/unrealircd-4.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,14 +14,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="class-nofakelag curl +extban-stacking libressl +operoverride operoverride-verify
-	+prefixaq showlistmodes shunnotices topicisnuhost +usermod"
+	+prefixaq showlistmodes shunnotices +usermod"
 
 RDEPEND="
+	>=app-crypt/argon2-20171227-r1:=
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	dev-libs/libpcre2
-	dev-libs/tre
 	>=net-dns/c-ares-1.7:=
+	net-libs/libnsl:=
 	sys-libs/zlib
 	curl? ( net-misc/curl[adns] )
 "
@@ -75,19 +76,19 @@ src_configure() {
 		--without-privatelibdir \
 		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
 		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+		--with-maxconnections=1024 \
 		--with-nick-history=2000 \
 		--with-sendq=3000000 \
 		--with-permissions=0640 \
-		--with-fd-setsize=1024 \
+		--with-system-argon2 \
 		--with-system-cares \
 		--with-system-pcre2 \
-		--with-system-tre \
+		--without-tre \
 		--enable-dynamic-linking \
 		--enable-ssl="${EPREFIX}"/usr \
 		$(use_enable curl libcurl "${EPREFIX}"/usr) \
 		$(use_enable prefixaq) \
 		$(use_with showlistmodes) \
-		$(use_with topicisnuhost) \
 		$(use_with shunnotices) \
 		$(use_with !operoverride no-operoverride) \
 		$(use_with operoverride-verify) \