Add kerberos support, thanks to Martin Mokrejš in bug #134922. Add patch to use system libltdl for the dynamic loader (needed for this new module)

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 95 insertions, 6 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 6d8fe2b3f3f0..eea2e60da484 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.195 2009/02/23 14:00:07 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.196 2009/02/24 22:00:44 voyageur Exp $
+
+  24 Feb 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/proftpd-1.3.2-system-libltdl.patch, proftpd-1.3.2-r2.ebuild:
+  Add kerberos support, thanks to Martin Mokrejš in bug #134922. Add patch
+  to use system libltdl for the dynamic loader (needed for this new module)
 
 *proftpd-1.3.2-r2 (23 Feb 2009)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 818867c2045e..f11afc58964b 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -8,6 +8,7 @@ AUX proftpd-1.3.1_rc2-bug178866.patch 1731 RMD160 11d06f7d5ea2ad4678ff989514daaa
 AUX proftpd-1.3.1_rc2-bug181712.patch 1098 RMD160 1c4a77dfb401c6d888fabc259e21f5022828335b SHA1 387e079c66df054909a2c7d94485189aa1b09afc SHA256 bdb1364ae5a518f5d50b8a232e94bd83b2d3f846d51566c7ed63550ac3858698
 AUX proftpd-1.3.2-mysql-include.patch 363 RMD160 4406e4ff522580962662f9aa00310a75f4984cbd SHA1 979f0c1272c25e34fe489ac4227f2dce2db35804 SHA256 5be06884923c23ff4e44e5e9e87d27a88aaee2d10bc341daba6cd21d26543330
 AUX proftpd-1.3.2-parallel-build.patch 786 RMD160 ff9df4ca01c5d95664bc00650996896300ada1d7 SHA1 c0d6d23c8da22cf6b9b882d01ab6e562d51dd1b3 SHA256 a429b3f7c79d46a279d77357481208f962b6e93fcea5424b2b030e366fe3c662
+AUX proftpd-1.3.2-system-libltdl.patch 1932 RMD160 135045db34d87dfdb62ff643864778c3884fa013 SHA1 6e1fe98fd9e3b92aaa2886536646b7bb58765c89 SHA256 74bcb197a66b7767d8b5d327e955d979d5676be6bc3d17794be8ddc09879f2b4
 AUX proftpd-1.3.2-upstream-bug-3183.patch 3032 RMD160 b3acacfadca5a0a8f35a3ca7f16561bc4271f27b SHA1 a967187a682a955369715782409cfd1de2e057bd SHA256 b2f16611b753e4c5d7874d544462217b2e44dc308b45d6a127bb17566c264403
 AUX proftpd-1.3.2_rc2-CVE-2008-4242.patch 5522 RMD160 a0f73525f1b6b9f06fd6b6ff0b5eb6112a8abe5b SHA1 6f51a0653ce994c6a0f4e447f152b5676b213a19 SHA256 4d77366e9bc08058f906d7e93c9ec8427fb5d36ba85db9cec74c510ca40ba728
 AUX proftpd.conf 1968 RMD160 10394bf0fcaa201c59873c1a518a75f7f9d7b53c SHA1 6d3c932efa5a16c3772b49d68bc46e0239472b0b SHA256 82ebf842526eb5b1e6ac2126511063b8242ad66a271095b2ab5d1f18f908c192
@@ -17,6 +18,7 @@ DIST mod_clamav-0.10.tar.gz 5256 RMD160 5db26964bc1d3135d0da4234de010f2236d0f881
 DIST mod_clamav-0.7.tar.gz 3676 RMD160 779203276643343bb54dc5e8225cf16392959533 SHA1 2e9376865eb03d482e2aac89a0ce611a5587e084 SHA256 61aa9d6af9432d1409170305526d87f63742aca198dd299d21ce37a60a8f41e7
 DIST mod_clamav_new.c 7399 RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb SHA1 f037c573b6c0052f8ed5ee427504a8cd8834f15c SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1
 DIST mod_clamav_new.html 4645 RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 SHA1 58479f3aae082effad3636026a27c09ddb232905 SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e
+DIST mod_gss-1.3.1.tar.gz 113778 RMD160 b961395bcd4898a39d2867da33594d14aebb29dc SHA1 a4af0c6615b952c18733d6b18ab53ac12d54c7fe SHA256 c6f71458777c76fc09f5fdb5bb5060db7d9e4b69f730633d3a825327004cf54d
 DIST proftpd-1.3.1.tar.bz2 2243888 RMD160 ed47f7a7c446b01c3d00d2d25d89573c787da905 SHA1 0b54286492967172c5355e2f489f9665b46591e5 SHA256 03bc023e5b7b1c04d8eb2d5dca53b931b3e02cc7aba7dd8f629b0878535dc91b
 DIST proftpd-1.3.1rc2.tar.bz2 1516464 RMD160 aa928315880cf1e9d1980850ce2bb07193d2ac46 SHA1 7db6435707983fe8e865064661cedb159ebc1cf6 SHA256 7494ea061ef28efc7afa63ffe0a80d598a55909d06dede9254e955c67e6440da
 DIST proftpd-1.3.2.tar.bz2 2457498 RMD160 cefc52ad19bd633a24b28438a2cde12fd99c2a56 SHA1 b48bfb0acde11bd2a2f7a7c74a1d72d497cca46a SHA256 1cadcaf9bb0ff8a2fddcc20fc93844568cf52db872a3aea9f90ab22efa7baf1e
@@ -34,10 +36,10 @@ EBUILD proftpd-1.3.1-r1.ebuild 7268 RMD160 325241cc3f68e24e73c8f627daee64b42490c
 EBUILD proftpd-1.3.1.ebuild 6951 RMD160 f2d030f82d5c73d2312d413aa9ba2f9f8174219d SHA1 69618caa7299ec3a9b4ae935aa71b0096b937b62 SHA256 f8b1ba70aba8cbb6c5b296731e0ed748c7659eac3935ffe2758df0c3363dab1f
 EBUILD proftpd-1.3.1_rc2-r3.ebuild 6338 RMD160 5af01205da38a4e4cdf4ad4ddfbb8f979b42cfdc SHA1 993a40f69700583842aa7c1d1527ee97f7292cc3 SHA256 5977e86165767799cd4123e14bd391b04cbd14f29c563ecc6081d014f9fadbb2
 EBUILD proftpd-1.3.2-r1.ebuild 7400 RMD160 df80e1c2a92e28cf1dd67e07900c1459739c3a6d SHA1 d97a376f5f0b6533ed7deef29368e4a6326905b7 SHA256 1f599b4aa444d0e63942d40499699692921307997a1da8a3860f7f3c231a2f96
-EBUILD proftpd-1.3.2-r2.ebuild 7418 RMD160 580e0e702d23d1f3e0395d3a151d62e18453b728 SHA1 2e0a67505815dc9ee536c9eca2b7ca40222ba70e SHA256 0c1325797c0b37ebda74ce999c500f8a94ad1583e67b93564037678fc02342bb
+EBUILD proftpd-1.3.2-r2.ebuild 8270 RMD160 830929f8875660cdced09aa5709f44f2dacc6df4 SHA1 9f073edad7fd03665eb97cd3c88e51ede8b56ad0 SHA256 584de9a813ee11b5cfd5a9164797fa56f0d0e0100985479d8074841ca427561f
 EBUILD proftpd-1.3.2.ebuild 7295 RMD160 b9cf62e810575cb7162df6ceb74d80a3e9d3a626 SHA1 8ca909a27093c613e3e6d821b11435e956baece7 SHA256 347cebd98354833e0afeeedd404c7eaabd01c83ae5d54583ef494994c535865e
 EBUILD proftpd-1.3.2_rc2-r1.ebuild 6866 RMD160 957abaf1d215e283cf6fba9596c99b38bc0f280b SHA1 7c383e52874c514a07949a103b6492b9379909c5 SHA256 9bd1c563370a5238f7ec4e76bfd35ec62b7ee4bda75e197b058d8a4a58391a63
 EBUILD proftpd-1.3.2_rc2-r2.ebuild 7140 RMD160 4dfff1c4625569484d79c6e6f94e09443d1a65ee SHA1 db8a58e69ac73990534b03775a04a3d60fb0c932 SHA256 2243bba7f96ef569c67598885a0585642c6d4cd87337a2d3f1c3ef33942fa30e
 EBUILD proftpd-1.3.2_rc2.ebuild 6117 RMD160 cc531c8dd2e471301b60968cb8d20dfa90790e1c SHA1 7eabe46dc93f9cbaf850b4c31c1dc7cd17b5cb84 SHA256 76600e594fb69342e0f30f4ea636a3c47020cb3c8268fc2ea96685b587f58039
-MISC ChangeLog 32709 RMD160 d731922fb2b5223179a09594c61a7f4799f3b669 SHA1 0048d8518236dc11594fea7b36525b43f7d5d7a6 SHA256 3eefb5a793b9425709ee6df73555924c75ad11e5d986055ad9b9a9691b98057c
+MISC ChangeLog 32987 RMD160 d4e554dc8aef4ba32de984d1a21a5bf8cb805542 SHA1 57b10451ee19a6b4f6f925f21ac368da9040fc4c SHA256 05659c03181e755202d36c1b4094346897f718e90440854870f4730f75444ae0
 MISC metadata.xml 1266 RMD160 2eb6ab3b7a7c68eca09e193daaea833a2dc08362 SHA1 86bf2fc8f6b6c944bf384e97e9bcdec7d7ec8d77 SHA256 ffe716530aba4cf0ec4069d86c2b09f9a4dbfca541d7f467c579f871cf78c0de
diff --git a/net-ftp/proftpd/files/proftpd-1.3.2-system-libltdl.patch b/net-ftp/proftpd/files/proftpd-1.3.2-system-libltdl.patch
new file mode 100644
index 000000000000..5a1c175ef4ec
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.2-system-libltdl.patch
@@ -0,0 +1,55 @@
+--- configure.in.orig	2009-02-24 21:58:08.000000000 +0100
++++ configure.in	2009-02-24 22:21:20.000000000 +0100
+@@ -54,8 +54,8 @@
+ 
+ dnl AC_PROG_LIBTOOL relies on this variable
+ top_builddir=.
+-AC_LIBTOOL_DLOPEN([lib/libltdl])
+-AC_LIBLTDL_CONVENIENCE([lib/libltdl])
++AC_LIBTOOL_DLOPEN
++AC_WITH_LTDL
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+@@ -485,18 +485,12 @@
+       ac_core_modules="$ac_core_modules mod_dso.o"
+       ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o"
+ 
+-      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic"
++      MAIN_LDFLAGS="-dlopen self -export-dynamic"
+       MAIN_LIBS="\$(LIBLTDL)"
+ 
+       MODULE_LDFLAGS="-avoid-version -export-dynamic -module"
+ 
+-      INSTALL_DEPS="install-libltdl"
+-      LIB_DEPS="libltdl"
+-      MODULE_DEPS="libltdl"
+       AC_DEFINE(PR_USE_DSO, 1, [Define if using DSO support.])
+-
+-      dnl Run configure scripts in subdirectories
+-      AC_CONFIG_SUBDIRS(lib/libltdl)
+     fi
+   ])
+ 
+--- modules/Makefile.in.orig	2009-02-24 22:34:00.000000000 +0100
++++ modules/Makefile.in	2009-02-24 22:34:13.000000000 +0100
+@@ -229,7 +229,6 @@
+ mod_dso.o: ../include/trace.h ../include/encode.h ../include/compat.h
+ mod_dso.o: ../include/proctitle.h ../include/pidfile.h ../include/env.h
+ mod_dso.o: ../include/pr-syslog.h ../include/mod_ctrls.h
+-mod_dso.o: ../lib/libltdl/ltdl.h
+ mod_facl.o: ../include/conf.h ../include/version.h ../config.h
+ mod_facl.o: ../include/default_paths.h ../include/options.h ../include/pool.h
+ mod_facl.o: ../include/str.h ../include/regexp.h ../include/table.h
+--- modules/mod_dso.c.orig	2009-02-24 22:32:50.000000000 +0100
++++ modules/mod_dso.c	2009-02-24 22:33:03.000000000 +0100
+@@ -31,8 +31,7 @@
+ #include "conf.h"
+ #include "mod_ctrls.h"
+ 
+-/* Make sure we use the libltdl shipped with proftpd, not the system libltdl. */
+-#include "lib/libltdl/ltdl.h"
++#include <ltdl.h>
+ 
+ #define MOD_DSO_VERSION		"mod_dso/0.4"
+ 
diff --git a/net-ftp/proftpd/proftpd-1.3.2-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.2-r2.ebuild
index f5644dcd68f4..d8ab0fcd3fd2 100644
--- a/net-ftp/proftpd/proftpd-1.3.2-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.2-r2.ebuild
@@ -1,16 +1,17 @@
 # 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.2-r2.ebuild,v 1.1 2009/02/23 14:00:07 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.2-r2.ebuild,v 1.2 2009/02/24 22:00:44 voyageur Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
+IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 kerberos ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
 
 CASE_VER="0.3"
 CLAMAV_VER="0.10"
 DEFLATE_VER="0.3.1"
+MODGSS_VER="1.3.1"
 SHAPER_VER="0.6.5"
 VROOT_VER="0.8.3"
 
@@ -20,18 +21,21 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
 		case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
 		clamav? ( http://www.thrallingpenguin.com/resources/mod_clamav-${CLAMAV_VER}.tar.gz )
 		deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
+		kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MODGSS_VER}.tar.gz )
 		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
 		vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
 
 HOMEPAGE="http://www.proftpd.org/
 		http://www.castaglia.org/proftpd/
-		http://www.thrallingpenguin.com/resources/mod_clamav.htm"
+		http://www.thrallingpenguin.com/resources/mod_clamav.htm
+		http://gssmod.sourceforge.net"
 
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="acl? ( sys-apps/acl sys-apps/attr )
 		clamav? ( app-antivirus/clamav )
+		kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( virtual/mysql )
 		ncurses? ( sys-libs/ncurses )
@@ -65,6 +69,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-parallel-build.patch
 	# Fix mysql include when both backends are enabled
 	epatch "${FILESDIR}"/${P}-mysql-include.patch
+	# Do not use bundled libltdl when compiling mod_dso
+	epatch "${FILESDIR}"/${P}-system-libltdl.patch
 
 	# Fix stripping of files
 	sed -e "s| @INSTALL_STRIP@||g" -i Make*
@@ -87,6 +93,10 @@ src_unpack() {
 		cp -f mod_deflate/mod_deflate.html doc/
 	fi
 
+	if use kerberos ; then
+		unpack mod_gss-${MODGSS_VER}.tar.gz
+	fi
+
 	if use shaper ; then
 		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
 		cp -f mod_shaper/mod_shaper.c contrib/
@@ -186,6 +196,23 @@ src_compile() {
 		myconf="${myconf} --enable-auth-unix"
 	fi
 
+	if use kerberos ; then
+		cd "${S}"/mod_gss-${MODGSS_VER}
+		# Generate source files for installed virtual/krb5 provider
+		if has_version app-crypt/mit-krb5; then
+			econf --enable-mit
+		else
+			econf --enable-heimdal
+		fi
+		cd "${S}"
+		# copy the generated files
+		cp -f mod_gss-${MODGSS_VER}/mod_gss.c contrib/
+		cp -f mod_gss-${MODGSS_VER}/mod_gss.h include/
+		cp -f mod_gss-${MODGSS_VER}/mod_auth_gss.c contrib/
+
+		myconf="${myconf} --enable-dso  --with-shared=mod_gss:mod_auth_gss"
+	fi
+
 	LIBS="${mylibs}" econf \
 		--sbindir=/usr/sbin \
 		--localstatedir=/var/run \