* [gentoo-commits] gentoo-x86 commit in net-ftp/proftpd: ChangeLog proftpd-1.3.3_rc1-r1.ebuild
@ 2009-09-20 9:01 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2009-09-20 9:01 UTC (permalink / raw
To: gentoo-commits
voyageur 09/09/20 09:01:31
Modified: ChangeLog proftpd-1.3.3_rc1-r1.ebuild
Log:
Fix typo on README.mod_auth_gss, only use in mod_gss mit-krb5 if <1.7 (as in DEPEND)
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Revision Changes Path
1.208 net-ftp/proftpd/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.208&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.208&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/ChangeLog?r1=1.207&r2=1.208
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- ChangeLog 16 Sep 2009 20:15:58 -0000 1.207
+++ ChangeLog 20 Sep 2009 09:01:31 -0000 1.208
@@ -1,6 +1,11 @@
# 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.207 2009/09/16 20:15:58 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.208 2009/09/20 09:01:31 voyageur Exp $
+
+ 20 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+ proftpd-1.3.3_rc1-r1.ebuild:
+ Fix typo on README.mod_auth_gss, only use in mod_gss mit-krb5 if <1.7 (as
+ in DEPEND)
*proftpd-1.3.3_rc1-r1 (16 Sep 2009)
1.2 net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild?r1=1.1&r2=1.2
Index: proftpd-1.3.3_rc1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proftpd-1.3.3_rc1-r1.ebuild 16 Sep 2009 20:15:58 -0000 1.1
+++ proftpd-1.3.3_rc1-r1.ebuild 20 Sep 2009 09:01:31 -0000 1.2
@@ -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.1 2009/09/16 20:15:58 voyageur Exp $
+# $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 $
EAPI="2"
inherit autotools eutils
@@ -101,14 +101,14 @@
use exec && mymodules="${mymodules}:mod_exec"
if use kerberos ; then
cd "${WORKDIR}"/mod_gss-${GSS_VER}
- if has_version app-crypt/mit-krb5 ; then
+ if has_version <app-crypt/mit-krb5-1.7 ; then
econf --enable-mit
else
econf --enable-heimdal
fi
mv mod_{auth_gss,gss}.c "${S}"/contrib
mv mod_gss.h "${S}"/include
- mv README.mod_{authgss,gss} "${S}"
+ mv README.mod_{auth_gss,gss} "${S}"
mv mod_gss.html "${S}"/doc/contrib
mv rfc{1509,2228}.txt "${S}"/doc/rfc
cd "${S}"
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-ftp/proftpd: ChangeLog proftpd-1.3.3_rc1-r1.ebuild
@ 2009-09-24 15:42 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2009-09-24 15:42 UTC (permalink / raw
To: gentoo-commits
voyageur 09/09/24 15:42:21
Modified: ChangeLog proftpd-1.3.3_rc1-r1.ebuild
Log:
Fix compilation with kerberos and heimdal, bug #284853
(Portage version: 2.2_rc41/cvs/Linux x86_64)
Revision Changes Path
1.209 net-ftp/proftpd/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.209&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.209&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/ChangeLog?r1=1.208&r2=1.209
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- ChangeLog 20 Sep 2009 09:01:31 -0000 1.208
+++ ChangeLog 24 Sep 2009 15:42:20 -0000 1.209
@@ -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:
1.3 net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild?r1=1.2&r2=1.3
Index: proftpd-1.3.3_rc1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- proftpd-1.3.3_rc1-r1.ebuild 20 Sep 2009 09:01:31 -0000 1.2
+++ proftpd-1.3.3_rc1-r1.ebuild 24 Sep 2009 15:42:20 -0000 1.3
@@ -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 @@
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-24 15:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-20 9:01 [gentoo-commits] gentoo-x86 commit in net-ftp/proftpd: ChangeLog proftpd-1.3.3_rc1-r1.ebuild Bernard Cafarelli (voyageur)
-- strict thread matches above, loose matches on Subject: below --
2009-09-24 15:42 Bernard Cafarelli (voyageur)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox