5 files changed, 163 insertions, 4 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 78e883db3649..5d5e11d8e72c 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index 6cb6c5dac8cd..9438d1d1827b 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,3 +1,4 @@
+AUX ngircd-26.1-configure-getaddrinfo.patch 919 BLAKE2B 0ecac7c7e44b2ce31e2252955177c25009d6eb383bdb2b16fa39b2d2bec94c8f11fc1f8e0c8878522c4209a12ea7e94d518496d755cc92b7ee9c4978b9fc091a SHA512 891b9e4d41d8dad92e6bff7ad11fa04cff78821a5b07c8d32b82256a79976660ceb91af497a05e6a7363a30d31d165b5448961e06b81bcfb4888af8b012dc096
 AUX ngircd-26.1-systemd-unit.patch 674 BLAKE2B 275a8b73b550b4431f529846ccb70fcb73e193ef44bae04f130377495c8817693c634b3dd327bc4ce986be8af1db17ea1249987dafc5beb35ee614be4a1af7a6 SHA512 c631192434cc55130cb885c94b596e164bd7733dd3f854ea8fc2e4440529e64b1603015fbea7d5dcbf86feb2c60849bfd053206f1b9c15196b4588676a833ab4
 AUX ngircd.conf 35 BLAKE2B 59c5b7c2444d5d2561884db7d532fb7d4ce03cfffacf679f2e72ee0e06415bdf292bfd4f959d47f2b598254902a954a07eb48d4d5ab170e356f89d3f8fb9f15e SHA512 24525591e0ca0249aaff10746d0526fcdc7ff5a8844e98b7d31a5fd710cf92c5905653628ec03e2a491f8cc5890d63f4b05f00bb2adeba502d60c317ad2d3e1c
 AUX ngircd.conf.d 166 BLAKE2B a7e6e149bfe04bb54e97820f6d4fda2f7d81c224fb0975335a190fc41f80aa7edad5b5f509831acf9fdd0949d02e49fa8661860b62f7409c225cecac604cce6d SHA512 0c71a27130f0d918d3ba78f4e19d882bd1089e7f6e899cf89456d1e249d27fe5fe8678bccc90b5fa5eb73c0976240a7fe0722b3094d7553fbfa919dbce235d6a
@@ -5,4 +6,5 @@ AUX ngircd.init-r2.d 1271 BLAKE2B f385805c7ae63f4046cee12449b60bc4309007fe69b52a
 DIST ngircd-26.1.tar.xz 375812 BLAKE2B 4bd7dae47b579bdfaceee0e3ff1b30ac7c70326cd9d609a128192b1efbec17ac50010cb1bf27f4ca6d921700b7bd8cf3d0e8fb5bc569a84d6a101be10ec5832a SHA512 6333244e3fb2dc00ee9812c8c45990baa95ff473a7037a0a11ca495bed86fa438110ad5151d86b9274b6187d86b7b5712fdca2b74b8cb92f7f66fa10cf1961ee
 DIST ngircd-26.1.tar.xz.sig 310 BLAKE2B 6bf3330387ef01af32c0026e12e5fe5a9a34f5d5fc221a66931312fb70d17832259b94e370ddc49f8834d0d29b9c53b52f11ddec3bfc12655472e046cc569e99 SHA512 c1bbc481dd92e487706fa0b3b18dffd214018946fad8ced77feccc1105a65fcc33c82b0e93529a14ad103ef784da20e3bf86358a8f26cdddeac9f947833d6848
 EBUILD ngircd-26.1-r5.ebuild 2669 BLAKE2B f92056ca5140d62216dd9980a55e6c7d67670810fd9acecceee64c9904b3313206d47f3f9f8b47314f4ce9c54522671a73e2ed20c8603cffad4bc4851341a63f SHA512 19e22d432cbc2272466e2fe21ada3790ddaf81a09f2100adfee41dccd7ce4eac52d03f53a079772c13ee2fda34bb9aa2af9448952cde2cfa73850015ed3f7535
-MISC metadata.xml 651 BLAKE2B ba57a0fffdef6acaf3510f62bc146c9dbfec0805b9e6a5e889360fee39c3a3e539aaead44fa42c72523957c492c066a9729c2f362c84f56c0ab27627b8e92f36 SHA512 82529647ece0d29898c2ad7f5794d6376f919d0e1d30cdc7dea0bea97418c9fba26e9e9748232a7e9963d329d5a8b5f4f8d2c6acc03682a231ec3984c63980f7
+EBUILD ngircd-26.1-r6.ebuild 3027 BLAKE2B cb19e3a378470011b26eaf15bd11a1d0612f936b31ab586d0d112aff498676f374c73471baa671d2787a014665a6a28a56100b36f2d4162e019be726f5e5153a SHA512 b1392049e5000976f1e7f2d081e4754256d0d3309225d090dd25079ecb19de377767a9e63ef731b0e0c95f3cb0d3b6137d4ad3dce2136813f671e82aca235bf3
+MISC metadata.xml 800 BLAKE2B cc7f5ce6b254924a0bb0c96bea5a23dfce85bea86b14a91becec0d8a43a06c82dc1f3e33001f6efd9f85883c61810f8176277caf8be4ce298b14d91c73c899f6 SHA512 3c32b19adcc98cb85bbd95b5556fe85c92602a4838d4ae341fa88ffa7b34fe2a7d93ea5717a7b3ea5634944cad62347b3ddcaf51a9e161913fbf850d09844162
diff --git a/net-irc/ngircd/files/ngircd-26.1-configure-getaddrinfo.patch b/net-irc/ngircd/files/ngircd-26.1-configure-getaddrinfo.patch
new file mode 100644
index 000000000000..3d6bff5bf54b
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd-26.1-configure-getaddrinfo.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/946998
+
+configure report getaddrinfo not works because of stricter compiler check:
+  configure:6303: x86_64-pc-linux-gnu-gcc -o conftest -g -O2 -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes -fstack-protector -DSYSCONFDIR='"$(sysconfdir)"' -DDOCDIR='"$(docdir)"' conftest.c >&5
+  conftest.c: In function 'main':
+  conftest.c:99:9: error: implicit declaration of function 'memset' [-Wimplicit-function-declaration]
+
+configure.ac still use de-ANSI-fication (which is only available in old
+automake) in order to support old systems. So we can't patch configure.ac
+and run eautoreconf. see https://github.com/ngircd/ngircd/issues/261
+
+diff --git a/configure b/configure
+index e4023a3..9337a85 100755
+--- a/configure
++++ b/configure
+@@ -6283,6 +6283,7 @@ else
+ /* end confdefs.h.  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
diff --git a/net-irc/ngircd/metadata.xml b/net-irc/ngircd/metadata.xml
index b9ed1a091b88..f37d7a115b23 100644
--- a/net-irc/ngircd/metadata.xml
+++ b/net-irc/ngircd/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
+	<maintainer type="person" proxied="yes">
+		<email>zhixu.liu@gmail.com</email>
+		<name>Z. Liu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="ident">Enables support for <pkg>net-libs/libident</pkg></flag>
diff --git a/net-irc/ngircd/ngircd-26.1-r6.ebuild b/net-irc/ngircd/ngircd-26.1-r6.ebuild
new file mode 100644
index 000000000000..6d6e98e30b0c
--- /dev/null
+++ b/net-irc/ngircd/ngircd-26.1-r6.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}-26.1-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
+}