summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2007-02-03 15:08:19 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2007-02-03 15:08:19 +0000
commit4e3d552c26d4fbb3e67098f7fbe398a14e1bc34b (patch)
treed5b4db8f82aa32e1a49405d59be73e456b242e4d /dev-libs/cyrus-sasl
parentstable on amd64 (diff)
downloadhistorical-4e3d552c26d4fbb3e67098f7fbe398a14e1bc34b.tar.gz
historical-4e3d552c26d4fbb3e67098f7fbe398a14e1bc34b.tar.bz2
historical-4e3d552c26d4fbb3e67098f7fbe398a14e1bc34b.zip
Fixed QA issues, migrate to new java build system bug#146647
Package-Manager: portage-2.1.2-r6
Diffstat (limited to 'dev-libs/cyrus-sasl')
-rw-r--r--dev-libs/cyrus-sasl/ChangeLog8
-rw-r--r--dev-libs/cyrus-sasl/Manifest29
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild260
-rw-r--r--dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch22
-rw-r--r--dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.22-r26
5 files changed, 310 insertions, 15 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 44af9944a53f..ffdf077c1658 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.176 2007/01/08 20:56:09 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.177 2007/02/03 15:08:19 alonbl Exp $
+
+*cyrus-sasl-2.1.22-r2 (03 Feb 2007)
+
+ 03 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org>
+ +files/cyrus-sasl-2.1.22-qa.patch, +cyrus-sasl-2.1.22-r2.ebuild:
+ Fixed QA issues, migrate to new java build system bug#146647
08 Jan 2007; Torsten Veller <tove@gentoo.org>
-files/cyrus-sasl-2.1.20-configdir.patch,
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 5f01d46d81ba..22937d7830e4 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX cyrus-sasl-2.1.17-pgsql-include.patch 617 RMD160 b6a01c3447b49c8cc33ae0c7ca63294cad8e672c SHA1 a7a22f113044d8bda07e8345781913c317941f53 SHA256 394b196e7d5d7abb3d340de69ddea718bf80936de1eb667580ebae40b9cca228
MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
RMD160 b6a01c3447b49c8cc33ae0c7ca63294cad8e672c files/cyrus-sasl-2.1.17-pgsql-include.patch 617
@@ -17,6 +14,10 @@ AUX cyrus-sasl-2.1.22-crypt.patch 3767 RMD160 413d73e0e6249e27c43a5590712ffa5a09
MD5 f64f267fe3ad90980bfa8df766a6ac0d files/cyrus-sasl-2.1.22-crypt.patch 3767
RMD160 413d73e0e6249e27c43a5590712ffa5a091e241c files/cyrus-sasl-2.1.22-crypt.patch 3767
SHA256 09c717cc95d6deb8b9ac9ba371c2a26803b19f1433620b803669872de45ef17e files/cyrus-sasl-2.1.22-crypt.patch 3767
+AUX cyrus-sasl-2.1.22-qa.patch 829 RMD160 f3640f3f77847df1395c96c2d1a333ad242d7583 SHA1 a2694e41980dc4ee9dbc8accb6bc697198f38d57 SHA256 ca3a06cc817712387ab9c9d9bad502f9a61afedb4eb178e5e5d1c512130d0c48
+MD5 0b65d21b05290cff7f86b471f7d27e8b files/cyrus-sasl-2.1.22-qa.patch 829
+RMD160 f3640f3f77847df1395c96c2d1a333ad242d7583 files/cyrus-sasl-2.1.22-qa.patch 829
+SHA256 ca3a06cc817712387ab9c9d9bad502f9a61afedb4eb178e5e5d1c512130d0c48 files/cyrus-sasl-2.1.22-qa.patch 829
AUX java.README.gentoo 934 RMD160 53369bc85186e7be3e86a98d19a0a19ca4535c2b SHA1 8ddb577ffe968d4ff3cda27402ce21988c55519a SHA256 aeb733ab6371c1fe50e413e8469dcd11f0750b5afff489408c45f118857fc3fe
MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934
RMD160 53369bc85186e7be3e86a98d19a0a19ca4535c2b files/java.README.gentoo 934
@@ -43,14 +44,18 @@ EBUILD cyrus-sasl-2.1.22-r1.ebuild 8792 RMD160 7b54fa36a6ed5e09eb097149190624148
MD5 8c20d2c36a29341d76c9d119dd6012f7 cyrus-sasl-2.1.22-r1.ebuild 8792
RMD160 7b54fa36a6ed5e09eb097149190624148dfcfb35 cyrus-sasl-2.1.22-r1.ebuild 8792
SHA256 cf90725f6fe6b13674224ab27961a004356304fd7de905f8f0a937e26e4c60d0 cyrus-sasl-2.1.22-r1.ebuild 8792
+EBUILD cyrus-sasl-2.1.22-r2.ebuild 9014 RMD160 7a0c7ae3c35cf6becc0c404239ca8904f932c24d SHA1 14ec2bb503f6eb918eb0020a28ed1084e9af5e86 SHA256 4cdb553f44524bedc91d2cb72a6ad5cfebe2c091709f741e4f228b7682220460
+MD5 c84234b88b3b7dff83d85ce8df79d941 cyrus-sasl-2.1.22-r2.ebuild 9014
+RMD160 7a0c7ae3c35cf6becc0c404239ca8904f932c24d cyrus-sasl-2.1.22-r2.ebuild 9014
+SHA256 4cdb553f44524bedc91d2cb72a6ad5cfebe2c091709f741e4f228b7682220460 cyrus-sasl-2.1.22-r2.ebuild 9014
EBUILD cyrus-sasl-2.1.22.ebuild 8759 RMD160 5048f3f95646dd47d4b98760f4a8760a8bdea85c SHA1 ff603f9842e74f25547041f85bf4cf6c8e75d8b9 SHA256 af946487bdeb3c7b6ec625560a6c1257a0440f81872a8a897768401838cd2921
MD5 e38946d538c009324defb0270d013ad7 cyrus-sasl-2.1.22.ebuild 8759
RMD160 5048f3f95646dd47d4b98760f4a8760a8bdea85c cyrus-sasl-2.1.22.ebuild 8759
SHA256 af946487bdeb3c7b6ec625560a6c1257a0440f81872a8a897768401838cd2921 cyrus-sasl-2.1.22.ebuild 8759
-MISC ChangeLog 30310 RMD160 350f489929ce43c057d6a89f8c26ee43b4c4b7bb SHA1 aab73ebf5983189a0fd8a18049e0fb1aed9d8521 SHA256 e3e37e887f6314dac48bdeac3dd64752ce120380b945b15a84837924eca2f9b8
-MD5 ee95463f6eaae00553ef41e9d6d2230d ChangeLog 30310
-RMD160 350f489929ce43c057d6a89f8c26ee43b4c4b7bb ChangeLog 30310
-SHA256 e3e37e887f6314dac48bdeac3dd64752ce120380b945b15a84837924eca2f9b8 ChangeLog 30310
+MISC ChangeLog 30528 RMD160 ab28445c22dbe18f97f003e1234cbbff135f67eb SHA1 e2cbfacd954b22c0584253833c49ef85736fc4aa SHA256 6de09f037741ba273d139eefa80600b85c48146d8c004dbe0a4411b33fc1e418
+MD5 9b503e6e665df7f8891c871e5da830dc ChangeLog 30528
+RMD160 ab28445c22dbe18f97f003e1234cbbff135f67eb ChangeLog 30528
+SHA256 6de09f037741ba273d139eefa80600b85c48146d8c004dbe0a4411b33fc1e418 ChangeLog 30528
MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -61,10 +66,6 @@ SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/di
MD5 867cdff3326eba0a057e9f78e16f9de1 files/digest-cyrus-sasl-2.1.22-r1 560
RMD160 70eac19a0f9ef23cfefcd6061eb588cab116b3d1 files/digest-cyrus-sasl-2.1.22-r1 560
SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/digest-cyrus-sasl-2.1.22-r1 560
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFoq+eV3J2n04EauwRAmTXAKC6M15S8IFucGkgZiYO7DaVpXI6ZQCffBoj
-TQwubk4J7jw5XdjuQpMHmis=
-=y+tB
------END PGP SIGNATURE-----
+MD5 867cdff3326eba0a057e9f78e16f9de1 files/digest-cyrus-sasl-2.1.22-r2 560
+RMD160 70eac19a0f9ef23cfefcd6061eb588cab116b3d1 files/digest-cyrus-sasl-2.1.22-r2 560
+SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/digest-cyrus-sasl-2.1.22-r2 560
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild
new file mode 100644
index 000000000000..31a4d2f55cf6
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2007 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.22-r2.ebuild,v 1.1 2007/02/03 15:08:19 alonbl Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.7"
+
+inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2
+
+ntlm_patch=${P}-ntlm_impl-spnego.patch.gz
+SASLAUTHD_CONF_VER=2.1.21
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+# Removed 'static' USE flag because it is broken upstream, Bug #94137
+IUSE="berkdb crypt gdbm ldap mysql postgres kerberos ssl pam authdaemond sample urandom srp ntlm_unsupported_patch"
+
+RDEPEND="berkdb? ( >=sys-libs/db-3.2 )
+ gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ ldap? ( >=net-nds/openldap-2.0.25 )
+ mysql? ( virtual/mysql )
+ 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/jre-1.4 )
+ ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4
+ java? ( >=virtual/jdk-1.4 )"
+
+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
+}
+
+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"
+
+ # Fix include path for newer PostgreSQL versions.
+ epatch "${FILESDIR}/${PN}-2.1.17-pgsql-include.patch"
+
+ # UNSUPPORTED ntlm patch. Bug #81342
+ use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
+
+ # --as-needed.
+ epatch "${FILESDIR}/${P}-as-needed.patch"
+
+ # Support 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}
+
+ # Fixes for bug #152544
+ epatch "${FILESDIR}/${P}-crypt.patch"
+
+ epatch "${FILESDIR}/${P}-qa.patch"
+
+ # Recreate configure.
+ rm "${S}/config/libtool.m4"
+ AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
+}
+
+src_compile() {
+ # QA issues
+ append-flags -fno-strict-aliasing
+ append-flags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+
+ # Java
+ use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+ local myconf="--enable-login --enable-ntlm --enable-auth-sasldb --disable-krb4 --disable-otp"
+# myconf="${myconf} `use_enable static`" -- doesn't work upstream Bug #94137
+ myconf="${myconf} `use_with ssl openssl`"
+ myconf="${myconf} `use_with pam`"
+ myconf="${myconf} `use_with ldap`"
+ myconf="${myconf} `use_enable ldap ldapdb`"
+ myconf="${myconf} `use_enable sample`"
+ myconf="${myconf} `use_enable kerberos gssapi`"
+ myconf="${myconf} `use_with mysql` `use_enable mysql`"
+ myconf="${myconf} `use_enable postgres`"
+ use postgres && myconf="${myconf} `use_with postgres pgsql $(pg_config --libdir)`"
+
+ # 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"
+
+ 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
+ # We sed'd Makefile.in already. Remove this block after testing period.
+ # sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile
+
+ # we force -j1 for bug #110066
+ emake -j1 || die "compile problem"
+
+ # 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() {
+ 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
+ java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
+ #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/*
+ dodir "/usr/share/doc/${PF}/java/Test"
+ insinto "/usr/share/doc/${PF}/java/Test"
+ doins "${S}"/java/Test/*.java \
+ || die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
+ fi
+
+ docinto ""
+ dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
+ newdoc pwcheck/README README.pwcheck
+ dohtml doc/*.html
+
+ docinto saslauthd
+ dodoc saslauthd/{AUTHORS,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-${SASLAUTHD_CONF_VER}.conf" saslauthd || \
+ die "failed to install /etc/conf.d/saslauthd"
+
+ exeinto /usr/sbin
+ newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
+ die "failed to install testsaslauthd."
+}
+
+pkg_postinst () {
+ # Generate an empty sasldb2 with correct permissions.
+ if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]]; then
+ einfo "Generate an empty sasldb2 with correct permissions."
+ echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
+ || die "failed to generate sasldb2"
+ "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
+ || die "failed to delete temp user"
+ chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
+ || die "failed to chown ${ROOT}/etc/sasl2/sasldb2"
+ chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
+ || die "failed to chmod ${ROOT}/etc/sasl2/sasldb2"
+ fi
+
+ 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
+
+ if use authdaemond; then
+ ewarn "You need to add a user running a service using Courier's"
+ ewarn "authdaemon to the 'mail' group. For example, do:"
+ ewarn " gpasswd -a postfix mail"
+ ewarn "to add postfix to 'mail' group."
+ fi
+}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch
new file mode 100644
index 000000000000..891eb47eba04
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch
@@ -0,0 +1,22 @@
+diff -urNp cyrus-sasl-2.1.22.org/lib/auxprop.c cyrus-sasl-2.1.22/lib/auxprop.c
+--- cyrus-sasl-2.1.22.org/lib/auxprop.c 2006-03-14 16:23:55.000000000 +0200
++++ cyrus-sasl-2.1.22/lib/auxprop.c 2007-02-03 16:28:26.000000000 +0200
+@@ -43,6 +43,7 @@
+ */
+
+ #include <config.h>
++#include <stdio.h>
+ #include <sasl.h>
+ #include <prop.h>
+ #include <ctype.h>
+diff -urNp cyrus-sasl-2.1.22.org/pwcheck/pwcheck_getspnam.c cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
+--- cyrus-sasl-2.1.22.org/pwcheck/pwcheck_getspnam.c 1999-08-26 19:22:44.000000000 +0300
++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c 2007-02-03 16:29:34.000000000 +0200
+@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF
+ ******************************************************************/
+
+ #include <shadow.h>
++#include <string.h>
+
+ extern char *crypt();
+
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.22-r2 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.22-r2
new file mode 100644
index 000000000000..5b2ad91fb88b
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.22-r2
@@ -0,0 +1,6 @@
+MD5 2e039a5b53e8934a3ca7107808acd7e1 cyrus-sasl-2.1.22-ntlm_impl-spnego.patch.gz 7466
+RMD160 70e498d2ca27289bd729563793dcdabe650ffac4 cyrus-sasl-2.1.22-ntlm_impl-spnego.patch.gz 7466
+SHA256 a696dddc27d46ab1950b546fcf49efc1a03a8380ecc4537d085d8daacb88ccf0 cyrus-sasl-2.1.22-ntlm_impl-spnego.patch.gz 7466
+MD5 45dde9d19193ae9dd388eb68b2027bc9 cyrus-sasl-2.1.22.tar.gz 1609278
+RMD160 086e20d01588cb86decad001244b72a37223354c cyrus-sasl-2.1.22.tar.gz 1609278
+SHA256 c69e3853f35b14ee2c3f6e876e42d880927258ff4678aa052e5f0853db209962 cyrus-sasl-2.1.22.tar.gz 1609278