added fix for a NULL pointer dereference in webadmin. removed old patches.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xEB9B4AFA

8 files changed, 219 insertions, 139 deletions

diff --git a/net-irc/znc/ChangeLog b/net-irc/znc/ChangeLog
index 971a35b1e251..2270c24f7306 100644
--- a/net-irc/znc/ChangeLog
+++ b/net-irc/znc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-irc/znc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.65 2013/05/03 04:15:05 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.66 2013/05/28 14:27:49 wired Exp $
+
+*znc-1.0-r2 (28 May 2013)
+
+  28 May 2013; Alex Alexander <wired@gentoo.org> +znc-1.0-r2.ebuild,
+  -files/znc-0.096-clearbuffersonmsg-fix.patch,
+  -files/znc-0.098-modpython-as-needed.patch,
+  -files/znc-0.200-segfault-fix.patch,
+  -files/znc-0.202-bouncedcc-dos-fix.patch,
+  +files/znc-1.0-webadmin-null-pointer-dereference-fix.patch:
+  added fix for a NULL pointer dereference in webadmin. removed old patches.
 
   03 May 2013; Alex Alexander <wired@gentoo.org> -znc-0.094.ebuild,
   -znc-0.202-r1.ebuild, -znc-0.204.ebuild, -znc-0.206.ebuild, metadata.xml:
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index e4d96ec925b4..ed77d4c795ef 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,32 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX znc-0.096-clearbuffersonmsg-fix.patch 1567 SHA256 1d9a4a7d60e3ad0333544feb2933097e8faa2336c66c4fa231d5febbc53c0cb9 SHA512 ab81adaf3f767ff448e73099e8da14a62797633a0883bc586cd87baf140d3f7087dc9c1f7ed3e85a06ad3895a43b9c31cff168c3e1eadd26a32b3a1f581b15c4 WHIRLPOOL 23e54c66a85ddc08ca101f7d439117bed4e5c909b26a323a15b85acdfbfe1dd926efb37afb2a1618d5dda11d933c1b7f3b394b7492dc03819884ede5e9feb958
-AUX znc-0.098-modpython-as-needed.patch 820 SHA256 a4d1d2ef2e32a673e6e019ed6a874ce020dfa9170675613e867e79e335edae45 SHA512 dbbdaf93fb48ff01926e3cff78f160a21871c04f272e62fc92f62561c0df193bcfa6ac960594a1bad475edc806f341d6eae9817ae78b9768b7842a348d9e437e WHIRLPOOL 4658ba75e0dca9a47a6b8a0dbaace1d5283b9899d21a16de3a3093b300c8ebe35fc937384e53776b565fcc8a7b615f54774471b580bea70b1c79c19a66a5a75d
-AUX znc-0.200-segfault-fix.patch 829 SHA256 230afba64b775a15e543222e92302b36e98c28e57351bba21bbf66106ddf95ea SHA512 ceaa0356f0cbb269fc9bdb56f8a1b1b091474771216b3855274860ee3a4ae821b2606390783bf73ddc5d377dc5de77e669b40514401a027a042334a8e99561c8 WHIRLPOOL 5dfc183725268859b07d75be1ce15b0f14403531c87627557e29f3170f6fdfd5285d82ef1276dc6e3be0fc4d187185050dfe884590ca7475312d8e57b406ac73
-AUX znc-0.202-bouncedcc-dos-fix.patch 1509 SHA256 0c975d930571d5edc48bec2f85e0415ea43f85c65c7290c8ab517bd36c40808a SHA512 3c4d66b88263c2dfded105604cc91db22ba247ab57f0017e7fb39448f3d69f6af30390587c6d3e041cdad910d37c59a48d4de2a81a695ab292e73bce82cd306d WHIRLPOOL 3fdf9c31a70bc4df2bc939ae8b8431ebb1e908e8b76c95d33b9600137834dc9684e1915a7b57f8360753b325676ddc690d87d665fe6ecd1d0468bf1b2daa04ac
 AUX znc-1.0-systemwideconfig.patch 4252 SHA256 1ddd5e95b299ef3c2293ce89829bae290a5c8fdc8e260ff09ae7f22264b8fbc9 SHA512 4527317f8b45c77e329167cedd792eb7886b85eeb9cb0b39f7bb117edff9bdde406d3fc4aa81410a3b1f9f7957e8ac312cdd168469fdaefd234ddbbae279341e WHIRLPOOL 3556fef6a5a840657ed50e5e283d913ab441c73b3becdfd5e05661dd312cf9670677407734ec5ba8d4254a1e22a6d3274563ab8ff81b04b16fadc9c16029e933
+AUX znc-1.0-webadmin-null-pointer-dereference-fix.patch 1620 SHA256 2684bed1046b5a1d46f7f8aaa5deb75d051ce7b79b9d8089502fc6726036252c SHA512 60a7b960781c5fd0a06f0da3ef69fce821cf001c75a6c646cf87c16a22493a73adfef2e5bdf9bc350481b34a650dc1e9264502db90dec75394e58e41ca480d8f WHIRLPOOL 7ed241a4575adbebc3d83b5b6e2ad4418eb2a1cccd35b4abfb8821d4f7370203a126bdab6c8023ea2a6eb3b3bf2f5335007f07ab724940558dfe43f3f779b8ed
 AUX znc.confd 123 SHA256 be3155e79e6ed13be88fbf9d99f6889b3ee8425837120c448c827b8302672063 SHA512 352f18d64cbfbd5970c859f2ae2290c0ddafcbd8f1bb5d74f33976bc8388f65a75f8a9a73a093fbac12f2d243d4bcf74380bbb3aaab8d68f7bf4eab7ce3bea46 WHIRLPOOL 24e8272f1d94ff39cb748c9c280761437e2f6527ffa26e4972d83c99cde62e2f70d0c99639f4a8aabb4464fd85ee4856eb8086d3196e12286e3989d8e19c544b
 AUX znc.initd 910 SHA256 9df9e738efca0e6ace045bdb6a1419082408119ba92c032566c6d4a61b1844b5 SHA512 0d1b9bf71cde1b803e9deddc64006528778dc628603bb4ba8cca17098dcb6b8fc34dcb43eca7de7dec61ce84832dd07d76c7ccb2d9175f859d5aee2a349e8045 WHIRLPOOL 0640b8c30c7ff64b772998c86f06fcaae06759a5af7e0384a5ffbd1a1c4c85923c9d87362720a2ae6fb5a164d1a298d12e4493617a1e66813f3dfee0b40d04ce
 DIST znc-1.0.tar.gz 1222361 SHA256 a85539da42697b26e4d46205def36bb799f83d6aeef401d53c49ee674142062a SHA512 4219cdd32296e5851f6cd99a8ac6e14d2579df10e8e111bb09d6c3789e400e2fcdc173968afd54808d286f0fb4945aa57d2d0f3b62a20e761de64500c8938e35 WHIRLPOOL 864c45762f8508c8d724246153345554b660336789a5340e9633b83aed249c901f976d2aa6207a82ce8e7836d680fc30fca03cafbc8942932745c6f1584e99cc
 EBUILD znc-1.0-r1.ebuild 4005 SHA256 ac5a45427e1abadb896d54364a263bb7fab26b936b0b9215e123b1b0a91ddc39 SHA512 52b8c3e0dc73e7fc5b592443b43a279ca65f906dc49a4d3dc8c368465cfb16610c8c3d01f0806b7afe27d25561375379549d59a052adc13592fb1ea197219e47 WHIRLPOOL d876c45bdd8bab52f8cd6120fd7552cafcd9d711ad3bebef11ada750f43c0601ef913bb0def531d22aab491d751b067489e60b18a03d73f98a57a68218f3c7c2
+EBUILD znc-1.0-r2.ebuild 4073 SHA256 bfd08596d712a9f6ec7edf7a84ea57d768f6ff60bfca7ceb13c6c31ba95dd37d SHA512 5ca67a781a4428e2a0379fdeb7756630cdeba7e3e073f97be345144607da0d710022663e1cd6e995d32ab5c6216f8e634a90e3a193cd1acc0ac61bf40c8f8ea6 WHIRLPOOL 4da50f13a752a45c180ff2411a240f6356ba001542d6758a3aef2f916975387b6b531aeceae972117170933d12a964e441409c2179090bdbb009b3ed4c6c1fb6
 EBUILD znc-9999.ebuild 4247 SHA256 908a281c271adb7f4ea0f0075ea62a256842f38d95e5d88d1e16d54daeb55e21 SHA512 572a8acbe2f370252ede90514de11cac4c945be1cde185914fc1697aff3ddbebcbfe302566c400e50af963dbf357e562bd9d05dd511e93e8d9fed8bf4781577f WHIRLPOOL 10239f774cb226092e32f4b82c2928befb30aecd1720f068217b539420810974f08f9c4ec4cae1d4b578941c8e04b1c0c294b54f3dbd69f8d47bc373ef2140c6
-MISC ChangeLog 9337 SHA256 c4c9c6ecb2e0d0e394967fd562e679c7053554f8052939ff90223c54a503e16b SHA512 8d5b658ee6997f6ec3df3d1bb1cbbd8177df01b8728dfeefe8a9742f6cd503c23b7c7f832ed1ed611a06c7d7d00107053ed96e0d007e920ba6e5f2eb10889ebb WHIRLPOOL 76e543ef025e96c310d1d038d5cd71c5308fefeb72cef49d80c666609ddeb8ba66bf1da480dff102be2d160b013f8070310aae0265085e230da502b76329316f
+MISC ChangeLog 9750 SHA256 715c8ff511d56cd3e0858294190e1a4ac89a34925b59702b51f1682bbdc75acc SHA512 1fd2f016f1e1b08f3437e90a5a615da09529318ab2e0c8a3ec35aa57fafcb75181ff94b3767f6b66e997ce6dec2ba80ac25156d8a5e54d7fd6318f04cecc34ad WHIRLPOOL 8bad45d3dd4103c319e38d6a266dc8e34968c7b77fc7a092df17732ffda4301e2d12a4b67e06b6d2697f1cf700bceaed58c852827a3ebf01142169744d03909f
 MISC metadata.xml 387 SHA256 864beefb6d435cf17de251ce82df948cb7af8181bd1ddbdf0d18106f0cb042ed SHA512 37de68d3d350980d0ced5ee9f46e6a6422a4341ca8aeba05fd6eb539081935c26feafabdb103e44470b5da76ef73fd08018662b9d85579b00395292a5bf77054 WHIRLPOOL c2ca27a67d989fc4b0b6f346409a5bd756400be9c4c3616ea548e4caff577c060508e3edc546c9b341d513ba9afa42e3dcec0bd4b40c416177c09e75fa8a3491
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRgzo6AAoJEDZF8K7rm0r6qMEQAJLkUbpPcr2hUmNSTosDfLn6
-6fpT/Nfbesu9QtdTj4fZ+7MT5UntFvlGgYoMfMUF0xbTDKy1dVAkJfxMS33x6J7o
-dbNnfTVyaJlc3nu4euxGlc4eAVIoORUDq2GI120KiUjhyN1GlJpyxGPS6/B3Gnos
-+d8FpZr7SXboRkgylUjX4GLMz57/c7QwTXvJPenVE9ObY8Ntp4AfmnM00+Orqy17
-OBGahUYXiSd4tMBG5qfZzTDfIpkcoT4evG6bXHsD4r2Fik+GZznq8b4kXSQYZVCG
-NLulsrjA1nm+G9Q1ufeyDNzULzPlg93k8YJ66kUs+x0caMaMGLpNW9V5inGU2qJw
-XR7udQWc1/Gwus86D4hqYihELVD3LkunIRynnEWYBfovzAN6iEHDMsvpS5fsFz5d
-A+II+Yi02V175MEWfuOeepCK4Jq5191HdrMCPdcDpkGt5gN8aO8aUKrd9LvW+rPA
-yF3SLJNnYH/04HhND58/Udi93TbXFPO7P/rd5ZuKfZ099rpXBqfcSeaC/DGFxdw2
-otAFXCemMcTwl76w8UE5ME6nNztY6hhj1R9fmW+ED0kBZzi7+gR2SI6EfA9ch66I
-oaH+5TzkNW3ykp0/gxbggyX9BWUAZ+SDOZIyDXFGzZfcLjny804xhrwp3s4uaYK/
-vIAs+lkLkvOBh0Ou8rky
-=QCOr
+iQIcBAEBCAAGBQJRpL73AAoJEDZF8K7rm0r6FfwQAI76dkuWNIr1BB9ktPECf664
+jIGe7vcGlvfgDS4zjrO3w7kGbpvyvGbueu4L9ISO5OtMGnB9OBGCjo7c4AXT4Q6d
+M+vso6ixTBPglApiazAmruw+cSW7JRtssfLkOFvqLc9dwT5r3bN+prHjH5Cwv6eo
+vxSVnJmnonEDDZpDf+i3gdJ8PzXXuo8/CgWRhCgl2pWvcGfAKLbVi77p2tfvxc2n
+gPXaqAxD8Wph3RzG5LKma0nUE2ch2tDS8g4ckg0PGv76Q1YLZ4hqKTIWlDU9Jbn6
+DzgJsInGyfGPL7byWKqwtoK3bzX0oxWyWzMWmM/MdxZOE0fOv4l2z7hS3nApfrdH
+iQd3iOtkyPUh5QiSiIl7BUNh1e9Tn5jpZjrqQ47impRlkF5IKqyv9kJyN8+gJktD
+WyWn/AN0QoHLRLOxPl4BIUJwaLVhgsYG31RSBmIWpvhCuqDrwYGc44yoTE2glifV
+5ZVWswmEHD78P0rYKzXbbu3BfcQg8K+OA7zllZ1zid/ZG3lxJBLvqcrT9roMv7pN
+bASduAeuupQjggFvjOes1AP+aghXWeywOKLrlQ2HExxTR4KZcsJTLmIF9J8XIPuV
+ROeDM2MJjMS71QOKVVPOt5PGrzz2OOdVSRtZ/Ml45lHuSRuiYg7ePhxKxzqE9Lkq
+Rw7kDt+DS+rK4zNtWCvq
+=Cnv/
 -----END PGP SIGNATURE-----
diff --git a/net-irc/znc/files/znc-0.096-clearbuffersonmsg-fix.patch b/net-irc/znc/files/znc-0.096-clearbuffersonmsg-fix.patch
deleted file mode 100644
index 23a8384ee0ca..000000000000
--- a/net-irc/znc/files/znc-0.096-clearbuffersonmsg-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ddd302fbf549bac9cbd9b6675b145ddf0a802aa7 Mon Sep 17 00:00:00 2001
-From: cflakes <cflakes@726aef4b-f618-498e-8847-2d620e286838>
-Date: Sun, 23 Jan 2011 21:12:12 +0000
-Subject: [PATCH] clearbuffersonmsg module in znc-extra: removed OnUserJoin and OnClientLogin hooks. This means that those events will no longer clear the buffer and thereby make the module more useful. You can now e.g. use it to get all the benefits of KeepBuffer = true, but still have the buffer cleared whenever you do something (we assume that doing something means you have read all previous messages).
-
-https://github.com/znc/znc/commit/ddd302fbf549bac9cbd9b6675b145ddf0a802aa7
----
- modules/extra/clearbufferonmsg.cpp |   11 -----------
- 1 files changed, 0 insertions(+), 11 deletions(-)
-
-diff --git a/modules/extra/clearbufferonmsg.cpp b/modules/extra/clearbufferonmsg.cpp
-index f0248b9..5ed6be7 100644
---- a/modules/extra/clearbufferonmsg.cpp
-+++ b/modules/extra/clearbufferonmsg.cpp
-@@ -51,11 +51,6 @@ public:
- 		return CONTINUE;
- 	}
- 
--	virtual EModRet OnUserJoin(CString& sChannel, CString& sKey) {
--		ClearAllBuffers();
--		return CONTINUE;
--	}
--
- 	virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) {
- 		ClearAllBuffers();
- 		return CONTINUE;
-@@ -65,12 +60,6 @@ public:
- 		ClearAllBuffers();
- 		return CONTINUE;
- 	}
--
--	virtual void OnClientLogin() {
--		ClearAllBuffers();
--	}
--
--	// No OnClientDisconnect(), disconnect could be coming from e.g. a timeout
- };
- 
- MODULEDEFS(CClearBufferOnMsgMod, "Clear all channel buffers whenever the user does something")
--- 
-1.7.0.2
-
diff --git a/net-irc/znc/files/znc-0.098-modpython-as-needed.patch b/net-irc/znc/files/znc-0.098-modpython-as-needed.patch
deleted file mode 100644
index 02e983ed34c0..000000000000
--- a/net-irc/znc/files/znc-0.098-modpython-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix modpython compilation with forced --as-needed
-
---- znc-0.098-orig/modules/modpython/Makefile.inc
-+++ znc-0.098/modules/modpython/Makefile.inc
-@@ -1,7 +1,7 @@
- # vim: filetype=make
- 
- ifneq "$(PYCFG)" ""
--PYTHONCOMMON := $(shell $(PYCFG) --includes) $(shell $(PYCFG) --ldflags)
-+PYTHONCOMMON := $(shell $(PYCFG) --includes)
- PYTHONCOMMON += -DSWIG_TYPE_TABLE=znc
- PYTHONCOMMON += -Wno-missing-field-initializers -Wno-unused -Wno-shadow
- PYTHONCOMMON += -Wno-missing-declarations -Wno-uninitialized
-@@ -56,7 +56,7 @@
- 
- modpython/compiler: modpython/compiler.cpp Makefile
- 	$(E) Building optimizer for python files...
--	$(Q)$(CXX) $(PYTHONCOMMON) -o $@ $<
-+	$(Q)$(CXX) $(PYTHONCOMMON) -o $@ $< $(shell $(PYCFG) --ldflags)
- 
- modpython_install: create_install_dir install_metadirs modpython_all
- 	-for i in *.pyc; do \
diff --git a/net-irc/znc/files/znc-0.200-segfault-fix.patch b/net-irc/znc/files/znc-0.200-segfault-fix.patch
deleted file mode 100644
index 42ea7859ea13..000000000000
--- a/net-irc/znc/files/znc-0.200-segfault-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c6b74fa29d709c545e90ac0f8a254d78ba9fe7b2 Mon Sep 17 00:00:00 2001
-From: Kyle Fuller <inbox@kylefuller.co.uk>
-Date: Sun, 4 Sep 2011 19:18:26 +0000
-Subject: [PATCH] Fix CChan::TrimBuffer() (#63)
-
-CChan::TrimBuffer() was trying to do "m_vsBuffer.begin() + -<some number>" which would cause a segmentation fault
-
-Fixes #63
----
- Chan.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Chan.cpp b/Chan.cpp
-index b6eb9d4..31e74c0 100644
---- a/Chan.cpp
-+++ b/Chan.cpp
-@@ -535,7 +535,7 @@ void CChan::ClearBuffer() {
- 
- void CChan::TrimBuffer(const unsigned int uMax) {
- 	if (m_vsBuffer.size() > uMax) {
--		m_vsBuffer.erase(m_vsBuffer.begin(), m_vsBuffer.begin() + (uMax - m_vsBuffer.size()));
-+		m_vsBuffer.erase(m_vsBuffer.begin(), m_vsBuffer.begin() + (m_vsBuffer.size() - uMax));
- 	}
- }
- 
--- 
-1.7.5.4
-
diff --git a/net-irc/znc/files/znc-0.202-bouncedcc-dos-fix.patch b/net-irc/znc/files/znc-0.202-bouncedcc-dos-fix.patch
deleted file mode 100644
index 090932e927a5..000000000000
--- a/net-irc/znc/files/znc-0.202-bouncedcc-dos-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# Fix crash in bouncedcc module.
-# It happens when DCC RESUME is received.
-# Affected ZNC versions: 0.200, 0.202.
-
-https://bugs.gentoo.org/show_bug.cgi?id=398159
-
-diff -Naur znc-0.202.orig/modules/bouncedcc.cpp znc-0.202/modules/bouncedcc.cpp
---- znc-0.202.orig/modules/bouncedcc.cpp	2011-09-21 22:20:19.000000000 +0200
-+++ znc-0.202/modules/bouncedcc.cpp	2012-01-07 14:47:20.436704782 +0100
-@@ -238,7 +238,7 @@
- 					CDCCBounce* pSock = (CDCCBounce*) *it;
- 
- 					if (pSock->GetLocalPort() == uResumePort) {
--						m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pClient->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetUserPort()) + " " + sMessage.Token(4) + "\001");
-+						m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pUser->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetUserPort()) + " " + sMessage.Token(4) + "\001");
- 					}
- 				}
- 			} else if (sType.Equals("ACCEPT")) {
-@@ -248,7 +248,7 @@
- 					CDCCBounce* pSock = (CDCCBounce*) *it;
- 
- 					if (pSock->GetUserPort() == sMessage.Token(3).ToUShort()) {
--						m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pClient->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetLocalPort()) + " " + sMessage.Token(4) + "\001");
-+						m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pUser->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetLocalPort()) + " " + sMessage.Token(4) + "\001");
- 					}
- 				}
- 			}
diff --git a/net-irc/znc/files/znc-1.0-webadmin-null-pointer-dereference-fix.patch b/net-irc/znc/files/znc-1.0-webadmin-null-pointer-dereference-fix.patch
new file mode 100644
index 000000000000..c46aa6abf9bb
--- /dev/null
+++ b/net-irc/znc/files/znc-1.0-webadmin-null-pointer-dereference-fix.patch
@@ -0,0 +1,41 @@
+Fix NULL pointer dereference in webadmin.
+
+https://github.com/znc/znc/commit/2bd410ee5570cea127233f1133ea22f25174eb28
+--- modules/webadmin.cpp
++++ modules/webadmin.cpp
+@@ -404,7 +426,7 @@
+ 			CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock);
+ 
+ 			// Admin||Self Check
+-			if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) {
++			if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
+ 				return false;
+ 			}
+ 
+@@ -433,7 +455,7 @@
+ 			CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock);
+ 
+ 			// Admin||Self Check
+-			if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) {
++			if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
+ 				return false;
+ 			}
+ 
+@@ -457,7 +479,7 @@
+ 			CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock);
+ 
+ 			// Admin||Self Check
+-			if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) {
++			if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
+ 				return false;
+ 			}
+ 
+@@ -471,7 +493,7 @@
+ 			CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock);
+ 
+ 			// Admin||Self Check
+-			if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) {
++			if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
+ 				return false;
+ 			}
+ 
diff --git a/net-irc/znc/znc-1.0-r2.ebuild b/net-irc/znc/znc-1.0-r2.ebuild
new file mode 100644
index 000000000000..0c449f689f2e
--- /dev/null
+++ b/net-irc/znc/znc-1.0-r2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-1.0-r2.ebuild,v 1.1 2013/05/28 14:27:49 wired Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="python? 3"
+inherit base python user
+
+MY_PV=${PV/_/-}
+DESCRIPTION="An advanced IRC Bouncer"
+HOMEPAGE="http://znc.in"
+SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="daemon debug ipv6 perl python ssl sasl tcl"
+
+RDEPEND="
+	perl? ( >=dev-lang/perl-5.10 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	tcl? ( dev-lang/tcl )
+"
+DEPEND="
+	virtual/pkgconfig
+	perl? ( dev-lang/swig )
+	python? (
+		>=dev-lang/swig-2.0.2
+		>=dev-lang/perl-5.10
+	)
+	${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+	"${FILESDIR}/${P}-systemwideconfig.patch"
+	"${FILESDIR}/${P}-webadmin-null-pointer-dereference-fix.patch"
+)
+
+CONFDIR="/var/lib/znc"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 3
+		python_pkg_setup
+	fi
+	if use daemon; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /dev/null ${PN}
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable perl) \
+		$(use python && echo "--enable-python=python-$(python_get_version)") \
+		$(use_enable sasl cyrus) \
+		$(use_enable ssl openssl) \
+		$(use_enable tcl tcl)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS README.md
+	if use daemon; then
+		newinitd "${FILESDIR}"/znc.initd znc
+		newconfd "${FILESDIR}"/znc.confd znc
+	fi
+}
+
+pkg_postinst() {
+	if use !daemon; then
+		elog
+		elog "Run 'znc --makeconf' as the user you want to run ZNC as"
+		elog "to make a configuration file"
+		elog "If you are using SSL you should also run 'znc --makepem'"
+		elog
+	else
+		elog
+		elog "An init-script was installed in /etc/init.d"
+		elog "A config file was installed in /etc/conf.d"
+		if [[ ! -d "${EROOT}${CONFDIR}" ]]; then
+			elog
+			elog "Run 'emerge --config znc' to configure ZNC"
+			elog "as a system-wide daemon."
+			elog
+			elog "If you are using SSL you should also run:"
+			elog "  znc --system-wide-config-as znc --makepem -d ${CONFDIR}"
+			elog "as root"
+			elog
+			elog "If migrating from a user-based install"
+			elog "you can use your existing config files:"
+			elog "  mkdir ${CONFDIR}"
+			elog "  mv /home/\$USER/.znc/* ${CONFDIR}"
+			elog "  rm -rf /home/\$USER/.znc"
+			elog "  chown -R znc:znc ${CONFDIR}"
+			elog
+			elog "If you already have znc set up and want take advantage of the"
+			elog "init script but skip of all the above, you can also edit"
+			elog "  /etc/conf.d/znc"
+			elog "and adjust the variables to your current znc user and config"
+			elog "location."
+			if [[ -d "${EROOT}"/etc/znc ]]; then
+				elog
+				ewarn "/etc/znc exists on your system."
+				ewarn "Due to the nature of the contents of that folder,"
+				ewarn "we have changed the default configuration to use"
+				ewarn "	/var/lib/znc"
+				ewarn "please move /etc/znc to /var/lib/znc"
+				ewarn "or adjust /etc/conf.d/znc"
+			fi
+		else
+			elog "Existing config detected in ${CONFDIR}"
+			elog "You're good to go :)"
+		fi
+		elog
+	fi
+}
+
+pkg_config() {
+	if use daemon && ! [[ -d "${EROOT}${CONFDIR}" ]]; then
+		einfo "Press ENTER to interactively create a new configuration file for znc."
+		einfo "To abort, press Control-C"
+		read
+		mkdir -p "${EROOT}${CONFDIR}" || die
+		chown -R ${PN}:${PN} "${EROOT}${CONFDIR}" ||
+			die "Setting permissions failed"
+		"${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${CONFDIR}" ||
+			die "Config failed"
+		echo
+		einfo "To start znc, run '/etc/init.d/znc start'"
+		einfo "or add znc to a runlevel:"
+		einfo "  rc-update add znc default"
+	else
+		if use daemon; then
+			ewarn "${CONFDIR} already exists, aborting to avoid damaging"
+			ewarn "any existing configuration. If you are sure you want"
+			ewarn "to generate a new configuration, remove the folder"
+			ewarn "and try again."
+		else
+			ewarn "To configure znc as a system-wide daemon you have to"
+			ewarn "enable the 'daemon' use flag."
+		fi
+	fi
+}