From 27fa8a03870d2bdc51b4a075a862fa04cbf66f75 Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Thu, 23 Dec 2004 15:11:07 +0000 Subject: Added sample USE flag. Closes #64733. --- dev-libs/cyrus-sasl/ChangeLog | 13 +- dev-libs/cyrus-sasl/Manifest | 60 +++--- dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild | 230 +++++++++++++++++++++ .../cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r1 | 1 + 4 files changed, 267 insertions(+), 37 deletions(-) create mode 100644 dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild create mode 100644 dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r1 (limited to 'dev-libs/cyrus-sasl') diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index f7b25d24fc52..e881d3a69500 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,12 +1,19 @@ # ChangeLog for dev-libs/cyrus-sasl # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.108 2004/12/21 17:13:30 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.109 2004/12/23 15:11:07 ticho Exp $ - 21 Dec 2004; Bryan Østergaard +*cyrus-sasl-2.1.20-r1 (23 Dec 2004) + + 23 Dec 2004; Andrej Kacian + +cyrus-sasl-2.1.20-r1.ebuild: + Added sample local USE flag to enable building of sample client and server. + See bug #64733, reported by Warren Howard . + + 21 Dec 2004; Bryan Østergaard cyrus-sasl-2.1.20.ebuild: Stable on alpha. - 16 Dec 2004; Bryan Østergaard + 16 Dec 2004; Bryan Østergaard cyrus-sasl-2.1.20.ebuild: Fix alpha compilation, bug 69112. diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest index 2438504ccc5c..07db9f7ea12d 100644 --- a/dev-libs/cyrus-sasl/Manifest +++ b/dev-libs/cyrus-sasl/Manifest @@ -1,48 +1,40 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 9d8d289b250c087a6e31e1946167bad9 ChangeLog 19315 -MD5 b6b628180f01eae601d52e9ca5faf725 cyrus-sasl-2.1.19-r1.ebuild 7156 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 -MD5 04ab88578310e66a55032b38819541a1 cyrus-sasl-2.1.18-r2.ebuild 5427 MD5 888ff0ec58f34193c69acc689393dc9b cyrus-sasl-2.1.20.ebuild 7328 -MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934 -MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730 -MD5 41c1024f02bc0725406a23eeff93edd5 files/saslauthd-2.1.20.conf 906 -MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890 -MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448 -MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510 -MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540 -MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056 -MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527 -MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.19-configdir.patch 8231 -MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388 +MD5 04ab88578310e66a55032b38819541a1 cyrus-sasl-2.1.18-r2.ebuild 5427 +MD5 a4258e8b3f0a3c250b3bbf9eea6f1ed2 cyrus-sasl-2.1.20-r1.ebuild 7269 +MD5 b6b628180f01eae601d52e9ca5faf725 cyrus-sasl-2.1.19-r1.ebuild 7156 MD5 c355c365d74408c00cdaa25beea6d4f7 files/digest-cyrus-sasl-2.1.20 70 MD5 c38995773eff23cf7f05b23fe7fba6d3 files/saslauthd.rc6 525 -MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095 -MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529 -MD5 f8ad054201be2531b337375299c4c39b files/cyrus-sasl-2.1.20-gcc4.patch 462 MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906 -MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752 -MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624 -MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938 +MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223 +MD5 c355c365d74408c00cdaa25beea6d4f7 files/digest-cyrus-sasl-2.1.20-r1 70 MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426 +MD5 41c1024f02bc0725406a23eeff93edd5 files/saslauthd-2.1.20.conf 906 +MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752 +MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.19-configdir.patch 8231 MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.20-configdir.patch 8231 +MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527 MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617 +MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624 +MD5 f8ad054201be2531b337375299c4c39b files/cyrus-sasl-2.1.20-gcc4.patch 462 +MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604 +MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095 +MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510 +MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529 +MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032 +MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934 +MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938 MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148 +MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730 MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451 +MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890 MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70 -MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480 -MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604 MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242 -MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529 -MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223 +MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056 +MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480 +MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540 MD5 d6d8b3c7c3a2aacf656f970a043d3158 files/digest-cyrus-sasl-2.1.19-r1 70 -MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFByFnEugEuf3OQ0akRAm4OAJ9Text5q7OdSCAwQVcIbpE48fkcKQCfXZN6 -NhBCQOOeezj1jh6iHexjAfE= -=HSIi ------END PGP SIGNATURE----- +MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448 +MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529 +MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388 diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild new file mode 100644 index 000000000000..69178f56f210 --- /dev/null +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild,v 1.1 2004/12/23 15:11:07 ticho Exp $ + +inherit eutils gnuconfig flag-o-matic java-pkg + +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 ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64" +IUSE="berkdb gdbm ldap mysql postgres kerberos static ssl java pam authdaemond sample" + +RDEPEND="virtual/libc + berkdb? ( >=sys-libs/db-3.2 ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + ldap? ( >=net-nds/openldap-2.0.25 ) + mysql? ( >=dev-db/mysql-3.23.51 ) + postgres? ( >=dev-db/postgresql-7.2 ) + pam? ( >=sys-libs/pam-0.75 ) + ssl? ( >=dev-libs/openssl-0.9.6d ) + kerberos? ( virtual/krb5 ) + authdaemond? ( + || ( + >=net-mail/courier-imap-3.0.7 + >=mail-mta/courier-0.46 + )) + java? ( virtual/jdk )" +DEPEND="${RDEPEND} + >=sys-apps/sed-4 + >=sys-devel/autoconf-2.58 + sys-devel/automake + sys-devel/libtool" + +pkg_setup() { + if use gdbm && use berkdb; then + echo + ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags." + ewarn "Will default to GNU DB as your SASLdb database backend." + ewarn "If you want to build with Berkeley DB support; hit Control-C now." + ewarn "Change your USE flag -gdbm and emerge again." + echo + has_version ">=sys-apps/portage-2.0.50" && ( + einfo "It would be best practice to add the set of USE flags that you use for this" + einfo "package to the file: /etc/portage/package.use. Example:" + einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`" + einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend." + ) + echo + ewarn "Waiting 10 seconds before starting..." + ewarn "(Control-C to abort)..." + epause 10 + fi + + echo + einfo "This version include a "-r" option for saslauthd to instruct it to reassemble" + einfo "realm and username into a username of "user@realm" form." + echo + einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for" + einfo "authentication, please edit /etc/conf.d/saslauthd to read:" + einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\"" + einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`." + echo + einfo "Pause 10 seconds before continuing." + epause 10 +} + +src_unpack() { + unpack ${A} && cd "${S}" + + + # Fix default port name for rimap auth mechanism. + sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \ + -i saslauthd/auth_rimap.c || die "sed failed" + + # DB4 detection and versioned symbols. + # Fixed upstream. + # epatch "${FILESDIR}/cyrus-sasl-2.1.18-db4.patch" + + # Add configdir support. + epatch "${FILESDIR}/${P}-configdir.patch" + + # Fix include path for newer PostgreSQL versions. + epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch" + + # Add setuid/setgid check for SASL_PATH + # Fixed upstream. + # epatch "${FILESDIR}/${P}-sasl-path-fix.patch" + + # Fix for gcc-4.0 + epatch "${FILESDIR}/${P}-gcc4.patch" + + # Recreate configure. + export WANT_AUTOCONF="2.5" + rm -rf configure config.h.in autom4te.cache + ebegin "Recreating configure" + aclocal -I cmulocal -I config && autoheader && autoconf || \ + die "recreate configure failed" + eend $? + +} + +src_compile() { + local myconf="--enable-login --enable-ntlm --disable-krb4 --disable-otp" + myconf="${myconf} `use_enable static`" + myconf="${myconf} `use_with ssl openssl`" + myconf="${myconf} `use_with pam`" + myconf="${myconf} `use_with ldap`" + myconf="${myconf} `use_enable sample`" + myconf="${myconf} `use_enable kerberos gssapi`" + myconf="${myconf} `use_with mysql` `use_enable mysql`" + myconf="${myconf} `use_with postgres pgsql` `use_enable postgres`" + myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`" + # bug #56523. add authdaemond support. + myconf="${myconf} `use_with authdaemond`" + + # fix for bug #59634. langthang 20040810. + if ! use ssl; then + myconf="${myconf} --without-des" + fi + + if use mysql || use postgres ; then + myconf="${myconf} --enable-sql" + else + myconf="${myconf} --disable-sql" + fi + + # default to GDBM if both 'gdbm' and 'berkdb' present. + if use gdbm; then + einfo "build with GNU DB as database backend for your SASLdb." + myconf="${myconf} --with-dblib=gdbm" + elif use berkdb ; then + einfo "build with Berkeley DB as database backend for your SASLdb." + myconf="${myconf} --with-dblib=berkeley" + else + einfo "build without SASLdb support" + myconf="${myconf} --with-dblib=none" + fi + + # Detect mips systems properly. + gnuconfig_update + + 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} || die "econf failed" + + # Parallel build doesn't work. + # Parallel build doesn't like distcc? + if has distcc $FEATURES; then + einfo "You have \"distcc\" enabled" + einfo "build with MAKEOPTS=-j1" + emake -j1 || die "compile problem" + else + einfo "build with MAKEOPTS=$MAKEOPTS" + emake || die "compile problem" + fi + + # Bug #60769. Default location for java classes breaks OpenOffice. + # Thanks to axxo@gentoo.org for the solution. + cd "${S}" + if use java; then + jar -cvf ${PN}.jar -C java $(find java -name "*.class") + fi + + # Bug #58768. Add testsaslauthd. + cd "${S}/saslauthd" + emake testsaslauthd || die "failed to make" +} + +src_install () { + #einstall + make DESTDIR=${D} install || die "failed to install." + keepdir /var/lib/sasl2 /etc/sasl2 + + # Bug #60769. Default location for java classes breaks OpenOffice. + if use java; then + java-pkg_dojar ${PN}.jar + #hackish, don't wanna dig though makefile + rm -rf ${D}/usr/lib/java + docinto java + dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/* + mkdir ${D}/usr/share/doc/${PF}/java/Test/ \ + || die "failed to create ${D}/usr/share/doc/${PF}/java/Test/" + cp ${S}/java/Test/*.java ${D}/usr/share/doc/${PF}/java/Test/ \ + || die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/" + fi + + # Generate an empty sasldb2 with correct permissions. + LD_OLD="${LD_LIBRARY_PATH}" + export LD_LIBRARY_PATH="${D}/usr/lib" SASL_PATH="${D}/usr/lib/sasl2" + echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login + "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login + export LD_LIBRARY_PATH="${LD_OLD}" + chown root:mail "${D}/etc/sasl2/sasldb2" + chmod 0640 "${D}/etc/sasl2/sasldb2" + + docinto "" + dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt + newdoc pwcheck/README README.pwcheck + dohtml doc/*.html + + docinto examples + dodoc sample/{*.[ch],Makefile} + + docinto saslauthd + dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README} + + if use pam ; then + insinto /etc/pam.d + newins "${FILESDIR}/saslauthd.pam" saslauthd + fi + + exeinto /etc/init.d + newexe "${FILESDIR}/pwcheck.rc6" pwcheck || \ + die "failed to \"newexe\" pwdcheck to /etc/init.d" + newexe "${FILESDIR}/saslauthd2.rc6" saslauthd || \ + die "failed to \"newexe\" saslauthd to /etc/init.d" + insinto /etc/conf.d + newins "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \ + die "failed to install /etc/conf/saslauthd." + exeinto ${ROOT}/usr/sbin + newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \ + die "failed to install testsaslauthd." +} diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r1 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r1 new file mode 100644 index 000000000000..517d47fb2f8d --- /dev/null +++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r1 @@ -0,0 +1 @@ +MD5 268ead27f4ac39bcfe17d9e38e0f2977 cyrus-sasl-2.1.20.tar.gz 1775163 -- cgit v1.2.3-65-gdbad