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
commit12c2467e797c99f0267c7dca9f56264cd7a61206 (patch)
treebbd2443549d90d6242a72562e89a1ae7748fc393
parentupdated metadata (diff)
downloadhistorical-12c2467e797c99f0267c7dca9f56264cd7a61206.tar.gz
historical-12c2467e797c99f0267c7dca9f56264cd7a61206.tar.bz2
historical-12c2467e797c99f0267c7dca9f56264cd7a61206.zip
Fix compilation with kerberos and heimdal, bug #284853
Package-Manager: portage-2.2_rc41/cvs/Linux x86_64
-rw-r--r--net-ftp/proftpd/ChangeLog6
-rw-r--r--net-ftp/proftpd/Manifest4
-rw-r--r--net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild5
3 files changed, 11 insertions, 4 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/Manifest b/net-ftp/proftpd/Manifest
index b9c02309e085..c5d36504e34f 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -22,6 +22,6 @@ DIST proftpd-mod-vroot-0.8.3.tar.gz 6999 RMD160 7a8d5a29e7c2754b774cebe649f8a28f
DIST proftpd-mod-vroot-0.8.5.tar.gz 8349 RMD160 0e9c3ea9615ed74556fcaf6145863922ee45bedf SHA1 fea69382f4dda36b620780e69cef5872f41f86fe SHA256 305ad1e3b320dc21172982c54a614a09d43373f7289b63202788de640145bbd4
EBUILD proftpd-1.3.2-r2.ebuild 8258 RMD160 ff347403170e81ceef75b3a67a96bc81c33787c3 SHA1 b9443a84b36ee8e5cb74039ef3d5ec8e51eff587 SHA256 cd85a13ac1b5dbe65a529c82e61ed0cfe1f78a2b6ce980c0ca80c2d36723519a
EBUILD proftpd-1.3.2a.ebuild 8250 RMD160 74d619c6a9799c13025425a1bb498d91466ae1ae SHA1 a5424542984ef749eaa104c6bb9cffae09486c37 SHA256 04c011cb7a33aa7d89e3c8125af70e03bbda51af8193a8b23b4fbc09eaa114d6
-EBUILD proftpd-1.3.3_rc1-r1.ebuild 7526 RMD160 5e3761459e310432a0f424e3517e54c26afae1d3 SHA1 f6b2bcc1cc4ddf53424377feab63c3c447f69b92 SHA256 426c9c98a245e984b62a9845036027e85762f5bf283cdded5692042251c78f71
-MISC ChangeLog 35537 RMD160 c18d0ab102ea2566c1c25e53bcb6d18c55c5e441 SHA1 ebac3d65b721a90f6f1b67cc6f75a17e4bfcbf10 SHA256 c6339db6a8b4272458c69906a2876cbdfbc14d0cac0278f34b1ef11aaa0613ee
+EBUILD proftpd-1.3.3_rc1-r1.ebuild 7679 RMD160 8ff5c6b01ffe1f7e4d8f36f331bb9617240427eb SHA1 517ee48ea747a384d744a413b732aa058873d897 SHA256 a53b5aad721688b8ba755dc991fb2d9921dfa6cc8a3fe1219b6e453a39ca9ada
+MISC ChangeLog 35681 RMD160 1690a33a15c88528cd085fef984bbaa76fa8d677 SHA1 00fb5767169f9a2909ede0143e8ff775d095500f SHA256 1b49655d77e724e976aba5a87f151e7e4b68280283e1e8804615935eaabca79b
MISC metadata.xml 1903 RMD160 a15236976f8f0d3f1102ca97f5d9ee1d3e9abe42 SHA1 7cad7067da6c4fe1a5e882792f1516b8a0bb53a6 SHA256 0283e9ccb80ad1b1892a1ee84074210add15433c59b6e4daad5a55d39ff30fd7
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