commit: 5963463de387b87083b4891f6263f76eb39572e0 Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Sun Dec 29 06:40:16 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 6 04:22:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5963463d
net-irc/ngircd: Bump to 27 Closes: https://bugs.gentoo.org/947035 Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/39882 Signed-off-by: Sam James <sam <AT> gentoo.org> net-irc/ngircd/Manifest | 2 + net-irc/ngircd/files/ngircd-27-systemd-unit.patch | 24 ++++ net-irc/ngircd/ngircd-27.ebuild | 130 ++++++++++++++++++++++ 3 files changed, 156 insertions(+) diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest index d7843a4c462e..8b00622fff05 100644 --- a/net-irc/ngircd/Manifest +++ b/net-irc/ngircd/Manifest @@ -1,2 +1,4 @@ DIST ngircd-26.1.tar.xz 375812 BLAKE2B 4bd7dae47b579bdfaceee0e3ff1b30ac7c70326cd9d609a128192b1efbec17ac50010cb1bf27f4ca6d921700b7bd8cf3d0e8fb5bc569a84d6a101be10ec5832a SHA512 6333244e3fb2dc00ee9812c8c45990baa95ff473a7037a0a11ca495bed86fa438110ad5151d86b9274b6187d86b7b5712fdca2b74b8cb92f7f66fa10cf1961ee DIST ngircd-26.1.tar.xz.sig 310 BLAKE2B 6bf3330387ef01af32c0026e12e5fe5a9a34f5d5fc221a66931312fb70d17832259b94e370ddc49f8834d0d29b9c53b52f11ddec3bfc12655472e046cc569e99 SHA512 c1bbc481dd92e487706fa0b3b18dffd214018946fad8ced77feccc1105a65fcc33c82b0e93529a14ad103ef784da20e3bf86358a8f26cdddeac9f947833d6848 +DIST ngircd-27.tar.xz 377484 BLAKE2B 177bccf689690799cb746934c67c5efac31fbc73aa74d678ce6f542dd1c6651b36ad74b84ae59f06f47f24478a9bfc1a5834fc159e980eced3a50507dbd1898c SHA512 d653e0f430bc27485780c9492038622a850be9b910993d625cec4045f0d9973e448a39949c576450598e2cd923b377304ba987a6330f3fcdc42978e8a30334b8 +DIST ngircd-27.tar.xz.sig 566 BLAKE2B 43c03f65f8ddd40c51390afd27359a3fba379aff529c586ccfc8e5ea434af0e128a199a2a2bc8e64c61979f9adb6921655d72ddbb7837a169385f9dca6b3dfe0 SHA512 e759bb199d001be2dab1b292d8fdaf09fd4f32e8345e35ef4ad0f381141f95b1ef2efb5dbb7958c4aefe758c30dc349d3dffef36c6f4cdb2414a6b958d4c0389 diff --git a/net-irc/ngircd/files/ngircd-27-systemd-unit.patch b/net-irc/ngircd/files/ngircd-27-systemd-unit.patch new file mode 100644 index 000000000000..22f203f997b9 --- /dev/null +++ b/net-irc/ngircd/files/ngircd-27-systemd-unit.patch @@ -0,0 +1,24 @@ +diff --git a/contrib/ngircd.service b/contrib/ngircd.service +index 311bc0d..0191034 100644 +--- a/contrib/ngircd.service ++++ b/contrib/ngircd.service +@@ -12,8 +12,8 @@ Before=bopm.service hopm.service + + [Service] + Type=notify +-User=irc +-Group=irc ++User=ngircd ++Group=ngircd + # Settings & limits: + CapabilityBoundingSet=CAP_SYS_CHROOT CAP_NET_BIND_SERVICE + MemoryDenyWriteExecute=yes +@@ -27,7 +27,7 @@ ProtectKernelTunables=yes + ProtectSystem=full + RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX + RestrictRealtime=yes +-RuntimeDirectory=ircd ++RuntimeDirectory=ngircd + RuntimeDirectoryMode=750 + StandardError=journal + StandardOutput=journal diff --git a/net-irc/ngircd/ngircd-27.ebuild b/net-irc/ngircd/ngircd-27.ebuild new file mode 100644 index 000000000000..998b85cca770 --- /dev/null +++ b/net-irc/ngircd/ngircd-27.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alexbarton.asc +inherit tmpfiles systemd verify-sig + +DESCRIPTION="An IRC server written from scratch" +HOMEPAGE="https://ngircd.barton.de/"; +SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.xz"; +SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.xz.sig )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" +IUSE="debug gnutls ident +irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib" + +# Flaky test needs investigation (bug #719256) +RESTRICT="test" + +RDEPEND=" + acct-user/ngircd + irc-plus? ( virtual/libiconv ) + ident? ( net-libs/libident ) + pam? ( sys-libs/pam ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + dev-libs/openssl:0= + ) + ) + tcpd? ( sys-apps/tcp-wrappers ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-tcltk/expect + net-misc/netkit-telnetd + ) + verify-sig? ( >=sec-keys/openpgp-keys-alexbarton-20241211 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-27-systemd-unit.patch + "${FILESDIR}"/${PN}-26.1-configure-getaddrinfo.patch # XXX #946998 PLEASE CHECK PER RELEASE +) + +src_prepare() { + default + + if ! use prefix ; then + sed -i \ + -e "/;ServerUID = /s/65534/ngircd/" \ + -e "/;ServerGID = /s/65534/ngircd/" \ + doc/sample-ngircd.conf.tmpl || die + fi + + # Make pidfiles work out-of-the-box + sed -i \ + -e "/;PidFile = /s/;//" \ + -e "/;ServerUID = /s/;//" \ + -e "/;ServerGID = /s/;//" \ + doc/sample-ngircd.conf.tmpl || die + + # Note that if we need to use automake, we need a certain version (for now): + # https://github.com/ngircd/ngircd/issues/261 + # WANT_AUTOMAKE=1.11 + # eautomake +} + +src_configure() { + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/${PN} + + $(use_enable debug sniffer) + $(use_enable debug) + $(use_enable irc-plus ircplus) + $(use_enable ipv6) + $(use_enable strict-rfc) + $(use_with irc-plus iconv) + $(use_with ident) + $(use_with pam) + $(use_with tcpd tcp-wrappers) + $(use_with zlib) + ) + + if use ssl ; then + if use gnutls ; then + myeconfargs+=( + $( use_with gnutls ) + ) + else + myeconfargs+=( + $( use_with !gnutls openssl ) + ) + fi + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + fowners root:ngircd /etc/ngircd/{,ngircd.conf} + fperms 0750 /etc/ngircd/ + fperms 0640 /etc/ngircd/ngircd.conf + + newinitd "${FILESDIR}"/ngircd.init-r2.d ngircd + newconfd "${FILESDIR}"/ngircd.conf.d ngircd + + systemd_dounit contrib/ngircd.{service,socket} + + dotmpfiles "${FILESDIR}"/ngircd.conf +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] && use pam ; then + elog "ngircd will use PAMIsOptionalPAM by default, please change this option." + elog "You may not be able to login until you change this." + fi + + if ! use irc-plus ; then + ewarn "server-login-test occasional failure had been reported. Upstream suggests" + ewarn "to enable ircplus by default. See Gentoo bug #719256. You have been warned." + fi + tmpfiles_process ngircd.conf +}
