Here is an update to ircd-hybrid 8.2.0.
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 30 Aug 2014 00:18:24 -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.2.0
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 30 Aug 2014 00:18:34 -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.2.0.tgz) = D0zPAeCa7rVwXi/6gO6bOricgJlHadmB22iTVJapG0A=
+SIZE (ircd-hybrid-8.2.0.tgz) = 1156024
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 30 Aug 2014 00:18:57 -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 Sun Aug 24 07:30:49 2014
++++ doc/Makefile.in Fri Aug 29 20:18:53 2014
+@@ -385,25 +385,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
+@@ -445,7 +445,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 30 Aug 2014 00:18:57 -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 Aug 24 07:30:49 2014
++++ doc/reference.conf Fri Aug 29 20:18:53 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,35 +14,35 @@ $OpenBSD: patch-doc_reference_conf,v 1.3
* Common Name: irc.someirc.net
* E-mail: [email protected]
*/
--# ssl_certificate_file = "/usr/local/ircd/etc/cert.pem";
+-# ssl_certificate_file = "etc/cert.pem";
+# ssl_certificate_file = "${SYSCONFDIR}/ircd-hybrid/cert.pem";
/*
- * ssl_dh_param_file:
-@@ -147,7 +147,7 @@ serverinfo {
+ * ssl_dh_param_file: path to the PEM encoded Diffie-Hellman
+@@ -145,7 +145,7 @@ serverinfo {
* 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";
/*
- * ssl_cipher_list:
-@@ -453,7 +453,7 @@ operator {
+ * ssl_dh_elliptic_curve: defines the curve to use for the
+@@ -464,7 +464,7 @@ operator {
* 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 {
+@@ -1335,8 +1335,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 30 Aug 2014 00:18:59 -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 Sun Aug 24 07:30:49 2014
++++ modules/core/Makefile.in Fri Aug 29 20:18:53 2014
+@@ -808,7 +808,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 30 Aug 2014 00:18:57 -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 Sun Aug 24 07:30:48 2014
++++ src/ircd.c Fri Aug 29 20:18:53 2014
+@@ -151,7 +151,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[])
+@@ -474,8 +473,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? */
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 8 May 2014 14:36:49 -0000 1.10
+++ pkg/PLIST 30 Aug 2014 00:21:12 -0000
@@ -71,8 +71,6 @@ lib/ircd-hybrid/modules/autoload/m_names
lib/ircd-hybrid/modules/autoload/m_names.so
lib/ircd-hybrid/modules/autoload/m_oper.la
lib/ircd-hybrid/modules/autoload/m_oper.so
-lib/ircd-hybrid/modules/autoload/m_operwall.la
-lib/ircd-hybrid/modules/autoload/m_operwall.so
lib/ircd-hybrid/modules/autoload/m_pass.la
lib/ircd-hybrid/modules/autoload/m_pass.so
lib/ircd-hybrid/modules/autoload/m_ping.la
@@ -87,20 +85,22 @@ lib/ircd-hybrid/modules/autoload/m_resta
lib/ircd-hybrid/modules/autoload/m_restart.so
lib/ircd-hybrid/modules/autoload/m_resv.la
lib/ircd-hybrid/modules/autoload/m_resv.so
-lib/ircd-hybrid/modules/autoload/m_services.la
-lib/ircd-hybrid/modules/autoload/m_services.so
lib/ircd-hybrid/modules/autoload/m_set.la
lib/ircd-hybrid/modules/autoload/m_set.so
lib/ircd-hybrid/modules/autoload/m_stats.la
lib/ircd-hybrid/modules/autoload/m_stats.so
lib/ircd-hybrid/modules/autoload/m_svinfo.la
lib/ircd-hybrid/modules/autoload/m_svinfo.so
+lib/ircd-hybrid/modules/autoload/m_svsjoin.la
+lib/ircd-hybrid/modules/autoload/m_svsjoin.so
lib/ircd-hybrid/modules/autoload/m_svskill.la
lib/ircd-hybrid/modules/autoload/m_svskill.so
lib/ircd-hybrid/modules/autoload/m_svsmode.la
lib/ircd-hybrid/modules/autoload/m_svsmode.so
lib/ircd-hybrid/modules/autoload/m_svsnick.la
lib/ircd-hybrid/modules/autoload/m_svsnick.so
+lib/ircd-hybrid/modules/autoload/m_svspart.la
+lib/ircd-hybrid/modules/autoload/m_svspart.so
lib/ircd-hybrid/modules/autoload/m_tburst.la
lib/ircd-hybrid/modules/autoload/m_tburst.so
lib/ircd-hybrid/modules/autoload/m_time.la
@@ -109,6 +109,14 @@ lib/ircd-hybrid/modules/autoload/m_topic
lib/ircd-hybrid/modules/autoload/m_topic.so
lib/ircd-hybrid/modules/autoload/m_trace.la
lib/ircd-hybrid/modules/autoload/m_trace.so
+lib/ircd-hybrid/modules/autoload/m_undline.la
+lib/ircd-hybrid/modules/autoload/m_undline.so
+lib/ircd-hybrid/modules/autoload/m_unkline.la
+lib/ircd-hybrid/modules/autoload/m_unkline.so
+lib/ircd-hybrid/modules/autoload/m_unresv.la
+lib/ircd-hybrid/modules/autoload/m_unresv.so
+lib/ircd-hybrid/modules/autoload/m_unxline.la
+lib/ircd-hybrid/modules/autoload/m_unxline.so
lib/ircd-hybrid/modules/autoload/m_user.la
lib/ircd-hybrid/modules/autoload/m_user.so
lib/ircd-hybrid/modules/autoload/m_userhost.la
@@ -129,6 +137,8 @@ lib/ircd-hybrid/modules/autoload/m_whowa
lib/ircd-hybrid/modules/autoload/m_whowas.so
lib/ircd-hybrid/modules/autoload/m_xline.la
lib/ircd-hybrid/modules/autoload/m_xline.so
+lib/ircd-hybrid/modules/m_bmask.la
+lib/ircd-hybrid/modules/m_bmask.so
lib/ircd-hybrid/modules/m_die.la
lib/ircd-hybrid/modules/m_die.so
lib/ircd-hybrid/modules/m_error.la
@@ -155,6 +165,8 @@ lib/ircd-hybrid/modules/m_sjoin.la
lib/ircd-hybrid/modules/m_sjoin.so
lib/ircd-hybrid/modules/m_squit.la
lib/ircd-hybrid/modules/m_squit.so
+lib/ircd-hybrid/modules/m_tmode.la
+lib/ircd-hybrid/modules/m_tmode.so
@man man/man8/ircd.8
share/examples/ircd-hybrid/
@mode 700
@@ -211,7 +223,6 @@ share/ircd-hybrid/help/names
share/ircd-hybrid/help/nick
share/ircd-hybrid/help/notice
share/ircd-hybrid/help/oper
-share/ircd-hybrid/help/operwall
share/ircd-hybrid/help/part
share/ircd-hybrid/help/pass
share/ircd-hybrid/help/ping
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
