An update to ircd-hybrid 8.1.15.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile 4 Feb 2014 09:46:48 -0000 1.30
+++ Makefile 3 Apr 2014 02:26:10 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY = Yes
COMMENT = Internet Relay Chat server
-DISTNAME = ircd-hybrid-8.1.13
+DISTNAME = ircd-hybrid-8.1.15
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.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 4 Feb 2014 09:46:48 -0000 1.12
+++ distinfo 3 Apr 2014 02:26:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (ircd-hybrid-8.1.13.tgz) = n2nSdsPej8S6W8EcQ1qdqEuR0SEKbEGV/buynISZa5E=
-SIZE (ircd-hybrid-8.1.13.tgz) = 1143544
+SHA256 (ircd-hybrid-8.1.15.tgz) = 0Q41iidOSIj5mzlINggp+RTRIUagubfcoJkZExvamvI=
+SIZE (ircd-hybrid-8.1.15.tgz) = 1145565
Index: patches/patch-doc_reference_conf
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-doc_reference_conf,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-doc_reference_conf
--- patches/patch-doc_reference_conf 17 Sep 2013 19:53:00 -0000 1.2
+++ patches/patch-doc_reference_conf 28 Mar 2014 20:58:33 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-doc_reference_conf,v 1.2 2013/09/17 19:53:00 brad Exp $
---- doc/reference.conf.orig Sun Aug 18 16:12:33 2013
-+++ doc/reference.conf Sun Sep 15 15:06:50 2013
+--- doc/reference.conf.orig Tue Feb 25 07:27:21 2014
++++ doc/reference.conf Fri Mar 28 16:56:14 2014
@@ -108,7 +108,7 @@ serverinfo {
* chown <ircd-user>.<ircd.group> rsa.key
* chmod 0600 rsa.key
@@ -29,7 +29,7 @@ $OpenBSD: patch-doc_reference_conf,v 1.2
/*
* ssl_cipher_list:
@@ -453,7 +453,7 @@ operator {
- * A password should not be defined when this is used; see
+ * 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";
@@ -37,7 +37,7 @@ $OpenBSD: patch-doc_reference_conf,v 1.2
/*
* ssl_certificate_fingerprint: enhances security by additionally
checking
-@@ -1233,8 +1233,8 @@ modules {
+@@ -1234,8 +1234,8 @@ modules {
* path: other paths to search for modules specified below
* and in "/module load".
*/
Index: patches/patch-include_defaults_h
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-include_defaults_h,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-include_defaults_h
--- patches/patch-include_defaults_h 7 Aug 2013 23:41:08 -0000 1.6
+++ patches/patch-include_defaults_h 28 Mar 2014 20:58:39 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-include_defaults_h,v 1.6 2013/08/07 23:41:08 brad Exp $
---- include/defaults.h.orig Thu May 23 16:00:07 2013
-+++ include/defaults.h Thu May 30 18:58:14 2013
-@@ -47,6 +47,11 @@
+--- include/defaults.h.orig Tue Feb 25 07:27:20 2014
++++ include/defaults.h Fri Mar 28 16:58:19 2014
+@@ -49,6 +49,11 @@
* AUTOMODPATH = directory for autoloaded modules
*/
@@ -11,18 +11,18 @@ $OpenBSD: patch-include_defaults_h,v 1.6
+#endif
+
/* dirs */
- #define DPATH PREFIX
- #define SBINPATH PREFIX "/sbin/"
-@@ -55,9 +60,9 @@
- #define MODPATH LIBDIR "/" PACKAGE "/modules/"
- #define HPATH DATADIR "/" PACKAGE "/help"
- #define AUTOMODPATH MODPATH "/autoload/"
--#define ETCPATH SYSCONFDIR
--#define LOGPATH LOCALSTATEDIR "/log"
--#define RUNPATH LOCALSTATEDIR "/run"
-+#define ETCPATH SYSCONFDIR "/ircd-hybrid/"
-+#define LOGPATH LOCALSTATEDIR "/log/ircd-hybrid"
-+#define RUNPATH LOCALSTATEDIR "/run/ircd-hybrid"
+ #define DPATH PREFIX
+ #define SBINPATH PREFIX "/sbin/"
+@@ -57,9 +62,9 @@
+ #define MODPATH LIBDIR "/" PACKAGE "/modules/"
+ #define HPATH DATADIR "/" PACKAGE "/help"
+ #define AUTOMODPATH MODPATH "/autoload/"
+-#define ETCPATH SYSCONFDIR
+-#define LOGPATH LOCALSTATEDIR "/log"
+-#define RUNPATH LOCALSTATEDIR "/run"
++#define ETCPATH SYSCONFDIR "/ircd-hybrid/"
++#define LOGPATH LOCALSTATEDIR "/log/ircd-hybrid"
++#define RUNPATH LOCALSTATEDIR "/run/ircd-hybrid"
/* files */
- #define SPATH SBINPATH "/ircd" /* ircd executable */
+ #define SPATH SBINPATH "/ircd" /* ircd executable */
Index: patches/patch-src_ircd_c
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-src_ircd_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_ircd_c
--- patches/patch-src_ircd_c 31 Oct 2013 01:23:26 -0000 1.5
+++ patches/patch-src_ircd_c 28 Mar 2014 20:58:33 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_ircd_c,v 1.5 2013/10/31 01:23:26 brad Exp $
---- src/ircd.c.orig Fri Oct 25 16:40:44 2013
-+++ src/ircd.c Wed Oct 30 20:44:28 2013
-@@ -136,7 +136,6 @@ make_daemon(void)
+--- 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)
}
else if (pid > 0)
{
@@ -9,7 +9,7 @@ $OpenBSD: patch-src_ircd_c,v 1.5 2013/10
exit(EXIT_SUCCESS);
}
-@@ -468,8 +467,19 @@ main(int argc, char *argv[])
+@@ -464,8 +463,19 @@ main(int argc, char *argv[])
/* Check to see if the user is running us as root, which is a nono */
if (geteuid() == 0)
{
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 4 Feb 2014 09:46:48 -0000 1.9
+++ pkg/PLIST 3 Apr 2014 02:31:02 -0000
@@ -4,6 +4,7 @@
@conflict ircd-ratbox-*
@newgroup _ircd-hybrid:616
@newuser _ircd-hybrid:616:616:daemon:IRC Daemon:/var/empty:/sbin/nologin
+@bin bin/ircd
@bin bin/mkpasswd
@bin bin/respond
lib/ircd-hybrid/
@@ -113,8 +114,6 @@ lib/ircd-hybrid/modules/autoload/m_user.
lib/ircd-hybrid/modules/autoload/m_user.so
lib/ircd-hybrid/modules/autoload/m_userhost.la
lib/ircd-hybrid/modules/autoload/m_userhost.so
-lib/ircd-hybrid/modules/autoload/m_users.la
-lib/ircd-hybrid/modules/autoload/m_users.so
lib/ircd-hybrid/modules/autoload/m_version.la
lib/ircd-hybrid/modules/autoload/m_version.so
lib/ircd-hybrid/modules/autoload/m_wallops.la
@@ -158,7 +157,6 @@ lib/ircd-hybrid/modules/m_sjoin.so
lib/ircd-hybrid/modules/m_squit.la
lib/ircd-hybrid/modules/m_squit.so
@man man/man8/ircd.8
-@bin sbin/ircd
share/examples/ircd-hybrid/
@mode 700
@owner _ircd-hybrid
@@ -241,7 +239,6 @@ share/ircd-hybrid/help/unresv
share/ircd-hybrid/help/unxline
share/ircd-hybrid/help/user
share/ircd-hybrid/help/userhost
-share/ircd-hybrid/help/users
share/ircd-hybrid/help/version
share/ircd-hybrid/help/wallops
share/ircd-hybrid/help/who
Index: pkg/ircd_hybrid.rc
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/pkg/ircd_hybrid.rc,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 ircd_hybrid.rc
--- pkg/ircd_hybrid.rc 19 Oct 2011 13:46:17 -0000 1.4
+++ pkg/ircd_hybrid.rc 3 Apr 2014 02:31:18 -0000
@@ -2,7 +2,7 @@
#
# $OpenBSD: ircd_hybrid.rc,v 1.4 2011/10/19 13:46:17 jasper Exp $
-daemon="${TRUEPREFIX}/sbin/ircd"
+daemon="${TRUEPREFIX}/bin/ircd"
. /etc/rc.d/rc.subr
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
