From 0f9bb6bab756533d441e23ad9559cac28f88d1db Mon Sep 17 00:00:00 2001 From: "Fernando J. Pereda" Date: Fri, 20 May 2005 16:19:11 +0000 Subject: opempam compatibility, fixes #93167. Thanks to flameeyes (Portage version: 2.0.51.19) --- dev-libs/cyrus-sasl/ChangeLog | 8 +- dev-libs/cyrus-sasl/Manifest | 13 +- dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild | 268 +++++++++++++++++++++ .../cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3 | 2 + dev-libs/cyrus-sasl/files/saslauthd.pam-include | 8 + 5 files changed, 288 insertions(+), 11 deletions(-) create mode 100644 dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild create mode 100644 dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3 create mode 100644 dev-libs/cyrus-sasl/files/saslauthd.pam-include (limited to 'dev-libs/cyrus-sasl') diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index f88f92199d45..2a132cb17e73 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/cyrus-sasl # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.120 2005/05/05 15:41:23 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.121 2005/05/20 16:19:11 ferdy Exp $ + +*cyrus-sasl-2.1.20-r3 (20 May 2005) + + 20 May 2005; Fernando J. Pereda + +files/saslauthd.pam-include, +cyrus-sasl-2.1.20-r3.ebuild: + opempam compatibility, fixes #93167. Thanks to flameeyes 05 May 2005; Sven Wegener cyrus-sasl-2.1.20-r2.ebuild: diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest index 94553b576a88..08a94df520ea 100644 --- a/dev-libs/cyrus-sasl/Manifest +++ b/dev-libs/cyrus-sasl/Manifest @@ -1,10 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 04c0b54fe6928e86aef07b627b88765f cyrus-sasl-2.1.18-r2.ebuild 5430 MD5 54f2bd76be47e4beec9b53b237d0e44f cyrus-sasl-2.1.19-r1.ebuild 7161 MD5 e578e465b63000464660f0c5b53dbb8e cyrus-sasl-2.1.20-r2.ebuild 9521 MD5 bba00f641b9c816375ce3571c3d8e3d1 cyrus-sasl-2.1.20-r1.ebuild 8556 +MD5 138acd4eb7969b0fca515bf524dda3a0 cyrus-sasl-2.1.20-r3.ebuild 9212 MD5 797f744eeac374bb4f4f3d57ac7b2715 ChangeLog 21163 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 MD5 a9165d22687a67e63870b187eeb3e1a8 cyrus-sasl-2.1.20.ebuild 7346 @@ -15,6 +13,7 @@ MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70 MD5 d6d8b3c7c3a2aacf656f970a043d3158 files/digest-cyrus-sasl-2.1.19-r1 70 MD5 c355c365d74408c00cdaa25beea6d4f7 files/digest-cyrus-sasl-2.1.20-r1 70 MD5 459aa1c6826a31cb3c0efe7a1c5ebbc4 files/digest-cyrus-sasl-2.1.20-r2 149 +MD5 459aa1c6826a31cb3c0efe7a1c5ebbc4 files/digest-cyrus-sasl-2.1.20-r3 149 MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529 MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752 MD5 f8ad054201be2531b337375299c4c39b files/cyrus-sasl-2.1.20-gcc4.patch 462 @@ -24,6 +23,7 @@ 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 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617 +MD5 a1b5b72d1285487654685fc497aa81b5 files/saslauthd.pam-include 160 MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906 MD5 41c1024f02bc0725406a23eeff93edd5 files/saslauthd-2.1.20.conf 906 MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451 @@ -44,10 +44,3 @@ MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624 MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095 MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056 MD5 c355c365d74408c00cdaa25beea6d4f7 files/digest-cyrus-sasl-2.1.20 70 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCej63I1lqEGTUzyQRAiA6AKCUeawzLwSBJXTbuilTZi3rarMFUgCcCRfW -yhlqVu6S2Fga1+LA7qGgPrk= -=Vtx9 ------END PGP SIGNATURE----- diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild new file mode 100644 index 000000000000..77578c08492a --- /dev/null +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild @@ -0,0 +1,268 @@ +# Copyright 1999-2005 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-r3.ebuild,v 1.1 2005/05/20 16:19:11 ferdy Exp $ + +inherit eutils gnuconfig flag-o-matic java-pkg multilib + +ntlm_patch=${PN}-ntlm_impl-spnego.patch.gz + +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 + ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )" + +LICENSE="as-is" +SLOT="2" +KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64" +IUSE="berkdb crypt gdbm ldap mysql postgres kerberos static ssl java pam + authdaemond sample urandom srp ntlm_unsupported_patch" + +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? ( virtual/pam ) + 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 ) + ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )" + +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" + + # 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" + + # Fix for gcc-4.0 + epatch "${FILESDIR}/${P}-gcc4.patch" + + # UNSUPPORTED ntlm patch. Bug #81342 + use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_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 $? + + # Sypport for crypted passwords. Bug #45181 + use crypt && epatch "${FILESDIR}/cyrus-sasl-2.1.19-checkpw.c.patch" + + # Upstream doesn't even honor their own configure options... grumble + sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile.{am,in} +} + +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`" + # Add use srp. Bug #81970. + myconf="${myconf} `use_enable srp`" + 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 + + # Use /dev/urandom instead of /dev/random. Bug #46038 + use urandom && myconf="${myconf} --with-devrandom=/dev/urandom" + + # Detect mips systems properly. + gnuconfig_update + + econf \ + --with-saslauthd=/var/lib/sasl2 \ + --with-pwcheck=/var/lib/sasl2 \ + --with-configdir=/etc/sasl2 \ + --with-plugindir=/usr/$(get_libdir)/sasl2 \ + --with-dbpath=/etc/sasl2/sasldb2 \ + ${myconf} || die "econf failed" + + # Upstream doesn't even honor their own configure options... grumble + sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile + + # Fix PEBCAK in make.conf. Bug #75538. + CFLAGS="$(echo ${CFLAGS} | xargs)" + CXXFLAGS="$(echo ${CXXFLAGS} | xargs)" + LDFLAGS="$(echo ${LDFLAGS} | xargs)" + + # Parallel build doesn't work. + # Parallel build doesn't like distcc/ccache? Bug #78643. + if has distcc $FEATURES || has ccache $FEATURES; then + einfo "You have \"distcc\" or \"ccache\" 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 + + # Install everything necessary so user can build sample client/server + # (bug #64733) + if use sample; then + insinto /usr/share/${PN}-2/examples + doins aclocal.m4 config.h config.status configure.in + dosym /usr/include/sasl /usr/share/${PN}-2/examples/include + exeinto /usr/share/${PN}-2/examples + doexe libtool + insinto /usr/share/${PN}-2/examples/sample + doins sample/*.{c,h} sample/*Makefile* + insinto /usr/share/${PN}-2/examples/sample/.deps + doins sample/.deps/* + dodir /usr/share/${PN}-2/examples/lib + dosym /usr/$(get_libdir)/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la + dodir /usr/share/${PN}-2/examples/lib/.libs + dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so + fi + + # 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/$(get_libdir)/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/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/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 saslauthd + dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README} + + newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd + newinitd "${FILESDIR}pwcheck.rc6" pwcheck || \ + die "failed to install pwcheck to /etc/init.d" + newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || \ + die "failed to install saslauthd to /etc/init.d" + newconfd "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \ + die "failed to install /etc/conf.d/saslauthd" + + exeinto ${ROOT}/usr/sbin + newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \ + die "failed to install testsaslauthd." +} + +pkg_postinst () { + if use sample; then + einfo "You have chosen to install sources for example client and server." + einfo "To build these, please type:" + einfo "\tcd /usr/share/${PN}-2/examples/sample && make" + fi +} diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3 new file mode 100644 index 000000000000..7364412cd6ab --- /dev/null +++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3 @@ -0,0 +1,2 @@ +MD5 268ead27f4ac39bcfe17d9e38e0f2977 cyrus-sasl-2.1.20.tar.gz 1775163 +MD5 a3a8fcefa0874e1fb97787a034880d9f cyrus-sasl-ntlm_impl-spnego.patch.gz 7430 diff --git a/dev-libs/cyrus-sasl/files/saslauthd.pam-include b/dev-libs/cyrus-sasl/files/saslauthd.pam-include new file mode 100644 index 000000000000..d50a84946a78 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/saslauthd.pam-include @@ -0,0 +1,8 @@ +#%PAM-1.0 + +auth required pam_nologin.so +auth include system-auth + +account include system-auth + +session include system-auth -- cgit v1.2.3-65-gdbad