updated SRC_URI, removed old patches

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

6 files changed, 36 insertions, 133 deletions

diff --git a/net-irc/znc/ChangeLog b/net-irc/znc/ChangeLog
index 45630ef02b5c..fbf4bcad6a6e 100644
--- a/net-irc/znc/ChangeLog
+++ b/net-irc/znc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/znc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.46 2010/11/08 18:08:03 wired Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.47 2011/02/21 07:44:44 wired Exp $
+
+  21 Feb 2011; Alex Alexander <wired@gentoo.org>
+  -files/znc-0.090-null-pointer-dereference-fix.patch,
+  -files/znc-0.092-dos-fix.patch, znc-0.094.ebuild, znc-0.096.ebuild:
+  updated SRC_URI, removed old patches
 
   08 Nov 2010; Alex Alexander <wired@gentoo.org> -znc-0.090-r1.ebuild,
   -znc-0.092.ebuild, -znc-0.092-r1.ebuild:
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 455c2a6055d8..c65001109da0 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,8 +1,26 @@
-AUX znc-0.090-null-pointer-dereference-fix.patch 1254 RMD160 da43163ccacf0b3983d53c920921346943ad9b91 SHA1 902b55de4052848d1907e2bebcb82407ee6e06c0 SHA256 3ce1a31adeff6bbefb1f6e43531243617429cd1d9783a99b70c61f60efe945b1
-AUX znc-0.092-dos-fix.patch 3281 RMD160 50ae00286c65024fa643487149fbe8d0eee95a79 SHA1 0de964de52fb85c5db19dd1348b7d8f01a47d94a SHA256 347c152f0753324cc6a9df1f1f9b50c3dac2966b1239e5354830f03ea379c42b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST znc-0.094.tar.gz 603191 RMD160 f1dfd184e23beb58d441e0313d2ac2ec50e1bd16 SHA1 825f52905722ac3f0ff3055420aa8119940819e9 SHA256 a673ebec938c1285509da5cacb480c30b2b348941f3bac7907aa4b3dc094f94a
 DIST znc-0.096.tar.gz 617914 RMD160 c89d5a936c8364c35cd66fb3b0d3d038642c213c SHA1 13df77809028befac4832e467a9f09f98be1eefb SHA256 3d0961b63ae2174df788958a5eb08f791345341bbe4698dad4111d746e5de016
-EBUILD znc-0.094.ebuild 1254 RMD160 c297f8b563155a8a16e6f403908afa213d06bfb0 SHA1 7938a01acfd464aebf8cc265c47f928fe739d747 SHA256 7ee537a1a78b447e81a86a115d6c4db356021e4c8eacd48844fc43bfc55b1228
-EBUILD znc-0.096.ebuild 1276 RMD160 03a80cdafb1db429d42a82d37eb1acd4121f30df SHA1 dfb5f3615911bbdf933027d4de8724577e2a2daa SHA256 98ab211e3f7baa24e6f8159220bfe8a143fea584b05233287deabc998635b42c
-MISC ChangeLog 5959 RMD160 57ab8309386436985a4461c74a494f4dae949a9b SHA1 c8457cf5fb2ee800836d8879d154fc4526a6496d SHA256 8d3e78da86d26d507b8804be382034dc2aa69e85af047a0025e530e126b11993
+EBUILD znc-0.094.ebuild 1253 RMD160 8a4137952eec6cec05da62da48e348ce964cb7e3 SHA1 50778127c600e8d83714068e60194133d3654711 SHA256 43a451cbe0eabe1772df7ccce6e274e4a3807340ff16985c8bb9a79797044ccd
+EBUILD znc-0.096.ebuild 1280 RMD160 7d6bbd9bb1eb91ba40686770a7d2d8b7b3ea7dde SHA1 030744e6ea41aff1797939d379c4f183a04881f5 SHA256 069e6507c1adb17c95da874f2a66a3392cb19b8319821d594359ba35dc156d5e
+MISC ChangeLog 6173 RMD160 91cc3a61094359abc16a10913df3a52f5c6ce203 SHA1 a02b5658674a1769e0e2b98a37eee3c7f4cac826 SHA256 35cca196cb3c5a658f65fc48048079f7e0f1aacaa06d5ec42f015bc536794581
 MISC metadata.xml 409 RMD160 f6476a5c2d494c26a600e104d723b4be74185bfe SHA1 3677f5f84105a59c3c0056b7718990ccd3eacbfc SHA256 9f5b022b9a72f00cb0b91ce0d8bf502bfe5bbd619c962dd8d5891096e5e3b84b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNYhf+AAoJEDZF8K7rm0r6kjEP/Al8117Q/cIgVEkGcKVgBrqo
+ErXmnV3z5h1MNHvAPgIgyot13MREgW8Pd2JLv41gzzJz7HLLtq+3UlrcJjcIniO+
+n9rbHdVUmt5jLKqmVLwrm6pPnjhI36alQ1IvtU2o3f9AG3j9zCigDriOS6WawIqx
+OE+ddIk4iL8eGRq3aobp7rNH+tl/VlnJ8e3y9FtAfOZLr8+DybqLB1VjvTAELf+b
+5HLHLyq7A/Avo7xpJ6oPLbKRaqsk8+leOS5HmHNsWtfBIxNNMm0FEGrYhLCO0kUq
+lq6eJ2TJsHpX5P0O5Tf4KZk3mvQLRiwUtbqAOsJwiOcPhv9o1JvNxB/foFXeBHv4
+Otfv6erbF/4mZOZOir5Yj9jm56MxfNiOhncDQzm/kgq63twEUOsXIF1ou3lugDRs
+h8rDwgHRtOo9cJ13Ljdq5OGXLXeuxV/rSl8vnHJDXpXg6WD9lEtfdkqE9hJ9rmkB
+LQ6AH5e/vIDbykhSCv1AZz3rjCRxLm1JRE0q09zt60PV8jvD8AIVfUOD5m24hsDN
+vRhdHXW+pwmsnFDje/70XQDzp3F0PfZScgPpDb6ZL25aI3+Uc3aK5VK5lcWXtY/L
+4p975Av8GDAinc/WvBlq845gDb8XacSAXn2FR7pjvod4OAyWRhs7/KpF9Xm1CRud
+JKgA7cHC5o2xQd1y+sCH
+=NLfh
+-----END PGP SIGNATURE-----
diff --git a/net-irc/znc/files/znc-0.090-null-pointer-dereference-fix.patch b/net-irc/znc/files/znc-0.090-null-pointer-dereference-fix.patch
deleted file mode 100644
index c41e1fe9ed7b..000000000000
--- a/net-irc/znc/files/znc-0.090-null-pointer-dereference-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- trunk/znc.cpp	2010/06/13 07:58:28	2025
-+++ trunk/znc.cpp	2010/06/13 17:14:52	2026
-@@ -1927,18 +1927,18 @@
- 	}
- 
- 	for (CSockManager::const_iterator it = m_Manager.begin(); it != m_Manager.end(); ++it) {
-+		CUser *pUser = NULL;
- 		if ((*it)->GetSockName().Left(5) == "IRC::") {
--			CIRCSock *p = (CIRCSock *) *it;
--			ret[p->GetUser()->GetUserName()].first  += p->GetBytesRead();
--			ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten();
--			uiUsers_in  += p->GetBytesRead();
--			uiUsers_out += p->GetBytesWritten();
-+			pUser = ((CIRCSock *) *it)->GetUser();
- 		} else if ((*it)->GetSockName().Left(5) == "USR::") {
--			CClient *p = (CClient *) *it;
--			ret[p->GetUser()->GetUserName()].first  += p->GetBytesRead();
--			ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten();
--			uiUsers_in  += p->GetBytesRead();
--			uiUsers_out += p->GetBytesWritten();
-+			pUser = ((CClient*) *it)->GetUser();
-+		}
-+
-+		if (pUser) {
-+			ret[pUser->GetUserName()].first  += (*it)->GetBytesRead();
-+			ret[pUser->GetUserName()].second += (*it)->GetBytesWritten();
-+			uiUsers_in  += (*it)->GetBytesRead();
-+			uiUsers_out += (*it)->GetBytesWritten();
- 		} else {
- 			uiZNC_in  += (*it)->GetBytesRead();
- 			uiZNC_out += (*it)->GetBytesWritten();
diff --git a/net-irc/znc/files/znc-0.092-dos-fix.patch b/net-irc/znc/files/znc-0.092-dos-fix.patch
deleted file mode 100644
index a2688f4b1cfc..000000000000
--- a/net-irc/znc/files/znc-0.092-dos-fix.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -u -r znc-0.092-orig//Client.cpp znc-0.092/Client.cpp
---- znc-0.092-orig//Client.cpp	2010-08-15 01:29:28.972436649 +0300
-+++ znc-0.092/Client.cpp	2010-08-15 01:30:34.721440283 +0300
-@@ -185,7 +185,10 @@
- 		// won't answer the ping (=no server connected) -> PONG back.
- 		// else: It's the server's job to send a PONG.
- 		if (sTarget.Equals("irc.znc.in") || !GetIRCSock()) {
--			PutClient("PONG " + sLine.substr(5));
-+			if (sLine.length() >= 5)
-+				PutClient("PONG " + sLine.substr(5));
-+			else
-+				PutClient(":irc.znc.in PONG irc.znc.in");
- 			return;
- 		}
- 	} else if (sCommand.Equals("PONG")) {
-diff -u -r znc-0.092-orig//IRCSock.cpp znc-0.092/IRCSock.cpp
---- znc-0.092-orig//IRCSock.cpp	2010-08-15 01:29:28.972436649 +0300
-+++ znc-0.092/IRCSock.cpp	2010-08-15 01:31:03.345456528 +0300
-@@ -87,7 +87,7 @@
- 		return;
- 	} else if (sLine.Equals("ERROR ", false, 6)) {
- 		//ERROR :Closing Link: nick[24.24.24.24] (Excess Flood)
--		CString sError(sLine.substr(7));
-+		CString sError(sLine.substr(6));
- 
- 		if (sError.Left(1) == ":") {
- 			sError.LeftChomp();
-diff -u -r znc-0.092-orig//modules/adminlog.cpp znc-0.092/modules/adminlog.cpp
---- znc-0.092-orig//modules/adminlog.cpp	2010-08-15 01:29:28.970434898 +0300
-+++ znc-0.092/modules/adminlog.cpp	2010-08-15 01:31:13.639445703 +0300
-@@ -52,7 +52,7 @@
- 		if (sLine.Equals("ERROR ", false, 6)) {
- 			//ERROR :Closing Link: nick[24.24.24.24] (Excess Flood)
- 			//ERROR :Closing Link: nick[24.24.24.24] Killer (Local kill by Killer (reason))
--			CString sError(sLine.substr(7));
-+			CString sError(sLine.substr(6));
- 			if (sError.Left(1) == ":")
- 				sError.LeftChomp();
- 			Log("[" + m_pUser->GetUserName() + "] disconnected from IRC: " +
-diff -u -r znc-0.092-orig//modules/away.cpp znc-0.092/modules/away.cpp
---- znc-0.092-orig//modules/away.cpp	2010-08-15 01:29:28.970434898 +0300
-+++ znc-0.092/modules/away.cpp	2010-08-15 01:31:47.479451226 +0300
-@@ -390,7 +390,7 @@
- 			CBlowfish c(m_sPassword, BF_DECRYPT);
- 			sBuffer = c.Crypt(sFile);
- 
--			if (sBuffer.substr(0, strlen(CRYPT_VERIFICATION_TOKEN)) != CRYPT_VERIFICATION_TOKEN)
-+			if (sBuffer.Left(strlen(CRYPT_VERIFICATION_TOKEN)) != CRYPT_VERIFICATION_TOKEN)
- 			{
- 				// failed to decode :(
- 				PutModule("Unable to decode Encrypted messages");
-diff -u -r znc-0.092-orig//modules/extra/email.cpp znc-0.092/modules/extra/email.cpp
---- znc-0.092-orig//modules/extra/email.cpp	2010-08-15 01:29:28.971434361 +0300
-+++ znc-0.092/modules/extra/email.cpp	2010-08-15 01:32:57.262438966 +0300
-@@ -154,7 +154,7 @@
- 
- 	virtual void ReadLine(const CS_STRING & sLine)
- 	{
--		if (sLine.substr(0, 5) == "From ")
-+		if (sLine.Left(5) == "From ")
- 		{
- 			if (!m_sMailBuffer.empty())
- 			{
-@@ -168,7 +168,7 @@
- 	void ProcessMail()
- 	{
- 		EmailST tmp;
--		tmp.sUidl = (char *)CMD5(m_sMailBuffer.substr(0, 255));
-+		tmp.sUidl = (char *)CMD5(m_sMailBuffer.Left(255));
- 		VCString vsLines;
- 		VCString::iterator it;
- 
-@@ -200,15 +200,7 @@
- 
- void CEmail::OnModCommand(const CString& sCommand)
- {
--	CString::size_type iPos = sCommand.find(" ");
--	CString sCom, sArgs;
--	if (iPos == CString::npos)
--		sCom = sCommand;
--	else
--	{
--		sCom = sCommand.substr(0, iPos);
--		sArgs = sCommand.substr(iPos + 1, CString::npos);
--	}
-+	CString sCom = sCommand.Token(0);
- 
- 	if (sCom == "timers")
- 	{
diff --git a/net-irc/znc/znc-0.094.ebuild b/net-irc/znc/znc-0.094.ebuild
index 4aec8e0ea1c0..c8aef92ab094 100644
--- a/net-irc/znc/znc-0.094.ebuild
+++ b/net-irc/znc/znc-0.094.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-0.094.ebuild,v 1.4 2010/08/28 23:31:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-0.094.ebuild,v 1.5 2011/02/21 07:44:44 wired Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ inherit base
 
 DESCRIPTION="An advanced IRC Bouncer"
 HOMEPAGE="http://znc.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="http://znc.in/releases/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-irc/znc/znc-0.096.ebuild b/net-irc/znc/znc-0.096.ebuild
index 220b51862e98..a4068b2bd916 100644
--- a/net-irc/znc/znc-0.096.ebuild
+++ b/net-irc/znc/znc-0.096.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-0.096.ebuild,v 1.1 2010/11/08 07:59:02 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-0.096.ebuild,v 1.2 2011/02/21 07:44:44 wired Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ inherit base
 
 DESCRIPTION="An advanced IRC Bouncer"
 HOMEPAGE="http://znc.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="http://znc.in/releases/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"