[gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
commit: 3ef274e3ab39a17aac1416bc73f037cf4a445589 Author: Sam James gentoo org> AuthorDate: Wed Jun 15 22:43:25 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 15 22:43:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ef274e3 net-irc/ngircd: add systemd unit Reported on forums at https://forums.gentoo.org/viewtopic-p-8719094.html. Signed-off-by: Sam James gentoo.org> .../ngircd/files/ngircd-26.1-systemd-unit.patch| 24 net-irc/ngircd/ngircd-26.1-r5.ebuild | 123 + 2 files changed, 147 insertions(+) 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 ..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 ..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
[gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
commit: 667cd1feb5ad07556adbe2aada4a116fe6e112fd Author: Sam James gentoo org> AuthorDate: Fri Apr 29 09:30:30 2022 + Commit: Sam James gentoo org> CommitDate: Fri Apr 29 10:20:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667cd1fe net-irc/ngircd: drop 26.1-r2 Signed-off-by: Sam James gentoo.org> net-irc/ngircd/files/ngircd.init-r1.d | 21 --- net-irc/ngircd/ngircd-26.1-r2.ebuild | 103 -- 2 files changed, 124 deletions(-) diff --git a/net-irc/ngircd/files/ngircd.init-r1.d b/net-irc/ngircd/files/ngircd.init-r1.d deleted file mode 100644 index 3346d698d441.. --- a/net-irc/ngircd/files/ngircd.init-r1.d +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - use logger - provide ircd -} - -start() { - ebegin "Starting ngIRCd" - start-stop-daemon --start --quiet --exec /usr/sbin/ngircd - eend $? -} - -stop() { - ebegin "Stopping ngIRCd" - start-stop-daemon --stop --quiet --exec /usr/sbin/ngircd - eend $? -} diff --git a/net-irc/ngircd/ngircd-26.1-r2.ebuild b/net-irc/ngircd/ngircd-26.1-r2.ebuild deleted file mode 100644 index 427b47aa1dcc.. --- a/net-irc/ngircd/ngircd-26.1-r2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/alexbarton.asc -inherit 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 - acct-group/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 ) -" - -src_prepare() { - default - - if ! use prefix ; then - sed -i \ - -e "s:;ServerUID = 65534:ServerUID = ngircd:" \ - -e "s:;ServerGID = 65534:ServerGID = ngircd:" \ - doc/sample-ngircd.conf.tmpl || die - fi - - # 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 myeconf=( - --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 - myeconf+=( - $( use_with gnutls ) - ) - else - myeconf+=( - $( use_with !gnutls openssl ) - ) - fi - fi - - econf "${myeconf[@]}" -} - -src_install() { - default - - newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd -} - -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 -}
[gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
commit: 20c644c4564ed2edef8a10ac3a1437394e824bfb Author: Anna Vyalkova sysrq in> AuthorDate: Sun Mar 13 16:10:00 2022 + Commit: Sam James gentoo org> CommitDate: Sun Mar 13 17:02:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20c644c4 net-irc/ngircd: add missing tmpfiles.d file OpenRC service was broken because /run/ngircd didn't exist. Signed-off-by: Anna Vyalkova sysrq.in> Closes: https://github.com/gentoo/gentoo/pull/24538 Signed-off-by: Sam James gentoo.org> net-irc/ngircd/files/ngircd.conf| 1 + net-irc/ngircd/{ngircd-26.1-r3.ebuild => ngircd-26.1-r4.ebuild} | 5 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/net-irc/ngircd/files/ngircd.conf b/net-irc/ngircd/files/ngircd.conf new file mode 100644 index ..e9993a3430ef --- /dev/null +++ b/net-irc/ngircd/files/ngircd.conf @@ -0,0 +1 @@ +d /run/ngircd 0755 ngircd ngircd - diff --git a/net-irc/ngircd/ngircd-26.1-r3.ebuild b/net-irc/ngircd/ngircd-26.1-r4.ebuild similarity index 96% rename from net-irc/ngircd/ngircd-26.1-r3.ebuild rename to net-irc/ngircd/ngircd-26.1-r4.ebuild index 579814e2b0e5..a5474e5b57a6 100644 --- a/net-irc/ngircd/ngircd-26.1-r3.ebuild +++ b/net-irc/ngircd/ngircd-26.1-r4.ebuild @@ -4,7 +4,7 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/alexbarton.asc" -inherit verify-sig +inherit tmpfiles verify-sig DESCRIPTION="An IRC server written from scratch" HOMEPAGE="https://ngircd.barton.de/; @@ -101,6 +101,7 @@ src_install() { fowners ngircd:ngircd /etc/ngircd/ngircd.conf newinitd "${FILESDIR}"/ngircd.init-r2.d ngircd newconfd "${FILESDIR}"/ngircd.conf.d ngircd + dotmpfiles "${FILESDIR}"/ngircd.conf } pkg_postinst() { @@ -108,4 +109,6 @@ pkg_postinst() { 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 }
[gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
commit: 9f4569a28161fc2d931863ab8e826d2dd2080e3f Author: Sam James (sam_c) cmpct info> AuthorDate: Wed Apr 15 19:33:15 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Apr 26 13:36:49 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4569a2 net-irc/ngircd: Bump to 25, GLEP 81 Closes: https://bugs.gentoo.org/696572 Closes: https://bugs.gentoo.org/707634 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Joonas Niilola gentoo.org> net-irc/ngircd/Manifest | 1 + net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch | 77 net-irc/ngircd/files/ngircd-25-make-env.patch | 75 net-irc/ngircd/metadata.xml | 2 + net-irc/ngircd/ngircd-25.ebuild | 111 5 files changed, 266 insertions(+) diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest index 3f5358b844b..a9321e747c2 100644 --- a/net-irc/ngircd/Manifest +++ b/net-irc/ngircd/Manifest @@ -1,2 +1,3 @@ DIST ngircd-23.tar.gz 517686 BLAKE2B 1e1d7386a95f22917e6f69ec43bc48a8031543c48d6141a16d81fd935dab47ae89d8bbc91d9d71a26b0a1d2fd2040feb478e773fcc2a3049061fc0b21c8bad18 SHA512 714fbb4af12335e62c615fa1e8de9c7366c4c6da6af9b334019ba900dce072067f7b08199de8c96aad5dd4b9b786b57d536ba9dc92c62b37d2ae11960dbd01b1 DIST ngircd-24.tar.gz 524968 BLAKE2B 8ec0518d54f43a4c42fbf9744d217eb2aae498fe4f0010bce6ad68164037c2e55dc2b9681babce8ca5f7e26bac60a91389c63dab397d349dd4bcbcce6c2e9839 SHA512 66d1b9576c03d0a70be17a235f2da50ee661646cd428d18a6c61975407671dd4a3a545069258536773b27d4fb63523527366bbbf4f35cb08111dc60842924395 +DIST ngircd-25.tar.gz 527886 BLAKE2B ab75c9a904fae8da4c89e07bd66bb000bc9b614e27269be3ac6f55254c77abeb2d6f7d0afc6d05630f7c548ea13d842d4c0376123035f9417eda55565a69dcec SHA512 0c96e97da312fe86c50007a72db03f85b9f79df053806f50badd07c7ca8e8bddd99adb478eab8be9630330707d7aa578b5d0bd3017b59bf4515319a64c29ea6c diff --git a/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch b/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch new file mode 100644 index 000..33e0d444bd5 --- /dev/null +++ b/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch @@ -0,0 +1,77 @@ +From f27827d7937375b5348107ca7427abf74c9eff3d Mon Sep 17 00:00:00 2001 +From: michi +Date: Tue, 14 Apr 2020 16:53:02 +0200 +Subject: [PATCH] Unbreak GCC 10 (-fno-common) build + +--- + src/ngircd/conn.c | 1 + + src/ngircd/conn.h | 14 +++--- + src/ngircd/ngircd.c | 1 + + src/portab/portab.h | 4 + 4 files changed, 17 insertions(+), 3 deletions(-) + +diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c +index f62e9675..e14e6c08 100644 +--- a/src/ngircd/conn.c b/src/ngircd/conn.c +@@ -10,6 +10,7 @@ + */ + + #define CONN_MODULE ++#define CONN_MODULE_GLOBAL_INIT + + #include "portab.h" + +diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h +index c642541f..869477f0 100644 +--- a/src/ngircd/conn.h b/src/ngircd/conn.h +@@ -105,9 +105,17 @@ typedef struct _Connection + #endif + } CONNECTION; + +-GLOBAL CONNECTION *My_Connections; +-GLOBAL CONN_ID Pool_Size; +-GLOBAL long WCounter; ++ ++#ifdef CONN_MODULE_GLOBAL_INIT ++CONNECTION *My_Connections; ++CONN_ID Pool_Size; ++long WCounter; ++#else ++extern CONNECTION *My_Connections; ++extern CONN_ID Pool_Size; ++extern long WCounter; ++#endif ++ + + #define CONNECTION2ID(x) (long)(x - My_Connections) + +diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c +index 7166640b..41255ca0 100644 +--- a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c +@@ -9,6 +9,7 @@ + * Please read the file COPYING, README and AUTHORS for more information. + */ + ++#define GLOBAL_INIT + #include "portab.h" + + /** +diff --git a/src/portab/portab.h b/src/portab/portab.h +index 70d5ed3e..43f2f907 100644 +--- a/src/portab/portab.h b/src/portab/portab.h +@@ -102,7 +102,11 @@ typedef unsigned char bool; + #endif + + #undef GLOBAL ++#ifdef GLOBAL_INIT + #define GLOBAL ++#else ++#define GLOBAL extern ++#endif + + /* SPLint */ + diff --git a/net-irc/ngircd/files/ngircd-25-make-env.patch b/net-irc/ngircd/files/ngircd-25-make-env.patch new file mode 100644 index 000..e6494c72007 --- /dev/null +++ b/net-irc/ngircd/files/ngircd-25-make-env.patch @@ -0,0 +1,75 @@ +--- a/Makefile.am 2016-09-18 18:01:30.0 - b/Makefile.am 2020-04-20 14:01:43.166312404 - +@@ -25,13 +25,13 @@ + rm -f config.log debian + + testsuite: +- cd src/testsuite && make check ++ cd src/testsuite && ${MAKE} check + + lint: +- cd src/ngircd && make lint ++ cd src/ngircd && ${MAKE} lint + + srcdoc: +- cd doc && make srcdoc ++ cd doc && ${MAKE} srcdoc + + have-xcodebuild: + @xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \ +@@ -66,7 +66,7 @@ +--out ../../$(distdir).mpkg + rm -f $(distdir).mpkg.zip + zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg +- make osxpkg-clean ++ ${MAKE} osxpkg-clean
[gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
commit: 11a915dc086071bff70c080de2c29cc00d452c74 Author: Ian Delaney gentoo org> AuthorDate: Fri Jan 15 04:13:35 2016 + Commit: Ian Delaney gentoo org> CommitDate: Fri Jan 15 06:30:30 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a915dc net-irc/ngircd: revbump to vn. 23-r1 with corresponding updated init script init script is files/ngircd.init-r1.d, ngircd-23-r1.ebuild edited to match, script adds use logger to depend(), patch by maintainer via the gentoo bug Gentoo bug: #503074 Package-Manager: portage-2.2.26 net-irc/ngircd/files/ngircd.init-r1.d | 22 + net-irc/ngircd/ngircd-23-r1.ebuild| 85 +++ 2 files changed, 107 insertions(+) diff --git a/net-irc/ngircd/files/ngircd.init-r1.d b/net-irc/ngircd/files/ngircd.init-r1.d new file mode 100644 index 000..ad7df21 --- /dev/null +++ b/net-irc/ngircd/files/ngircd.init-r1.d @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need net + use logger + provide ircd +} + +start() { + ebegin "Starting ngIRCd" + start-stop-daemon --start --quiet --exec /usr/sbin/ngircd + eend $? +} + +stop() { + ebegin "Stopping ngIRCd" + start-stop-daemon --stop --quiet --exec /usr/sbin/ngircd + eend $? +} diff --git a/net-irc/ngircd/ngircd-23-r1.ebuild b/net-irc/ngircd/ngircd-23-r1.ebuild new file mode 100644 index 000..6cfa1ab --- /dev/null +++ b/net-irc/ngircd/ngircd-23-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit autotools-utils eutils user + +DESCRIPTION="An IRC server written from scratch" +HOMEPAGE="http://ngircd.barton.de/; +SRC_URI="http://ngircd.barton.de/pub/${PN}/${P}.tar.gz; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x64-macos" +IUSE="debug gnutls iconv ident ipv6 libressl pam ssl tcpd zlib" + +RDEPEND=" + iconv? ( virtual/libiconv ) + ident? ( net-libs/libident ) + pam? ( virtual/pam ) + ssl? ( + !gnutls? ( + !libressl? ( dev-libs/openssl:0 ) + ) + gnutls? ( net-libs/gnutls ) + libressl? ( dev-libs/libressl ) + ) + tcpd? ( sys-apps/tcp-wrappers ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND} + >=sys-apps/sed-4 +" + +RESTRICT="test" + +src_configure() { + if ! use prefix; then + sed -i \ + -e "s:;ServerUID = 65534:ServerUID = ngircd:" \ + -e "s:;ServerGID = 65534:ServerGID = nogroup:" \ + doc/sample-ngircd.conf.tmpl || die + fi + + local myeconfargs=( + --docdir="${EPREFIX}"/usr/share/doc/${PF} + --sysconfdir="${EPREFIX}"/etc/ngircd + $(use_enable debug sniffer) + $(use_enable debug) + $(use_enable ipv6) + $(use_with iconv) + $(use_with ident) + $(use_with pam) + $(use_with tcpd tcp-wrappers) + $(use_with zlib) + ) + + if use ssl; then + myeconfargs+=( + $(use_with !gnutls openssl) + $(use_with gnutls) + ) + else + myeconfargs+=( + --without-gnutls + --without-openssl + ) + fi + + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd +} + +pkg_postinst() { + if ! use prefix; then + enewuser ngircd + chown ngircd "${ROOT}"/etc/ngircd/ngircd.conf + fi +}