summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kalika <max@gentoo.org>2004-01-15 00:44:27 +0000
committerMax Kalika <max@gentoo.org>2004-01-15 00:44:27 +0000
commit52843bf4b2bafcac6d5e854a0f51eff12276bffb (patch)
tree52c36a7469b70e6de250134000d849e0891f2299 /net-mail/cyrus-imspd
parentcleanup (diff)
downloadgentoo-2-52843bf4b2bafcac6d5e854a0f51eff12276bffb.tar.gz
gentoo-2-52843bf4b2bafcac6d5e854a0f51eff12276bffb.tar.bz2
gentoo-2-52843bf4b2bafcac6d5e854a0f51eff12276bffb.zip
Bump to version 1.7a. Security update!
Diffstat (limited to 'net-mail/cyrus-imspd')
-rw-r--r--net-mail/cyrus-imspd/ChangeLog9
-rw-r--r--net-mail/cyrus-imspd/Manifest10
-rw-r--r--net-mail/cyrus-imspd/cyrus-imspd-1.7a.ebuild (renamed from net-mail/cyrus-imspd/cyrus-imspd-1.7-r1.ebuild)24
-rw-r--r--net-mail/cyrus-imspd/files/cyrus-imspd-db4.patch36
-rw-r--r--net-mail/cyrus-imspd/files/cyrus-imspd-gentoo.patch92
-rw-r--r--net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7-r11
-rw-r--r--net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7a1
7 files changed, 67 insertions, 106 deletions
diff --git a/net-mail/cyrus-imspd/ChangeLog b/net-mail/cyrus-imspd/ChangeLog
index da84f304acda..d4ce8b3fb9ff 100644
--- a/net-mail/cyrus-imspd/ChangeLog
+++ b/net-mail/cyrus-imspd/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-mail/cyrus-imspd
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.3 2003/11/04 05:11:59 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.4 2004/01/15 00:44:15 max Exp $
+
+*cyrus-imspd-1.7a (14 Jan 2004)
+
+ 14 Jan 2004; Max Kalika <max@gentoo.org> cyrus-imspd-1.7-r1.ebuild,
+ cyrus-imspd-1.7a.ebuild, files/cyrus-imspd-db4.patch,
+ files/cyrus-imspd-gentoo.patch:
+ Bump to version 1.7a. Security update!
03 Nov 2003; Max Kalika <max@gentoo.org> cyrus-imspd-1.7-r1.ebuild,
files/gentestcrt.sh:
diff --git a/net-mail/cyrus-imspd/Manifest b/net-mail/cyrus-imspd/Manifest
index ff0ea87389ee..50d39d62bf60 100644
--- a/net-mail/cyrus-imspd/Manifest
+++ b/net-mail/cyrus-imspd/Manifest
@@ -1,9 +1,9 @@
-MD5 562a16d8c86875b72b21c72e0763f088 cyrus-imspd-1.7-r1.ebuild 1982
-MD5 26128c32234575911bef5cca466a5915 ChangeLog 2236
+MD5 5da30716715ff01418a16a71eb838cc0 cyrus-imspd-1.7a.ebuild 2176
+MD5 1a3eb979c6456dad994e17a5bac8e706 ChangeLog 2471
MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 3c8013bd55f6ce72fda11e0b0a058221 files/cyrus-imspd-db4.patch 3786
+MD5 bbf3166bc707a84443c5e396c1d6d6f9 files/cyrus-imspd-db4.patch 3446
MD5 aa6f51b5cf7fcffd8af00e26c81c2eed files/imspd.conf 156
MD5 4abe3ce5da075b56135d9fb7060fc1e9 files/imspd.rc6 1149
-MD5 7d092edc1868ef27ebd61712f1be77ce files/cyrus-imspd-gentoo.patch 5092
-MD5 091bfd9602efd88a1f6411bf09203ffc files/digest-cyrus-imspd-1.7-r1 68
+MD5 d97f9081cc542625ba06e672f58e7377 files/cyrus-imspd-gentoo.patch 4188
+MD5 467b1d072a9e9cdc75584ed06d38a238 files/digest-cyrus-imspd-1.7a 69
MD5 9cc4403d49faa5913f7cafe219e0ce41 files/stunnel.conf 220
diff --git a/net-mail/cyrus-imspd/cyrus-imspd-1.7-r1.ebuild b/net-mail/cyrus-imspd/cyrus-imspd-1.7a.ebuild
index a79fe42a4ab0..96897f0da90b 100644
--- a/net-mail/cyrus-imspd/cyrus-imspd-1.7-r1.ebuild
+++ b/net-mail/cyrus-imspd/cyrus-imspd-1.7a.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.7-r1.ebuild,v 1.2 2003/11/04 05:11:59 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.7a.ebuild,v 1.1 2004/01/15 00:44:15 max Exp $
-inherit ssl-cert
+inherit gnuconfig ssl-cert
DESCRIPTION="Internet Message Support Protocol (IMSP) server."
HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
@@ -14,6 +14,10 @@ KEYWORDS="x86"
IUSE="kerberos ldap ssl"
DEPEND="virtual/glibc
+ sys-devel/gnuconfig
+ sys-devel/autoconf
+ sys-devel/automake
+ sys-devel/libtool
>=sys-libs/db-3.2
>=dev-libs/cyrus-sasl-2.1.3
>=dev-libs/cyrus-imap-dev-2.1.14
@@ -26,20 +30,25 @@ S="${WORKDIR}/${PN}-v${PV}"
src_unpack() {
unpack ${A} && cd "${S}"
- epatch "${FILESDIR}/cyrus-imspd-gentoo.patch"
epatch "${FILESDIR}/cyrus-imspd-db4.patch"
+ epatch "${FILESDIR}/cyrus-imspd-gentoo.patch"
- # cyrus 2.2.x has an extra library.
+ # Cyrus 2.2.x has an extra library.
if [ "`best_version '=dev-libs/cyrus-imap-dev-2.2*'`" ] ; then
sed -e "s:-lcyrus:-lcyrus -lcyrus_min:" \
-i "${S}/imsp/Makefile.in" \
-i "${S}/cmulocal/libcyrus.m4" || die "sed failed"
fi
- # recreate configure.
+ export WANT_AUTOCONF_2_5=1
+ touch config.{guess,sub}
+ gnuconfig_update
+
+ # Recreate configure.
ebegin "Recreating configure"
rm -f configure acconfig.h
- sh SMakefile &>/dev/null || die "SMakefile failed"
+ aclocal -I cmulocal && autoheader && autoconf || \
+ die "recreate configure failed"
eend $?
}
@@ -70,7 +79,6 @@ src_install() {
newins "${FILESDIR}/stunnel.conf" imspd.conf
dosed "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" /etc/conf.d/imspd
-
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMSP Server}"
insinto /etc/ssl/imspd
docert server
diff --git a/net-mail/cyrus-imspd/files/cyrus-imspd-db4.patch b/net-mail/cyrus-imspd/files/cyrus-imspd-db4.patch
index aa414ef35949..c66f0c11cef1 100644
--- a/net-mail/cyrus-imspd/files/cyrus-imspd-db4.patch
+++ b/net-mail/cyrus-imspd/files/cyrus-imspd-db4.patch
@@ -1,21 +1,22 @@
diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4
--- cyrus-sasl-2.1.14/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500
+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500
-@@ -211,12 +211,20 @@
+@@ -211,12 +211,21 @@
BDB_LIBADD=""
fi
-- for dbname in 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.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
+- for dbname in 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.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
do
- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
- dblib="berkeley"; break, dblib="no")
+ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
+ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+ dblib="berkeley"; break, dblib="no"))
++ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4002, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++ dblib="berkeley"; break, dblib="no")))
done
if test "$dblib" = "no"; then
-+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
++ for dbname in 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 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+ do
+ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
+ dblib="berkeley"; break, dblib="no")
@@ -25,24 +26,9 @@ diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmuloc
AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
dblib="berkeley"; dbname=db,
dblib="no")
-diff -urN cyrus-sasl-2.1.14/cmulocal/sasl2.m4 cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4
---- cyrus-sasl-2.1.14/cmulocal/sasl2.m4 2003-05-14 13:36:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4 2003-07-09 03:18:31.000000000 -0500
-@@ -25,8 +25,9 @@
- dnl
- dnl The choice is reflected in GSSAPIBASE_LIBS
- dnl we might need libdb
-- AC_CHECK_LIB(db, db_open)
--
-+ AC_CHECK_LIB(db, db_open,,
-+ AC_CHECK_LIB(db, db_open_4001,,
-+ AC_CHECK_LIB(db, db_open_4000)))
- gss_impl="no";
- AC_CHECK_LIB(resolv,res_search)
- if test -d ${gssapi}; then
--- cyrus-sasl-2.1.14/configure.in 2003-04-15 17:25:41.000000000 -0500
+++ cyrus-sasl-2.1.14-modified/configure.in 2003-07-09 03:17:48.000000000 -0500
-@@ -55,28 +55,34 @@
+@@ -57,28 +57,34 @@
CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
CMU_ADD_LIBPATH("/usr/local/lib")
@@ -65,16 +51,16 @@ diff -urN cyrus-sasl-2.1.14/cmulocal/sasl2.m4 cyrus-sasl-2.1.14-modified/cmuloca
+--with-bdb-libdir or --with-bdb-incdir configure options.])
+fi
--AC_CHECK_FUNC(dbopen, [AC_DEFINE(HAVE_LIBDB)
+-AC_CHECK_FUNC(dbopen, [AC_DEFINE(HAVE_LIBDB,[],[Berkeley DB?])
- use_db=1],
-- AC_CHECK_LIB(db,dbopen,[AC_DEFINE(HAVE_LIBDB)
+- AC_CHECK_LIB(db,dbopen,[AC_DEFINE(HAVE_LIBDB,[],[Berkeley DB?])
- LIBS=" -ldb ${LIBS}"
- use_db=1]))
-dnl if db_185.h is present, we're using db2 or 3 and should include db_185.h
-dnl instead of db.h; otherwise, include db.h. this is handled in the code
-dnl itself.
--AC_CHECK_HEADER(db_185.h, [AC_DEFINE(HAVE_DB_185_H)
-- AC_DEFINE(HAVE_LIBDB)
+-AC_CHECK_HEADER(db_185.h, [AC_DEFINE(HAVE_DB_185_H,[],[DB 185 h?])
+- AC_DEFINE(HAVE_LIBDB,[],[Berkeley DB?])
- LIBS="-ldb ${LIBS}"
- use_db=1])
-
diff --git a/net-mail/cyrus-imspd/files/cyrus-imspd-gentoo.patch b/net-mail/cyrus-imspd/files/cyrus-imspd-gentoo.patch
index 06b75bde8af5..bb4493130cec 100644
--- a/net-mail/cyrus-imspd/files/cyrus-imspd-gentoo.patch
+++ b/net-mail/cyrus-imspd/files/cyrus-imspd-gentoo.patch
@@ -1,6 +1,6 @@
-diff -ruN cyrus-imspd-v1.7-vanilla/Makefile.in cyrus-imspd-v1.7/Makefile.in
---- cyrus-imspd-v1.7-vanilla/Makefile.in 1997-10-28 19:12:07.000000000 -0800
-+++ cyrus-imspd-v1.7/Makefile.in 2003-09-10 13:24:02.000000000 -0700
+diff -ruN cyrus-imspd-v1.7a-vanilla/Makefile.in cyrus-imspd-v1.7a/Makefile.in
+--- cyrus-imspd-v1.7a-vanilla/Makefile.in 1997-10-28 19:12:07.000000000 -0800
++++ cyrus-imspd-v1.7a/Makefile.in 2003-09-10 13:24:02.000000000 -0700
@@ -21,7 +21,7 @@
# SOFTWARE.
#
@@ -10,49 +10,9 @@ diff -ruN cyrus-imspd-v1.7-vanilla/Makefile.in cyrus-imspd-v1.7/Makefile.in
srcdir = @srcdir@
VPATH = @srcdir@
-diff -ruN cyrus-imspd-v1.7-vanilla/SMakefile cyrus-imspd-v1.7/SMakefile
---- cyrus-imspd-v1.7-vanilla/SMakefile 1969-12-31 16:00:00.000000000 -0800
-+++ cyrus-imspd-v1.7/SMakefile 2003-09-10 13:42:02.000000000 -0700
-@@ -0,0 +1,36 @@
-+#
-+# This file is specific to Carnegie Mellon University's
-+# software build process
-+#
-+
-+echo aclocal -I cmulocal
-+aclocal -I cmulocal
-+echo autoconf
-+autoconf
-+echo autoheader
-+autoheader
-+
-+CC=gcc
-+WITHAUTH="--with-auth=krb_pts --with-krb=/usr/local --with-ldap=ldap"
-+
-+LIBS=""
-+case `uname` in
-+ Linux) CFLAGS="-O3"
-+ LIBS="-ldbm" ;;
-+ SunOS)
-+# CFLAGS="-xO4 -xdepend"
-+ CC=gcc
-+ CFLAGS="-g -O2"
-+ ;;
-+ *) CFLAGS=-g ;;
-+esac
-+export CFLAGS CC LIBS
-+
-+
-+MFCOMMAND="./configure"
-+
-+unset LD_LIBRARY_PATH
-+
-+LNCOMMAND="${LNCOMMAND} ; ${SRCDIR}/configure $WITHAUTH"
-+INSTCOMMAND="${MAKE} DESTDIR=${DESTDIR} prefix=${DESTDIR} exec_prefix=${DESTDIR} install"
-+
-diff -ruN cyrus-imspd-v1.7-vanilla/imsp/Makefile.in cyrus-imspd-v1.7/imsp/Makefile.in
---- cyrus-imspd-v1.7-vanilla/imsp/Makefile.in 2000-12-17 19:37:53.000000000 -0800
-+++ cyrus-imspd-v1.7/imsp/Makefile.in 2003-09-10 13:25:06.000000000 -0700
+diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/Makefile.in cyrus-imspd-v1.7a/imsp/Makefile.in
+--- cyrus-imspd-v1.7a-vanilla/imsp/Makefile.in 2000-12-17 19:37:53.000000000 -0800
++++ cyrus-imspd-v1.7a/imsp/Makefile.in 2003-09-10 13:25:06.000000000 -0700
@@ -48,8 +48,8 @@
DEFS = @DEFS@ $(DEFINES)
@@ -64,10 +24,10 @@ diff -ruN cyrus-imspd-v1.7-vanilla/imsp/Makefile.in cyrus-imspd-v1.7/imsp/Makefi
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
-diff -ruN cyrus-imspd-v1.7-vanilla/imsp/abook.c cyrus-imspd-v1.7/imsp/abook.c
---- cyrus-imspd-v1.7-vanilla/imsp/abook.c 2000-12-17 17:47:03.000000000 -0800
-+++ cyrus-imspd-v1.7/imsp/abook.c 2003-09-10 13:27:47.000000000 -0700
-@@ -109,7 +109,7 @@
+diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/abook.c cyrus-imspd-v1.7a/imsp/abook.c
+--- cyrus-imspd-v1.7a-vanilla/imsp/abook.c 2000-12-17 17:47:03.000000000 -0800
++++ cyrus-imspd-v1.7a/imsp/abook.c 2003-09-10 13:27:47.000000000 -0700
+@@ -108,7 +108,7 @@
/* get the ACL */
if (!acl && sdb_get(abooks, name, SDB_ICASE, &acl) < 0) return (0);
@@ -76,7 +36,7 @@ diff -ruN cyrus-imspd-v1.7-vanilla/imsp/abook.c cyrus-imspd-v1.7/imsp/abook.c
/* check for administrator */
if (auth_level(id) == AUTH_ADMIN) mask |= ACL_ALL;
-@@ -699,7 +699,7 @@
+@@ -700,7 +700,7 @@
strcpy(tmpacl, "\t");
tmpc = name[osrclen];
name[osrclen] = '\0';
@@ -85,7 +45,7 @@ diff -ruN cyrus-imspd-v1.7-vanilla/imsp/abook.c cyrus-imspd-v1.7/imsp/abook.c
name[osrclen] = tmpc;
}
value = tmpacl;
-@@ -928,7 +928,7 @@
+@@ -932,7 +932,7 @@
strcpy(acl, "\t");
tmpc = name[ownerlen];
name[ownerlen] = '\0';
@@ -94,7 +54,7 @@ diff -ruN cyrus-imspd-v1.7-vanilla/imsp/abook.c cyrus-imspd-v1.7/imsp/abook.c
name[ownerlen] = tmpc;
}
} else {
-@@ -937,9 +937,9 @@
+@@ -941,9 +941,9 @@
}
/* update acl */
if (acl
@@ -107,7 +67,7 @@ diff -ruN cyrus-imspd-v1.7-vanilla/imsp/abook.c cyrus-imspd-v1.7/imsp/abook.c
if (sdb_set(abooks, name, SDB_ICASE, acl) == 0) {
result = AB_SUCCESS;
}
-@@ -962,7 +962,7 @@
+@@ -966,7 +966,7 @@
char *name, *rights;
{
/* some more error checking might be in order... */
@@ -116,9 +76,9 @@ diff -ruN cyrus-imspd-v1.7-vanilla/imsp/abook.c cyrus-imspd-v1.7/imsp/abook.c
return (AB_SUCCESS);
}
-diff -ruN cyrus-imspd-v1.7-vanilla/imsp/authize.c cyrus-imspd-v1.7/imsp/authize.c
---- cyrus-imspd-v1.7-vanilla/imsp/authize.c 2003-08-06 09:56:53.000000000 -0700
-+++ cyrus-imspd-v1.7/imsp/authize.c 2003-09-10 13:28:11.000000000 -0700
+diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/authize.c cyrus-imspd-v1.7a/imsp/authize.c
+--- cyrus-imspd-v1.7a-vanilla/imsp/authize.c 2003-08-06 09:56:53.000000000 -0700
++++ cyrus-imspd-v1.7a/imsp/authize.c 2003-09-10 13:28:11.000000000 -0700
@@ -122,7 +122,7 @@
/* Get an authentication state from the libcyrus "auth" module
@@ -128,9 +88,9 @@ diff -ruN cyrus-imspd-v1.7-vanilla/imsp/authize.c cyrus-imspd-v1.7/imsp/authize.
* Free id->state in case this isn't the first authentication this session.
*/
if (id->state)
-diff -ruN cyrus-imspd-v1.7-vanilla/imsp/bb.c cyrus-imspd-v1.7/imsp/bb.c
---- cyrus-imspd-v1.7-vanilla/imsp/bb.c 2000-02-10 14:10:21.000000000 -0800
-+++ cyrus-imspd-v1.7/imsp/bb.c 2003-09-10 13:28:37.000000000 -0700
+diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/bb.c cyrus-imspd-v1.7a/imsp/bb.c
+--- cyrus-imspd-v1.7a-vanilla/imsp/bb.c 2000-02-10 14:10:21.000000000 -0800
++++ cyrus-imspd-v1.7a/imsp/bb.c 2003-09-10 13:28:37.000000000 -0700
@@ -385,7 +385,7 @@
struct auth_state *id;
char *name, *acl;
@@ -140,13 +100,13 @@ diff -ruN cyrus-imspd-v1.7-vanilla/imsp/bb.c cyrus-imspd-v1.7/imsp/bb.c
char *user = auth_username(id);
int len = strlen(user);
-diff -ruN cyrus-imspd-v1.7-vanilla/imsp/imsp_server.c cyrus-imspd-v1.7/imsp/imsp_server.c
---- cyrus-imspd-v1.7-vanilla/imsp/imsp_server.c 2003-08-06 09:56:54.000000000 -0700
-+++ cyrus-imspd-v1.7/imsp/imsp_server.c 2003-09-10 13:30:25.000000000 -0700
-@@ -1272,7 +1272,7 @@
- defacl = malloc(strlen(user) + 32);
+diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/imsp_server.c cyrus-imspd-v1.7a/imsp/imsp_server.c
+--- cyrus-imspd-v1.7a-vanilla/imsp/imsp_server.c 2003-08-06 09:56:54.000000000 -0700
++++ cyrus-imspd-v1.7a/imsp/imsp_server.c 2003-09-10 13:30:25.000000000 -0700
+@@ -1273,7 +1273,7 @@
+ defacl = malloc(defacllen);
if (defacl) {
- sprintf(acl = defacl, "%s\t%s\t", user,
+ snprintf(acl = defacl, defacllen, "%s\t%s\t", user,
- acl_masktostr(ACL_ALL, rbuf));
+ cyrus_acl_masktostr(ACL_ALL, rbuf));
}
diff --git a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7-r1 b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7-r1
deleted file mode 100644
index 7027025bfc13..000000000000
--- a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 43374692dcbef7c30440818bb20759cb cyrus-imspd-v1.7.tar.gz 612076
diff --git a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7a b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7a
new file mode 100644
index 000000000000..1a00757ae6a9
--- /dev/null
+++ b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7a
@@ -0,0 +1 @@
+MD5 ad852945cafb30b9d685fbfb65e8fd20 cyrus-imspd-v1.7a.tar.gz 638209