summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Visi <merlin@gentoo.org>2004-07-01 14:08:55 +0000
committerCory Visi <merlin@gentoo.org>2004-07-01 14:08:55 +0000
commit9bd0ae7ada2bf2f6720e9a6ac9a3a13b5ed1b837 (patch)
tree305e128e95485dad4a0913022908c5b9e93108f5
parentstable on ppc64 bug #54799 (diff)
downloadhistorical-9bd0ae7ada2bf2f6720e9a6ac9a3a13b5ed1b837.tar.gz
historical-9bd0ae7ada2bf2f6720e9a6ac9a3a13b5ed1b837.tar.bz2
historical-9bd0ae7ada2bf2f6720e9a6ac9a3a13b5ed1b837.zip
mark 2.1.18 unstable, remove 2.1.17 from portage
-rw-r--r--dev-libs/cyrus-sasl/ChangeLog9
-rw-r--r--dev-libs/cyrus-sasl/Manifest42
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild142
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild4
-rw-r--r--dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.171
5 files changed, 30 insertions, 168 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index e881f870e23e..d1f68ddc5ca8 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,13 @@
# 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.73 2004/06/25 18:15:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.74 2004/07/01 14:08:55 merlin Exp $
+
+ 01 Jul 2004; Cory Visi <merlin@gentoo.org> cyrus-sasl-2.1.18.ebuild:
+ Moved all archs to unstable due to numerous open bugs
+
+ 01 Jul 2004; Cory Visi <merlin@gentoo.org> cyrus-sasl-2.1.17.ebuild:
+ Unstable 2.1.17 dropped due to broken db4 patch, please use 2.1.18; reference:
+ Bug 47027 & Bug Bug 46936
25 Jun 2004; Aron Griffis <agriffis@gentoo.org> cyrus-sasl-2.1.17.ebuild,
cyrus-sasl-2.1.18.ebuild:
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 58c1acefa3b5..799700d46ec0 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,33 +1,31 @@
-MD5 0a852a6ca1b32f698d275f70d64e1f9d cyrus-sasl-1.5.27-r6.ebuild 2763
-MD5 d86378e0b5c06b582093e0550a48fde8 cyrus-sasl-2.1.18.ebuild 4266
-MD5 9bec5bcd49985c0721eec238b54ccc3d cyrus-sasl-2.1.15.ebuild 3747
+MD5 adc56644ae4ed04f1b3face1107d546e ChangeLog 14149
MD5 31d306e5edf54b32c9de31b7d8c22797 cyrus-sasl-1.5.27-r5.ebuild 2691
-MD5 fdf316a2a4f0d8a426cc3cfb46774b24 cyrus-sasl-2.1.17.ebuild 4248
+MD5 0a852a6ca1b32f698d275f70d64e1f9d cyrus-sasl-1.5.27-r6.ebuild 2763
MD5 0364033278f9f21b78e0a6cb0025db6b cyrus-sasl-2.1.14.ebuild 3917
-MD5 2515200ddd13b4f815018927cf2ca59a ChangeLog 13842
+MD5 9bec5bcd49985c0721eec238b54ccc3d cyrus-sasl-2.1.15.ebuild 3747
+MD5 e3c211d4b69e6036afc5a39c16fa20ea cyrus-sasl-2.1.18.ebuild 4270
MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
+MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
+MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
-MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
-MD5 1b1b242c70955511bc086ba8008d3536 files/saslauthd2.conf 744
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 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
-MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
-MD5 65e5efdf063dbf2d5427b421343c9ff2 files/saslauthd.rc6 531
-MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
-MD5 a21930769b34c30d8166dc1d65482c26 files/pwcheck.rc6 546
-MD5 8d0729dbeb7685b261231cd0ddef4dfb files/saslauthd2.rc6 533
-MD5 d1672e7dfaaa66893c8eefe0712b7e36 files/saslauthd.conf 896
-MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
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 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
+MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
MD5 6ba386a4eb5f9addf367d41093ba369e files/digest-cyrus-sasl-2.1.14 70
MD5 6109117a3ea3c1141364d60d212f48d9 files/digest-cyrus-sasl-2.1.15 70
-MD5 960ffd4d83e165ccaa68cf43937ff63d files/digest-cyrus-sasl-2.1.17 70
MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18 70
+MD5 a21930769b34c30d8166dc1d65482c26 files/pwcheck.rc6 546
+MD5 d1672e7dfaaa66893c8eefe0712b7e36 files/saslauthd.conf 896
+MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
+MD5 65e5efdf063dbf2d5427b421343c9ff2 files/saslauthd.rc6 531
+MD5 1b1b242c70955511bc086ba8008d3536 files/saslauthd2.conf 744
+MD5 8d0729dbeb7685b261231cd0ddef4dfb files/saslauthd2.rc6 533
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
deleted file mode 100644
index 42e01c3a5238..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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.17.ebuild,v 1.19 2004/06/25 18:15:01 agriffis Exp $
-
-inherit eutils flag-o-matic gnuconfig
-
-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 ~amd64 alpha ia64 hppa mips"
-IUSE="gdbm ldap mysql postgres kerberos static ssl java pam"
-
-RDEPEND="virtual/glibc
- >=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 )
- java? ( virtual/jdk )"
-
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4
- sys-devel/libtool
- >=sys-devel/autoconf-2.58
- sys-devel/automake"
-
-src_unpack() {
- unpack ${A} && cd "${S}"
-
- # Fix broken include.
- sed -e 's:sasl/sasl.h:sasl.h:' \
- -i saslauthd/lak.c || die "sed failed"
-
- # 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.
- epatch "${FILESDIR}/cyrus-sasl-2.1.17-db4.patch"
-
- # Add configdir support.
- epatch "${FILESDIR}/cyrus-sasl-2.1.17-configdir.patch"
-
- # Fix include path for newer PostgreSQL versions.
- epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
-
- # Recreate configure.
- export WANT_AUTOCONF="2.5"
- rm -f configure config.h.in saslauthd/configure
- ebegin "Recreating configure"
- aclocal -I cmulocal -I config && autoheader && autoconf || \
- die "recreate configure failed"
- eend $?
-
- cd "${S}/saslauthd"
- ebegin "Recreating saslauthd/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 kerberos gssapi`"
- myconf="${myconf} `use_with mysql` `use_enable mysql sql`"
- myconf="${myconf} `use_with postgres pgsql` `use_enable postgres sql`"
- myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-
- if use mysql || use postgres ; then
- myconf="${myconf} --enable-sql"
- else
- myconf="${myconf} --disable-sql"
- fi
- if use gdbm ; then
- myconf="${myconf} --with-dblib=gdbm"
- else
- myconf="${myconf} --with-dblib=berkeley"
- fi
-
- # Compaq-sdk checks for -D_REENTRANT and -pthread takes care the cpp stuff.
- # taviso #24998 (17 Aug 03)
- use alpha && append-flags -D_REENTRANT -pthread
-
- # Detect mips systems properly
- use mips && 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.
- emake -j1 || die "compile problem"
-}
-
-src_install () {
- einstall
- keepdir /var/lib/sasl2 /etc/sasl2
-
- # 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"
-
- 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
- newexe "${FILESDIR}/saslauthd2.rc6" saslauthd
- insinto /etc/conf.d
- newins "${FILESDIR}/saslauthd2.conf" saslauthd
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild
index 5cea7f38e154..2218053505db 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild
@@ -1,6 +1,6 @@
# 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.18.ebuild,v 1.13 2004/06/25 18:15:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild,v 1.14 2004/07/01 14:08:55 merlin Exp $
inherit eutils flag-o-matic gnuconfig
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
IUSE="gdbm ldap mysql postgres kerberos static ssl java pam"
RDEPEND="virtual/glibc
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17
deleted file mode 100644
index 954839a230d0..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4add6be2f194dc51aafc64193a1dd77b cyrus-sasl-2.1.17.tar.gz 1499725