Hello ports, attached is an update to ngircd 26. With this I would also like to take over the maintainer role for this port. I contacted tsg@ (CCed) about this and got "[...] Feel free to work on it or to become the new maintainer. [...]".
Tested on amd64. Regards Michael Index: net/ngircd/Makefile =================================================================== RCS file: /cvs/ports/net/ngircd/Makefile,v retrieving revision 1.19 diff -u -p -u -p -r1.19 Makefile --- net/ngircd/Makefile 24 Feb 2020 10:30:16 -0000 1.19 +++ net/ngircd/Makefile 21 Jun 2020 11:14:24 -0000 @@ -2,15 +2,13 @@ COMMENT = lightweight irc server -DISTNAME = ngircd-25 - -REVISION = 0 +DISTNAME = ngircd-26 CATEGORIES = net HOMEPAGE = https://ngircd.barton.de/ -MAINTAINER = Giannis Tsaraias <[email protected]> +MAINTAINER = Michael <[email protected]> # GPLv2 PERMIT_PACKAGE = Yes @@ -18,8 +16,9 @@ PERMIT_PACKAGE = Yes # use pledge() WANTLIB = c crypto iconv ssl z -MASTER_SITES = http://ngircd.barton.de/pub/ngircd/ \ - http://ngircd.mirror.3rz.org/pub/ngircd/ +MASTER_SITES = https://ngircd.barton.de/pub/ngircd/ \ + https://ngircd.mirror.3rz.org/pub/ngircd/ \ + https://ngircd.sourceforge.io/pub/ngircd/ LIB_DEPENDS = converters/libiconv TEST_DEPENDS = lang/expect \ Index: net/ngircd/distinfo =================================================================== RCS file: /cvs/ports/net/ngircd/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- net/ngircd/distinfo 13 Feb 2019 16:09:40 -0000 1.11 +++ net/ngircd/distinfo 21 Jun 2020 11:14:24 -0000 @@ -1,2 +1,2 @@ -SHA256 (ngircd-25.tar.gz) = UZFXgFGbrkPaN5iAfjvtYNiH5OqnKDVKprthzbzaSbo= -SIZE (ngircd-25.tar.gz) = 527886 +SHA256 (ngircd-26.tar.gz) = EoRBJWxIn2emPG2EWbl/AQaVlSbM1wtRProlCN+6xlE= +SIZE (ngircd-26.tar.gz) = 565579 Index: net/ngircd/patches/patch-doc_Makefile_in =================================================================== RCS file: /cvs/ports/net/ngircd/patches/patch-doc_Makefile_in,v retrieving revision 1.5 diff -u -p -u -p -r1.5 patch-doc_Makefile_in --- net/ngircd/patches/patch-doc_Makefile_in 13 Feb 2019 16:09:40 -0000 1.5 +++ net/ngircd/patches/patch-doc_Makefile_in 21 Jun 2020 11:14:24 -0000 @@ -2,13 +2,13 @@ $OpenBSD: patch-doc_Makefile_in,v 1.5 20 Index: doc/Makefile.in --- doc/Makefile.in.orig +++ doc/Makefile.in -@@ -612,16 +612,13 @@ maintainer-clean-local: +@@ -648,16 +648,13 @@ maintainer-clean-local: all: $(generated_docs) 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 \ Index: net/ngircd/patches/patch-src_ngircd_conf_c =================================================================== RCS file: /cvs/ports/net/ngircd/patches/patch-src_ngircd_conf_c,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-src_ngircd_conf_c --- net/ngircd/patches/patch-src_ngircd_conf_c 13 Feb 2019 16:09:40 -0000 1.6 +++ net/ngircd/patches/patch-src_ngircd_conf_c 21 Jun 2020 11:14:24 -0000 @@ -11,7 +11,7 @@ Index: src/ngircd/conf.c printf(" MaxListSize = %d\n", Conf_MaxListSize); printf(" PingTimeout = %d\n", Conf_PingTimeout); printf(" PongTimeout = %d\n", Conf_PongTimeout); -@@ -757,7 +757,7 @@ Set_Defaults(bool InitServers) +@@ -758,7 +758,7 @@ Set_Defaults(bool InitServers) strlcat(Conf_HelpFile, HELP_FILE, sizeof(Conf_HelpFile)); strcpy(Conf_ServerPwd, ""); strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile)); @@ -20,7 +20,7 @@ Index: src/ngircd/conf.c /* Limits */ Conf_ConnectRetry = 60; -@@ -1644,7 +1644,7 @@ Handle_LIMITS(const char *File, int Line, char *Var, c +@@ -1506,7 +1506,7 @@ Handle_LIMITS(const char *File, int Line, char *Var, c return; } if (strcasecmp(Var, "MaxPenaltyTime") == 0) { @@ -29,7 +29,7 @@ Index: src/ngircd/conf.c if (Conf_MaxPenaltyTime < -1) Conf_MaxPenaltyTime = -1; /* "unlimited" */ return; -@@ -2291,8 +2291,8 @@ Validate_Config(bool Configtest, bool Rehash) +@@ -2122,8 +2122,8 @@ Validate_Config(bool Configtest, bool Rehash) if (Conf_MaxPenaltyTime != -1) Config_Error(LOG_WARNING, Index: net/ngircd/patches/patch-src_ngircd_ngircd_c =================================================================== RCS file: /cvs/ports/net/ngircd/patches/patch-src_ngircd_ngircd_c,v retrieving revision 1.5 diff -u -p -u -p -r1.5 patch-src_ngircd_ngircd_c --- net/ngircd/patches/patch-src_ngircd_ngircd_c 24 Feb 2020 10:30:16 -0000 1.5 +++ net/ngircd/patches/patch-src_ngircd_ngircd_c 21 Jun 2020 11:14:24 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1. Index: src/ngircd/ngircd.c --- src/ngircd/ngircd.c.orig +++ src/ngircd/ngircd.c -@@ -259,6 +259,16 @@ main(int argc, const char *argv[]) +@@ -261,6 +261,16 @@ main(int argc, const char *argv[]) exit(1); } @@ -16,9 +16,9 @@ Index: src/ngircd/ngircd.c + err(1, "pledge"); + } + - /* Initialize modules, part II: these functions are eventually - * called with already dropped privileges ... */ - Channel_Init(); + if (!io_library_init(CONNECTION_POOL)) { + Log(LOG_ALERT, + "Fatal: Could not initialize IO routines: %s", @@ -563,7 +573,7 @@ Setup_FDStreams(int fd) #if !defined(SINGLE_USER_OS) Index: net/ngircd/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/ngircd/pkg/PLIST,v retrieving revision 1.5 diff -u -p -u -p -r1.5 PLIST --- net/ngircd/pkg/PLIST 13 Feb 2019 16:09:40 -0000 1.5 +++ net/ngircd/pkg/PLIST 21 Jun 2020 11:14:24 -0000 @@ -1,6 +1,14 @@ @comment $OpenBSD: PLIST,v 1.5 2019/02/13 16:09:40 tsg Exp $ @newgroup _ngircd:703 @newuser _ngircd:703:703:daemon:ngircd account:/var/ngircd:/sbin/nologin +@mode 700 +@owner _ngircd +@group _ngircd +@sample ${SYSCONFDIR}/ +@sample /var/ngircd/ +@mode +@owner +@group @rcscript ${RCDIR}/ngircd @man man/man5/ngircd.conf.5 @man man/man8/ngircd.8 @@ -15,26 +23,18 @@ share/doc/ngircd/Commands.txt share/doc/ngircd/Contributing.txt share/doc/ngircd/FAQ.txt share/doc/ngircd/HowToRelease.txt -share/doc/ngircd/INSTALL +share/doc/ngircd/INSTALL.md share/doc/ngircd/Modes.txt share/doc/ngircd/NEWS share/doc/ngircd/PAM.txt share/doc/ngircd/Platforms.txt share/doc/ngircd/Protocol.txt -share/doc/ngircd/README share/doc/ngircd/README-AUX.txt share/doc/ngircd/README-BeOS.txt share/doc/ngircd/README-Interix.txt +share/doc/ngircd/README.md share/doc/ngircd/RFC.txt share/doc/ngircd/SSL.txt share/doc/ngircd/Services.txt share/examples/ngircd/ share/examples/ngircd/sample-ngircd.conf -@mode 700 -@owner _ngircd -@group _ngircd -@sample ${SYSCONFDIR}/ -@mode 600 -@sample ${SYSCONFDIR}/ngircd.conf -@mode 700 -@sample /var/ngircd/
