cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to ircd-hybrid 8.2.1.

Browse Source
This commit is contained in:
brad 2014-11-06 00:45:31 +00:00
parent 645beb1d8e
commit f1c763bcab
9 changed files with 52 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/ircd-hybrid/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.32 2014/07/16 12:31:29 pascal Exp $
# $OpenBSD: Makefile,v 1.33 2014/11/06 00:45:31 brad Exp $
SHARED_ONLY = Yes
COMMENT = Internet Relay Chat server
DISTNAME = ircd-hybrid-8.1.17
REVISION = 0
DISTNAME = ircd-hybrid-8.2.1
CATEGORIES = net
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
EXTRACT_SUFX = .tgz

4
net/ircd-hybrid/distinfo
View File

@ -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.1.tgz) = accFk4WeAfurJowhgZBZDIIxpXt06CKA5tfZUeDZQps=
SIZE (ircd-hybrid-8.2.1.tgz) = 1161406

10
net/ircd-hybrid/patches/patch-doc_Makefile_in
View File

@ -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:
$OpenBSD: patch-doc_Makefile_in,v 1.5 2014/11/06 00:45:31 brad Exp $
--- 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 2013/10/31 01:23:26 brad Exp $
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:

28
net/ircd-hybrid/patches/patch-doc_reference_conf
View File

@ -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
$OpenBSD: patch-doc_reference_conf,v 1.4 2014/11/06 00:45:31 brad Exp $
--- 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 2014/05/08 14:36:49 brad Exp $
* Common Name: irc.someirc.net
* E-mail: you@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";
/*
* 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";

8
net/ircd-hybrid/patches/patch-modules_core_Makefile_in
View File

@ -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:
$OpenBSD: patch-modules_core_Makefile_in,v 1.6 2014/11/06 00:45:31 brad Exp $
--- 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)

53
net/ircd-hybrid/patches/patch-modules_core_m_server_c
View File

@ -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

16
net/ircd-hybrid/patches/patch-src_ircd_c
View File

@ -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)
$OpenBSD: patch-src_ircd_c,v 1.7 2014/11/06 00:45:31 brad Exp $
--- src/ircd.c.orig Tue Oct 21 05:04:51 2014
+++ src/ircd.c Tue Oct 28 23:50:45 2014
@@ -150,7 +150,6 @@ make_daemon(void)
}
else if (pid > 0)
{
@ -9,11 +9,11 @@ $OpenBSD: patch-src_ircd_c,v 1.6 2014/05/08 14:36:49 brad Exp $
exit(EXIT_SUCCESS);
}
@@ -464,8 +463,19 @@ main(int argc, char *argv[])
@@ -475,8 +474,19 @@ main(int argc, char *argv[])
/* Check to see if the user is running us as root, which is a nono */
if (geteuid() == 0)
if (!geteuid())
{
- 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/08 14:36:49 brad Exp $
+
+ 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;
+ }
}

16
net/ircd-hybrid/patches/patch-src_rsa_c
View File

@ -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? */

23
net/ircd-hybrid/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2014/05/08 14:36:49 brad Exp $
@comment $OpenBSD: PLIST,v 1.11 2014/11/06 00:45:31 brad Exp $
@conflict bnc-*
@conflict ircd-ratbox-*
@newgroup _ircd-hybrid:616
@ -71,8 +71,6 @@ lib/ircd-hybrid/modules/autoload/m_names.la
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_restart.la
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.la
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_whowas.la
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