File ircd-ratbox-3.0.10_sslproc_fix.patch of Package ircd-ratbox
diff -x .svn -ruN ./ChangeLog ../ircd-ratbox-3_0/ChangeLog
--- ./ChangeLog 2016-01-13 12:33:51.000000000 -0700
+++ ../ircd-ratbox-3_0/ChangeLog 2016-03-01 14:40:57.890536008 -0700
@@ -1,9 +1,9 @@
-androsyn 2016/01/13 19:33:49 UTC (20160113_12-29315)
+androsyn 2016/01/19 16:49:34 UTC (20160119_0-29329)
Log:
- tag ircd-ratbox RATBOX_3_0_10
+ blah..fix stupid bug that was stopping dh parameters from being unset
Modified:
- ircd-ratbox/tags/RATBOX_3_0_10/ (File Added)
+ ircd-ratbox/branches/RATBOX_3_0/src/sslproc.c (File Modified)
androsyn 2016/01/13 19:14:52 UTC (20160113_11-29311)
diff -x .svn -ruN ./include/serno.h ../ircd-ratbox-3_0/include/serno.h
--- ./include/serno.h 2016-01-13 12:33:51.000000000 -0700
+++ ../ircd-ratbox-3_0/include/serno.h 2016-03-01 14:40:57.518544765 -0700
@@ -1 +1 @@
-#define SERIALNUM "20160113_12-29315"
+#define SERIALNUM "20160119_0-29329"
diff -x .svn -ruN ./README.md ../ircd-ratbox-3_0/README.md
--- ./README.md 1969-12-31 17:00:00.000000000 -0700
+++ ../ircd-ratbox-3_0/README.md 2016-04-06 12:01:36.899847439 -0600
@@ -0,0 +1,133 @@
+
+# **IRCD-RATBOX** #
+
+
+## Important ##
+Notes for those among you, who don't bother reading docs:
+ * Your install is likely to fail unless you read this document. Completely.
+ * Reading INSTALL is now a must, as the old DPATH is now specified
+ when configure is run.
+ * You now need to `./configure --prefix="/path/to/install/ircd"`
+ * The old config format **WILL NOT WORK**. Please see [example.conf](file://doc/example.conf) !
+ * The old kline format **WILL NOT WORK**. Please use bantool which
+ will be installed along-side your ircd!
+ * Run bantool after each upgrade to ensure your database is in a current format.
+ Failure to do so will result in weird, unexplained crashes.
+ * Its is _highly_ recommended that you `make clean` or even better `make distclean`
+ in your current source tree before running `./configure`
+
+
+##  About this document ##
+
+This document is written in **MARKDOWN**. You may, as you likely are now, read
+it as-is, or you can view it formatted in a viewer such as the ATOM IDE,
+Google Chrome with the Markdown Plus extension, or in ReText.
+There are other viewers, such as for the console, but this will be left as an
+exercise for the reader.
+
+## Features & Requirements ##
+### A short introduction ###
+ircd-ratbox-3.x now has several major changes over previous version that you
+will notice right away.
+
+ - Storage of bans in a database, versus the old flat-files.
+ - SSL Client support.
+ - SSL Only Channel support.
+ - Adminwall (think Operwall, but for admins only).
+ - Force Nick Change (FNC).
+ - Support for global CIDR limits.
+ - Connection Throttling.
+ - Please see [whats-new-3.0.txt](file://doc/whats-new-3.0.txt) for more detailed changes.
+
+### Necessary Requirements ###
+ - A supported platform (look below)
+ - A working dynamic load library, unless
+ compiling as static, without module
+ support.
+ - A working lex. Solaris /usr/ccs/bin/lex
+ appears to be broken, on this system flex
+ should be used.
+
+### Feature Specific Requirements ###
+ - For SSL Clients, SSL Challenge controlled OPER feature, and encrypted server links,
+ a working SSL library. Though OpenSSL is still supported, LibreSSL is recommended.
+ - For encrypted oper and (optional) server passwords, a working DES, MD5, or SHA library.
+
+
+## Supported Distributions
+This code should compile without any warnings on:
+ - FreeBSD 6.x/7.x/8.x/9.x *
+ - Gentoo & Gentoo Hardened (stable archs)
+ - CentOS / Redhat Enterprise 5/6
+ - SUSE Linux Enterprise 12**
+ - openSUSE Evergreen, Leap 42.1, and Tumbleweed**
+ - Debian Etch,
+ - OpenSolaris 2008.x?
+ - Solaris 10 sparc.
+
+\* FREEBSD USERS: if you are compiling with ipv6 you may experience
+ problems with ipv4 due to the way the socket code is written. To
+ fix this you must: "sysctl net.inet6.ip6.v6only=0"
+
+** SUSE RPM's can be installed from here:
+ https://software.opensuse.org/download.html?project=home%3Adubkat&package=ircd-ratbox
+
+
+
+## For More Information....
+- To report bugs in ircd-ratbox, send the bug report to ircd-ratbox@lists.ratbox.org
+
+- Known bugs are listed in the BUGS file
+
+- See the INSTALL document for info on configuring and compiling
+ ircd-ratbox.
+
+- Please read doc/index.txt to get an overview of the current documentation.
+
+- Old Hybrid 5/6 configuration files are no longer supported. Config files from
+ previous ircd-ratbox versions will need some changes. The ircd -conftest option
+ is your friend here. Old kline/xline/dline.conf files will have to be converted to
+ the new database format. A config import utility is provided and installed
+ as bin/bantool.
+
+- If you are wondering why config.h is practically empty, its because many
+ things that were once in config.h are now specified in the 'general'
+ block of ircd.conf. Look at example.conf for more information about
+ these options.
+
+- The files, /etc/services, /etc/protocols, and /etc/resolv.conf, MUST be
+ readable by the user running the server in order for ircd to start.
+ Errors from adns causing the ircd to refuse to start up are often related
+ to permission problems on these files.
+
+- There is a mailing list for ircd-ratbox. To subscribe to this list
+ visit http://lists.ratbox.org/cgi-bin/mailman/listinfo/ircd-ratbox
+ Note that this list also gets the commit emails from the CVS server.
+
+- SOLARIS USERS: this code appears to tickle a bug in older gcc and
+ egcs ONLY on 64-bit Solaris7. gcc-2.95 and SunPro C on 64bit should
+ work fine, and any gcc or SunPro compiled on 32bit.
+
+- DARWIN AND MACOS X USERS: You must be using at least the December 2001
+ Development Tools from Apple to build ircd-ratbox with shared modules.
+ Before then you MUST disable shared modules, as we do not have the proper
+ flags for cc(1) prior to that point to produce shared modules.
+
+- It probably does not compile on AIX, IRIX or libc5 Linux.
+
+- TESTED PLATFORMS: The code has been tested on the following platforms, and
+ is known to run properly.
+ FreeBSD 6.x/7.x
+ Linux glibc-2.6, glibc-2.7
+ Solaris 2.6/7/8
+ OpenBSD 2.8
+ NetBSD 1.4
+ Cygwin 1.3+ (static modules, no servlink)
+ OpenVMS/Alpha 7.2 (static modules, no servlink)
+
+- Please read doc/whats-new-3.0.txt for information about what is in this release
+
+- Other files recommended for reading: BUGS, INSTALL
+
+--------------------------------------------------------------------------------
+`$Id: README.md 29432 2016-04-06 18:00:33Z dubkat $`
diff -x .svn -ruN ./src/sslproc.c ../ircd-ratbox-3_0/src/sslproc.c
--- ./src/sslproc.c 2015-10-13 08:48:47.000000000 -0600
+++ ../ircd-ratbox-3_0/src/sslproc.c 2016-03-01 14:41:06.202340356 -0700
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
- * $Id: sslproc.c 28755 2015-10-13 14:48:47Z androsyn $
+ * $Id: sslproc.c 29329 2016-01-19 16:49:34Z androsyn $
*/
#include <ratbox_lib.h>
@@ -36,6 +36,7 @@
#include "client.h"
#include "send.h"
#include "packet.h"
+#include "match.h"
#define ZIPSTATS_TIME 60
@@ -630,15 +631,17 @@
send_new_ssl_certs(const char *ssl_cert, const char *ssl_private_key, const char *ssl_dh_params)
{
rb_dlink_node *ptr;
- if(ssl_cert == NULL || ssl_private_key == NULL || ssl_dh_params == NULL)
+
+ if(ssl_cert == NULL || ssl_private_key == NULL)
{
ircd_ssl_ok = 0;
return;
}
+
RB_DLINK_FOREACH(ptr, ssl_daemons.head)
{
ssl_ctl_t *ctl = ptr->data;
- send_new_ssl_certs_one(ctl, ssl_cert, ssl_private_key, ssl_dh_params);
+ send_new_ssl_certs_one(ctl, ssl_cert, ssl_private_key, EmptyString(ssl_dh_params) ? "" : ssl_dh_params);
}
}
