From 258626a9aa10113bde9e68a88cb5b8704b8b9960 Mon Sep 17 00:00:00 2001 From: Alex Alexander Date: Thu, 8 Sep 2011 20:27:13 +0000 Subject: [PATCH] version bump Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64 --- net-irc/znc/ChangeLog | 8 ++- net-irc/znc/Manifest | 35 +++++----- .../znc/files/znc-0.200-segfault-fix.patch | 28 ++++++++ net-irc/znc/znc-0.200.ebuild | 70 +++++++++++++++++++ 4 files changed, 124 insertions(+), 17 deletions(-) create mode 100644 net-irc/znc/files/znc-0.200-segfault-fix.patch create mode 100644 net-irc/znc/znc-0.200.ebuild 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 +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/Manifest b/net-irc/znc/Manifest index b398c60786c0..039c34f24649 100644 --- a/net-irc/znc/Manifest +++ b/net-irc/znc/Manifest @@ -1,31 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX znc-0.096-clearbuffersonmsg-fix.patch 1567 RMD160 549840d80e143428737b304725c0e5e992ea9e53 SHA1 d7ecd45bff47e480b4f17628df90b902509dda59 SHA256 1d9a4a7d60e3ad0333544feb2933097e8faa2336c66c4fa231d5febbc53c0cb9 AUX znc-0.098-modpython-as-needed.patch 820 RMD160 b944281272a61d4948d4a807bf3cc3899bf4834d SHA1 29274c3f2b77704b010d410316d716ea40e2a480 SHA256 a4d1d2ef2e32a673e6e019ed6a874ce020dfa9170675613e867e79e335edae45 +AUX znc-0.200-segfault-fix.patch 829 RMD160 480c2b629319116e1b5dccbec09acf18b7ba88f3 SHA1 e31bcf7c9d437a9e86f9d28be10d1bd1b998760e SHA256 230afba64b775a15e543222e92302b36e98c28e57351bba21bbf66106ddf95ea 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 DIST znc-0.098.tar.gz 637247 RMD160 1731558cf0effb889e1bc55c01bb06fdaa1e064f SHA1 5f1a32b6d03ed015534f831b6dd7910a07a7d832 SHA256 3b88d33c21e464aa82c84b2dc3bcd52dec95c87a052bb80aff6336dbb4043eb4 +DIST znc-0.200.tar.gz 653585 RMD160 f08d3e1f8cc4fd3425923a79567d64449ac1b053 SHA1 c4350d5cd8005b32132903fc92168b2b23d2e4a6 SHA256 733726585502d57be82296df08bf36e13f36f1855a841b8e69deb124e7719e70 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 EBUILD znc-0.098.ebuild 1611 RMD160 9add45ee6445bcc11be0fee58b5bd983dab7f9d2 SHA1 028fca2f89edec40e349f456054dd80ba0d6af54 SHA256 85dca3b99aedc96c34e11f55bdf8dcb23e2abc1292926fd0b80bcae493faf19a -MISC ChangeLog 6608 RMD160 00ca6aa94a063f5145e8c4f9f6b24ac1ef2a488f SHA1 a99344959f1988c97c6d39d6c507af1a736dab46 SHA256 39f06f44ac3cf6846db2cf71ec7df6c95d17ade7d395a8f56b3d49e415095314 +EBUILD znc-0.200.ebuild 1606 RMD160 d89d327751ea23f1621908361405dbb9a5c96d6d SHA1 2918d5b3e834ef6f043eeb760aae43715cc6dde3 SHA256 53d8d39b39ac5ddd3b189ad0b8d8fac6a624e10b1e1ac66950b568591764e356 +MISC ChangeLog 6757 RMD160 31b0e17ee82d9036225d57a24271310d3decd573 SHA1 d5c5df5ecef1919008a7d349434c4956d068debb SHA256 5c3a046929215f6c8efb321ce9c55002ade2c4d8509f17aa31511ed566bf5f19 MISC metadata.xml 409 RMD160 f6476a5c2d494c26a600e104d723b4be74185bfe SHA1 3677f5f84105a59c3c0056b7718990ccd3eacbfc SHA256 9f5b022b9a72f00cb0b91ce0d8bf502bfe5bbd619c962dd8d5891096e5e3b84b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCAAGBQJNlcG+AAoJEDZF8K7rm0r6zBUP/3JUg+qP7cpri1DnL8F67OKC -NmiudM8N7MwUr15N1yxeiGOYPRHXuN6W526opyQooqamGHxmIzFkPv6nLewCagWd -zFGyl0FZmS0wLu7cEy63+zIpaRrJszu+wU7kp+nZQuE+71sYRoersF4zA47vIlyt -BfLwnNhniFkq813e6YkOFVvkdUBV0xESVvQO9YxPmYOP1GwtKl6L3oFKkS6o6heu -smlLt/aQCWYMT/fwzGUoBiv+656hiqRd1fr4vqJeclSt9TT33N05AtbsXPKatS7A -r7Qb4QqDbaaRp3uK0JIVffCDhS34FXxVMdMVFmIz2AShK96NaipY5pJx/W0GLqRe -40xKsReOIibKb1vY+ECJ0Jo+Sc7PaesucUf1fOGqcMu3rVBrxWYsF920rd0mKoGq -wNLsHbJ814HYSnL5xA8Xy/EaFj1eN9y2CuTajEuqQvMUq/ggV7YXLw356PNRn+0A -ZY0GlxXaCTUNPY4uUDmMXgS5sh8bNc34EkaSZrCW7R0oWOfrSVEk6LRFk2waRnvV -f5jG0s/LwAykFRZipI+XWmyxV7SpS9oVA8ZAAOuo6cwrsQpmGiLCs84mVLnCRn/o -GlC0AdIz5hDYVcMR01DQBxGONtWpBwJDKuBB+OS8pbSEds2tp+Mdu8FkGauKG8Xs -y7kToRs1Up9aIGuC4MQj -=AWOO +iQIcBAEBCgAGBQJOaSU9AAoJEDZF8K7rm0r622IP/0sN7Ram4kPD0ww4wpJ+sJpl +CW46/54fQvuM6qkXNAyEeOlTD+xeD7h+zJsaIvgrp4+y89jboxMvs3VQFEOrAaUR +c2rBBgpLqBjEc1wKpmWS2q5ZgCTf2lFbUh5x+iugU5A99Xcc7JxcoCQhCAM+KRWo +ih2TydwhiRAJferm166ElJ3jaiKKNl/G/b/L/8/i+mb5xfjmN4s2g83qEpMH6qom +XtURKFLkIj9bm1EK7p25XRzOwSldW6zpU7NWdHQJUx6oaulAvoMjrxu4cG2r4Ksh +K2XkKPrc0YAMQrQY7xF+6ZciRx9E0qwbTj7qvyTXmjxsILNmNw+iRzIqM9DNdRK3 +GURbwQQ9eCSWthtUqfsaTR3kdvxpDhhpH4m7gJB/W0O2YEn/gkd525dadeaP65sG +ZjJj8LQaZQ/YYG+sePVFB5kVTUzQXBxspFdYaxaL2m5V08mgNoXP/vpnRmWlgNZm +YdFuO+FEZBk9QUwpo26SudB1iAGrpzWxU7+GNQkD+vv/7TnlV1NkXc/AScZEJp1q +EiZLto2KFIczIkZbAZdsyKNgI79/hpXwTZ8GxVguogOKcBGs41ImFjTNvEhuR7AP +k0I7nk75+nquyaOaBKa4q9NJp/sBUDMaE77gtDUPKtrDAaJei+RlZMRRyAuhfTbC +zoupB2ZQnweX298V0opo +=fDmv -----END PGP SIGNATURE----- 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 +Date: Sun, 4 Sep 2011 19:18:26 +0000 +Subject: [PATCH] Fix CChan::TrimBuffer() (#63) + +CChan::TrimBuffer() was trying to do "m_vsBuffer.begin() + -" 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 +} -- 2.26.2