version bump

(Portage version: 2.2.0_alpha54/cvs/Linux x86_64)

3 files changed, 105 insertions, 1 deletions

diff --git a/net-irc/znc/ChangeLog b/net-irc/znc/ChangeLog
index c1919a852cad..195a035020df 100644
--- a/net-irc/znc/ChangeLog
+++ b/net-irc/znc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.49 2011/04/01 12:14:41 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.50 2011/09/08 20:27:13 wired Exp $
+
+*znc-0.200 (08 Sep 2011)
+
+  08 Sep 2011; Alex Alexander <wired@gentoo.org> +znc-0.200.ebuild,
+  +files/znc-0.200-segfault-fix.patch:
+  version bump
 
 *znc-0.098 (01 Apr 2011)
 
diff --git a/net-irc/znc/files/znc-0.200-segfault-fix.patch b/net-irc/znc/files/znc-0.200-segfault-fix.patch
new file mode 100644
index 000000000000..42ea7859ea13
--- /dev/null
+++ b/net-irc/znc/files/znc-0.200-segfault-fix.patch
@@ -0,0 +1,28 @@
+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/znc-0.200.ebuild b/net-irc/znc/znc-0.200.ebuild
new file mode 100644
index 000000000000..4970acc13e76
--- /dev/null
+++ b/net-irc/znc/znc-0.200.ebuild
@@ -0,0 +1,70 @@
+# 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.200.ebuild,v 1.1 2011/09/08 20:27:13 wired Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="python? 3"
+inherit base python
+
+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 python 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 )
+	python? ( dev-lang/swig )
+	${RDEPEND}
+"
+
+PATCHES=(
+	# https://github.com/znc/znc/issues/63
+	"${FILESDIR}/${P}-segfault-fix.patch"
+)
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 3
+		python_pkg_setup
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable ares c-ares) \
+		$(use_enable debug) \
+		$(use_enable extras extra) \
+		$(use_enable ipv6) \
+		$(use_enable perl) \
+		$(use python && echo "--enable-python=python-$(python_get_version)") \
+		$(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.md || 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
+}