Here is an update to ircd-hybrid 8.1.20. OK?
Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/Makefile,v retrieving revision 1.32 diff -u -p -u -p -r1.32 Makefile --- Makefile 16 Jul 2014 12:31:29 -0000 1.32 +++ Makefile 2 Aug 2014 02:43:07 -0000 @@ -4,8 +4,7 @@ SHARED_ONLY = Yes COMMENT = Internet Relay Chat server -DISTNAME = ircd-hybrid-8.1.17 -REVISION = 0 +DISTNAME = ircd-hybrid-8.1.20 CATEGORIES = net MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/} EXTRACT_SUFX = .tgz Index: distinfo =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/distinfo,v retrieving revision 1.13 diff -u -p -u -p -r1.13 distinfo --- distinfo 8 May 2014 14:36:49 -0000 1.13 +++ distinfo 2 Aug 2014 02:43:14 -0000 @@ -1,2 +1,2 @@ -SHA256 (ircd-hybrid-8.1.17.tgz) = RAydhrpryTDv75zarsVHtCXDXK0/CL7Y32nlV4jBJoo= -SIZE (ircd-hybrid-8.1.17.tgz) = 1146488 +SHA256 (ircd-hybrid-8.1.20.tgz) = VXC+ifp2snEtfwjWyCjWE9IB2u2MEGS+ckX+EL3/oig= +SIZE (ircd-hybrid-8.1.20.tgz) = 1144153 Index: patches/patch-doc_Makefile_in =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-doc_Makefile_in,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 31 Oct 2013 01:23:26 -0000 1.4 +++ patches/patch-doc_Makefile_in 10 Jun 2014 05:20:49 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.4 2013/10/31 01:23:26 brad Exp $ ---- doc/Makefile.in.orig Fri Oct 25 16:40:44 2013 -+++ doc/Makefile.in Sat Oct 26 22:53:55 2013 -@@ -380,25 +380,25 @@ uninstall-man8: +--- doc/Makefile.in.orig Mon Jun 9 08:48:45 2014 ++++ doc/Makefile.in Tue Jun 10 01:18:40 2014 +@@ -381,25 +381,25 @@ uninstall-man8: dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) install-dist_sysconfDATA: $(dist_sysconf_DATA) @$(NORMAL_INSTALL) @@ -34,7 +34,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.4 20 tags TAGS: ctags CTAGS: -@@ -440,7 +440,7 @@ check-am: all-am +@@ -441,7 +441,7 @@ check-am: all-am check: check-am all-am: Makefile $(MANS) $(DATA) installdirs: Index: patches/patch-doc_reference_conf =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-doc_reference_conf,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-doc_reference_conf --- patches/patch-doc_reference_conf 8 May 2014 14:36:49 -0000 1.3 +++ patches/patch-doc_reference_conf 10 Aug 2014 03:16:53 -0000 @@ -1,11 +1,11 @@ $OpenBSD: patch-doc_reference_conf,v 1.3 2014/05/08 14:36:49 brad Exp $ ---- doc/reference.conf.orig Thu May 1 16:58:12 2014 -+++ doc/reference.conf Thu May 8 06:09:45 2014 +--- doc/reference.conf.orig Sun Jul 20 06:09:35 2014 ++++ doc/reference.conf Sat Aug 9 23:16:43 2014 @@ -108,7 +108,7 @@ serverinfo { * chown <ircd-user>.<ircd.group> rsa.key * chmod 0600 rsa.key */ --# rsa_private_key_file = "/usr/local/ircd/etc/rsa.key"; +-# rsa_private_key_file = "etc/rsa.key"; +# rsa_private_key_file = "${SYSCONFDIR}/ircd-hybrid/rsa.key"; /* @@ -14,7 +14,7 @@ $OpenBSD: patch-doc_reference_conf,v 1.3 * Common Name: irc.someirc.net * E-mail: y...@domain.com */ --# ssl_certificate_file = "/usr/local/ircd/etc/cert.pem"; +-# ssl_certificate_file = "etc/cert.pem"; +# ssl_certificate_file = "${SYSCONFDIR}/ircd-hybrid/cert.pem"; /* @@ -23,7 +23,7 @@ $OpenBSD: patch-doc_reference_conf,v 1.3 * regarding specific OpenSSL dhparam command-line options * can be found in the OpenSSL manual. */ --# ssl_dh_param_file = "/usr/local/ircd/etc/dhparam.pem"; +-# ssl_dh_param_file = "etc/dhparam.pem"; +# ssl_dh_param_file = "${SYSCONFDIR}/ircd-hybrid/dhparam.pem"; /* @@ -32,17 +32,17 @@ $OpenBSD: patch-doc_reference_conf,v 1.3 * A password should not be defined when this is used; see * doc/challenge.txt for more information. */ --# rsa_public_key_file = "/usr/local/ircd/etc/oper.pub"; +-# rsa_public_key_file = "etc/oper.pub"; +# rsa_public_key_file = "${SYSCONFDIR}/ircd-hybrid/oper.pub"; /* * ssl_certificate_fingerprint: enhances security by additionally checking -@@ -1235,8 +1235,8 @@ modules { +@@ -1224,8 +1224,8 @@ modules { * path: other paths to search for modules specified below * and in "/module load". */ -- path = "/usr/local/ircd/lib/ircd-hybrid/modules"; -- path = "/usr/local/ircd/lib/ircd-hybrid/modules/autoload"; +- path = "lib/ircd-hybrid/modules"; +- path = "lib/ircd-hybrid/modules/autoload"; + path = "${TRUEPREFIX}/lib/ircd-hybrid/modules"; + path = "${TRUEPREFIX}/lib/ircd-hybrid/modules/autoload"; Index: patches/patch-modules_core_Makefile_in =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-modules_core_Makefile_in,v retrieving revision 1.5 diff -u -p -u -p -r1.5 patch-modules_core_Makefile_in --- patches/patch-modules_core_Makefile_in 31 Oct 2013 01:23:26 -0000 1.5 +++ patches/patch-modules_core_Makefile_in 10 Jun 2014 05:20:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-modules_core_Makefile_in,v 1.5 2013/10/31 01:23:26 brad Exp $ ---- modules/core/Makefile.in.orig Fri Oct 25 16:40:45 2013 -+++ modules/core/Makefile.in Sat Oct 26 22:53:55 2013 -@@ -775,7 +775,6 @@ install-dvi-am: +--- modules/core/Makefile.in.orig Mon Jun 9 08:48:45 2014 ++++ modules/core/Makefile.in Tue Jun 10 01:18:40 2014 +@@ -776,7 +776,6 @@ install-dvi-am: install-exec-am: @$(NORMAL_INSTALL) Index: patches/patch-modules_core_m_server_c =================================================================== RCS file: patches/patch-modules_core_m_server_c diff -N patches/patch-modules_core_m_server_c --- patches/patch-modules_core_m_server_c 16 Jul 2014 12:31:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,53 +0,0 @@ -$OpenBSD: patch-modules_core_m_server_c,v 1.1 2014/07/16 12:31:29 pascal Exp $ ---- modules/core/m_server.c.orig Sat Jul 12 16:13:24 2014 -+++ modules/core/m_server.c Sat Jul 12 16:38:38 2014 -@@ -260,7 +260,7 @@ server_estab(struct Client *client_p) - const char *inpath; - static char inpath_ip[HOSTLEN * 2 + USERLEN + 6]; - dlink_node *ptr; --#ifdef HAVE_LIBCRYPTO -+#if defined(HAVE_LIBCRYPTO) && !defined(OPENSSL_NO_COMP) - const COMP_METHOD *compression = NULL, *expansion = NULL; - #endif - -@@ -369,26 +369,40 @@ server_estab(struct Client *client_p) - #ifdef HAVE_LIBCRYPTO - if (client_p->localClient->fd.ssl) - { -+#ifndef OPENSSL_NO_COMP - compression = SSL_get_current_compression(client_p->localClient->fd.ssl); - expansion = SSL_get_current_expansion(client_p->localClient->fd.ssl); -+#endif - - sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, - "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)", - inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl), -+#ifndef OPENSSL_NO_COMP - compression ? SSL_COMP_get_name(compression) : "NONE", - expansion ? SSL_COMP_get_name(expansion) : "NONE", -+#else -+ "NONE", "NONE", -+#endif - show_capabilities(client_p)); - /* Now show the masked hostname/IP to opers */ - sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE, - "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)", - inpath, ssl_get_cipher(client_p->localClient->fd.ssl), -+#ifndef OPENSSL_NO_COMP - compression ? SSL_COMP_get_name(compression) : "NONE", - expansion ? SSL_COMP_get_name(expansion) : "NONE", -+#else -+ "NONE", "NONE", -+#endif - show_capabilities(client_p)); - ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)", - inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl), -+#ifndef OPENSSL_NO_COMP - compression ? SSL_COMP_get_name(compression) : "NONE", - expansion ? SSL_COMP_get_name(expansion) : "NONE", -+#else -+ "NONE", "NONE", -+#endif - show_capabilities(client_p)); - } - else Index: patches/patch-src_ircd_c =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-src_ircd_c,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-src_ircd_c --- patches/patch-src_ircd_c 8 May 2014 14:36:49 -0000 1.6 +++ patches/patch-src_ircd_c 10 Jul 2014 00:01:22 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_ircd_c,v 1.6 2014/05/08 14:36:49 brad Exp $ ---- src/ircd.c.orig Tue Feb 25 07:27:20 2014 -+++ src/ircd.c Fri Mar 28 16:56:14 2014 -@@ -131,7 +131,6 @@ make_daemon(void) +--- src/ircd.c.orig Sat Jul 5 15:59:55 2014 ++++ src/ircd.c Wed Jul 9 20:01:17 2014 +@@ -129,7 +129,6 @@ make_daemon(void) } else if (pid > 0) { @@ -9,11 +9,11 @@ $OpenBSD: patch-src_ircd_c,v 1.6 2014/05 exit(EXIT_SUCCESS); } -@@ -464,8 +463,19 @@ main(int argc, char *argv[]) +@@ -462,8 +461,19 @@ main(int argc, char *argv[]) /* Check to see if the user is running us as root, which is a nono */ if (geteuid() == 0) { -- fprintf(stderr, "Don't run ircd as root!!!\n"); +- fprintf(stderr, "ERROR: This server won't run as root/superuser\n"); - return -1; + struct passwd *pw; + @@ -25,7 +25,7 @@ $OpenBSD: patch-src_ircd_c,v 1.6 2014/05 + + if (setusercontext(NULL, pw, pw->pw_uid, LOGIN_SETALL) < 0) + { -+ fprintf(stderr, "Can't set user context to %s!\n", IRCD_USER); ++ fprintf(stderr, "ERROR: This server won't run as root/superuser\n"); + return -1; + } } Index: patches/patch-src_rsa_c =================================================================== RCS file: patches/patch-src_rsa_c diff -N patches/patch-src_rsa_c --- patches/patch-src_rsa_c 8 May 2014 14:36:49 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_rsa_c,v 1.2 2014/05/08 14:36:49 brad Exp $ ---- src/rsa.c.orig Sun Apr 20 11:06:24 2014 -+++ src/rsa.c Tue Apr 22 22:15:23 2014 -@@ -70,12 +70,6 @@ binary_to_hex(unsigned char *bin, char *hex, int lengt - int - get_randomness(unsigned char *buf, int length) - { -- /* Seed OpenSSL PRNG with EGD enthropy pool -kre */ -- if (ConfigFileEntry.use_egd && -- ConfigFileEntry.egdpool_path) -- if (RAND_egd(ConfigFileEntry.egdpool_path) == -1) -- return -1; -- - if (RAND_status()) - return RAND_bytes(buf, length); - /* XXX - abort? */ -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.