From 687a3134aba22c2603d3694d0aaa9e7366c9e43c Mon Sep 17 00:00:00 2001 From: adrianp Date: Tue, 4 Aug 2009 22:17:36 +0000 Subject: Featuring nothing but further stability fixes including possible crash on rehash, rc4 is just about how we want things to be. No major problems have been reported in some time (though of course we still advocate using SVN rather than tarballs). IMPORTANT CHANGES: * Channel aliases now work more like user aliases. This is a BREAKING CHANGE. $1 is now the fantasy command that was invoked, $2 is the first real parameter of the command. (in other words, adjust all your numbers up by one for channel fantasy commands). * $chan in m_fantasy will be replaced by an empty string if used in a non-channel (i.e. user) alias. * m_ssl_oper_cert and m_ssl_dummy are both gone, and merged into m_sslinfo - so you won't have to load so many SSL modules * m_sslinfo is no longer in extra/. There was no need for it to be there. * DNS now resolves multiple-answer DNS queries (CNAME, A) correctly. --- chat/inspircd12/Makefile | 7 ++++--- chat/inspircd12/PLIST | 4 ++-- chat/inspircd12/distinfo | 12 ++++++------ chat/inspircd12/patches/patch-ab | 8 ++++---- chat/inspircd12/patches/patch-ac | 15 ++++++++++++--- 5 files changed, 28 insertions(+), 18 deletions(-) (limited to 'chat/inspircd12') diff --git a/chat/inspircd12/Makefile b/chat/inspircd12/Makefile index 0fc5dd06397..4503da1a220 100644 --- a/chat/inspircd12/Makefile +++ b/chat/inspircd12/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2009/07/22 09:24:13 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2009/08/04 22:17:36 adrianp Exp $ # -DISTNAME= InspIRCd-1.2.0rc3 +DISTNAME= InspIRCd-1.2.0rc4 PKGNAME= ${DISTNAME:S/InspIRCd/inspircd/} CATEGORIES= chat MASTER_SITES= http://www.inspircd.org/downloads/ @@ -23,6 +23,7 @@ USE_LANGUAGES= c++ PLIST_SRC= ${WRKDIR}/.PLIST_SRC RCD_SCRIPTS+= inspircd PKG_SYSCONFSUBDIR= inspircd +MAKE_FILE= GNUmakefile FILES_SUBST+= INSPIRCD_USER=${INSPIRCD_USER:Q} FILES_SUBST+= INSPIRCD_GROUP=${INSPIRCD_GROUP:Q} @@ -65,7 +66,7 @@ SUBST_MESSAGE.conf= Fixing configuration files. SUBST_CLASSES+= install SUBST_STAGE.install= post-configure -SUBST_FILES.install= Makefile +SUBST_FILES.install= GNUmakefile SUBST_SED.install+= -e "s|-cp conf|\#-cp conf|g" SUBST_MESSAGE.install= Fixing installation files. diff --git a/chat/inspircd12/PLIST b/chat/inspircd12/PLIST index c365dc410f4..fa0a6010262 100644 --- a/chat/inspircd12/PLIST +++ b/chat/inspircd12/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:37:45 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/08/04 22:17:36 adrianp Exp $ bin/inspircd lib/inspircd/cmd_admin.so lib/inspircd/cmd_away.so @@ -172,7 +172,7 @@ share/inspircd/modules/m_showwhois.so share/inspircd/modules/m_silence.so share/inspircd/modules/m_spanningtree.so share/inspircd/modules/m_spy.so -share/inspircd/modules/m_ssl_dummy.so +share/inspircd/modules/m_sslinfo.so share/inspircd/modules/m_sslmodes.so share/inspircd/modules/m_stripcolor.so share/inspircd/modules/m_svshold.so diff --git a/chat/inspircd12/distinfo b/chat/inspircd12/distinfo index b65d2510de2..f8e2f440eed 100644 --- a/chat/inspircd12/distinfo +++ b/chat/inspircd12/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2009/06/06 17:02:21 adrianp Exp $ +$NetBSD: distinfo,v 1.4 2009/08/04 22:17:36 adrianp Exp $ -SHA1 (InspIRCd-1.2.0rc3.tar.bz2) = ae0dab0f3536949e209d8039e0f183ad077ce205 -RMD160 (InspIRCd-1.2.0rc3.tar.bz2) = 6715d7cc4228f16b84c4de6dd32cd65ca461036d -Size (InspIRCd-1.2.0rc3.tar.bz2) = 640737 bytes +SHA1 (InspIRCd-1.2.0rc4.tar.bz2) = 1871074a83bc8d85f521dd00550b401dd0de2c99 +RMD160 (InspIRCd-1.2.0rc4.tar.bz2) = f3f251a156ac03113db1a2ad11d8a5e9e411ffd8 +Size (InspIRCd-1.2.0rc4.tar.bz2) = 628667 bytes SHA1 (patch-aa) = 16c092692872173dede40925be51c4a391491a03 -SHA1 (patch-ab) = ddd675b13e89ca514b594c61cee00a3b9f1510e8 -SHA1 (patch-ac) = b9282332189ad19e6c48a5e2e6efa7bffbd7ccb0 +SHA1 (patch-ab) = 4c69874702dc6bacbb4eb86fd2ea3a15dacd74ae +SHA1 (patch-ac) = 2d099d624205d88ac2200f3fdcef4e89ba40f069 SHA1 (patch-ad) = e17969eb0b06f6e77742927f3fde6e2de1f0c34e diff --git a/chat/inspircd12/patches/patch-ab b/chat/inspircd12/patches/patch-ab index dc5c1ad3679..d5797a17916 100644 --- a/chat/inspircd12/patches/patch-ab +++ b/chat/inspircd12/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.1.1.1 2009/01/04 00:52:27 adrianp Exp $ +$NetBSD: patch-ab,v 1.2 2009/08/04 22:17:36 adrianp Exp $ ---- .Makefile.inc.orig 2008-02-24 21:12:51.000000000 +0000 +--- .Makefile.inc.orig 2009-06-07 03:58:07.000000000 +0100 +++ .Makefile.inc -@@ -69,7 +69,6 @@ ircd: - install: all@EXTRA_DIR@ +@@ -96,7 +96,6 @@ finishmessage: ircd mods + install: ircd mods@EXTRA_DIR@ @-install -d -m $(INSTMODE) $(BASE) @-install -d -m $(INSTMODE) $(LIBPATH) - @-install -d -m $(INSTMODE) $(BINPATH) diff --git a/chat/inspircd12/patches/patch-ac b/chat/inspircd12/patches/patch-ac index ebd2f4be010..47b9cfe0ed4 100644 --- a/chat/inspircd12/patches/patch-ac +++ b/chat/inspircd12/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2009/01/04 00:52:27 adrianp Exp $ +$NetBSD: patch-ac,v 1.2 2009/08/04 22:17:36 adrianp Exp $ ---- configure.orig 2008-08-26 14:47:49.000000000 +0100 +--- configure.orig 2009-07-03 20:28:07.000000000 +0100 +++ configure -@@ -319,8 +319,8 @@ $config{EXTRA_DIR} = ""; # Is emp +@@ -320,8 +320,8 @@ $config{EXTRA_DIR} = ""; # Is emp if ($config{OSNAME} =~ /darwin/i) { $config{IS_DARWIN} = "YES"; @@ -13,3 +13,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/01/04 00:52:27 adrianp Exp $ $config{EXTRA_DIR} = " launchd_dir"; # Is OSX specific path. } $config{CC} = "g++"; # C++ compiler +@@ -871,7 +871,7 @@ if (($config{USE_OPENSSL} eq "y") && ($c + our $failed = 0; + + $config{CERTGEN} ||= 'y'; +-yesno('CERTGEN',"Would you like generate SSL certificates now?") if $config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y"; ++#yesno('CERTGEN',"Would you like generate SSL certificates now?") if $config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y"; + + if ($config{USE_GNUTLS} eq "y") { + unless (-r "src/modules/m_ssl_gnutls.cpp") { -- cgit v1.2.3