diff options
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/cyrus-sasl/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/Manifest | 45 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild | 127 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/files/2.1.14-kerberos.patch | 30 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/files/2.1.14-mysql.patch | 19 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.14 | 1 |
6 files changed, 211 insertions, 21 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index a1eef7eeb100..ea262514c86f 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/cyrus-sasl # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.39 2003/06/22 17:28:04 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.40 2003/07/09 07:53:38 raker Exp $ + +*cyrus-sasl-2.1.14 (09 Jul 2003) + + 09 Jul 2003; Nick Hadaway <raker@gentoo.org> cyrus-sasl-2.1.14.ebuild, + files/2.1.14-kerberos.patch, files/2.1.14-mysql.patch: + Version bump. 2 fixes included from cvs which were noted immediately + after release on the dev mailing list. Added java and pam to IUSE. + otp support will be added as soon as opie is in portage. *cyrus-sasl-2.1.13 (09 Jun 2003) diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest index 457d954b735c..c86f25a0db5d 100644 --- a/dev-libs/cyrus-sasl/Manifest +++ b/dev-libs/cyrus-sasl/Manifest @@ -1,28 +1,33 @@ -MD5 b688f52b3c129bd50da0140b5d732e74 files/crypt.diff 529 -MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242 -MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448 -MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480 -MD5 5f2cc406af0465a53e2a4e72b6e79a12 files/cyrus-sasl-2.1.12-kerberos.patch 1529 +MD5 3f81216b8fbe549b9c885473bfab579d cyrus-sasl-1.5.27-r6.ebuild 2774 +MD5 5c4224dce90af6c87ba69282674a2bf3 cyrus-sasl-2.1.13.ebuild 3284 +MD5 ea6ea07ae111539aa580d35a09bf2afe cyrus-sasl-1.5.27-r5.ebuild 2699 +MD5 00c5f0384f7c4800a881106e4fc5fc36 cyrus-sasl-2.1.14.ebuild 3827 +MD5 40f4413e63a6b1596984df933ff85b2d ChangeLog 8173 MD5 6d3c58ecd8d6d3da231db3e44d345bbe files/cyrus-sasl-2.1.6-iovec.diff 1405 -MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510 -MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426 -MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624 -MD5 0a6a28252ab81d3b3765967b11517fa8 files/cyrus-sasl-iovec.diff 1405 -MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938 -MD5 c1e3be15214652c1d1036f7cb84fe8fe files/cyrus-sasl2-heimdal-deps.patch 1478 -MD5 8e605da1bfdae5c2d9da9a3919d3d5cb files/saslauthd.confd-2.1 751 +MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448 MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69 MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69 -MD5 e13f74e7ff91c036fa377c50fefe223b files/digestmd5.patch 2839 -MD5 38fca8679fe76370d26c76b9063c25b8 files/gssapi-sefault.patch 1311 -MD5 1c211557e54537ad23feb847b3a23b48 files/pwcheck.rc6 557 MD5 5cae6fb7465603cab6243e14d0382543 files/saslauthd.confd 909 +MD5 2bdbac1797e21ecbd4f8f95475470e80 files/cyrus-sasl-2.1.10-db4.patch 1375 +MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480 +MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242 +MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730 +MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148 +MD5 5f2cc406af0465a53e2a4e72b6e79a12 files/cyrus-sasl-2.1.12-kerberos.patch 1529 MD5 0ab944570bf61ce0ee9e907d7b1f9657 files/saslauthd.rc6 536 +MD5 b688f52b3c129bd50da0140b5d732e74 files/crypt.diff 529 +MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426 +MD5 1c211557e54537ad23feb847b3a23b48 files/pwcheck.rc6 557 +MD5 8e605da1bfdae5c2d9da9a3919d3d5cb files/saslauthd.confd-2.1 751 MD5 7c0958ee10762956aa0f7b2d549ca86e files/saslauthd2.rc6 542 -MD5 2bdbac1797e21ecbd4f8f95475470e80 files/cyrus-sasl-2.1.10-db4.patch 1375 MD5 a302e1b2ed33b7965de1a307cd25a32d files/cyrus-sasl-2.1.12-db4.patch 1902 +MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938 +MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510 +MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624 +MD5 216eb279339ba0b6e3f94bac8ee0dc03 files/cyrus-sasl-2.1.14-kerberos.patch 456 +MD5 c1e3be15214652c1d1036f7cb84fe8fe files/cyrus-sasl2-heimdal-deps.patch 1478 +MD5 e13f74e7ff91c036fa377c50fefe223b files/digestmd5.patch 2839 +MD5 0a6a28252ab81d3b3765967b11517fa8 files/cyrus-sasl-iovec.diff 1405 MD5 1d5bc32d69dbcb3c053f0f336086218e files/digest-cyrus-sasl-2.1.13 70 -MD5 ea6ea07ae111539aa580d35a09bf2afe cyrus-sasl-1.5.27-r5.ebuild 2699 -MD5 3f81216b8fbe549b9c885473bfab579d cyrus-sasl-1.5.27-r6.ebuild 2774 -MD5 f50ab83def9f2be41daf17ae9b748765 ChangeLog 7807 -MD5 5c4224dce90af6c87ba69282674a2bf3 cyrus-sasl-2.1.13.ebuild 3284 +MD5 6ba386a4eb5f9addf367d41093ba369e files/digest-cyrus-sasl-2.1.14 70 +MD5 38fca8679fe76370d26c76b9063c25b8 files/gssapi-sefault.patch 1311 diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild new file mode 100644 index 000000000000..fe737ce65779 --- /dev/null +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild,v 1.1 2003/07/09 07:53:38 raker Exp $ + +inherit eutils + +S=${WORKDIR}/${P} +DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)" +HOMEPAGE="http://asg.web.cmu.edu/sasl/" +SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz" +LICENSE="as-is" +SLOT="2" +KEYWORDS="~x86 ~ppc ~sparc ~hppa" +IUSE="gdbm berkdb ldap mysql kerberos static ssl java pam" #add otp + +RDEPEND=">=sys-libs/db-3.2 + >=sys-libs/pam-0.75 + >=dev-libs/openssl-0.9.6d + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + berkdb? ( >=sys-libs/db-3.2.9 ) + ldap? ( >=net-nds/openldap-2.0.25 ) + mysql? ( >=dev-db/mysql-3.23.51 ) + kerberos? ( virtual/krb5 ) + java? ( virtual/jdk )" +DEPEND="${RDEPEND} + sys-devel/libtool + sys-devel/autoconf + sys-devel/automake" + +src_unpack() { + unpack ${A}; cd ${S} + + # Fix for compiling with kerberos enabled + # http://asg.web.cmu.edu/archive/message.php?mailbox=archive.cyrus-sasl&msg=3912 + epatch ${FILESDIR}/2.1.14-kerberos.patch + + # Fix for compatibility with MySQL 4.x + # http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/plugins/mysql.c.diff?r1=1.10&r2=1.11 + epatch ${FILESDIR}/2.1.14-mysql.patch +} + +src_compile() { + libtoolize --copy --force + aclocal -I config -I cmulocal || die + autoheader || die + automake -a --foreign || die + autoconf || die + autoconf saslauthd/configure.in > saslauthd/configure || die + chmod +x saslauthd/configure || die + + local myconf + myconf="--with-gnu-ld --enable-login --enable-ntlm" + + use static && myconf="${myconf} --enable-static" + + use ssl && myconf="${myconf} --with-openssl" \ + || myconf="${myconf} --without-openssl" + + use ldap && myconf="${myconf} --with-ldap" \ + || myconf="${myconf} --without-ldap" + + use mysql && myconf="${myconf} --with-mysql" \ + || myconf="${myconf} --without-mysql" + + if use berkdb; then + myconf="${myconf} --with-dblib=berkeley" + elif use gdbm; then + myconf="${myconf} --with-dblib=gdbm --with-gdbm=/usr" + else + myconf="${myconf} --with-dblib=berkeley" + fi + + use kerberos && myconf="${myconf} --enable-gssapi" \ + || myconf="${myconf} --disable-gssapi" + # Kerberos 4 support doesn't compile.. and i'm not sure why + # If you want to test/fix for me, emerge kth-krb + # and have at it. :) -raker 02/07/2003 + #if [ "$ENABLE_KRB4" = "yes" ]; then + # myconf="${myconf} --enable-krb4=/usr/athena" + #else + myconf="${myconf} --disable-krb4" + #fi + + use java && myconf="${myconf} --enable-java --with-javabase=${JAVA_HOME}" + + use pam || myconf="${myconf} --without-pam" + + + # otp support via opie is not in portage yet + myconf="${myconf} --disable-otp" + # use otp && myconf="${myconf} --with-opie=/usr" + + econf \ + --with-saslauthd=/var/lib/sasl2 \ + --with-pwcheck=/var/lib/sasl2 \ + --with-configdir=/etc/sasl2 \ + --with-plugindir=/usr/lib/sasl2 \ + --with-dbpath=/etc/sasl2/sasldb2 \ + ${myconf} + + emake || die "compile problem" +} + +src_install () { + + einstall || die "install problem" + + dodoc AUTHORS ChangeLog COPYING NEWS README doc/*.txt + docinto examples ; dodoc sample/{*.[ch],Makefile} + newdoc pwcheck/README README.pwcheck + dohtml doc/* + + dodir /var/lib/sasl2 + dodir /etc/sasl2 + # generate an empty sasldb2 with correct permissions + LD_OLD=${LD_LIBRARY_PATH} + export LD_LIBRARY_PATH=${S}/lib/.libs + echo "gentoo" | ${D}usr/sbin/saslpasswd2 -f ${D}etc/sasl2/sasldb2 -p cyrus + ${D}usr/sbin/saslpasswd2 -f ${D}etc/sasl2/sasldb2 -d cyrus + export LD_LIBRARY_PATH=${LD_OLD} + chown root.mail ${D}etc/sasl2/sasldb2 + chmod 0640 ${D}etc/sasl2/sasldb2 + + insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd-2.1 saslauthd + exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd + exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck +} diff --git a/dev-libs/cyrus-sasl/files/2.1.14-kerberos.patch b/dev-libs/cyrus-sasl/files/2.1.14-kerberos.patch new file mode 100644 index 000000000000..0fb657a47339 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/2.1.14-kerberos.patch @@ -0,0 +1,30 @@ +diff -urN cyrus-sasl-2.1.14/acconfig.h cyrus-sasl-2.1.14-modified/acconfig.h +--- cyrus-sasl-2.1.14/acconfig.h 2003-04-15 11:24:04.000000000 -0500 ++++ cyrus-sasl-2.1.14-modified/acconfig.h 2003-07-09 00:24:07.000000000 -0500 +@@ -109,6 +109,9 @@ + /* what flavor of GSSAPI are we using? */ + #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE + ++/* does GSSAPI provide GSS_C_NT_USER_NAME? */ ++#undef HAVE_GSS_C_NT_USER_NAME ++ + /* do we have gssapi.h or gssapi/gssapi.h? */ + #undef HAVE_GSSAPI_H + +diff -urN cyrus-sasl-2.1.14/plugins/gssapi.c cyrus-sasl-2.1.14-modified/plugins/gssapi.c +--- cyrus-sasl-2.1.14/plugins/gssapi.c 2003-05-30 18:17:48.000000000 -0500 ++++ cyrus-sasl-2.1.14-modified/plugins/gssapi.c 2003-07-09 00:27:41.000000000 -0500 +@@ -772,7 +772,12 @@ + + maj_stat = gss_import_name (&min_stat, + &name_without_realm, +- GSS_C_NT_USER_NAME, ++ /* Solaris 8/9 gss_import_name doesn't accept GSS_C_NULL_OID here, so use GSS_C_NT_USER_NAME instead if available. */ ++ #ifdef HAVE_GSS_C_NT_USER_NAME ++ GSS_C_NT_USER_NAME, ++ #else ++ GSS_C_NULL_OID, ++ #endif + &without); + + if (GSS_ERROR(maj_stat)) { diff --git a/dev-libs/cyrus-sasl/files/2.1.14-mysql.patch b/dev-libs/cyrus-sasl/files/2.1.14-mysql.patch new file mode 100644 index 000000000000..9a2a12b42d16 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/2.1.14-mysql.patch @@ -0,0 +1,19 @@ +diff -urN cyrus-sasl-2.1.14/plugins/mysql.c cyrus-sasl-2.1.14-modified/plugins/mysql.c +--- cyrus-sasl-2.1.14/plugins/mysql.c 2003-05-14 13:46:02.000000000 -0500 ++++ cyrus-sasl-2.1.14-modified/plugins/mysql.c 2003-07-09 00:49:42.000000000 -0500 +@@ -323,9 +323,14 @@ + + if (settings->mysql_verbose) + sparams->utils->log(NULL, SASL_LOG_WARN, +- "mysql plugin try and connect to %s\n", ++ "mysql plugin trying to connect to %s\n", + cur_host); + ++ if(mysql_init(&mysql) == NULL) { ++ sparams->utils->log(NULL, SASL_LOG_WARN, ++ "mysql plugin: could not execute mysql_init"); ++ goto done; ++ } + sock = mysql_real_connect(&mysql,cur_host, + settings->mysql_user, + settings->mysql_passwd, diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.14 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.14 new file mode 100644 index 000000000000..8f19004aa6d3 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.14 @@ -0,0 +1 @@ +MD5 f2c5adf17029fc103903a3c801d95107 cyrus-sasl-2.1.14.tar.gz 1375758 |