cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to ngircd-25.

Browse Source 
MaxPenaltyTime patch and OK from sthen@.
This commit is contained in:
tsg 2019-02-13 16:09:40 +00:00
parent 1222f84a37
commit 4b2a5a9457
6 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/ngircd/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.16 2018/01/11 19:27:07 rpe Exp $
# $OpenBSD: Makefile,v 1.17 2019/02/13 16:09:40 tsg Exp $
COMMENT = lightweight irc server
DISTNAME = ngircd-24
REVISION = 0
DISTNAME = ngircd-25
CATEGORIES = net
HOMEPAGE = http://ngircd.barton.de/
HOMEPAGE = https://ngircd.barton.de/
MAINTAINER = Giannis Tsaraias <tsg@openbsd.org>

4
net/ngircd/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ngircd-24.tar.gz) = PgCn2lLIH8HgK7mWonv0PakFunA3v4xrs70TMh4Mhas=
SIZE (ngircd-24.tar.gz) = 524968
SHA256 (ngircd-25.tar.gz) = UZFXgFGbrkPaN5iAfjvtYNiH5OqnKDVKprthzbzaSbo=
SIZE (ngircd-25.tar.gz) = 527886

9
net/ngircd/patches/patch-doc_Makefile_in
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-doc_Makefile_in,v 1.4 2014/07/01 10:26:07 fgsch Exp $
--- doc/Makefile.in.orig Wed Mar 26 09:19:14 2014
+++ doc/Makefile.in Wed Mar 26 09:20:50 2014
@@ -586,16 +586,13 @@ maintainer-clean-local:
$OpenBSD: patch-doc_Makefile_in,v 1.5 2019/02/13 16:09:40 tsg Exp $
Index: doc/Makefile.in
--- doc/Makefile.in.orig
+++ doc/Makefile.in
@@ -612,16 +612,13 @@ maintainer-clean-local:
all: $(generated_docs)
install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)

15
net/ngircd/patches/patch-doc_sample-ngircd_conf_tmpl
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.4 2014/12/03 10:32:18 jasper Exp $
--- doc/sample-ngircd.conf.tmpl.orig Mon Jul 14 13:26:07 2014
+++ doc/sample-ngircd.conf.tmpl Tue Dec 2 20:05:31 2014
$OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.5 2019/02/13 16:09:40 tsg Exp $
Index: doc/sample-ngircd.conf.tmpl
--- doc/sample-ngircd.conf.tmpl.orig
+++ doc/sample-ngircd.conf.tmpl
@@ -77,14 +77,14 @@
# Group ID under which the ngIRCd should run; you can use the name
# of the group or the numerical ID. ATTENTION: For this to work the
@ -18,7 +19,7 @@ $OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.4 2014/12/03 10:32:18 jasper Exp
[Limits]
# Define some limits and timeouts for this ngIRCd instance. Default
@@ -149,7 +149,7 @@
@@ -155,7 +155,7 @@
# binary. By default ngIRCd won't use the chroot() feature.
# ATTENTION: For this to work the server must have been started
# with root privileges!
@ -27,7 +28,7 @@ $OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.4 2014/12/03 10:32:18 jasper Exp
# Set this hostname for every client instead of the real one.
# Use %x to add the hashed value of the original hostname.
@@ -252,7 +252,7 @@
@@ -267,7 +267,7 @@
# So don't forget to remove the ";" above if this is the case ...
# SSL Server Key Certificate
@ -36,8 +37,8 @@ $OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.4 2014/12/03 10:32:18 jasper Exp
# Select cipher suites allowed for SSL/TLS connections. This defaults
# to HIGH:!aNULL:@STRENGTH (OpenSSL) or SECURE128 (GnuTLS).
@@ -264,10 +264,10 @@
;CipherList = SECURE128
@@ -279,10 +279,10 @@
;CipherList = SECURE128:-VERS-SSL3.0
# Diffie-Hellman parameters
- ;DHFile = :ETCDIR:/ssl/dhparams.pem

38
net/ngircd/patches/patch-src_ngircd_conf_c
View File

@ -1,7 +1,17 @@
$OpenBSD: patch-src_ngircd_conf_c,v 1.5 2014/12/03 10:32:18 jasper Exp $
--- src/ngircd/conf.c.orig Fri Aug 1 23:40:50 2014
+++ src/ngircd/conf.c Tue Dec 2 20:05:31 2014
@@ -755,7 +755,7 @@ Set_Defaults(bool InitServers)
$OpenBSD: patch-src_ngircd_conf_c,v 1.6 2019/02/13 16:09:40 tsg Exp $
Index: src/ngircd/conf.c
--- src/ngircd/conf.c.orig
+++ src/ngircd/conf.c
@@ -388,7 +388,7 @@ Conf_Test( void )
printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP);
printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1);
printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1);
- printf(" MaxPenaltyTime = %ld\n", Conf_MaxPenaltyTime);
+ printf(" MaxPenaltyTime = %lld\n", (long long)Conf_MaxPenaltyTime);
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)
strlcat(Conf_HelpFile, HELP_FILE, sizeof(Conf_HelpFile));
strcpy(Conf_ServerPwd, "");
strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile));
@ -10,3 +20,23 @@ $OpenBSD: patch-src_ngircd_conf_c,v 1.5 2014/12/03 10:32:18 jasper Exp $
/* Limits */
Conf_ConnectRetry = 60;
@@ -1644,7 +1644,7 @@ Handle_LIMITS(const char *File, int Line, char *Var, c
return;
}
if (strcasecmp(Var, "MaxPenaltyTime") == 0) {
- Conf_MaxPenaltyTime = atol(Arg);
+ Conf_MaxPenaltyTime = atoll(Arg);
if (Conf_MaxPenaltyTime < -1)
Conf_MaxPenaltyTime = -1; /* "unlimited" */
return;
@@ -2291,8 +2291,8 @@ Validate_Config(bool Configtest, bool Rehash)
if (Conf_MaxPenaltyTime != -1)
Config_Error(LOG_WARNING,
- "Maximum penalty increase ('MaxPenaltyTime') is set to %ld, this is not recommended!",
- Conf_MaxPenaltyTime);
+ "Maximum penalty increase ('MaxPenaltyTime') is set to %lld, this is not recommended!",
+ (long long)Conf_MaxPenaltyTime);
#ifdef DEBUG
servers = servers_once = 0;

7
net/ngircd/pkg/PLIST
View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.4 2016/04/28 13:35:46 tsg Exp $
@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
@rcscript ${RCDIR}/ngircd
@man man/man5/ngircd.conf.5
@man man/man8/ngircd.8
@bin sbin/ngircd
@ -37,7 +38,3 @@ share/examples/ngircd/sample-ngircd.conf
@sample ${SYSCONFDIR}/ngircd.conf
@mode 700
@sample /var/ngircd/
@mode
@owner
@group
@rcscript ${RCDIR}/ngircd