* [gentoo-commits] proj/loongson:master commit in: dev-libs/cyrus-sasl/, dev-libs/cyrus-sasl/files/
@ 2012-02-09 16:51 Matt Turner
0 siblings, 0 replies; only message in thread
From: Matt Turner @ 2012-02-09 16:51 UTC (permalink / raw
To: gentoo-commits
commit: 2efe5af6339584e7d94d7f66f33a65702d524791
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Feb 9 16:42:09 2012 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Feb 9 16:42:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=2efe5af6
Remove dev-libs/cyrus-sasl
gcc 4.4 patch (bug 248738) is available in versions 2.1.22-r2 and newer
available in portage.
Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>
---
dev-libs/cyrus-sasl/Manifest | 15 --
dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild | 250 --------------------
.../files/cyrus-sasl-2.1.17-pgsql-include.patch | 13 -
.../files/cyrus-sasl-2.1.19-checkpw.c.patch | 170 -------------
.../files/cyrus-sasl-2.1.22-as-needed.patch | 11 -
.../cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch | 74 ------
.../cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch | 11 -
.../cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch | 22 --
dev-libs/cyrus-sasl/files/cyrus-sasl-gcc4.4.patch | 20 --
dev-libs/cyrus-sasl/files/java.README.gentoo | 39 ---
dev-libs/cyrus-sasl/files/pwcheck.rc6 | 21 --
dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf | 25 --
dev-libs/cyrus-sasl/files/saslauthd.pam-include | 8 -
dev-libs/cyrus-sasl/files/saslauthd2.rc6 | 21 --
14 files changed, 0 insertions(+), 700 deletions(-)
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
deleted file mode 100644
index 3cb1b90..0000000
--- a/dev-libs/cyrus-sasl/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX cyrus-sasl-2.1.17-pgsql-include.patch 617 RMD160 b6a01c3447b49c8cc33ae0c7ca63294cad8e672c SHA1 a7a22f113044d8bda07e8345781913c317941f53 SHA256 394b196e7d5d7abb3d340de69ddea718bf80936de1eb667580ebae40b9cca228
-AUX cyrus-sasl-2.1.19-checkpw.c.patch 4858 RMD160 04f03808803b7a6f73bec5325c867b6e96e50f73 SHA1 60949a168c99b445298b3af786dae6e1b0f129d9 SHA256 57bc424e617ca4bac9e27f0f20da1bab6806a39801945c180b94ae29160981a8
-AUX cyrus-sasl-2.1.22-as-needed.patch 463 RMD160 190cfa32c54ad9417adaca7c6d0d75d771fee450 SHA1 438a7a8a3394bfefdb5280617e4f67deb7af1002 SHA256 bc26996cbafb59f4daf1d7acc077bae9a60e4746109a9ec4a580eaba5cb9ca78
-AUX cyrus-sasl-2.1.22-crypt.patch 3767 RMD160 413d73e0e6249e27c43a5590712ffa5a091e241c SHA1 aa1dbf61306a192359ef7364f9172f32abf73353 SHA256 09c717cc95d6deb8b9ac9ba371c2a26803b19f1433620b803669872de45ef17e
-AUX cyrus-sasl-2.1.22-db4.patch 691 RMD160 59d9323e51aeb1ddf0ad063aa43af95be9c4875a SHA1 1f0f0369b1e3e7f8e6729a1bd24f47c107af1fd8 SHA256 e6637054d8172f758f88f4e091e20b6f8966816d4bac965392fc49dea4c8f4b5
-AUX cyrus-sasl-2.1.22-qa.patch 829 RMD160 f3640f3f77847df1395c96c2d1a333ad242d7583 SHA1 a2694e41980dc4ee9dbc8accb6bc697198f38d57 SHA256 ca3a06cc817712387ab9c9d9bad502f9a61afedb4eb178e5e5d1c512130d0c48
-AUX cyrus-sasl-gcc4.4.patch 441 RMD160 b439723f3ab7229cae68c39f2076e6f417defdc7 SHA1 f83a92ce92e71c1bb2e7ad0b89c2f520ee4b1132 SHA256 2f18c8b02f63196d6b251f4b3ff00c39b5548a0be855e3223c8678bdd66b9f6a
-AUX java.README.gentoo 934 RMD160 53369bc85186e7be3e86a98d19a0a19ca4535c2b SHA1 8ddb577ffe968d4ff3cda27402ce21988c55519a SHA256 aeb733ab6371c1fe50e413e8469dcd11f0750b5afff489408c45f118857fc3fe
-AUX pwcheck.rc6 538 RMD160 acd0c14abc01390b6bf0944c2b35691e00f4c27f SHA1 ef9ebcf058536a0429211d8ed0d35aacb84a35cf SHA256 9e0d9ab2f0d0f7bccbcc194f6cbfe8ed67e94958465a18f3985f3819f5ed04e1
-AUX saslauthd-2.1.21.conf 926 RMD160 fab448738564cb27562a08363a9de84b1141bcc0 SHA1 3220aa01bc5aa3ed4163f3120790f581682fe2e3 SHA256 31e1676f845540dafa9c09799b110234a6362bcd056feaa1ae096e277c9d216e
-AUX saslauthd.pam-include 160 RMD160 643057c1c0e6fc859114b152dab1bf0e89c13c70 SHA1 4202ff7752fd39614211dfc099faace5509c632f SHA256 97166de49d227cf5ff305168ea75ca584feda9ab87d1eb1437638861986e70ba
-AUX saslauthd2.rc6 525 RMD160 b21261a0c3670d66314269775ec8ff06e9437d88 SHA1 1dfb2736a8a12181a1948870b1063577f6863b2d SHA256 329fb67382e307ab6d37aa789667b04a91ba3f69e9c1023b0902adafed065ee9
-DIST cyrus-sasl-2.1.22-ntlm_impl-spnego.patch.gz 7466 RMD160 70e498d2ca27289bd729563793dcdabe650ffac4 SHA1 2f944004dbd828ca9bbd53bc7619d79c8b8714ab SHA256 a696dddc27d46ab1950b546fcf49efc1a03a8380ecc4537d085d8daacb88ccf0
-DIST cyrus-sasl-2.1.22.tar.gz 1609278 RMD160 086e20d01588cb86decad001244b72a37223354c SHA1 d23454ab12054714ab97d229c86cb934ce63fbb1 SHA256 c69e3853f35b14ee2c3f6e876e42d880927258ff4678aa052e5f0853db209962
-EBUILD cyrus-sasl-2.1.22-r2.ebuild 8676 RMD160 7315e440ba810a7fb64bdf291fe4954b7440dc44 SHA1 2b5e1f49f8d1ebe9dae408588f287ee480793696 SHA256 4ed7c2d324b14578f3702274a9989d88e63356edcd60324bef1ee8c2c766f437
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
deleted file mode 100644
index 0d72762..0000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2008 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.15 2008/05/19 19:38:42 dev-zero 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"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-
-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"
-IUSE="authdaemond berkdb crypt gdbm kerberos ldap mysql ntlm_unsupported_patch pam postgres sample srp ssl urandom"
-
-RDEPEND="authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) )
- berkdb? ( >=sys-libs/db-3.2 )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- java? ( >=virtual/jre-1.4 )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-2.0.25 )
- mysql? ( virtual/mysql )
- ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )
- pam? ( virtual/pam )
- postgres? ( >=virtual/postgresql-base-7.2 )
- ssl? ( >=dev-libs/openssl-0.9.6d )"
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4
- java? ( >=virtual/jdk-1.4 )"
-
-pkg_setup() {
- if use gdbm && use berkdb ; then
- echo
- ewarn "You have both the 'gdbm' and 'berkdb' USE flags enabled."
- ewarn "Will default to GNU DB as your SASLdb database backend."
- ewarn "If you want to build with BerkeleyDB support, hit Control-C now,"
- ewarn "change your USE flags -gdbm and emerge again."
- echo
- ewarn "Waiting 10 seconds before starting ..."
- ewarn "(Control-C to abort) ..."
- epause 10
- fi
- java-pkg-opt-2_pkg_setup
-}
-
-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 fix.
- epatch "${FILESDIR}/${P}-as-needed.patch"
-
- # Support for crypted passwords (bug #45181).
- use crypt && epatch "${FILESDIR}/${PN}-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} || die "sed failed"
-
- # Fixes for bug #152544.
- epatch "${FILESDIR}/${P}-crypt.patch"
-
- # Fix QA issues.
- epatch "${FILESDIR}/${P}-qa.patch"
-
- # support new db versions #192753
- epatch "${FILESDIR}/${P}-db4.patch"
-
- epatch "${FILESDIR}/${PN}-gcc4.4.patch"
-
- # Recreate configure.
- rm -f "${S}/config/libtool.m4" || die "rm libtool.m4 failed"
- AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
-}
-
-src_compile() {
- # Fix QA issues.
- append-flags -fno-strict-aliasing
- append-flags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
- # Java support.
- use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
- local myconf="--enable-login --enable-ntlm --enable-auth-sasldb --disable-krb4 --disable-otp"
- 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 srp USE (bug #81970).
- myconf="${myconf} `use_enable srp`"
- # Java support.
- myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
- # Add authdaemond support (bug #56523).
- if use authdaemond ; then
- myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
- fi
-
- # Fix for bug #59634.
- 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' are present.
- if use gdbm ; then
- einfo "Building with GNU DB as database backend for your SASLdb"
- myconf="${myconf} --with-dblib=gdbm"
- elif use berkdb ; then
- einfo "Building with BerkeleyDB as database backend for your SASLdb"
- myconf="${myconf} --with-dblib=berkeley"
- else
- einfo "Building 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"
-
- # We force -j1 for bug #110066.
- emake -j1 || die "emake failed"
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- # 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
-
- # Add testsaslauthd (bug #58768).
- cd "${S}/saslauthd"
- emake testsaslauthd || die "emake testsaslauthd failed"
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install || die "emake install failed"
- keepdir /var/lib/sasl2 /etc/sasl2
-
- # Install everything necessary so users 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
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- if use java ; then
- java-pkg_dojar ${PN}.jar
- java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
- # hackish, don't wanna dig through 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 /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 || die "Failed to install saslauthd to /etc/pam.d"
-
- 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 saslauthd to /etc/conf.d"
-
- 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 "Generating 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
- elog "You have chosen to install sources for the example client and server."
- elog "To build these, please type:"
- elog "\tcd /usr/share/${PN}-2/examples/sample && make"
- fi
-
- if use authdaemond ; then
- elog "You need to add a user running a service using Courier's"
- elog "authdaemon to the 'mail' group. For example, do:"
- elog " gpasswd -a postfix mail"
- elog "to add the 'postfix' user to the 'mail' group."
- fi
-}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch
deleted file mode 100644
index 90afd85..0000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in.orig 2004-01-15 13:18:24.000000000 -0800
-+++ configure.in 2004-01-15 13:18:27.000000000 -0800
-@@ -674,7 +674,9 @@
- LIB_PGSQL_DIR=$LIB_PGSQL
- LIB_PGSQL="$LIB_PGSQL -lpq"
-
-- if test -d ${with_pgsql}/include/pgsql; then
-+ if test -d ${with_pgsql}/include/postgresql/pgsql; then
-+ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql/pgsql"
-+ elif test -d ${with_pgsql}/include/pgsql; then
- CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql"
- elif test -d ${with_pgsql}/pgsql/include; then
- CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-checkpw.c.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-checkpw.c.patch
deleted file mode 100644
index f7bf44b..0000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-checkpw.c.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in
---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200
-+++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200
-@@ -120,7 +120,7 @@
- JAVA_TRUE = @JAVA_TRUE@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = -lcrypt @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_CRYPT = @LIB_CRYPT@
- LIB_DES = @LIB_DES@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c
---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100
-+++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200
-@@ -94,6 +94,23 @@
- # endif
- #endif
-
-+/******************************
-+ * crypt(3) patch start *
-+ ******************************/
-+char *crypt(const char *key, const char *salt);
-+
-+/* cleartext password formats */
-+#define PASSWORD_FORMAT_CLEARTEXT 1
-+#define PASSWORD_FORMAT_CRYPT 2
-+#define PASSWORD_FORMAT_CRYPTTRAD 3
-+#define PASSWORD_SALT_BUF_LEN 22
-+
-+/* weeds out crypt(3) password's salt */
-+int _sasl_get_salt (char *dest, char *src, int format);
-+
-+/******************************
-+ * crypt(3) patch stop *
-+ ******************************/
-
- /* we store the following secret to check plaintext passwords:
- *
-@@ -143,7 +160,51 @@
- "*cmusaslsecretPLAIN",
- NULL };
- struct propval auxprop_values[3];
--
-+
-+ /******************************
-+ * crypt(3) patch start *
-+ * for password format check *
-+ ******************************/
-+ sasl_getopt_t *getopt;
-+ void *context;
-+ const char *p = NULL;
-+ /**
-+ * MD5: 12 char salt
-+ * BLOWFISH: 16 char salt
-+ */
-+ char salt[PASSWORD_SALT_BUF_LEN];
-+ int password_format;
-+
-+ /* get password format from auxprop configuration */
-+ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) {
-+ getopt(context, NULL, "password_format", &p, NULL);
-+ }
-+
-+ /* set password format */
-+ if (p) {
-+ /*
-+ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN);
-+ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1));
-+ */
-+ /* modern, modular crypt(3) */
-+ if (strncmp(p, "crypt", 11) == 0)
-+ password_format = PASSWORD_FORMAT_CRYPT;
-+ /* traditional crypt(3) */
-+ else if (strncmp(p, "crypt_trad", 11) == 0)
-+ password_format = PASSWORD_FORMAT_CRYPTTRAD;
-+ /* cleartext password */
-+ else
-+ password_format = PASSWORD_FORMAT_CLEARTEXT;
-+ } else {
-+ /* cleartext password */
-+ password_format = PASSWORD_FORMAT_CLEARTEXT;
-+ }
-+
-+ /******************************
-+ * crypt(3) patch stop *
-+ * for password format check *
-+ ******************************/
-+
- if (!conn || !userstr)
- return SASL_BADPARAM;
-
-@@ -180,14 +241,31 @@
- goto done;
- }
-
-- /* At the point this has been called, the username has been canonified
-- * and we've done the auxprop lookup. This should be easy. */
-- if(auxprop_values[0].name
-- && auxprop_values[0].values
-- && auxprop_values[0].values[0]
-- && !strcmp(auxprop_values[0].values[0], passwd)) {
-- /* We have a plaintext version and it matched! */
-- return SASL_OK;
-+
-+ /******************************
-+ * crypt(3) patch start *
-+ ******************************/
-+
-+ /* get salt */
-+ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format);
-+
-+ /* crypt(3)-ed password? */
-+ if (password_format != PASSWORD_FORMAT_CLEARTEXT) {
-+ /* compare password */
-+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0)
-+ return SASL_OK;
-+ else
-+ ret = SASL_BADAUTH;
-+ }
-+ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) {
-+ /* compare passwords */
-+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0)
-+ return SASL_OK;
-+ else
-+ ret = SASL_BADAUTH;
-+ /******************************
-+ * crypt(3) patch stop *
-+ ******************************/
- } else if(auxprop_values[1].name
- && auxprop_values[1].values
- && auxprop_values[1].values[0]) {
-@@ -975,3 +1053,37 @@
- #endif
- { NULL, NULL }
- };
-+
-+/* weeds out crypt(3) password's salt */
-+int _sasl_get_salt (char *dest, char *src, int format) {
-+ int num; /* how many characters is salt long? */
-+ switch (format) {
-+ case PASSWORD_FORMAT_CRYPT:
-+ /* md5 crypt */
-+ if (src[1] == '1')
-+ num = 12;
-+ /* blowfish crypt */
-+ else if (src[1] == '2')
-+ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16;
-+ /* traditional crypt */
-+ else
-+ num = 2;
-+ break;
-+
-+ case PASSWORD_FORMAT_CRYPTTRAD:
-+ num = 2;
-+ break;
-+
-+ default:
-+ return 1;
-+ }
-+
-+ /* destroy destination */
-+ memset(dest, '\0', (num + 1));
-+
-+ /* copy salt to destination */
-+ strncpy(dest, src, num);
-+
-+ return 1;
-+}
-+
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-as-needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-as-needed.patch
deleted file mode 100644
index 1294cb5..0000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700
-+++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700
-@@ -77,7 +77,7 @@
- AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
- SASL_DB_PATH_CHECK()
- SASL_DB_CHECK()
-- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
-+ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB"
- fi
-
- AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ],
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch
deleted file mode 100644
index 8ac4687..0000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -urpN cyrus-sasl-2.1.22-orig/lib/Makefile.am cyrus-sasl-2.1.22/lib/Makefile.am
---- cyrus-sasl-2.1.22-orig/lib/Makefile.am 2006-05-17 16:46:13.000000000 +0000
-+++ cyrus-sasl-2.1.22/lib/Makefile.am 2006-10-24 15:20:36.000000000 +0000
-@@ -45,6 +45,7 @@ sasl_version = 2:22:0
-
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
-
-+AM_CFLAGS = -fPIC
- EXTRA_DIST = windlopen.c staticopen.h NTMakefile
- EXTRA_LIBRARIES = libsasl2.a
- noinst_LIBRARIES = @SASL_STATIC_LIBS@
-diff -urpN cyrus-sasl-2.1.22-orig/plugins/Makefile.am cyrus-sasl-2.1.22/plugins/Makefile.am
---- cyrus-sasl-2.1.22-orig/plugins/Makefile.am 2006-05-17 16:46:16.000000000 +0000
-+++ cyrus-sasl-2.1.22/plugins/Makefile.am 2006-10-24 15:19:38.000000000 +0000
-@@ -63,6 +63,7 @@ srp_version = 2:22:0
-
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
- AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
-+AM_CFLAGS = -fPIC
-
- COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
-
-diff -urpN cyrus-sasl-2.1.22-orig/sasldb/Makefile.am cyrus-sasl-2.1.22/sasldb/Makefile.am
---- cyrus-sasl-2.1.22-orig/sasldb/Makefile.am 2006-05-17 16:46:17.000000000 +0000
-+++ cyrus-sasl-2.1.22/sasldb/Makefile.am 2006-10-24 15:20:10.000000000 +0000
-@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
-
- extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
-
-+AM_CFLAGS = -fPIC
- EXTRA_DIST = NTMakefile
-
- noinst_LTLIBRARIES = libsasldb.la
-diff -urpN cyrus-sasl-2.1.22-orig/utils/Makefile.am cyrus-sasl-2.1.22/utils/Makefile.am
---- cyrus-sasl-2.1.22-orig/utils/Makefile.am 2006-05-18 18:34:26.000000000 +0000
-+++ cyrus-sasl-2.1.22/utils/Makefile.am 2006-10-24 15:12:39.000000000 +0000
-@@ -42,7 +42,7 @@
- #
- ################################################################
-
--all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
-+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT)
- all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
-
- sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
-diff -urpN cyrus-sasl-2.1.22-orig/sample/Makefile.am cyrus-sasl-2.1.22/sample/Makefile.am
---- cyrus-sasl-2.1.22-orig/sample/Makefile.am 2004-03-10 15:44:55.000000000 +0000
-+++ cyrus-sasl-2.1.22/sample/Makefile.am 2006-10-24 16:03:22.000000000 +0000
-@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c
- server_SOURCES = server.c common.c common.h
- client_SOURCES = client.c common.c common.h
-
--server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
--client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
-+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-
--sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
--sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
-+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-
- EXTRA_DIST = NTMakefile
---- cyrus-sasl-2.1.22-orig/lib/Makefile.am 2006-10-24 16:51:41.000000000 +0000
-+++ cyrus-sasl-2.1.22/lib/Makefile.am 2006-10-24 16:51:10.000000000 +0000
-@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la
- libsasl2_la_SOURCES = $(common_sources) $(common_headers)
- libsasl2_la_LDFLAGS = -version-info $(sasl_version)
- libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
--libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
-+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT)
-
- if MACOSX
- framedir = /Library/Frameworks/SASL2.framework
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch
deleted file mode 100644
index 2ce8f79..0000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cyrus-sasl-2.1.22/cmulocal/berkdb.m4.orig 2007-10-02 10:10:07.000000000 -0700
-+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2007-10-02 10:28:14.000000000 -0700
-@@ -213,7 +213,7 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+ for dbname in db-4.6 db-4.5 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
- do
- LIBS="$saved_LIBS -l$dbname"
- AC_TRY_LINK([#include <db.h>],
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
deleted file mode 100644
index 891eb47..0000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/cyrus-sasl-gcc4.4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-gcc4.4.patch
deleted file mode 100644
index 1215fed..0000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-gcc4.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/digestmd5.c.orig 2009-02-28 12:22:31.000000000 +0800
-+++ plugins/digestmd5.c 2009-02-28 12:24:21.000000000 +0800
-@@ -2715,7 +2715,7 @@
- "DIGEST-MD5", /* mech_name */
- #ifdef WITH_RC4
- 128, /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
-@@ -4034,7 +4034,7 @@
- "DIGEST-MD5",
- #ifdef WITH_RC4 /* mech_name */
- 128, /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
diff --git a/dev-libs/cyrus-sasl/files/java.README.gentoo b/dev-libs/cyrus-sasl/files/java.README.gentoo
deleted file mode 100644
index fb73204..0000000
--- a/dev-libs/cyrus-sasl/files/java.README.gentoo
+++ /dev/null
@@ -1,39 +0,0 @@
-4-Nov-2000
-
-Note: this file has been modified to adapt to Gentoo specific.
-
-class files are installed in
-
-`java-config -p cyrus-sasl-2`
-
-to compile programs using it, do:
-
-javac -classpath $JAVA_HOME/lib/tools.jar:`java-config -p cyrus-sasl-2` <file>.java
-
-(make sure to substitute your JDK for $JAVA_HOME/lib/tools.jar)
-
-to run, do
-
-java -classpath <same path as above> <YourProgram>
-
-----------------------------
-This is a java version of the SASL libraries. It supports all the
-mechanisms in the C version and conforms to the internet draft in the
-doc/ directory. JNI is used.
-
-Sample applications exist in the Test/ directory.
-
-They generally can be run with something like:
-
-java -debug -classpath
-../:$JAVA_HOME/lib/tools.jar:`java-config -p cyrus-sasl-2`:. jimtest -p 2143 -m
-KERBEROS_V4 cyrus-dev
-
-and
-
-java -debug -classpath
-../:$JAVA_HOME/lib/tools.jar:`java-config -p cyrus-sasl-2`:. testserver
-
-
-Any feedback is welcome.
-
diff --git a/dev-libs/cyrus-sasl/files/pwcheck.rc6 b/dev-libs/cyrus-sasl/files/pwcheck.rc6
deleted file mode 100644
index a24b80d..0000000
--- a/dev-libs/cyrus-sasl/files/pwcheck.rc6
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# 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/files/pwcheck.rc6,v 1.5 2007/04/07 13:03:55 chtekk Exp $
-
-depend() {
- need localmount
- use logger
-}
-
-start() {
- ebegin "Starting sasl pwcheck daemon"
- start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/pwcheck
- eend $?
-}
-
-stop() {
- ebegin "Stopping sasl pwcheck daemon"
- start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/pwcheck
- eend $?
-}
diff --git a/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf b/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf
deleted file mode 100644
index 3f2653c..0000000
--- a/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf,v 1.2 2007/04/07 13:03:55 chtekk Exp $
-
-# Config file for /etc/init.d/saslauthd
-
-# Initial (empty) options.
-SASLAUTHD_OPTS=""
-
-# Specify the authentications mechanism.
-# **NOTE** For a list see: saslauthd -v
-# Since 2.1.19, add "-r" to options for old behavior,
-# ie. reassemble user and realm to user@realm form.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam -r"
-SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam"
-
-# Specify the hostname for remote IMAP server.
-# **NOTE** Only needed if rimap auth mechanism is used.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O localhost"
-
-# Specify the number of worker processes to create.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -n 5"
-
-# Enable credential cache, set cache size and timeout.
-# **NOTE** Size is measured in kilobytes.
-# Timeout is measured in seconds.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -c -s 128 -t 30"
diff --git a/dev-libs/cyrus-sasl/files/saslauthd.pam-include b/dev-libs/cyrus-sasl/files/saslauthd.pam-include
deleted file mode 100644
index d50a849..0000000
--- a/dev-libs/cyrus-sasl/files/saslauthd.pam-include
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-
-auth required pam_nologin.so
-auth include system-auth
-
-account include system-auth
-
-session include system-auth
diff --git a/dev-libs/cyrus-sasl/files/saslauthd2.rc6 b/dev-libs/cyrus-sasl/files/saslauthd2.rc6
deleted file mode 100644
index a5e9a44..0000000
--- a/dev-libs/cyrus-sasl/files/saslauthd2.rc6
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# 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/files/saslauthd2.rc6,v 1.7 2007/04/07 13:03:55 chtekk Exp $
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting saslauthd"
- start-stop-daemon --start --quiet --exec /usr/sbin/saslauthd \
- -- ${SASLAUTHD_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping saslauthd"
- start-stop-daemon --stop --quiet --pidfile /var/lib/sasl2/saslauthd.pid
- eend $?
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-02-09 16:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-09 16:51 [gentoo-commits] proj/loongson:master commit in: dev-libs/cyrus-sasl/, dev-libs/cyrus-sasl/files/ Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox