From 74631fa72870fd23040cd6fdda7797c4f0a2c50d Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Wed, 23 Jan 2019 23:15:02 +0100
Subject: [PATCH] ngIRCd Release 25

---
 AUTHORS                  |  3 +++
 ChangeLog                | 29 ++++++++++++++++++++++++++++-
 NEWS                     | 19 ++++++++++++++++++-
 contrib/Debian/changelog |  6 ++++++
 contrib/ngircd.spec      |  2 +-
 5 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2a5eadc2..11c4755c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,6 +45,7 @@ Gabor Adam Toth <tg@tgbit.net>
 Götz Hoffart <goetz@hoffart.de>
 Ian Chard <ian@chard.org>
 Ilja Osthoff <i.osthoff@gmx.net>
+ItsOnlyBinary <ItsOnlyBinary@users.noreply.github.com>
 James Lu <james@overdrivenetworks.com>
 Jari Aalto <jari.aalto@cante.net>
 LucentW <lucent@zebes.info>
@@ -52,10 +53,12 @@ Mantas Mikulėnas <grawity@gmail.com>
 Neale Pickett <neale@woozle.org>
 Peter Powell <petpow@saberuk.com>
 Rolf Eike Beer <eike@sf-mail.de>
+Rosen Penev <rosenp@gmail.com>
 Roy Sindre Norangshol <roy.sindre@norangshol.no>
 Scott Perry <scperry@ucsd.edu>
 Sean Reifschneider <jafo-rpms@tummy.com>
 Sebastian Köhler <sebkoehler@whoami.org.uk>
+shankari <shankari@eecs.berkeley.edu>
 Tassilo Schweyer <dev@welterde.de>
 Tom Ryder <tom@sanctum.geek.nz>
 Unit 193 <unit193@ubuntu.com>
diff --git a/ChangeLog b/ChangeLog
index f6066038..17f92d87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,34 @@
                                -- ChangeLog --
 
 
-ngIRCd 25
+ngIRCd 25 (2019-01-23)
+
+  - Fix documentation of MotdPhrase length, which actually is 126 characters:
+    update sample configuration file as well as the man page. Thanks to
+    shankari <shankari@eecs.berkeley.edu>.
+    Closes #254.
+  - Implement new configuration option "MaxPenaltyTime", which configures the
+    maximum penalty time increase in seconds, per penalty event. Set to -1 for
+    no limit (the default), 0 to disable penalties altogether. ngIRCd doesn't
+    use penalty increases higher than 2 seconds during normal operation, so
+    values higher than 1 rarely make sense.
+    Disabling (or reducing) penalties can greatly speed up "make check" runs
+    for example, see below, but are mostly a debugging feature and normally
+    not meant to be used on production systems!
+    Some example timings running "make check" from my macOS workstation:
+     - MaxPenaltyTime not set: 4:41,79s
+     - "MaxPenaltyTime = 1":   3:14,71s
+     - "MaxPenaltyTime = 0":     25,46s
+    Closes #249 and #251.
+  - Fix compilation without deprecated OpenSSL APIs. Thanks to Rosen Penev
+    <rosenp@gmail.com> for the patch!
+    Closes #252.
+  - Update Xcode project for latest Xcode version (10.0)
+  - Fix some compiler warnings of Apple Xcode/Clang
+  - Allow a 5th parameter in WEBIRC. Thanks to "ItsOnlyBinary".
+    Closes #247.
+  - Update some more documentation files and source code comments.
+  - Platforms.txt: Add and update systems.
 
   ngIRCd 25~rc1 (2018-08-11)
   - Update config.guess (2018-03-08) and config.sub (2018-03-08) files.
diff --git a/NEWS b/NEWS
index 2793fb78..1819ef6f 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,24 @@
 
                                   -- NEWS --
 
-ngIRCd 25
+ngIRCd 25 (2019-01-23)
+
+  - Implement new configuration option "MaxPenaltyTime", which configures the
+    maximum penalty time increase in seconds, per penalty event. Set to -1 for
+    no limit (the default), 0 to disable penalties altogether. ngIRCd doesn't
+    use penalty increases higher than 2 seconds during normal operation, so
+    values higher than 1 rarely make sense.
+    Disabling (or reducing) penalties can greatly speed up "make check" runs
+    for example, see below, but are mostly a debugging feature and normally
+    not meant to be used on production systems!
+    Some example timings running "make check" from my macOS workstation:
+     - MaxPenaltyTime not set: 4:41,79s
+     - "MaxPenaltyTime = 1":   3:14,71s
+     - "MaxPenaltyTime = 0":     25,46s
+    Closes #249 and #251.
+  - Update Xcode project for latest Xcode version (10.0)
+  - Allow a 5th parameter in WEBIRC. Thanks to "ItsOnlyBinary".
+    Closes #247.
 
   ngIRCd 25~rc1 (2018-08-11)
   - Only send TOPIC updates to a channel when the topic actually changed:
diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog
index cb073ebe..bd88c26a 100644
--- a/contrib/Debian/changelog
+++ b/contrib/Debian/changelog
@@ -1,3 +1,9 @@
+ngircd (25-0ab1) unstable; urgency=low
+
+  * New "upstream" release: ngIRCd 25.
+
+ -- Alexander Barton <alex@barton.de>  Wed, 23 Jan 2019 23:13:03 +0100
+
 ngircd (25~rc1-0ab1) unstable; urgency=low
 
   * New "upstream" release candidate 1 for ngIRCd Release 25.
diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec
index c85a7bef..be766783 100644
--- a/contrib/ngircd.spec
+++ b/contrib/ngircd.spec
@@ -1,5 +1,5 @@
 %define name    ngircd
-%define version 25~rc1
+%define version 25
 %define release 1
 %define prefix  %{_prefix}
 
-- 
2.39.2