From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- net-irc/ngircd/Manifest | 2 + .../ngircd/files/ngircd-26.1-systemd-unit.patch | 24 ++++ net-irc/ngircd/ngircd-26.1-r5.ebuild | 123 +++++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch create mode 100644 net-irc/ngircd/ngircd-26.1-r5.ebuild (limited to 'net-irc/ngircd') diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest index 6dbb7294765c..d3249dfcc0dc 100644 --- a/net-irc/ngircd/Manifest +++ b/net-irc/ngircd/Manifest @@ -1,7 +1,9 @@ +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 AUX ngircd.init-r2.d 1271 BLAKE2B f385805c7ae63f4046cee12449b60bc4309007fe69b52a2933a8562f5c05bd356cee49e0bd9bed389d9f42b92e94dbc37387db34eb3c5946e6cc92ea8ebf8ec2 SHA512 ceaeee66b31463273ff88c5356c63bc9b25c272dd038940adba95a8b7e3d4f4d0bd0c96bd9c99fb522b7dafa3a413b5611ecb748951ef5cc7a944384983cf45e 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-r4.ebuild 2533 BLAKE2B bb5d0f9d2653184ab0964afb08eb7fd803041af9005b9675e7446a13c3a63ed305e88c53d7e7fa4e116c8519a4f8edb63fa075be4845b4c94728ce49e1045120 SHA512 744ff2b19724127235a91c8b88e2f937ba7903a0ac0073e4d298276d3410171f231b907d5c114a7fd9da6157bf41186baf4a51243867a2af5b89672cf29062c5 +EBUILD ngircd-26.1-r5.ebuild 2672 BLAKE2B f9976614ed4baca6453e3713d7cf220b34eb7b76962ccc7938585c25838888a2775de74c1ca8ae868d4ac566abd2d4416137d544cb48501c6ed7fd19fba44783 SHA512 bdb0c5e4d37cee8d0a8afde1623215e647bc321f9cf1f1cab4040ee6921e5d6905588017a4d75bc5be9af6e2297de5460a95a539a13d08d1898f92bac48b8963 MISC metadata.xml 651 BLAKE2B ba57a0fffdef6acaf3510f62bc146c9dbfec0805b9e6a5e889360fee39c3a3e539aaead44fa42c72523957c492c066a9729c2f362c84f56c0ab27627b8e92f36 SHA512 82529647ece0d29898c2ad7f5794d6376f919d0e1d30cdc7dea0bea97418c9fba26e9e9748232a7e9963d329d5a8b5f4f8d2c6acc03682a231ec3984c63980f7 diff --git a/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch b/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch new file mode 100644 index 000000000000..f15025cc4856 --- /dev/null +++ b/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch @@ -0,0 +1,24 @@ +diff --git a/contrib/ngircd.service b/contrib/ngircd.service +index e4c30e2..ba1b513 100644 +--- a/contrib/ngircd.service ++++ b/contrib/ngircd.service +@@ -12,8 +12,8 @@ Before=bopm.service + + [Service] + Type=forking +-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 + # Try to load "default files" from any Debian package variant to keep this + # unit generic. diff --git a/net-irc/ngircd/ngircd-26.1-r5.ebuild b/net-irc/ngircd/ngircd-26.1-r5.ebuild new file mode 100644 index 000000000000..4c6293a77170 --- /dev/null +++ b/net-irc/ngircd/ngircd-26.1-r5.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-26.1-systemd-unit.patch +) + +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 ngircd:ngircd /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 + + tmpfiles_process ngircd.conf +} -- cgit v1.2.3