summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Horelick <jdhore@gentoo.org>2012-11-25 16:00:55 +0000
committerJeff Horelick <jdhore@gentoo.org>2012-11-25 16:00:55 +0000
commit5dbc3bc11151b4b57ff72b4920bda97d6ae31738 (patch)
tree2391067d4368f1229dd1f3a557d893730b45cb07 /net-irc
parentUpdate to support libav-9, the new snapshot is exactly the same as the previo... (diff)
downloadgentoo-2-5dbc3bc11151b4b57ff72b4920bda97d6ae31738.tar.gz
gentoo-2-5dbc3bc11151b4b57ff72b4920bda97d6ae31738.tar.bz2
gentoo-2-5dbc3bc11151b4b57ff72b4920bda97d6ae31738.zip
Drop unneeded patch
(Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key 23E9E900)
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/charybdis/ChangeLog6
-rw-r--r--net-irc/charybdis/charybdis-3.4.1.ebuild7
-rw-r--r--net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch20
3 files changed, 7 insertions, 26 deletions
diff --git a/net-irc/charybdis/ChangeLog b/net-irc/charybdis/ChangeLog
index 06010f472016..d152a439af73 100644
--- a/net-irc/charybdis/ChangeLog
+++ b/net-irc/charybdis/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-irc/charybdis
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/ChangeLog,v 1.17 2012/11/25 14:33:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/ChangeLog,v 1.18 2012/11/25 16:00:55 jdhore Exp $
+
+ 25 Nov 2012; Jeff Horelick <jdhore@gentoo.org>
+ -files/charybdis-3.4.0-testline-crash-fix.patch, charybdis-3.4.1.ebuild:
+ Drop unneeded patch
*charybdis-3.4.1 (25 Nov 2012)
diff --git a/net-irc/charybdis/charybdis-3.4.1.ebuild b/net-irc/charybdis/charybdis-3.4.1.ebuild
index cb8ccf195194..026949f8b5f2 100644
--- a/net-irc/charybdis/charybdis-3.4.1.ebuild
+++ b/net-irc/charybdis/charybdis-3.4.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-3.4.1.ebuild,v 1.1 2012/11/25 14:33:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-3.4.1.ebuild,v 1.2 2012/11/25 16:00:55 jdhore Exp $
EAPI=4
-inherit autotools eutils multilib user
+inherit eutils multilib user
DESCRIPTION="The atheme project's IRCd based on ratbox"
HOMEPAGE="http://atheme.org/project/charybdis http://www.stack.nl/~jilles/irc/#charybdis"
@@ -27,9 +27,6 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-testline-crash-fix.patch
- eautoreconf
-
# Fill the example configuration file with proper paths.
sed -i \
-e "s:path =.*modules:path = \"$(get_libdir)/${PN}/modules:g" \
diff --git a/net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch b/net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch
deleted file mode 100644
index 0e72f7d21393..000000000000
--- a/net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 047a9b1ab072b8103ec954adc2f75baf2e9be553
-Author: Jilles Tjoelker <jilles@stack.nl>
-Date: Thu Oct 18 15:54:24 2012 +0200
-
- Fix a crash with testline, introduced with the "underlying ipv4" feature.
- (cherry picked from commit 6387b5ad4472d1a8f8fbd0b7f3f32dd9d8542072)
-
-diff --git a/src/hostmask.c b/src/hostmask.c
-index 99899af..fb28bbb 100644
---- a/src/hostmask.c
-+++ b/src/hostmask.c
-@@ -422,7 +422,7 @@ find_address_conf(const char *host, const char *sockhost, const char *user,
- }
-
- #ifdef RB_IPV6
-- if(ip->sa_family == AF_INET6 &&
-+ if(ip != NULL && ip->sa_family == AF_INET6 &&
- ipv4_from_ipv6((const struct sockaddr_in6 *)(const void *)ip, &ip4))
- {
- kconf = find_conf_by_address(NULL, NULL, NULL, (struct sockaddr *)&ip4, CONF_KILL, AF_INET, vuser, NULL);