summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2009-09-24 15:42:20 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2009-09-24 15:42:20 +0000
commit54ace4672377f75c6b80d795b3fe290fe1944567 (patch)
treeb85dfb04b73cc1b45485a516a9d2df4806c47524 /net-ftp
parentupdated metadata (diff)
downloadgentoo-2-54ace4672377f75c6b80d795b3fe290fe1944567.tar.gz
gentoo-2-54ace4672377f75c6b80d795b3fe290fe1944567.tar.bz2
gentoo-2-54ace4672377f75c6b80d795b3fe290fe1944567.zip
Fix compilation with kerberos and heimdal, bug #284853
(Portage version: 2.2_rc41/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/proftpd/ChangeLog6
-rw-r--r--net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild5
2 files changed, 9 insertions, 2 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 50c686217a2e..541b93f0ad56 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/proftpd
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.208 2009/09/20 09:01:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.209 2009/09/24 15:42:20 voyageur Exp $
+
+ 24 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+ proftpd-1.3.3_rc1-r1.ebuild:
+ Fix compilation with kerberos and heimdal, bug #284853
20 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
proftpd-1.3.3_rc1-r1.ebuild:
diff --git a/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild
index ca50909a2cce..75c7f7a61b21 100644
--- a/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild,v 1.2 2009/09/20 09:01:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild,v 1.3 2009/09/24 15:42:20 voyageur Exp $
EAPI="2"
inherit autotools eutils
@@ -74,6 +74,9 @@ src_prepare() {
fi
use deflate && __prepare_plugin mod_deflate
use vroot && __prepare_plugin mod_vroot
+ # Bug #284853 when using heimdal
+ use kerberos && sed -i -e "s/krb5_principal2principalname/_\0/" \
+ "${WORKDIR}"/mod_gss-${GSS_VER}/mod_auth_gss.c.in
# Fix MySQL includes
sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c