* [gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
@ 2016-01-15 6:30 Ian Delaney
0 siblings, 0 replies; 6+ messages in thread
From: Ian Delaney @ 2016-01-15 6:30 UTC (permalink / raw
To: gentoo-commits
commit: 11a915dc086071bff70c080de2c29cc00d452c74
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 04:13:35 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 06:30:30 2016 +0000
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 0000000..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 0000000..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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
@ 2020-04-26 13:37 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-04-26 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 9f4569a28161fc2d931863ab8e826d2dd2080e3f
Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Wed Apr 15 19:33:15 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 13:36:49 2020 +0000
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) <sam <AT> cmpct.info>
Signed-off-by: Joonas Niilola <juippis <AT> 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 00000000000..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 <michi+ngircd@dataswamp.org>
+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 00000000000..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.000000000 -0000
++++ b/Makefile.am 2020-04-20 14:01:43.166312404 -0000
+@@ -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
+
+ osxpkg-clean:
+ [ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest
+@@ -74,12 +74,12 @@
+
+ osxpkg-dest: have-xcodebuild osxpkg-clean clean
+ ./configure --prefix=/opt/ngircd
+- make xcode
+- make -C contrib/MacOSX de.barton.ngircd.plist
++ ${MAKE} xcode
++ ${MAKE} -C contrib/MacOSX de.barton.ngircd.plist
+ mkdir -p ngircd.dest/opt/ngircd/sbin
+- DESTDIR="$$PWD/ngircd.dest" make -C doc install
+- DESTDIR="$$PWD/ngircd.dest" make -C contrib install
+- DESTDIR="$$PWD/ngircd.dest" make -C man install
++ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C doc install
++ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C contrib install
++ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C man install
+ cp contrib/MacOSX/build/Default/ngIRCd \
+ ngircd.dest/opt/ngircd/sbin/ngircd
+ rm ngircd.dest/opt/ngircd/etc/ngircd.conf
+--- a/doc/Makefile.am 2016-01-16 13:23:40.000000000 -0000
++++ b/doc/Makefile.am 2020-04-20 14:05:45.316912143 -0000
+@@ -55,7 +55,7 @@
+ install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)
+ $(MKDIR_P) -m 755 $(DESTDIR)$(sysconfdir)
+ @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
+- make install-config; \
++ ${MAKE} install-config; \
+ fi
+ $(MKDIR_P) -m 755 $(DESTDIR)$(docdir)
+ for f in $(static_docs) $(toplevel_docs); do \
+@@ -75,7 +75,7 @@
+ uninstall-hook:
+ rm -rf $(DESTDIR)$(docdir)
+ @if cmp --silent sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; then \
+- make uninstall-config; \
++ ${MAKE} uninstall-config; \
+ else \
+ echo; \
+ echo " ** NOTE: Not uninstalling changed configuration file:"; \
+@@ -87,7 +87,7 @@
+ rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf
+
+ srcdoc:
+- make -C src srcdoc
++ ${MAKE} -C src srcdoc
+
+ .PHONY: install-config uninstall-config srcdoc
+
diff --git a/net-irc/ngircd/metadata.xml b/net-irc/ngircd/metadata.xml
index fab3207f616..fe32ef1d9ca 100644
--- a/net-irc/ngircd/metadata.xml
+++ b/net-irc/ngircd/metadata.xml
@@ -11,5 +11,7 @@
</maintainer>
<use>
<flag name="ident">Enables support for <pkg>net-libs/libident</pkg></flag>
+ <flag name="irc-plus">Enables support for the IRC+ protocol (needs <pkg>virtual/libiconv</pkg>)</flag>
+ <flag name="strict-rfc">Strict RFC compliance; may harm compatibility</flag>
</use>
</pkgmetadata>
diff --git a/net-irc/ngircd/ngircd-25.ebuild b/net-irc/ngircd/ngircd-25.ebuild
new file mode 100644
index 00000000000..a7310708bf6
--- /dev/null
+++ b/net-irc/ngircd/ngircd-25.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Bug: https://github.com/ngircd/ngircd/issues/261
+WANT_AUTOMAKE=1.11.6
+inherit autotools
+
+DESCRIPTION="An IRC server written from scratch"
+HOMEPAGE="https://ngircd.barton.de/"
+SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="debug gnutls ident irc-plus +ipv6 libressl pam +ssl strict-rfc tcpd test zlib"
+
+RESTRICT="!test? ( 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? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+ tcpd? ( sys-apps/tcp-wrappers )
+ zlib? ( sys-libs/zlib )
+"
+
+BDEPEND="sys-devel/automake:1.11"
+
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-tcltk/expect
+ net-misc/netkit-telnetd
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-25-fix-gcc-10.patch"
+ "${FILESDIR}/${PN}-25-make-env.patch"
+)
+
+# Flaky test needs investigation (bug 719256)
+RESTRICT="test"
+
+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
+
+ # Once https://github.com/ngircd/ngircd/pull/270 is in a release (ngircd 26), we can remove
+ # the eautomake/autotools machinery.
+ eautomake
+}
+
+src_configure() {
+ local myconf=(
+ --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
+ myconf+=(
+ $( use_with gnutls )
+ )
+ else
+ myconf+=(
+ $( use_with !gnutls openssl )
+ )
+ fi
+ fi
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] && use pam; then
+ elog "ngircd will use PAMOnly by default, please change this option."
+ elog "You may not be able to login until you change this."
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
@ 2022-03-13 17:03 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-03-13 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 20c644c4564ed2edef8a10ac3a1437394e824bfb
Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sun Mar 13 16:10:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 17:02:05 2022 +0000
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 <cyber+gentoo <AT> sysrq.in>
Closes: https://github.com/gentoo/gentoo/pull/24538
Signed-off-by: Sam James <sam <AT> 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 000000000000..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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
@ 2022-04-29 10:21 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-04-29 10:21 UTC (permalink / raw
To: gentoo-commits
commit: 667cd1feb5ad07556adbe2aada4a116fe6e112fd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 09:30:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 10:20:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667cd1fe
net-irc/ngircd: drop 26.1-r2
Signed-off-by: Sam James <sam <AT> 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..000000000000
--- 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..000000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
@ 2022-06-15 22:44 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-06-15 22:44 UTC (permalink / raw
To: gentoo-commits
commit: 3ef274e3ab39a17aac1416bc73f037cf4a445589
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 22:43:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 22:43:25 2022 +0000
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 <sam <AT> 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 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/
@ 2025-01-06 4:23 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-01-06 4:23 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-01-06 4:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-29 10:21 [gentoo-commits] repo/gentoo:master commit in: net-irc/ngircd/, net-irc/ngircd/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 4:23 Sam James
2022-06-15 22:44 Sam James
2022-03-13 17:03 Sam James
2020-04-26 13:37 Joonas Niilola
2016-01-15 6:30 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox