gentoo resync : 06.04.2022

3 files changed, 188 insertions, 1 deletions

diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 821520050c4f..9ec4088cddc9 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -4,6 +4,8 @@ AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8d
 AUX unrealircd.tmpfiles 45 BLAKE2B 302201c42d7ebc272dfabfe36b49d583ce18c3d10d7348763a710ac7a3bb853a8c5b4d1cb2444773f128eb988d6d95e73617ceb5742a14da61096a8eaed8705c SHA512 4812c3c509461085665dcfdd38a082eed2aba9b5c175cc28f893ae42d8a00f72c3cfcd5195c6224667284df4ee58274e2a782dcfc6b5a9cb8ce9d323961fa6cd
 DIST unrealircd-5.2.4.tar.gz 7201203 BLAKE2B 06afc8b5e28bbd56971b2ce21da3e000e39366444472786891bfe000754f5fed37b59850f9539b4f01914d6b33c1f9f17a15fe69569620ba5213f39fce1cfcad SHA512 b6784d011bc56b0b8253d61fb1edddb2133e791e9ce4ae978f90059563d11f3f7b3ebca1cf13765b4077ebc39f0699e101bdfc71cbb0c5cf51d508c5a5fdacb3
 DIST unrealircd-6.0.2.tar.gz 8672255 BLAKE2B d52f2984f32331c489528b429f4671189713e4e308a7a7fd2f70933bfd606a938a9b6a6e581170b41fa9a948d1cc04c0cd8bb90c595c01c39b473cf341494a27 SHA512 041f97ad82d89222ad49bdc7db83869fc5133a049dd5354c34759c33c16307b9d60c25d3ef4e19a549059e3a0030699d061bd03fa8118428ded1f1e79d483398
+DIST unrealircd-6.0.3.tar.gz 8673998 BLAKE2B 64a5f8bfa6e19abb5cf5434134b2729d460cd4564ad2ca395241f27aab26113f85249d43b8e9a14245354868f767d07e399ff1f28c606bb7b75c4955048e03ae SHA512 be3b823eee42e5ecf7ffbdcac0d56cf4ff4cde8aa082affa8c2f78518a3c54a2d8bb3956cf2b95060958d7c3382ca8da00e6f7b816670cf3ba48e3b8588adba3
 EBUILD unrealircd-5.2.4-r1.ebuild 5271 BLAKE2B 0e9108223c171ceed448ac8b671aacfdfe6bb2b3dccd900aa088bd2c623bd6f7f0e341f1950656ab8adec24173a5bbd40e43c70c9f02f9f30cd396a295a4cac9 SHA512 8970101540211879de4ffd43a764ded38435b8c9dde9af6a4f94b9a4f897d1d42bf5b322966b3cdbd06779e584d15403cfe5d48e019a8162bc30a746a2f25d8f
 EBUILD unrealircd-6.0.2-r1.ebuild 5637 BLAKE2B 3895805954430f2ba0438e503699a84eda29bdafc3153231956c4f0498b1837749a5103ad7fe10d0048dbe338202b45961be933cb6449bf1367f6bcb64645cf2 SHA512 025e38d2e8b891d6c4d4a349ffbd2bd650ebd3f6737748d28a3ccf29026239d3611949699a49ebb56c74fc67799a58bf1b2009a4337afa42e5d9e284f996b246
-MISC metadata.xml 860 BLAKE2B 198191ef6f7cc07fede5439075736be578f72cc5e76e47eaa8c6ffc7e60af0ed57b1e00d43539487b99d094ab2d79f5d1797d870f80fd5eec4bddfff4ad54849 SHA512 8dd95561f5d8e9eda8ef236b1580f76a9cb182e0c1c97926fe146e3f2240101dc71a44696229de51307b898bc9cc95a2e52fd4149110557006af7aefd25f4850
+EBUILD unrealircd-6.0.3.ebuild 5637 BLAKE2B 3895805954430f2ba0438e503699a84eda29bdafc3153231956c4f0498b1837749a5103ad7fe10d0048dbe338202b45961be933cb6449bf1367f6bcb64645cf2 SHA512 025e38d2e8b891d6c4d4a349ffbd2bd650ebd3f6737748d28a3ccf29026239d3611949699a49ebb56c74fc67799a58bf1b2009a4337afa42e5d9e284f996b246
+MISC metadata.xml 892 BLAKE2B 420637f61871853a304df1163a1f46e5810a42e21c90aa45ae0a9cff6d0223e48718135d7c4f0b2b50885d6d36066de1a646faea811cae12da9b681c0043f5f6 SHA512 076dbbef8a8e13340c74973cac5c31c9e691b5ba6dcb87d01f5d8311b11262187b3c9ab57782a3a2fcea99841fe55033ff6e4e9cfb300efa21b4dbddffcae2b6
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index cf388677214f..07099fd71169 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>sam@gentoo.org</email>
diff --git a/net-irc/unrealircd/unrealircd-6.0.3.ebuild b/net-irc/unrealircd/unrealircd-6.0.3.ebuild
new file mode 100644
index 000000000000..275c8a7ffa4b
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-6.0.3.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SSL_CERT_MANDATORY=1
+inherit autotools ssl-cert systemd tmpfiles
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl geoip +operoverride operoverride-verify"
+
+RDEPEND="acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	dev-libs/jansson:=
+	>=net-dns/c-ares-1.7:=
+	virtual/libcrypt:=
+	curl? ( net-misc/curl[adns] )
+	geoip? ( dev-libs/libmaxminddb )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+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
+	fi
+
+	# File is missing from the 5.0.9.1 tarball
+	sed -i -e '/unrealircd-upgrade-script/d' configure.ac || die
+
+	default
+	eautoreconf
+}
+
+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-maxconnections=1024 \
+		--with-nick-history=2000 \
+		--with-permissions=0640 \
+		--with-system-argon2 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--with-system-sodium \
+		--with-system-jansson \
+		--enable-dynamic-linking \
+		--with-controlfile="${EPREFIX}"/run/${PN}/unrealircd.ctl \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify) \
+		$(use_enable geoip libmaxminddb)
+}
+
+src_install() {
+	keepdir /var/log/${PN}
+	keepdir /var/lib/${PN}/tmp
+
+	newbin src/ircd ${PN}
+	dobin src/unrealircdctl
+
+	newtmpfiles "${FILESDIR}"/unrealircd.tmpfiles unrealircd.conf
+
+	(
+		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}/tls
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r4 ${PN}
+
+	# config should be read-only
+	fperms -R 0640 /etc/${PN}
+	fperms 0750 /etc/${PN}{,/aliases,/help}
+	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() {
+	tmpfiles_process unrealircd.conf
+
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	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}/ssl to ${EROOT}/etc/${PN}/tls."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				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
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 6 | head -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/"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";/'${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 ${EROOT}/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."
+}