Update to 1.1.2

#  Use userrec::MakeHost not userrec::GetFullRealHost, one has the nick on and we dont want it
#  BP: Pick up a few error conditions we didnt before in the config reader, and also increment line number correctly when 'real' newline is found in a value
#  Deleted m_rpc_json from 1.1, since it isn't completed yet
#  Remove a whole load of #ifdef as we can now use gettimeofday., If we add a wrapper for getrusage, then we can remove a ton more
#  Backport: Provide error output on failure to load a core command; to console on startup, and to user on /reload
#  Backport display glitch fix found by djGrrr, fixed by w00t
#  Merge in epoll availability check from trunk

For a full list of changes see: http://www.inspircd.org/

4 files changed, 8 insertions, 22 deletions

diff --git a/chat/inspircd/Makefile b/chat/inspircd/Makefile
index 1a2cc74cf00..d5754cf842c 100644
--- a/chat/inspircd/Makefile
+++ b/chat/inspircd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2007/07/30 22:00:00 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2007/08/25 09:21:15 adrianp Exp $
 #
 
-DISTNAME=	InspIRCd-1.1.11
+DISTNAME=	InspIRCd-1.1.12
 PKGNAME=	${DISTNAME:S/InspIRCd/inspircd/}
 CATEGORIES=	chat
 MASTER_SITES=	http://www.inspircd.org/downloads/
diff --git a/chat/inspircd/PLIST b/chat/inspircd/PLIST
index 8258ea7b3e0..e95553052e0 100644
--- a/chat/inspircd/PLIST
+++ b/chat/inspircd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/07/30 22:00:00 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/08/25 09:21:15 adrianp Exp $
 bin/inspircd
 lib/inspircd/cmd_admin.so
 lib/inspircd/cmd_away.so
@@ -155,6 +155,7 @@ share/inspircd/modules/m_md5.so
 share/inspircd/modules/m_messageflood.so
 share/inspircd/modules/m_namesx.so
 share/inspircd/modules/m_nicklock.so
+share/inspircd/modules/m_nickflood.so
 share/inspircd/modules/m_noctcp.so
 share/inspircd/modules/m_noinvite.so
 share/inspircd/modules/m_nokicks.so
@@ -175,7 +176,6 @@ share/inspircd/modules/m_remove.so
 share/inspircd/modules/m_restrictbanned.so
 share/inspircd/modules/m_restrictchans.so
 share/inspircd/modules/m_restrictmsg.so
-share/inspircd/modules/m_rpc_json.so
 share/inspircd/modules/m_safelist.so
 share/inspircd/modules/m_sajoin.so
 share/inspircd/modules/m_samode.so
diff --git a/chat/inspircd/distinfo b/chat/inspircd/distinfo
index be7086cd419..20b1a466ef3 100644
--- a/chat/inspircd/distinfo
+++ b/chat/inspircd/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.2 2007/07/30 22:00:00 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2007/08/25 09:21:15 adrianp Exp $
 
-SHA1 (InspIRCd-1.1.11.tar.bz2) = 21ad8a46036fbcca49deb5d54673e410b9618df6
-RMD160 (InspIRCd-1.1.11.tar.bz2) = f1ab256ab44cdaf959ab9cfa7ab17d6f5e3c089a
-Size (InspIRCd-1.1.11.tar.bz2) = 509770 bytes
+SHA1 (InspIRCd-1.1.12.tar.bz2) = d9128ea358fd385d92c37e039ac9d2ae80da99d1
+RMD160 (InspIRCd-1.1.12.tar.bz2) = eabaa1dc351c71978e6b5a0548fad3b17f888ede
+Size (InspIRCd-1.1.12.tar.bz2) = 501185 bytes
 SHA1 (patch-aa) = d62675b6ace79ba5c0c0c4db2b4f9454346170c3
 SHA1 (patch-ab) = 683344dc906be076aaed688924bfad4e4aabe508
-SHA1 (patch-ac) = 3dfa1bab5bec26ffb2ee1c6ba792dad612913112
diff --git a/chat/inspircd/patches/patch-ac b/chat/inspircd/patches/patch-ac
deleted file mode 100644
index 5fec23a31d6..00000000000
--- a/chat/inspircd/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/07/30 22:00:00 adrianp Exp $
-
---- src/cmd_list.cpp.orig	2007-07-23 19:06:57.000000000 +0100
-+++ src/cmd_list.cpp
-@@ -71,7 +71,7 @@ CmdResult cmd_list::Handle (const char**
- 		}
- 		else
- 		{
--			if (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('p')))) || (n))
-+			if (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n))
- 			{
- 				long users = i->second->GetUserCounter();
- 				if (users)