From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- net-mail/courier-imap/Manifest | 6 - net-mail/courier-imap/courier-imap-4.15-r2.ebuild | 229 --------------------- .../files/courier-imap-4.15-aclocal-fix.patch | 10 - ...courier-imap-4.15-db4-bdbobj_configure.ac.patch | 33 --- .../files/courier-imap-4.15-db4-configure.ac.patch | 33 --- ...ourier-imap-4.15-disable-fam-configure.ac.patch | 23 --- 6 files changed, 334 deletions(-) delete mode 100644 net-mail/courier-imap/courier-imap-4.15-r2.ebuild delete mode 100644 net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch delete mode 100644 net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch delete mode 100644 net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch delete mode 100644 net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch (limited to 'net-mail/courier-imap') diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest index d43310824815..954284bccce9 100644 --- a/net-mail/courier-imap/Manifest +++ b/net-mail/courier-imap/Manifest @@ -9,10 +9,6 @@ AUX courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 840 BLAKE2B f0ae9238d382abd3d61308 AUX courier-imap-4.0.6-r1-gentoo-imapd.rc 886 BLAKE2B d93f475cd7ca0267d712559b6d56037a76612717fa6651f7225cfb4db3d2f2189424c06329185a0c8300263fdcbf5932aef22c1c6307bbe96de0dabc57d177af SHA512 ccb7f3fab4312918082df0e7f4875a70cd9c08ad69cd94b6bdd5f8a370eec64fd2a178e9806d5a8304711fce171222af4d4f19a59a700e5e6dfbd0ed7bcc3750 AUX courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 813 BLAKE2B c7efc770a6141a4f8174f1837c7d8cc840de4f08bea90cbbd19728f15440f04e6f0114b94ab54e941b35bd00ccc036a439539de5f892bd277c6f487c404bbaec SHA512 9a61aab00d99255b0f3c1780b10eed50bc5a040aade30d1032d202df9be65be03b0c42d9b894e623843fef3e53a1d9fea09ed5a9269548cdf0305b78f109530a AUX courier-imap-4.0.6-r1-gentoo-pop3d.rc 859 BLAKE2B 08d54a0f52be098842b8a182fecf35fad919ec85600170e3b2f394348defd2f462285e8b8a214c6c79548ac30ab72b0469988f063a6dcc4d11e64845064834aa SHA512 e86f7984a39aa1a40ff96eeb1d7967456660b7d0add1dfaf005e98313aeaaad645c503e79e9cb8a55bba7ff5f8164b43f0145aa4ef4c1df15f1659f09a97b040 -AUX courier-imap-4.15-aclocal-fix.patch 237 BLAKE2B 813cdec039a9ae7c23ccc7bd8991cb91f3bf3f28a89413ba08b1fc5785b28e0e8b280e3818c36f42bd15bb538da84651652c24b0f9314dbbb12a8ad86fb4d7ba SHA512 72cbb54c29dda061fabf96d7b415fcb9a3bf0faf527444c9d4f2a211238e54d516e77778efe31ab25476cbe47e554efd8a9175143a4a2a90c31f04631d6cdc29 -AUX courier-imap-4.15-db4-bdbobj_configure.ac.patch 1495 BLAKE2B e733283ac6ce2b1a710f9021e98033f5336cc3ddaacf3851113d81cba5ad8ad00d4e8b33e46afcb0173f61289e2a02100a480ee4b799841ba07eaa4db5606fac SHA512 f4e40ac312d37499fbbe61fc7f1be3602aac2bac17d3da888c8db77b6f17bd2825c90286dd7669f08b0716e1686c42c5af7953eb949c5a9b4e614fc3a53dd37e -AUX courier-imap-4.15-db4-configure.ac.patch 1460 BLAKE2B e18021f644fae24717baeb6d06cf93a5d7bd0af5555bf8a58978ba29419c2cd2271eec1241245a87bd70e055764164afb7993c3ed7d481160846badb61928a59 SHA512 99897d152f44713adf746996b8d720af65cb8af46e1ade68f4f3336b59b7b8acfba2d2e35b1b818c440e847e8126e8cf683a17fa4e2bf593e42274da6e21ce15 -AUX courier-imap-4.15-disable-fam-configure.ac.patch 626 BLAKE2B 9619b3b69265197db4a79a2927c897a2746fb00959554985c52450be68598ea6c681ccadab0a9ab1653d6e5b0014ffe6a1fbd919adfb9798251c8d3ef5b2b3d5 SHA512 649de2e7137642702b78f4e37808479124b1e71b7a2d9299f450bcae969399f1efdbc8a6076783baf7a8437fd90dfa6cc3a41908eb46e628ca05901e71c43a08 AUX courier-imap-4.17-aclocal-fix.patch 299 BLAKE2B 605f76516a72269720d07e1e8fc88e55ba4ed184dd5e8633a04a657e408dc9d31a20a945cab2fe41247abfd65823b90de71339288a5005a6eca6e6a6f41c7210 SHA512 a5771c2718d08386a3c36a1bb2812959c68af70049cb3833e49dd034126ae6ae278b51afd40301cc7ff6850efe8772889d05d90b0229be79d82cfd827f2ef75e AUX courier-imap-4.17-db4-bdbobj_configure.ac.patch 1499 BLAKE2B d619e493b066e0d60d083339ea2c7d09902a6aaa7a49996d47f895cf4e72ff5adc6a06e79c0173c548db10c66c31cae7b9aa69d5516c5acb487517ece328ed0a SHA512 2d1db6d13194b5e0866fadab40453264a07df8bf26b241af9f130b79dd800a4bb888a28151c7833b375315f43c9c42946312bc36220232a372179b23e5107b30 AUX courier-imap-4.17-db4-configure.ac.patch 1464 BLAKE2B 7f3aa5c86c7d12d369844757dbb3038afe9d12a034ec5d63860df76dba86ce18724fefc2c12f5596a27620ae05849ec9595ba1e410cadb0853dc4c322f965dd9 SHA512 55433b330d1039cd177af058cbc4a2bf7a65e53b8ecf29955c499dd6a68d634d7582449f54d1c70675ed759586e4d9dc7f43ce3703113e76df81b2a8703085bd @@ -22,10 +18,8 @@ AUX courier-imapd-r1.service 299 BLAKE2B 7b1fb3acc3b75cac873967f1eca099e9f65951f AUX courier-imapd-ssl-r1.service 310 BLAKE2B 3894d582ace57379929712aabdfb243b28c528f8f67271fb690deb6905e2638a7fb22ea7c2c3133edc510185684e9297c53aabc8c7ec628ec51d920857e9e11b SHA512 431a1113cbc10aa4042c621fda43eabaed79b4e0fabbc4692073c92368448324f958d3ad922b99b4290efad8a8164aff3698ac69e4e3c1f457d1616f769c11e5 AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71f53b4ac668044dc3b5ba415fe3e0f8842a03757d9caf206846dc1c6f6dd589a3adafd0af226e SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078 -DIST courier-imap-4.15.tar.bz2 3266353 BLAKE2B 08b44e9a58f13ead65174b913e9caca3305aff5155adf4fc495c79b31f51326fa4917a6c3335d9ab956b7895f98d66b6c65501faa3dcf1a13527cae8c7c137de SHA512 7829662282db5e6f414a1d34f06a94c2dd028e263510f01b49ebd3a1a4994055ecc08604568f5a44a30f6411e3a34e0d6c38807c29eaf255752191e885f82e1a DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563 SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1 DIST courier-imap-4.18.0.tar.bz2 3202389 BLAKE2B 3889d8db1bca082b1a8a1f1c8f04996ddcdf30b46e2aa3d16b45c46987426f75721223fc63810884a8fa2d8f8daf60d85c2909321abf0ef27e77cfcd0dc3c531 SHA512 16dedefe8a43ef48f76388c65ee7f100aaf12c30d9610f4c85f9adbd1adab374f9a0978930e70c221b551a60ed3d804f6b5e87a979b549f5c8249c34af1a3a64 -EBUILD courier-imap-4.15-r2.ebuild 7361 BLAKE2B eb1e02b3d11649d73ae21cce91fbc0bab28ab3a2f24c1920038d8429e356c7768d7f80bd706120bcc3c7dc9bd1d795cfc99e516c7a7db5f776e488c083a62086 SHA512 9cf45e7d0c150b7256632d50282bf625f24d1e1dba377736a499073e7626abdb20749cb36685c6e959c1cbaa7b9a55f6f953720caff2d2d3ae34aaecf895cbe9 EBUILD courier-imap-4.17.3.ebuild 6787 BLAKE2B 4f560cbb7538ff3c61ecc73705db27e46b3bd95673747c4322c7bf9043cc3c06f576b44d727048388542aa3c5473ee59c9f5461dea8df1e4b65136da46bfb79a SHA512 c8e3b52940b45fb492b2af63a1912eebd8ba48e996228953f1c59896f1630c16f2c9f448b369c033d2e2d183a1f1626c8d3556606ad3de97ec0cf26b23e5d8b5 EBUILD courier-imap-4.18.0.ebuild 6764 BLAKE2B 10986db94919f747aee195359295f83aa4b632eaf0305fb2bd429baf1a0265619e68c5504a0fa024bb7e7a242875c32cb015f77c2246314daba440eccd193d32 SHA512 04b7b67a0cce4f9a29782e4de0c831c9103fb21e0b7cca0f8a1cbac4ea4c743d4c90431829a4f1f406a1b7398762d7f9938778e7d9ff0b2fa78fe4b5a48d77f5 MISC metadata.xml 382 BLAKE2B e8299d24ed437cceeb508779d1915b7d2e54ed50a12e9959ff7ba6aca31a226817a01e9b0c778dd72047c345e5ce359f97e6baa443893357e0155c9dca9eca96 SHA512 2422c2a28ee3049a7b8da4b27f0dfca5699cb62ac77d39c89de4b9287f32f78167fc4b3eabf20e890c5c5dc1e00ccdce8a745501d3423846e42224f60e8ed110 diff --git a/net-mail/courier-imap/courier-imap-4.15-r2.ebuild b/net-mail/courier-imap/courier-imap-4.15-r2.ebuild deleted file mode 100644 index 1f85f454e158..000000000000 --- a/net-mail/courier-imap/courier-imap-4.15-r2.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils multilib libtool systemd - -DESCRIPTION="An IMAP daemon designed specifically for maildirs" -HOMEPAGE="http://www.courier-mta.org/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" -IUSE="berkdb debug fam +gdbm ipv6 selinux gnutls trashquota" - -REQUIRED_USE="|| ( berkdb gdbm )" - -CDEPEND=" - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) - >=net-libs/courier-authlib-0.61 - >=net-mail/mailbase-0.00-r8 - berkdb? ( sys-libs/db:= ) - fam? ( virtual/fam ) - gdbm? ( >=sys-libs/gdbm-1.8.0 )" -DEPEND="${CDEPEND} - dev-lang/perl - !mail-mta/courier - userland_GNU? ( sys-process/procps )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-courier )" - -# get rid of old style virtual - bug 350792 -# all blockers really needed? -RDEPEND="${RDEPEND} - !mail-mta/courier - !net-mail/bincimap - !net-mail/cyrus-imapd - !net-mail/uw-imap" - -RC_VER="4.0.6-r1" -INITD_VER="4.0.6-r1" - -src_prepare() { - # Bug #48838. Patch to enable/disable FAM support. - # 20 Aug 2004 langthang@gentoo.org - # This patch should fix bug #51540. fam USE flag is not needed for shared folder support. - epatch "${FILESDIR}"/${P}-disable-fam-configure.ac.patch - - # Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206). - epatch "${FILESDIR}"/${P}-aclocal-fix.patch - - # These patches should fix problems detecting BerkeleyDB. - # We now can compile with db4 support. - if use berkdb ; then - epatch \ - "${FILESDIR}"/${P}-db4-bdbobj_configure.ac.patch \ - "${FILESDIR}"/${P}-db4-configure.ac.patch - fi - - eautoreconf -} - -src_configure() { - local myconf="" - - # 19 Aug 2004 langthang@gentoo.org - # Default to gdbm if both berkdb and gdbm are present. - if use gdbm ; then - einfo "Building with GDBM support" - myconf="${myconf} --with-db=gdbm" - elif use berkdb ; then - einfo "Building with BerkeleyDB support" - myconf="${myconf} --with-db=db" - fi - - # Disabling unicode is no longer supported - # By default all available character sets are included - # Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10 - # to include only specified translation tables. - if [[ -z "${ENABLE_UNICODE}" ]] ; then - einfo "ENABLE_UNICODE is not set, building with all available character sets" - myconf="${myconf} --enable-unicode" - else - einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}" - myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}" - fi - - if use trashquota ; then - einfo "Building with Trash Quota Support" - myconf="${myconf} --with-trashquota" - fi - - use debug && myconf="${myconf} debug=true" - - # Do the actual build now - econf \ - --disable-root-check \ - --bindir=/usr/sbin \ - --sysconfdir=/etc/${PN} \ - --libexecdir=/usr/$(get_libdir)/${PN} \ - --localstatedir=/var/lib/${PN} \ - --with-authdaemonvar=/var/lib/${PN}/authdaemon \ - --enable-workarounds-for-imap-client-bugs \ - --with-mailuser=mail \ - --with-mailgroup=mail \ - $(use_with fam) \ - $(use_with ipv6) \ - $(use_with gnutls) \ - ${myconf} - - # Change the pem file location. - sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \ - libs/imap/imapd-ssl.dist || \ - die "sed failed" - - sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \ - libs/imap/pop3d-ssl.dist || \ - die "sed failed" -} - -src_compile() { - # spurious failures with parallel compiles - emake -j1 -} - -src_install() { - dodir /var/lib/${PN} /etc/pam.d - default - rm -Rf "${D}/etc/pam.d" || die - - # Avoid name collisions in /usr/sbin wrt imapd and pop3d - cd "${D}/usr/sbin" || die - for name in imapd pop3d ; do - mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}" - done - - # Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of - # 'Maildir', and to use /usr/sbin/courier-foo names. - cd "${D}/usr/$(get_libdir)/${PN}" || die - for service in {imapd,pop3d}{,-ssl} ; do - sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed" - sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed" - done - - # Rename the config files correctly and add a value for ${MAILDIR} to them. - cd "${D}/etc/${PN}" || die - for service in {imapd,pop3d}{,-ssl} ; do - mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}" - echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}" - echo 'MAILDIR=.maildir' >> "${service}" - echo 'MAILDIRPATH=.maildir' >> "${service}" - done - for service in imapd pop3d ; do - echo -e '# Put any program for ${PRERUN} here' >> "${service}" - echo 'PRERUN=' >> "${service}" - echo -e '# Put any program for ${LOGINRUN} here' >> "${service}" - echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}" - echo 'LOGINRUN=' >> "${service}" - done - - cd "${D}/usr/sbin" || die - for x in * ; do - if [[ -L "${x}" ]] ; then - rm -f "${x}" || die "Failed to rm ${x}" - fi - done - - cd ../share || die - mv -f * ../sbin || die - mv -f ../sbin/man . || die - cd .. || die - - for x in mkimapdcert mkpop3dcert ; do - mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig" - done - - dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" - - dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger - - mkdir "${WORKDIR}/tmp" && cd "${WORKDIR}/tmp" || die - - for initd in courier-{imapd,pop3d}{,-ssl} ; do - sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed" - doinitd "${initd}" - done - - systemd_newunit "${FILESDIR}"/courier-authdaemond-r1.service courier-authdaemond.service - systemd_newunit "${FILESDIR}"/courier-imapd-ssl-r1.service courier-imapd-ssl.service - systemd_newunit "${FILESDIR}"/courier-imapd-r1.service courier-imapd.service - - exeinto /usr/$(get_libdir)/${PN} - for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do - sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed" - doexe "${exe}" - done - - dodir /usr/bin - mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake" - - # Bug #45953, more docs. - cd "${S}" || die - dohtml -r "${S}"/* - dodoc "${S}"/{AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme - docinto imap - dodoc "${S}"/libs/imap/{ChangeLog,BUGS,BUGS.html,README} - docinto maildir - dodoc "${S}"/libs/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt} - docinto tcpd - dodoc "${S}"/libs/tcpd/README.couriertls -} - -pkg_postinst() { - elog "Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading" - elog "and remove TLS_DHPARAMS from configuration files or run mkdhparams" - - elog "For a quick-start howto please refer to" - elog "${PN}-gentoo.readme in /usr/share/doc/${PF}" - # Some users have been reporting that permissions on this directory were - # getting scrambled, so let's ensure that they are sane. - chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}" -} - -src_test() { - ewarn "make check is not supported by this package due to the" - ewarn "--enable-workarounds-for-imap-client-bugs option." -} diff --git a/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch deleted file mode 100644 index bc68698ea247..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2006-12-30 09:28:52.000000000 -0500 -+++ configure.ac 2007-02-27 12:13:38.000000000 -0500 -@@ -15,7 +15,6 @@ - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET --AC_PROG_SYSCONFTOOL - AC_LIBTOOL_DLOPEN - AM_PROG_LIBTOOL - diff --git a/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch deleted file mode 100644 index ba75db9ff5dd..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- libs/bdbobj/configure.ac.orig 2013-08-25 20:52:10.000000000 +0200 -+++ libs/bdbobj/configure.ac 2013-11-22 10:39:25.787861774 +0100 -@@ -23,15 +23,22 @@ - dnl Checks for libraries. - - saveLIBS="$LIBS" --AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ], -- AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"], -- AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $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 -+ do -+ AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ])))))) -+ done - FOUND_DB=0 --AC_CHECK_FUNC(dbopen, FOUND_DB=1) --AC_CHECK_FUNC(db_open, FOUND_DB=1) --AC_CHECK_FUNC(db_env_create, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4004, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4003, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1) -+AC_CHECK_FUNC(db_create, FOUND_DB=1) - - LIBS="$saveLIBS" - diff --git a/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch deleted file mode 100644 index 19fe77e28f69..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.ac.orig 2013-09-28 19:44:24.000000000 +0200 -+++ configure.ac 2013-11-22 10:46:34.910990069 +0100 -@@ -180,15 +180,21 @@ - if test "$db" != "gdbm" - then - -- AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ], -- AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"], -- AC_CHECK_LIB(db, db_env_create, -- [ LIBDB=-ldb; LIBS="-ldb $LIBS"]) -- )) -- -- AC_CHECK_FUNC(dbopen, HAVE_BDB=1) -- AC_CHECK_FUNC(db_open, HAVE_BDB=1) -- AC_CHECK_FUNC(db_env_create, HAVE_BDB=1) -+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 -+ do -+ AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ])))))) -+ done -+AC_CHECK_FUNC(db_create_4004, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create, HAVE_BDB=1) - fi - - LIBS="$saveLIBS" diff --git a/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch deleted file mode 100644 index 940703d1b6ca..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- libs/maildir/configure.ac.orig 2004-06-08 15:44:23.000000000 -0700 -+++ libs/maildir/configure.ac 2004-08-14 15:28:20.525714876 -0700 -@@ -73,6 +73,12 @@ - dnl Checks for library functions. - AC_CHECK_HEADER(fam.h, :, :) - AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes) -+AC_ARG_WITH(fam, [ --with-fam Compile with FAM support], -+ fam="$withval", -+ fam="no") -+ -+if test "$fam" != "no" -+then - AC_CHECK_LIB(fam, FAMOpen, [ - LIBFAM=-lfam - AC_DEFINE_UNQUOTED(HAVE_FAM,1, -@@ -87,6 +93,7 @@ - AC_MSG_ERROR([[FAM development libraries not found.]]) ] - ) - ]) -+fi - - AC_SUBST(LIBFAM) - -- cgit v1.2.3