ircd-hybrid: Update to 8.2.25

Changes since 8.2.24:

-- Noteworthy changes in version 8.2.25 (2019-04-24)
o) The 'class::number_per_ip', 'class::max_local' and 'class::max_global'
   configuration directives have been replaced with just 'class::number_per_ip_local'
   and 'class::number_per_ip_global'. The 'class::max_local' basically was
   redundant as it had the same functionality as 'class::number_per_ip'
o) Adding RESVs with wildcards no longer requires administrator privileges
o) The 'general::ignore_bogus_ts' configuration option has been deprecated
o) TLSv1.1 and TLSv1.0 are no longer supported and have been disabled in
   the openssl and gnutls module
o) Minimum supported OpenSSL version is 1.0.1f now
o) Minimum supported GnuTLS version is 3.5.8 now
o) The 'serverinfo::vhost' and 'serverinfo:vhost6' configuration directives have
   been deprecated. If you need to bind() a specific address you can specify one
   in the connect {} block
o) The 'connect::vhost' configuration directive has been renamed to 'connect::bind'

3 files changed, 12 insertions, 12 deletions

diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
index 2d2ae80a1e9..43fcbacc7ad 100644
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2019/02/08 13:09:35 fox Exp $
+# $NetBSD: Makefile,v 1.57 2019/05/18 20:34:56 fox Exp $
 
-DISTNAME=	ircd-hybrid-8.2.24
+DISTNAME=	ircd-hybrid-8.2.25
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
 EXTRACT_SUFX=	.tgz
diff --git a/chat/ircd-hybrid/distinfo b/chat/ircd-hybrid/distinfo
index 42238b3975b..156d7b7c662 100644
--- a/chat/ircd-hybrid/distinfo
+++ b/chat/ircd-hybrid/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2019/02/08 13:09:35 fox Exp $
+$NetBSD: distinfo,v 1.18 2019/05/18 20:34:56 fox Exp $
 
-SHA1 (ircd-hybrid-8.2.24.tgz) = 756df9c5b37f6a888cdc20c93df5969f5e57ba67
-RMD160 (ircd-hybrid-8.2.24.tgz) = a3021dd95927f7d162de95f47944ec15b1aa6614
-SHA512 (ircd-hybrid-8.2.24.tgz) = 48f68bf1fdb50b446387a310ff45d3cdf2a068d7eca97afa1e30c2486f1ae94fdf2af1db28b1627754ad94b3052edfc9d37255082d7bbdc46893518f2bad6b8c
-Size (ircd-hybrid-8.2.24.tgz) = 1210753 bytes
+SHA1 (ircd-hybrid-8.2.25.tgz) = bfc5ca0a7399013b93dca26a9f555274b56f26fc
+RMD160 (ircd-hybrid-8.2.25.tgz) = 0d7a50dfdd1dde12779d8fec85d2f8a155ccd49b
+SHA512 (ircd-hybrid-8.2.25.tgz) = 629a109cfe9b726922c1c03a0768cef84f154d03a7210a8134f94155726f06ae9d273050fa64cc3add4f9adfee19ab7447085f48e3146d58cb9a800792617c86
+Size (ircd-hybrid-8.2.25.tgz) = 1222612 bytes
 SHA1 (patch-doc_Makefile.in) = 787cb151da51cd947a384e33ae35c58df1d17e19
-SHA1 (patch-src_ircd.c) = 473c6b04bf2ca6f6800b681f5bb3af4a7eef465a
+SHA1 (patch-src_ircd.c) = bed5e5d1663dc64f78be905eeb4f2d9a2cdb1c64
diff --git a/chat/ircd-hybrid/patches/patch-src_ircd.c b/chat/ircd-hybrid/patches/patch-src_ircd.c
index 3c80fb3df99..2e626b096b5 100644
--- a/chat/ircd-hybrid/patches/patch-src_ircd.c
+++ b/chat/ircd-hybrid/patches/patch-src_ircd.c
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_ircd.c,v 1.1 2019/02/08 13:09:35 fox Exp $
+$NetBSD: patch-src_ircd.c,v 1.2 2019/05/18 20:34:56 fox Exp $
 
 Properly check for possible fgets(3) errors (otherwise possible
 unrelated errors are logged).
 
---- src/ircd.c.orig	2018-04-04 22:33:37.000000000 +0000
+--- src/ircd.c.orig	2019-04-24 17:50:27.000000000 +0000
 +++ src/ircd.c
-@@ -265,8 +265,11 @@ check_pidfile(const char *filename)
+@@ -236,8 +236,11 @@ check_pidfile(const char *filename)
    if ((fb = fopen(filename, "r")))
    {
-     if (!fgets(buf, 20, fb))
+     if (fgets(buf, 20, fb) == NULL)
 -      ilog(LOG_TYPE_IRCD, "Error reading from pid file %s: %s",
 -           filename, strerror(errno));
 +    {