Attachment 250588 Details for Bug 278919 – [PATCH] irc/ngircd: update to 27.0

[patch] [PATCH] irc/ngircd: update to 27.0

0001-irc-ngircd-update-to-27.0.patch (text/plain), 5.37 KB, created by Siva Mahadevan on 2024-05-11 19:00:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Siva Mahadevan

Created: 2024-05-11 19:00:36 UTC

Size: 5.37 KB

patch

obsolete

>From 61b54e373ca3a94820b2eeb684d6deef6ab4ccc5 Mon Sep 17 00:00:00 2001
>From: Siva Mahadevan <me@svmhdvn.name>
>Date: Fri, 10 May 2024 19:52:59 -0400
>Subject: [PATCH] irc/ngircd: update to 27.0
>
>Other minor improvements:
>* Add a dedicated system user/group pair for better daemon permissions
>* Move PLIST files into pkg-plist for better conditional installation of files
>* Fix installation of documentation files to %%DOCSDIR%%
>* Put configuration file (and sample) into %%ETCDIR%%
>* Run a --configtest before starting daemon for sanity check
>---
> GIDs                       |  2 +-
> UIDs                       |  2 +-
> irc/ngircd/Makefile        | 17 ++++++++---------
> irc/ngircd/distinfo        |  6 +++---
> irc/ngircd/files/ngircd.in | 16 ++++++++++++++--
> irc/ngircd/pkg-plist       | 28 ++++++++++++++++++++++++++++
> 6 files changed, 55 insertions(+), 16 deletions(-)
> create mode 100644 irc/ngircd/pkg-plist
>
>diff --git a/GIDs b/GIDs
>index ea5e397c234b..f70358ca66a9 100644
>--- a/GIDs
>+++ b/GIDs
>@@ -285,7 +285,7 @@ stunnel:*:341:
> openfire:*:342:
> gunicorn:*:343:
> snmpd:*:344:
>-# free: 345
>+ngircd:*:345:
> # free: 346
> eturnal:*:347:
> # free: 348
>diff --git a/UIDs b/UIDs
>index ceba79b7c0fc..5d49cd11192a 100644
>--- a/UIDs
>+++ b/UIDs
>@@ -290,7 +290,7 @@ stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin
> openfire:*:342:342::0:0:Openfire IM Daemon:/nonexistent:/usr/sbin/nologin
> gunicorn:*:343:343::0:0:Gunicorn Daemon:/nonexistent:/usr/sbin/nologin
> snmpd:*:344:344::0:0:Net-SNMP Daemon:/nonexistent:/usr/sbin/nologin
>-# free: 345
>+ngircd:*:345:345::0:0:ngIRCd Daemon:/nonexistent:/usr/sbin/nologin
> # free: 346
> eturnal:*:347:347::0:0:eturnal User:/var/spool/eturnal:/bin/sh
> # free: 348
>diff --git a/irc/ngircd/Makefile b/irc/ngircd/Makefile
>index f91ddba82b95..cf867a95f7ac 100644
>--- a/irc/ngircd/Makefile
>+++ b/irc/ngircd/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	ngircd
>-PORTVERSION=	26.1
>-PORTREVISION=	1
>+PORTVERSION=	27
> PORTEPOCH=	1
> CATEGORIES=	irc
> MASTER_SITES=	https://ngircd.barton.de/pub/ngircd/ \
>@@ -15,23 +14,23 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		cpe localbase:ldflags tar:xz
> GNU_CONFIGURE=	yes
>-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
>+CONFIGURE_ARGS+=	--sysconfdir=${ETCDIR}
>+
>+USERS=		ngircd
>+GROUPS=		ngircd
> USE_RC_SUBR=	ngircd
>+SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}"
> 
> CPE_VENDOR=	barton
> CPE_VERSION=	${PORTVERSION:C/^([0-9]+)$/\1.0/}
> 
>-PORTDOCS=	*
>-PLIST_FILES=	etc/ngircd.conf.sample \
>-		share/man/man5/ngircd.conf.5.gz \
>-		share/man/man8/ngircd.8.gz \
>-		sbin/ngircd
>+PORTDOCS=	doc/*
> 
> OPTIONS_DEFINE=		DEBUG DOCS ICONV IDENT IPV6 IRCPLUS LIBWRAP PAM \
> 			SNIFFER SYSLOG ZLIB
> OPTIONS_RADIO=		TLS
> OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
>-OPTIONS_DEFAULT=	ICONV IRCPLUS LIBWRAP OPENSSL PAM SYSLOG ZLIB
>+OPTIONS_DEFAULT=	DOCS ICONV IRCPLUS LIBWRAP OPENSSL PAM SYSLOG ZLIB
> 
> DEBUG_CONFIGURE_ENABLE=		debug
> GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
>diff --git a/irc/ngircd/distinfo b/irc/ngircd/distinfo
>index 0066fc72fff1..5871c2930ebf 100644
>--- a/irc/ngircd/distinfo
>+++ b/irc/ngircd/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1611437541
>-SHA256 (ngircd-26.1.tar.xz) = 55c16fd26009f6fc6a007df4efac87a02e122f680612cda1ce26e17a18d86254
>-SIZE (ngircd-26.1.tar.xz) = 375812
>+TIMESTAMP = 1715382223
>+SHA256 (ngircd-27.tar.xz) = 6897880319dd5e2e73c1c9019613509f88eb5b8daa5821a36fbca3d785c247b8
>+SIZE (ngircd-27.tar.xz) = 377484
>diff --git a/irc/ngircd/files/ngircd.in b/irc/ngircd/files/ngircd.in
>index 8c125e84f445..bdc1ed429dd6 100644
>--- a/irc/ngircd/files/ngircd.in
>+++ b/irc/ngircd/files/ngircd.in
>@@ -2,6 +2,7 @@
> 
> # PROVIDE: ngircd
> # REQUIRE: DAEMON
>+# KEYWORD: shutdown
> #
> # Add the following lines to /etc/rc.conf to run ngircd:
> #
>@@ -21,10 +22,21 @@ rcvar="ngircd_enable"
> load_rc_config $name
> 
> : ${ngircd_enable="NO"}
>-: ${ngircd_conf="%%PREFIX%%/etc/ngircd.conf"}
>+: ${ngircd_conf="%%ETCDIR%%/ngircd.conf"}
>+: ${ngircd_user=%%USERS%%}
>+: ${ngircd_group=%%GROUPS%%}
> 
> required_files="${ngircd_conf}"
> command=%%PREFIX%%/sbin/ngircd
>-command_args="-f ${ngircd_conf}"
>+command_args="--config ${ngircd_conf}"
>+start_precmd=do_precmd
>+
>+do_precmd()
>+{
>+	if ! ${command} ${command_args} --configtest > /dev/null; then
>+    		echo "ERROR: '${ngircd_conf}' incorrectly configured" >&2
>+    		exit 78 # EX_CONFIG
>+    	fi
>+}
> 
> run_rc_command "$1"
>diff --git a/irc/ngircd/pkg-plist b/irc/ngircd/pkg-plist
>new file mode 100644
>index 000000000000..8a27032ca81b
>--- /dev/null
>+++ b/irc/ngircd/pkg-plist
>@@ -0,0 +1,28 @@
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.md
>+%%PORTDOCS%%%%DOCSDIR%%/Bopm.txt
>+%%PORTDOCS%%%%DOCSDIR%%/Capabilities.txt
>+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>+%%PORTDOCS%%%%DOCSDIR%%/Commands.txt
>+%%PORTDOCS%%%%DOCSDIR%%/Container.md
>+%%PORTDOCS%%%%DOCSDIR%%/Contributing.txt
>+%%PORTDOCS%%%%DOCSDIR%%/FAQ.md
>+%%PORTDOCS%%%%DOCSDIR%%/HowToRelease.txt
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
>+%%PORTDOCS%%%%DOCSDIR%%/Modes.txt
>+%%PORTDOCS%%%%DOCSDIR%%/NEWS
>+%%PORTDOCS%%%%DOCSDIR%%/PAM.txt
>+%%PORTDOCS%%%%DOCSDIR%%/Platforms.txt
>+%%PORTDOCS%%%%DOCSDIR%%/Protocol.txt
>+%%PORTDOCS%%%%DOCSDIR%%/README-AUX.txt
>+%%PORTDOCS%%%%DOCSDIR%%/README-BeOS.txt
>+%%PORTDOCS%%%%DOCSDIR%%/README-Interix.txt
>+%%PORTDOCS%%%%DOCSDIR%%/README.md
>+%%PORTDOCS%%%%DOCSDIR%%/RFC.txt
>+%%PORTDOCS%%%%DOCSDIR%%/SSL.md
>+%%PORTDOCS%%%%DOCSDIR%%/Services.txt
>+%%PORTDOCS%%%%DOCSDIR%%/sample-ngircd.conf
>+@sample %%ETCDIR%%/ngircd.conf.sample
>+etc/rc.d/ngircd
>+sbin/ngircd
>+share/man/man5/ngircd.conf.5.gz
>+share/man/man8/ngircd.8.gz
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 278919: 250588