added upstream fix for the clearbuffersonmsg module that makes it ignore user joins and client logins, making it more useful.

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

4 files changed, 125 insertions, 15 deletions

diff --git a/net-irc/znc/ChangeLog b/net-irc/znc/ChangeLog
index fbf4bcad6a6e..7d78a1124a32 100644
--- a/net-irc/znc/ChangeLog
+++ b/net-irc/znc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/znc
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.48 2011/03/03 23:51:31 wired Exp $
+
+*znc-0.096-r1 (03 Mar 2011)
+
+  03 Mar 2011; Alex Alexander <wired@gentoo.org> +znc-0.096-r1.ebuild,
+  +files/znc-0.096-clearbuffersonmsg-fix.patch:
+  added upstream fix for the clearbuffersonmsg module that makes it ignore user
+  joins and client logins, making it more useful.
 
   21 Feb 2011; Alex Alexander <wired@gentoo.org>
   -files/znc-0.090-null-pointer-dereference-fix.patch,
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index c65001109da0..46cbf38c528f 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX znc-0.096-clearbuffersonmsg-fix.patch 1567 RMD160 549840d80e143428737b304725c0e5e992ea9e53 SHA1 d7ecd45bff47e480b4f17628df90b902509dda59 SHA256 1d9a4a7d60e3ad0333544feb2933097e8faa2336c66c4fa231d5febbc53c0cb9
 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 1253 RMD160 8a4137952eec6cec05da62da48e348ce964cb7e3 SHA1 50778127c600e8d83714068e60194133d3654711 SHA256 43a451cbe0eabe1772df7ccce6e274e4a3807340ff16985c8bb9a79797044ccd
+EBUILD znc-0.096-r1.ebuild 1423 RMD160 0be1f0dbf75f1c88b07ee60a0bda6b1336abf8c2 SHA1 492baa86c8b1f784e07f05d92176e9e7cae7df35 SHA256 d63570c6cc15364b6e360fb3097d8a7762aebd575e74ca2b468d70c8c2790d99
 EBUILD znc-0.096.ebuild 1280 RMD160 7d6bbd9bb1eb91ba40686770a7d2d8b7b3ea7dde SHA1 030744e6ea41aff1797939d379c4f183a04881f5 SHA256 069e6507c1adb17c95da874f2a66a3392cb19b8319821d594359ba35dc156d5e
-MISC ChangeLog 6173 RMD160 91cc3a61094359abc16a10913df3a52f5c6ce203 SHA1 a02b5658674a1769e0e2b98a37eee3c7f4cac826 SHA256 35cca196cb3c5a658f65fc48048079f7e0f1aacaa06d5ec42f015bc536794581
+MISC ChangeLog 6452 RMD160 a877dccb34da0e6881960d3c6bff5cff28b4a2f5 SHA1 edaf531e80765fbda7201506a6a96f22317238d8 SHA256 0676a871ea52af65b67f7b1774d59b5500b8b82b0fd31b2048ce12d77100e64f
 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
+iQIcBAEBCAAGBQJNcCmdAAoJEDZF8K7rm0r6cQ0QAJSmfdfE4o5SptGFb7OzS+p2
+UOHKfwc606DKsUYq2evWZBICqaIT8gUOZb+rML+aqzsrKo01l0BI86LeGPhhL8Lq
+pqLj9TlU3qFLwEJIjRRy8Qqn7UylJI8sV0mBCv28JPXnWSeEXeNUvE2i1Ix/NuMd
+M08KXyPHcVT1zpZr7VxbtODJ9ABBwW/eV2XNMlDZwiM9wC8DI9//tcPBXTgVZ8F+
+ew81x6oIhBJZ263GbYhaqz1FG5mqB+Rj9aFZvwsQZ6tqytyCBKJb5TC5O1D0PJXJ
+1BIgxXL9ivB2O46gUgMqlAa/vMmaN4oBeO1syHpfgie6+STyzzRdblOF/2hV4SZ6
+Z8lAEOVZQ2dR5KYb+T8dlr4cXzJMEa0CC38oIlz9pPVN/Wixi9kuKbp7prrs7R1x
+RHq9oYJ+3POSDnoNsXZCoy5Oqbdi73l2o7hUc6oGhMA5fla1Mz7GZ0DL0JEdiaY7
+7HabSOhgwQ89uXggx5RYEyZMNKlG7zk2TUWvGn4g2Kr8ny5kRFzyAzeU/kavz880
+1XDnGblBDv/hRt2HSaGT0k6eR6cb42gvXFuJyvd5dNUP9SUDVXdj9LVzNDXb02ds
+jCNwn78L5CPWNT6F3mRaIsbo1BqKBtsvm5KFp1o/UE0IpvQEId9Zfc+tzUdbEA4C
+QovIe0oUvU9RgoGvkFF3
+=rGm0
 -----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
new file mode 100644
index 000000000000..23a8384ee0ca
--- /dev/null
+++ b/net-irc/znc/files/znc-0.096-clearbuffersonmsg-fix.patch
@@ -0,0 +1,42 @@
+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/znc-0.096-r1.ebuild b/net-irc/znc/znc-0.096-r1.ebuild
new file mode 100644
index 000000000000..7f1c3582312f
--- /dev/null
+++ b/net-irc/znc/znc-0.096-r1.ebuild
@@ -0,0 +1,59 @@
+# 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-r1.ebuild,v 1.1 2011/03/03 23:51:31 wired Exp $
+
+EAPI=2
+
+inherit base
+
+DESCRIPTION="An advanced IRC Bouncer"
+HOMEPAGE="http://znc.sourceforge.net"
+SRC_URI="http://znc.in/releases/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ares debug extras ipv6 perl ssl sasl tcl"
+
+RDEPEND="
+	ares? ( >=net-dns/c-ares-1.5 )
+	perl? ( dev-lang/perl )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	tcl? ( dev-lang/tcl )
+"
+DEPEND="
+	dev-util/pkgconfig
+	perl? ( dev-lang/swig )
+	${RDEPEND}
+"
+PATCHES=(
+	# https://github.com/znc/znc/commit/ddd302fbf549bac9cbd9b6675b145ddf0a802aa7
+	"${FILESDIR}"/"${P}"-clearbuffersonmsg-fix.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable ares c-ares) \
+		$(use_enable debug) \
+		$(use_enable extras extra) \
+		$(use_enable ipv6) \
+		$(use_enable perl) \
+		$(use_enable sasl) \
+		$(use_enable ssl openssl) \
+		$(use_enable tcl tcl) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed."
+	dodoc AUTHORS README || die "dodoc failed"
+}
+
+pkg_postinst() {
+	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
+}