diff options
| -rw-r--r-- | net-mail/cyrus-imapd/ChangeLog | 8 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/Manifest | 15 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild | 6 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/files/cyrus-imapd-2.3.16+db-5.0.patch | 49 |
4 files changed, 72 insertions, 6 deletions
diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog index 96b51be41a28..160da826b079 100644 --- a/net-mail/cyrus-imapd/ChangeLog +++ b/net-mail/cyrus-imapd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-mail/cyrus-imapd -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.155 2009/12/31 09:29:16 dertobi123 Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.156 2011/01/10 13:53:59 flameeyes Exp $ + + 10 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> + cyrus-imapd-2.3.16.ebuild, +files/cyrus-imapd-2.3.16+db-5.0.patch: + Add patch to build against berkdb 5 (bug #351009). *cyrus-imapd-2.3.16 (31 Dec 2009) diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index 7f2bc37f6b26..dd20431ccfd8 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -1,7 +1,11 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX cyrus-imapd-2.2-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 SHA1 0075421585a73f2673e3daff9a4c140d9cc5046e SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e AUX cyrus-imapd-2.3.14-add-db47-support.patch 805 RMD160 18acd706ecdb14e8dc8713e1b66140fa13c65927 SHA1 e0008e89c924edb0f66587f2a312a06385a9a335 SHA256 09b275e21999355fea14ee173c9360658c02854b492c532b4bc58d301c387132 AUX cyrus-imapd-2.3.14-bug283596-2.patch 2888 RMD160 668bb8caa2768fab0670818267d447d8dfd2ca74 SHA1 13dabf135e80283cf7fc0b59dc7978cdef097105 SHA256 bf231f56605b3d9da4ef591765a097d2cad558dc06b466e8df856934a32797ff AUX cyrus-imapd-2.3.14-fix-db-rpath.patch 1287 RMD160 bc4e98cfdd2c0be3091e728569540a7e1f17abc8 SHA1 97fcfbc3d7724f0ca1b9e3621a7609e53c631e6f SHA256 4443953d6042e8b521f59b62776d53c99f639f1c589f4b63d0ed94bbb5104a80 +AUX cyrus-imapd-2.3.16+db-5.0.patch 1946 RMD160 6b46f403f6b130857c0443eb37a4d783c5fb56fb SHA1 29857557797bb0943df6c6d34ffe2b04a894ddfe SHA256 2f3e66a2c0488395382634cb608b781a1c8148ac0bbeedcc8e14e5b94d2bd7bc AUX cyrus-imapd-strip.patch 527 RMD160 83dda22c91798715c7790c3964705b60edeab904 SHA1 624635c7a3dd17e0d3ed84c2c7b07fe042d54cc0 SHA256 4edf438766a291c18847efbcf0596e5c7fc848a1c04b851b20074a195c1b2f18 AUX cyrus.conf 1354 RMD160 b2d6f470b7097036a5c64bc59f147f78fdbc16d5 SHA1 efc4d14807391be53018a81c4f4277cd8d6ce5f8 SHA256 23189674bb5c2f021f35027cfe22cfe56e022ce5e03da67f5c4913473bec1292 AUX cyrus.confd 279 RMD160 da79ff4128869a045b432abc9cea6667b65ee69a SHA1 6d2d3417b678c77336a4b89db3507314302fe4eb SHA256 3e786c28ffc44a222214b22d8849728360edc37f4b3f7d7c1473a23ab58c28a9 @@ -19,6 +23,13 @@ DIST cyrus-imapd-2.3.15.tar.gz 2370826 RMD160 8981b94b6002a4aec38b7244794d435803 DIST cyrus-imapd-2.3.16.tar.gz 2359349 RMD160 fa9d1462a7d7e839da9a11f52cddfd2ab854f2be SHA1 decc87045bfedb449d0af3512aa228090e558036 SHA256 e020ac79403a683bddc136c25887fe501edcc8d73b308982f4b68ec828ab63d2 EBUILD cyrus-imapd-2.3.14-r3.ebuild 8159 RMD160 87cfce3c30d8774ecd4d3e6e18abb8fb620d16b1 SHA1 c7fc7e126eb79609b9345027cd7e827b9a6ef544 SHA256 92bd6fbc59bb9f293508ba24d13b004fd4f17b86c31f3b2fc22855fa2b397f86 EBUILD cyrus-imapd-2.3.15.ebuild 7571 RMD160 88b9075cc8b2ff59465477a74d1585f05f4c887b SHA1 a3bcba7849b3f92ef7771d458400e044c47a4eb9 SHA256 dd82e9515834daf7e1226bc18e6852447e9d5c416885fd7e554ea8e7c469da97 -EBUILD cyrus-imapd-2.3.16.ebuild 7571 RMD160 612c4921221b165396c019520cea0e38e9fa9e04 SHA1 9d21ef1f71cf9955fe792f93ba8dc524a060f16d SHA256 4777a94c0eadfe99488d73755b0bd76a040d90cd21cffbf36a912b624713b8e1 -MISC ChangeLog 30407 RMD160 8c7dcc3d83fad10af7562c79c15f761637d19185 SHA1 0e9391093f4adfb85da39897506683d1f1f1cddf SHA256 7fa43d4b4a7182fbeaaf9360999a9b1b60c74bd76c7b9721a6cd48eed6fbb71e +EBUILD cyrus-imapd-2.3.16.ebuild 7611 RMD160 868331fb4a4d6e66ef68f46f7ae16bdd944fcb72 SHA1 9aecc2a99027d509c01bbb7d6af175d449ee7303 SHA256 c9e4e7421d432211858c764f9bdd0c7dfed5f21fc5ef69dd6fbbc8e8faad47ef +MISC ChangeLog 30585 RMD160 b42ca5affe02a4199d76374739f1e92644c55750 SHA1 437dc555c4db6af173bdd45947f1a83098d505cc SHA256 bae32adfbc548ffbc7841484a79565da63ccad3fc36570556dc2a8180c9f6ad1 MISC metadata.xml 450 RMD160 43d7242bfdfcd5c328805bf7912fd07b20999ddc SHA1 53cb62e89c804226d5392cdeef9c45a8bdeaf99c SHA256 b8a9c9faf2353b9f33814cf9f12fa6183ab18449699d58104260109cef3c8470 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAk0rD18ACgkQAiZjviIA2Xj16gCfX1y00GwsTVJT7e0D1bAYnJPE +wDYAoPH1XMlWoJ+w7IvgzyRQUkl9npgg +=Maqj +-----END PGP SIGNATURE----- diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild index 794d016b0cea..d9fc57e85503 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild,v 1.1 2009/12/31 09:29:16 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild,v 1.2 2011/01/10 13:53:59 flameeyes Exp $ EAPI=1 @@ -106,6 +106,8 @@ src_unpack() { # Fix prestripped binaries epatch "${FILESDIR}/${PN}-strip.patch" + epatch "${FILESDIR}/${P}+db-5.0.patch" + # Add libwrap defines as we don't have a dynamicly linked library. use tcpd && epatch "${FILESDIR}/${PN}-${LIBWRAP_PATCH_VER}-libwrap.patch" diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.16+db-5.0.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.16+db-5.0.patch new file mode 100644 index 000000000000..319abf1f6bb7 --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.16+db-5.0.patch @@ -0,0 +1,49 @@ +Index: cyrus-imapd-2.3.16/lib/cyrusdb_berkeley.c +=================================================================== +--- cyrus-imapd-2.3.16.orig/lib/cyrusdb_berkeley.c ++++ cyrus-imapd-2.3.16/lib/cyrusdb_berkeley.c +@@ -108,7 +108,7 @@ static void db_panic(DB_ENV *dbenv __att + exit(EC_TEMPFAIL); + } + +-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3) ++#if ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)) || (DB_VERSION_MAJOR >= 5) + static void db_err(const DB_ENV *dbenv __attribute__((unused)), + const char *db_prfx, const char *buffer) + #else +@@ -164,7 +164,7 @@ static int init(const char *dbdir, int m + #endif + } + +-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3) ++#if ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)) || (DB_VERSION_MAJOR >= 5) + dbenv->set_msgcall(dbenv, db_msg); + #endif + dbenv->set_errcall(dbenv, db_err); +@@ -282,7 +282,7 @@ static int mysync(void) + + assert(dbinit); + +-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) ++#if !((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5) + do { + #endif + #if (DB_VERSION_MAJOR > 3) || ((DB_VERSION_MAJOR == 3) && (DB_VERSION_MINOR > 0)) +@@ -290,7 +290,7 @@ static int mysync(void) + #else + r = txn_checkpoint(dbenv, 0, 0); + #endif +-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) ++#if !((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5) + } while (r == DB_INCOMPLETE); /* Never returned by BDB 4.1 */ + #endif + if (r) { +@@ -413,7 +413,7 @@ static int myopen(const char *fname, DBT + /* xxx set comparator! */ + if (flags & CYRUSDB_MBOXSORT) db->set_bt_compare(db, mbox_compar); + +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || (DB_VERSION_MAJOR >= 5) + r = (db->open)(db, NULL, fname, NULL, type, dbflags | DB_AUTO_COMMIT, 0664); + #else + r = (db->open)(db, fname, NULL, type, dbflags, 0664); |