commit: bad2c62afec624872bcef0a6f7f6a78cbe63156e Author: Anna (navi) Figueiredo Gomes <navi <AT> vlhl <DOT> dev> AuthorDate: Fri Apr 25 20:42:35 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 23 04:56:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad2c62a
net-irc/unrealircd: improve init.d script the new script uses supervise-daemon and standardized variables, as well as a fixed checkconfig that works across multiple instances Bug: https://bugs.gentoo.org/890338 Signed-off-by: Anna (navi) Figueiredo Gomes <navi <AT> vlhl.dev> Part-of: https://github.com/gentoo/gentoo/pull/41755 Closes: https://github.com/gentoo/gentoo/pull/41755 Signed-off-by: Sam James <sam <AT> gentoo.org> net-irc/unrealircd/files/unrealircd.confd-r5 | 24 +++ net-irc/unrealircd/files/unrealircd.initd-r4 | 33 ++++ net-irc/unrealircd/unrealircd-6.0.4.2-r1.ebuild | 195 ++++++++++++++++++++++++ 3 files changed, 252 insertions(+) diff --git a/net-irc/unrealircd/files/unrealircd.confd-r5 b/net-irc/unrealircd/files/unrealircd.confd-r5 new file mode 100644 index 000000000000..bd7f8d120d86 --- /dev/null +++ b/net-irc/unrealircd/files/unrealircd.confd-r5 @@ -0,0 +1,24 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Where to chroot to, uncomment this line for chrooting +#chroot="/var/chroot/ircd" + +# Which configuration file to load instead of unrealircd.conf. If you +# want to run multiple instances of unrealircd, you must ensure that +# files::pidfile and files::tunefile is different for each unrealircd +# instance. See https://www.unrealircd.org/docs/Configuration#Files_block. +# To support multiple instances of unrealircd, you may create symlinks +# in /etc/init.d pointing to /etc/init.d/unrealircd that follows the +# scheme unrealircd.${instance_name} be used. For each instance, you +# may make a copy of this file with the appropriate name to override +# default options specific to that instance. +#unrealircd_conf="${chroot}/etc/unrealircd/${RC_SVCNAME}.conf" + +# extra options to pass to unrealircd... +# You should not specify the -f option here; use unrealircd_conf instead. +# [-h servername] +# [-p portnumber] +# [-x loglevel] +# [-t] (to enable debug output) +#unrealircd_opts="" diff --git a/net-irc/unrealircd/files/unrealircd.initd-r4 b/net-irc/unrealircd/files/unrealircd.initd-r4 new file mode 100644 index 000000000000..5257df27976d --- /dev/null +++ b/net-irc/unrealircd/files/unrealircd.initd-r4 @@ -0,0 +1,33 @@ +#!/sbin/openrc-run +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${unrealircd_conf:=/etc/unrealircd/${RC_SVCNAME}.conf} + +depend() { + use dns net + provide ircd +} + +supervisor=supervise-daemon +command=/usr/bin/unrealircd +command_args="-F -f ${unrealircd_conf} ${unrealircd_opts}" +command_user="unrealircd:unrealircd" + +extra_started_commands="checkconfig reload" + +checkconfig() { + runuser -u "${command_user%%:*}" -- ${command} -c "${unrealircd_conf}" +} + +start_pre() { + checkconfig +} + +reload() { + checkconfig || return $? + + ebegin "Reloading ${RC_SVCNAME}" + supervise-daemon "${RC_SVCNAME}" --signal HUP + eend $? +} diff --git a/net-irc/unrealircd/unrealircd-6.0.4.2-r1.ebuild b/net-irc/unrealircd/unrealircd-6.0.4.2-r1.ebuild new file mode 100644 index 000000000000..3b94d77f5355 --- /dev/null +++ b/net-irc/unrealircd/unrealircd-6.0.4.2-r1.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +SSL_CERT_MANDATORY=1 +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unrealircd.asc +inherit autotools ssl-cert systemd tmpfiles verify-sig + +DESCRIPTION="An advanced Internet Relay Chat daemon" +HOMEPAGE="https://www.unrealircd.org/"; +SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"; +SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~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 + verify-sig? ( sec-keys/openpgp-keys-unrealircd ) +" + +DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} ) + +PATCHES=( + "${FILESDIR}"/${PN}-6.0.4.2-configure-clang16.patch +) + +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-r4 ${PN} + newconfd "${FILESDIR}"/${PN}.confd-r5 ${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 "${EPREFIX}"/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." +}
