On Thu, May 30, 2013 at 07:50:30PM -0400, Brad Smith wrote: > Here is an update to ircd-hybrid 8.1.0. > > OK?
And an update to 8.1.3. Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile 21 Mar 2013 08:46:34 -0000 1.24 +++ Makefile 29 Jun 2013 06:27:17 -0000 @@ -4,7 +4,7 @@ SHARED_ONLY = Yes COMMENT = Internet Relay Chat server -DISTNAME = ircd-hybrid-8.0.6 +DISTNAME = ircd-hybrid-8.1.3 CATEGORIES = net MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/} EXTRACT_SUFX = .tgz @@ -14,20 +14,20 @@ HOMEPAGE = http://ircd-hybrid.com/ # GPLv2 PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c crypto ltdl pcre ssl +WANTLIB = c crypto ltdl ssl -LIB_DEPENDS = devel/libtool,-ltdl \ - devel/pcre +LIB_DEPENDS = devel/libtool,-ltdl USE_GROFF = Yes LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = --disable-libgeoip CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" NO_TEST = Yes pre-configure: - @${SUBST_CMD} ${WRKSRC}/doc/example.conf + @${SUBST_CMD} ${WRKSRC}/doc/reference.conf .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 29 Jan 2013 23:50:04 -0000 1.6 +++ distinfo 29 Jun 2013 06:22:59 -0000 @@ -1,2 +1,2 @@ -SHA256 (ircd-hybrid-8.0.6.tgz) = ZMtzhPyLlNdM3GCLcKRsZnvzukeR4d34axVXH08TMIA= -SIZE (ircd-hybrid-8.0.6.tgz) = 1212065 +SHA256 (ircd-hybrid-8.1.3.tgz) = 6h7+wKtV5fdygtrZ4nslp5CQusgrh9goITXzdzP+NWs= +SIZE (ircd-hybrid-8.1.3.tgz) = 1127868 Index: patches/patch-doc_Makefile_in =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-doc_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 29 Jan 2013 23:50:04 -0000 1.2 +++ patches/patch-doc_Makefile_in 30 May 2013 22:58:30 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.2 2013/01/29 23:50:04 brad Exp $ ---- doc/Makefile.in.orig Mon Jan 28 14:39:31 2013 -+++ doc/Makefile.in Tue Jan 29 13:02:30 2013 -@@ -343,25 +343,25 @@ uninstall-man8: +--- doc/Makefile.in.orig Thu May 23 16:00:08 2013 ++++ doc/Makefile.in Thu May 30 18:58:14 2013 +@@ -371,25 +371,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.2 20 tags TAGS: ctags CTAGS: -@@ -403,7 +403,7 @@ check-am: all-am +@@ -431,7 +431,7 @@ check-am: all-am check: check-am all-am: Makefile $(MANS) $(DATA) installdirs: Index: patches/patch-doc_example_conf =================================================================== RCS file: patches/patch-doc_example_conf diff -N patches/patch-doc_example_conf --- patches/patch-doc_example_conf 29 Jan 2013 23:50:04 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,50 +0,0 @@ -$OpenBSD: patch-doc_example_conf,v 1.3 2013/01/29 23:50:04 brad Exp $ ---- doc/example.conf.orig Mon Jan 28 14:39:31 2013 -+++ doc/example.conf Tue Jan 29 12:58:58 2013 -@@ -114,7 +114,7 @@ serverinfo { - * chmod 0600 rsa.key - * chmod 0644 rsa.pub - */ -- #rsa_private_key_file = "/usr/local/ircd/etc/rsa.key"; -+ #rsa_private_key_file = "/etc/ircd-hybrid/rsa.key"; - - /* - * ssl_certificate_file: the path to the file containing our -@@ -134,7 +134,7 @@ serverinfo { - * Common Name: irc.someirc.net - * E-mail: y...@domain.com - */ -- #ssl_certificate_file = "/usr/local/ircd/etc/cert.pem"; -+ #ssl_certificate_file = "/etc/ircd-hybrid/cert.pem"; - - /* - * ssl_dh_param_file: -@@ -151,7 +151,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/ircd-hybrid/dhparam.pem"; - - /* - * ssl_cipher_list: -@@ -445,7 +445,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/ircd-hybrid/oper.pub"; - - /* class: the class the oper joins when they successfully /oper */ - class = "opers"; -@@ -1201,8 +1201,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 = "/usr/local/lib/ircd-hybrid/modules"; -+ path = "/usr/local/lib/ircd-hybrid/modules/autoload"; - - /* module: the name of a module to load on startup/rehash */ - #module = "some_module.la"; Index: patches/patch-doc_reference_conf =================================================================== RCS file: patches/patch-doc_reference_conf diff -N patches/patch-doc_reference_conf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-doc_reference_conf 29 Jun 2013 06:26:17 -0000 @@ -0,0 +1,50 @@ +$OpenBSD$ +--- doc/reference.conf.orig Sun Jun 23 13:49:22 2013 ++++ doc/reference.conf Sat Jun 29 02:25:49 2013 +@@ -110,7 +110,7 @@ serverinfo { + * chmod 0600 rsa.key + * chmod 0644 rsa.pub + */ +-# rsa_private_key_file = "/usr/local/ircd/etc/rsa.key"; ++# rsa_private_key_file = "${SYSCONFDIR}/ircd-hybrid/rsa.key"; + + /* + * ssl_certificate_file: the path to the file containing our +@@ -132,7 +132,7 @@ serverinfo { + * Common Name: irc.someirc.net + * E-mail: y...@domain.com + */ +-# ssl_certificate_file = "/usr/local/ircd/etc/cert.pem"; ++# ssl_certificate_file = "${SYSCONFDIR}/ircd-hybrid/cert.pem"; + + /* + * ssl_dh_param_file: +@@ -149,7 +149,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 = "${SYSCONFDIR}/ircd-hybrid/dhparam.pem"; + + /* + * ssl_cipher_list: +@@ -455,7 +455,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 = "${SYSCONFDIR}/ircd-hybrid/oper.pub"; + + /* + * ssl_certificate_fingerprint: enhances security by additionally checking +@@ -1236,8 +1236,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 = "${TRUEPREFIX}/lib/ircd-hybrid/modules"; ++ path = "${TRUEPREFIX}/lib/ircd-hybrid/modules/autoload"; + + /* module: the name of a module to load on startup/rehash. */ + # module = "some_module.la"; Index: patches/patch-include_defaults_h =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-include_defaults_h,v retrieving revision 1.5 diff -u -p -r1.5 patch-include_defaults_h --- patches/patch-include_defaults_h 29 Jan 2013 23:50:04 -0000 1.5 +++ patches/patch-include_defaults_h 30 May 2013 22:58:30 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-include_defaults_h,v 1.5 2013/01/29 23:50:04 brad Exp $ ---- include/defaults.h.orig Mon Jan 28 14:39:30 2013 -+++ include/defaults.h Tue Jan 29 18:30:03 2013 +--- 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 @@ * AUTOMODPATH = directory for autoloaded modules */ @@ -13,9 +13,9 @@ $OpenBSD: patch-include_defaults_h,v 1.5 /* dirs */ #define DPATH PREFIX #define SBINPATH PREFIX "/sbin/" -@@ -56,9 +61,9 @@ - #define HPATH DATADIR "/" PACKAGE "/help/opers" - #define UHPATH DATADIR "/" PACKAGE "/help/users" +@@ -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" Index: patches/patch-include_stdinc_h =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-include_stdinc_h,v retrieving revision 1.3 diff -u -p -r1.3 patch-include_stdinc_h --- patches/patch-include_stdinc_h 5 Nov 2012 23:45:30 -0000 1.3 +++ patches/patch-include_stdinc_h 30 May 2013 22:58:30 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-include_stdinc_h,v 1.3 2012/11/05 23:45:30 brad Exp $ ---- include/stdinc.h.orig Mon May 28 09:47:46 2012 -+++ include/stdinc.h Sun Jul 1 08:10:37 2012 -@@ -59,6 +59,8 @@ +--- include/stdinc.h.orig Thu May 23 16:00:07 2013 ++++ include/stdinc.h Thu May 30 18:58:14 2013 +@@ -63,6 +63,8 @@ #include <stdarg.h> #include <signal.h> #include <ctype.h> 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.3 diff -u -p -r1.3 patch-modules_core_Makefile_in --- patches/patch-modules_core_Makefile_in 29 Jan 2013 23:50:04 -0000 1.3 +++ patches/patch-modules_core_Makefile_in 30 May 2013 22:58:32 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-modules_core_Makefile_in,v 1.3 2013/01/29 23:50:04 brad Exp $ ---- modules/core/Makefile.in.orig Mon Jan 28 14:39:32 2013 -+++ modules/core/Makefile.in Tue Jan 29 12:58:58 2013 -@@ -722,7 +722,6 @@ install-dvi-am: +--- modules/core/Makefile.in.orig Thu May 23 16:00:09 2013 ++++ modules/core/Makefile.in Thu May 30 18:58:14 2013 +@@ -763,7 +763,6 @@ install-dvi-am: install-exec-am: @$(NORMAL_INSTALL) Index: patches/patch-src_ircd_c =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-src_ircd_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-src_ircd_c --- patches/patch-src_ircd_c 5 Nov 2012 23:45:30 -0000 1.3 +++ patches/patch-src_ircd_c 29 Jun 2013 06:26:02 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_ircd_c,v 1.3 2012/11/05 23:45:30 brad Exp $ ---- src/ircd.c.orig Sat Jul 21 16:39:18 2012 -+++ src/ircd.c Sat Jul 21 18:03:14 2012 -@@ -132,7 +132,6 @@ make_daemon(void) +--- src/ircd.c.orig Sun Jun 23 13:49:22 2013 ++++ src/ircd.c Sat Jun 29 02:23:34 2013 +@@ -136,7 +136,6 @@ make_daemon(void) } else if (pid > 0) { @@ -9,8 +9,8 @@ $OpenBSD: patch-src_ircd_c,v 1.3 2012/11 exit(EXIT_SUCCESS); } -@@ -482,8 +481,19 @@ main(int argc, char *argv[]) - */ +@@ -468,8 +467,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"); Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/net/ircd-hybrid/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 29 Jan 2013 23:50:04 -0000 1.7 +++ pkg/PLIST 30 Jun 2013 06:32:49 -0000 @@ -19,6 +19,8 @@ lib/ircd-hybrid/modules/autoload/m_cap.l lib/ircd-hybrid/modules/autoload/m_cap.so lib/ircd-hybrid/modules/autoload/m_capab.la lib/ircd-hybrid/modules/autoload/m_capab.so +lib/ircd-hybrid/modules/autoload/m_certfp.la +lib/ircd-hybrid/modules/autoload/m_certfp.so lib/ircd-hybrid/modules/autoload/m_challenge.la lib/ircd-hybrid/modules/autoload/m_challenge.so lib/ircd-hybrid/modules/autoload/m_close.la @@ -99,10 +101,6 @@ lib/ircd-hybrid/modules/autoload/m_svsni lib/ircd-hybrid/modules/autoload/m_svsnick.so lib/ircd-hybrid/modules/autoload/m_tburst.la lib/ircd-hybrid/modules/autoload/m_tburst.so -lib/ircd-hybrid/modules/autoload/m_testline.la -lib/ircd-hybrid/modules/autoload/m_testline.so -lib/ircd-hybrid/modules/autoload/m_testmask.la -lib/ircd-hybrid/modules/autoload/m_testmask.so lib/ircd-hybrid/modules/autoload/m_time.la lib/ircd-hybrid/modules/autoload/m_time.so lib/ircd-hybrid/modules/autoload/m_topic.la @@ -167,7 +165,7 @@ share/examples/ircd-hybrid/ @mode @owner @group -share/examples/ircd-hybrid/example.conf +share/examples/ircd-hybrid/reference.conf @mode 600 @owner _ircd-hybrid @group _ircd-hybrid @@ -175,111 +173,79 @@ share/examples/ircd-hybrid/example.conf @mode @owner @group -share/examples/ircd-hybrid/example.efnet.conf share/ircd-hybrid/ share/ircd-hybrid/help/ -share/ircd-hybrid/help/opers/ -share/ircd-hybrid/help/opers/accept -share/ircd-hybrid/help/opers/admin -share/ircd-hybrid/help/opers/away -share/ircd-hybrid/help/opers/capab -share/ircd-hybrid/help/opers/challenge -share/ircd-hybrid/help/opers/close -share/ircd-hybrid/help/opers/cmode -share/ircd-hybrid/help/opers/connect -share/ircd-hybrid/help/opers/die -share/ircd-hybrid/help/opers/dline -share/ircd-hybrid/help/opers/eob -share/ircd-hybrid/help/opers/error -share/ircd-hybrid/help/opers/etrace -share/ircd-hybrid/help/opers/gline -share/ircd-hybrid/help/opers/gungline -share/ircd-hybrid/help/opers/hash -share/ircd-hybrid/help/opers/help -share/ircd-hybrid/help/opers/index -share/ircd-hybrid/help/opers/info -share/ircd-hybrid/help/opers/invite -share/ircd-hybrid/help/opers/ison -share/ircd-hybrid/help/opers/join -share/ircd-hybrid/help/opers/kick -share/ircd-hybrid/help/opers/kill -share/ircd-hybrid/help/opers/kline -share/ircd-hybrid/help/opers/knock -share/ircd-hybrid/help/opers/links -share/ircd-hybrid/help/opers/list -share/ircd-hybrid/help/opers/locops -share/ircd-hybrid/help/opers/lusers -share/ircd-hybrid/help/opers/map -share/ircd-hybrid/help/opers/module -share/ircd-hybrid/help/opers/motd -share/ircd-hybrid/help/opers/names -share/ircd-hybrid/help/opers/nick -share/ircd-hybrid/help/opers/notice -share/ircd-hybrid/help/opers/omotd -share/ircd-hybrid/help/opers/oper -share/ircd-hybrid/help/opers/operwall -share/ircd-hybrid/help/opers/part -share/ircd-hybrid/help/opers/pass -share/ircd-hybrid/help/opers/ping -share/ircd-hybrid/help/opers/pong -share/ircd-hybrid/help/opers/post -share/ircd-hybrid/help/opers/privmsg -share/ircd-hybrid/help/opers/quit -share/ircd-hybrid/help/opers/rehash -share/ircd-hybrid/help/opers/restart -share/ircd-hybrid/help/opers/resv -share/ircd-hybrid/help/opers/server -share/ircd-hybrid/help/opers/set -share/ircd-hybrid/help/opers/sjoin -share/ircd-hybrid/help/opers/squit -share/ircd-hybrid/help/opers/stats -share/ircd-hybrid/help/opers/svinfo -share/ircd-hybrid/help/opers/testgecos -share/ircd-hybrid/help/opers/testline -share/ircd-hybrid/help/opers/testmask -share/ircd-hybrid/help/opers/time -share/ircd-hybrid/help/opers/topic -share/ircd-hybrid/help/opers/trace -share/ircd-hybrid/help/opers/uhelp -share/ircd-hybrid/help/opers/umode -share/ircd-hybrid/help/opers/undline -share/ircd-hybrid/help/opers/ungline -share/ircd-hybrid/help/opers/unkline -share/ircd-hybrid/help/opers/unresv -share/ircd-hybrid/help/opers/unxline -share/ircd-hybrid/help/opers/user -share/ircd-hybrid/help/opers/userhost -share/ircd-hybrid/help/opers/users -share/ircd-hybrid/help/opers/version -share/ircd-hybrid/help/opers/wallops -share/ircd-hybrid/help/opers/who -share/ircd-hybrid/help/opers/whois -share/ircd-hybrid/help/opers/whowas -share/ircd-hybrid/help/opers/xline -share/ircd-hybrid/help/users/ -share/ircd-hybrid/help/users/index -share/ircd-hybrid/help/users/info -share/ircd-hybrid/help/users/notice -share/ircd-hybrid/help/users/privmsg -share/ircd-hybrid/help/users/stats -share/ircd-hybrid/help/users/umode -share/ircd-hybrid/messages/ -share/ircd-hybrid/messages/ayb.lang -share/ircd-hybrid/messages/custom.lang -share/ircd-hybrid/messages/ircd-brazilian_pt.lang -share/ircd-hybrid/messages/ircd-bulgarian.lang -share/ircd-hybrid/messages/ircd-croatian.lang -share/ircd-hybrid/messages/ircd-danish.lang -share/ircd-hybrid/messages/ircd-dutch.lang -share/ircd-hybrid/messages/ircd-french.lang -share/ircd-hybrid/messages/ircd-german.lang -share/ircd-hybrid/messages/ircd-italian.lang -share/ircd-hybrid/messages/ircd-norwegian.lang -share/ircd-hybrid/messages/ircd-polish.lang -share/ircd-hybrid/messages/ircd-romanian.lang -share/ircd-hybrid/messages/ircd-russian.lang -share/ircd-hybrid/messages/ircd-spanish.lang -share/ircd-hybrid/messages/ircd-swedish.lang +share/ircd-hybrid/help/accept +share/ircd-hybrid/help/admin +share/ircd-hybrid/help/away +share/ircd-hybrid/help/capab +share/ircd-hybrid/help/challenge +share/ircd-hybrid/help/close +share/ircd-hybrid/help/cmode +share/ircd-hybrid/help/connect +share/ircd-hybrid/help/die +share/ircd-hybrid/help/dline +share/ircd-hybrid/help/eob +share/ircd-hybrid/help/error +share/ircd-hybrid/help/etrace +share/ircd-hybrid/help/gline +share/ircd-hybrid/help/gungline +share/ircd-hybrid/help/hash +share/ircd-hybrid/help/help +share/ircd-hybrid/help/index +share/ircd-hybrid/help/info +share/ircd-hybrid/help/invite +share/ircd-hybrid/help/ison +share/ircd-hybrid/help/join +share/ircd-hybrid/help/kick +share/ircd-hybrid/help/kill +share/ircd-hybrid/help/kline +share/ircd-hybrid/help/knock +share/ircd-hybrid/help/links +share/ircd-hybrid/help/list +share/ircd-hybrid/help/locops +share/ircd-hybrid/help/lusers +share/ircd-hybrid/help/map +share/ircd-hybrid/help/module +share/ircd-hybrid/help/motd +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 +share/ircd-hybrid/help/pong +share/ircd-hybrid/help/post +share/ircd-hybrid/help/privmsg +share/ircd-hybrid/help/quit +share/ircd-hybrid/help/rehash +share/ircd-hybrid/help/restart +share/ircd-hybrid/help/resv +share/ircd-hybrid/help/server +share/ircd-hybrid/help/set +share/ircd-hybrid/help/sjoin +share/ircd-hybrid/help/squit +share/ircd-hybrid/help/stats +share/ircd-hybrid/help/svinfo +share/ircd-hybrid/help/time +share/ircd-hybrid/help/topic +share/ircd-hybrid/help/trace +share/ircd-hybrid/help/umode +share/ircd-hybrid/help/undline +share/ircd-hybrid/help/unkline +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 +share/ircd-hybrid/help/whois +share/ircd-hybrid/help/whowas +share/ircd-hybrid/help/xline @rcscript ${RCDIR}/ircd_hybrid @mode 700 @owner _ircd-hybrid -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.