From 2c227f6e259b22c91e3d41fef10e69cd5b213bf8 Mon Sep 17 00:00:00 2001 From: Martin Hierling Date: Wed, 28 Feb 2007 17:53:25 +0000 Subject: net-mail/dbmail: version bump, message patch not needed anymore svn path=/sunrise/; revision=3103 --- net-mail/dbmail/ChangeLog | 6 ++ net-mail/dbmail/Manifest | 36 ++++---- net-mail/dbmail/dbmail-2.2.2-r1.ebuild | 96 ---------------------- net-mail/dbmail/dbmail-2.2.3.ebuild | 95 +++++++++++++++++++++ net-mail/dbmail/files/dbmail-2.2.2-messages.patch | 29 ------- .../dbmail/files/dbmail-2.2.2-removeversion.patch | 62 -------------- .../dbmail/files/dbmail-2.2.3-removeversion.patch | 60 ++++++++++++++ net-mail/dbmail/files/digest-dbmail-2.2.2-r1 | 3 - net-mail/dbmail/files/digest-dbmail-2.2.3 | 3 + 9 files changed, 180 insertions(+), 210 deletions(-) delete mode 100644 net-mail/dbmail/dbmail-2.2.2-r1.ebuild create mode 100644 net-mail/dbmail/dbmail-2.2.3.ebuild delete mode 100644 net-mail/dbmail/files/dbmail-2.2.2-messages.patch delete mode 100644 net-mail/dbmail/files/dbmail-2.2.2-removeversion.patch create mode 100644 net-mail/dbmail/files/dbmail-2.2.3-removeversion.patch delete mode 100644 net-mail/dbmail/files/digest-dbmail-2.2.2-r1 create mode 100644 net-mail/dbmail/files/digest-dbmail-2.2.3 diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog index 27198e66e..d21369105 100644 --- a/net-mail/dbmail/ChangeLog +++ b/net-mail/dbmail/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Feb 2007; Martin Hierling -dbmail-2.2.2-r1.ebuild, + -files/dbmail-2.2.2-messages.patch, + -files/dbmail-2.2.2-removeversion.patch, +dbmail-2.2.3.ebuild, + +files/dbmail-2.2.3-removeversion.patch: + version bump, message patch not needed anymore + 12 Feb 2007; Giuseppe Iannello (doctorzoidberg) dbmail-2.2.2-r1.ebuild: Added ~amd64 keyword diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest index 456b77d6d..8a0e2fc53 100644 --- a/net-mail/dbmail/Manifest +++ b/net-mail/dbmail/Manifest @@ -1,11 +1,7 @@ -AUX dbmail-2.2.2-messages.patch 985 RMD160 a6cc4e33d67ae7f1820fa75d9f9370878d0c20c3 SHA1 2d78c77d4fa06938666fa665a49d3bcdf5a21248 SHA256 d4a3b146d31212bfdcbfc093aa13d8bff018e264e88e97a865d42157d1bca9ea -MD5 96e7e20d7dcaec861b4507d47b6077b3 files/dbmail-2.2.2-messages.patch 985 -RMD160 a6cc4e33d67ae7f1820fa75d9f9370878d0c20c3 files/dbmail-2.2.2-messages.patch 985 -SHA256 d4a3b146d31212bfdcbfc093aa13d8bff018e264e88e97a865d42157d1bca9ea files/dbmail-2.2.2-messages.patch 985 -AUX dbmail-2.2.2-removeversion.patch 2294 RMD160 518c02c0a5aa9e0a174be8ff5e89563c2c888b46 SHA1 ed466f8ce11c574ad661e885a2e825dff9a89975 SHA256 9a5e8bf87a9e9d7ef6660d1ddb9b2976395f5a4242e9d7671b98afd3e6b388d5 -MD5 8b2e881603d8e403b101b9e2b7f19857 files/dbmail-2.2.2-removeversion.patch 2294 -RMD160 518c02c0a5aa9e0a174be8ff5e89563c2c888b46 files/dbmail-2.2.2-removeversion.patch 2294 -SHA256 9a5e8bf87a9e9d7ef6660d1ddb9b2976395f5a4242e9d7671b98afd3e6b388d5 files/dbmail-2.2.2-removeversion.patch 2294 +AUX dbmail-2.2.3-removeversion.patch 2219 RMD160 74824e2b86fad45d1316ae8a52c4d15ec274e375 SHA1 bdb5a68f73e6b12dcba4663d7733c1253041324e SHA256 b9c6d73a8584c57e10feb09881e6dd14ef0ceaa734b574fc3b303730cdb62aa4 +MD5 ae5a15e06e2e8586618f3662c23d93ab files/dbmail-2.2.3-removeversion.patch 2219 +RMD160 74824e2b86fad45d1316ae8a52c4d15ec274e375 files/dbmail-2.2.3-removeversion.patch 2219 +SHA256 b9c6d73a8584c57e10feb09881e6dd14ef0ceaa734b574fc3b303730cdb62aa4 files/dbmail-2.2.3-removeversion.patch 2219 AUX dbmail-imapd.initd 730 RMD160 c6da3a0cda2e767853c0c3239287dd347bed6ccc SHA1 37679fabcf02e277d660fe57a41b9b54d7de963e SHA256 f8c16208f31495d2557e6ac101f1dd9f18636268511c889a0ad4dee0c56612da MD5 76a0f8f96ca70a4af14c81716134cc5d files/dbmail-imapd.initd 730 RMD160 c6da3a0cda2e767853c0c3239287dd347bed6ccc files/dbmail-imapd.initd 730 @@ -22,19 +18,19 @@ AUX dbmail-timsieved.initd 744 RMD160 0b733fba999532536b07a9ec5b572c362ed96f08 S MD5 96ea543e77e04294deef1dd4abfba59a files/dbmail-timsieved.initd 744 RMD160 0b733fba999532536b07a9ec5b572c362ed96f08 files/dbmail-timsieved.initd 744 SHA256 572358fcddea2981f29cd267c55e6de8e840f5442bcc8520ad40edfaed71577d files/dbmail-timsieved.initd 744 -DIST dbmail-2.2.2.tar.gz 855310 RMD160 956525839081813d0bfe97b4a82da1d56f86975a SHA1 66ae8debf38efa3309bf7a26536053e5970abfa4 SHA256 fdf8327addcd6edb379debffe56584020e7e477a3d101e8c8d0d5d992e00b4c2 -EBUILD dbmail-2.2.2-r1.ebuild 2760 RMD160 14047113625cd5e7377486732705897d249e75a8 SHA1 ff33de85bf15057cf8fa71cf090fa16bb15f57fd SHA256 f4b52cb796a539dff29f70d4f6389ccf9bf551c85aea77492c13d47fcbe17bd8 -MD5 458ad6a46d3d210a4bdd061e5d5aa9df dbmail-2.2.2-r1.ebuild 2760 -RMD160 14047113625cd5e7377486732705897d249e75a8 dbmail-2.2.2-r1.ebuild 2760 -SHA256 f4b52cb796a539dff29f70d4f6389ccf9bf551c85aea77492c13d47fcbe17bd8 dbmail-2.2.2-r1.ebuild 2760 -MISC ChangeLog 2956 RMD160 616e3438fa4b3975be0a74a8ad8ac4249d75b1bc SHA1 21b23026b186bfbb71c0c9f476f6b936b8c92106 SHA256 ab07f53f4e635e91074f43301490ba6a54d69cbe2d3daaf8c2bef9d6cd1f6c50 -MD5 e19cd797090a1a8cadd03063554e5a52 ChangeLog 2956 -RMD160 616e3438fa4b3975be0a74a8ad8ac4249d75b1bc ChangeLog 2956 -SHA256 ab07f53f4e635e91074f43301490ba6a54d69cbe2d3daaf8c2bef9d6cd1f6c50 ChangeLog 2956 +DIST dbmail-2.2.3.tar.gz 861514 RMD160 8851e171093cb433faaa22034cf3624942c9589c SHA1 281759c25320be3a0f3b8f3abdf1c89896ea38b7 SHA256 dbbcc9af0ff20aebed956870db5fd499faa08a0486ff755e9d8901885e4d22b8 +EBUILD dbmail-2.2.3.ebuild 2718 RMD160 c838bfef10b8fd8b569f1dd1bdabdbea672a921c SHA1 897aa4ab0e18fa324b6f996640dd7c9b1434a4c1 SHA256 bfa7ad265d7267d15ca56b3b64b6c0f8f99fb39474efd6e9c9cb714ae1e8a4f2 +MD5 185b08ae5980b9993c5d779ac2a6ab5c dbmail-2.2.3.ebuild 2718 +RMD160 c838bfef10b8fd8b569f1dd1bdabdbea672a921c dbmail-2.2.3.ebuild 2718 +SHA256 bfa7ad265d7267d15ca56b3b64b6c0f8f99fb39474efd6e9c9cb714ae1e8a4f2 dbmail-2.2.3.ebuild 2718 +MISC ChangeLog 3227 RMD160 463083bd1f3f8b47ef10ad3708bdcf5c599ac0d9 SHA1 38de04594e6f1aade2d973b074ae96cb594c7805 SHA256 9b90c6bbc9a23c1c126e7b7df971ac328e1c55d709b14cc3c4988e96097fa4be +MD5 27afea9fa0b527637cf1e4be4d3fab61 ChangeLog 3227 +RMD160 463083bd1f3f8b47ef10ad3708bdcf5c599ac0d9 ChangeLog 3227 +SHA256 9b90c6bbc9a23c1c126e7b7df971ac328e1c55d709b14cc3c4988e96097fa4be ChangeLog 3227 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170 -MD5 e64fe5bb4817c023f165c12671c99fd3 files/digest-dbmail-2.2.2-r1 238 -RMD160 22e610bf69823bc5dcb2a07781a19467b1c09707 files/digest-dbmail-2.2.2-r1 238 -SHA256 bc6a03dd8a741abb35402dfc1fc46755bb100527b2bd4066c7384803b57c941b files/digest-dbmail-2.2.2-r1 238 +MD5 456a7508ae454fe43e5173f3fe67671e files/digest-dbmail-2.2.3 238 +RMD160 a286ee7223485ecbe8a0b00e470891a32c7b4674 files/digest-dbmail-2.2.3 238 +SHA256 de1459f1d177dbc209aee036247b11a1d8d48508b78ff4a34db2b98d3e10e5e6 files/digest-dbmail-2.2.3 238 diff --git a/net-mail/dbmail/dbmail-2.2.2-r1.ebuild b/net-mail/dbmail/dbmail-2.2.2-r1.ebuild deleted file mode 100644 index 60a7cba08..000000000 --- a/net-mail/dbmail/dbmail-2.2.2-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store" -HOMEPAGE="http://www.dbmail.org/" -SRC_URI="http://www.dbmail.org/download/2.2/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="ldap mysql postgres sieve sqlite3 ssl static" - -DEPEND="ssl? ( dev-libs/openssl ) - postgres? ( >=dev-db/postgresql-7.4 ) - mysql? ( >=virtual/mysql-4.1 ) - sqlite3? ( >=dev-db/sqlite-3.0 ) - sieve? ( >=mail-filter/libsieve-2.2.1 ) - app-text/asciidoc - app-text/xmlto - sys-libs/zlib - >=dev-libs/gmime-2.1 - >=dev-libs/glib-2.8" - -pkg_setup() { - enewgroup dbmail - enewuser dbmail -1 -1 /var/lib/dbmail dbmail -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-removeversion.patch" - epatch "${FILESDIR}/${P}-messages.patch" -} - -src_compile() { - use sqlite3 && myconf="--with-sqlite" - use ldap && myconf=${myconf}" --with-auth-ldap" - - econf \ - --sysconfdir=/etc/dbmail \ - ${myconf} \ - $(use_enable static) \ - $(use_with sieve) \ - $(use_with ssl) \ - $(use_with postgres pgsql) \ - $(use_with mysql) || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS BUGS UPGRADING ChangeLog README* INSTALL* NEWS THANKS - dodoc sql/mysql/* - dodoc sql/postgresql/* - dodoc sql/sqlite/* - - sed -i -e "s:nobody:dbmail:" dbmail.conf - sed -i -e "s:nogroup:dbmail:" dbmail.conf - insinto /etc/dbmail - newins dbmail.conf dbmail.conf.dist - - newinitd "${FILESDIR}"/dbmail-imapd.initd dbmail-imapd - newinitd "${FILESDIR}"/dbmail-lmtpd.initd dbmail-lmtpd - newinitd "${FILESDIR}"/dbmail-pop3d.initd dbmail-pop3d - use sieve && newinitd "${FILESDIR}"/dbmail-timsieved.initd dbmail-timsieved - - dobin contrib/mailbox2dbmail/mailbox2dbmail - doman contrib/mailbox2dbmail/mailbox2dbmail.1 - - keepdir /var/lib/dbmail - fperms 750 /var/lib/dbmail - -} - -pkg_postinst() { - elog "If you update from 2.1.7 please apply 2_1_7-2_2_0..gz" - elog "to your dbmail database and run dbmail-util -by ." - einfo - elog "Please read /usr/share/doc/${PF}/INSTALL.gz" - elog "for remaining instructions on setting up dbmail users and " - elog "for finishing configuration to connect to your MTA and " - elog "to connect to your db." - einfo - elog "Database schemes can be found in /usr/share/doc/${PF}/" - elog "You will also want to follow the installation instructions" - elog "on setting up the maintenance program to delete old messages." - elog "Don't forget to edit /etc/dbmail/dbmail.conf as well. :)" - elog ">>> --- For maintenance ---" - elog ">>> add this to crontab: 0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1 " -} diff --git a/net-mail/dbmail/dbmail-2.2.3.ebuild b/net-mail/dbmail/dbmail-2.2.3.ebuild new file mode 100644 index 000000000..3d0b20605 --- /dev/null +++ b/net-mail/dbmail/dbmail-2.2.3.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store" +HOMEPAGE="http://www.dbmail.org/" +SRC_URI="http://www.dbmail.org/download/2.2/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="ldap mysql postgres sieve sqlite3 ssl static" + +DEPEND="ssl? ( dev-libs/openssl ) + postgres? ( >=dev-db/postgresql-7.4 ) + mysql? ( >=virtual/mysql-4.1 ) + sqlite3? ( >=dev-db/sqlite-3.0 ) + sieve? ( >=mail-filter/libsieve-2.2.1 ) + app-text/asciidoc + app-text/xmlto + sys-libs/zlib + >=dev-libs/gmime-2.1 + >=dev-libs/glib-2.8" + +pkg_setup() { + enewgroup dbmail + enewuser dbmail -1 -1 /var/lib/dbmail dbmail +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-removeversion.patch" +} + +src_compile() { + use sqlite3 && myconf="--with-sqlite" + use ldap && myconf=${myconf}" --with-auth-ldap" + + econf \ + --sysconfdir=/etc/dbmail \ + ${myconf} \ + $(use_enable static) \ + $(use_with sieve) \ + $(use_with ssl) \ + $(use_with postgres pgsql) \ + $(use_with mysql) || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS BUGS UPGRADING ChangeLog README* INSTALL* NEWS THANKS + dodoc sql/mysql/* + dodoc sql/postgresql/* + dodoc sql/sqlite/* + + sed -i -e "s:nobody:dbmail:" dbmail.conf + sed -i -e "s:nogroup:dbmail:" dbmail.conf + insinto /etc/dbmail + newins dbmail.conf dbmail.conf.dist + + newinitd "${FILESDIR}"/dbmail-imapd.initd dbmail-imapd + newinitd "${FILESDIR}"/dbmail-lmtpd.initd dbmail-lmtpd + newinitd "${FILESDIR}"/dbmail-pop3d.initd dbmail-pop3d + use sieve && newinitd "${FILESDIR}"/dbmail-timsieved.initd dbmail-timsieved + + dobin contrib/mailbox2dbmail/mailbox2dbmail + doman contrib/mailbox2dbmail/mailbox2dbmail.1 + + keepdir /var/lib/dbmail + fperms 750 /var/lib/dbmail + +} + +pkg_postinst() { + elog "If you update from 2.1.7 please apply 2_1_7-2_2_0..gz" + elog "to your dbmail database and run dbmail-util -by ." + einfo + elog "Please read /usr/share/doc/${PF}/INSTALL.gz" + elog "for remaining instructions on setting up dbmail users and " + elog "for finishing configuration to connect to your MTA and " + elog "to connect to your db." + einfo + elog "Database schemes can be found in /usr/share/doc/${PF}/" + elog "You will also want to follow the installation instructions" + elog "on setting up the maintenance program to delete old messages." + elog "Don't forget to edit /etc/dbmail/dbmail.conf as well. :)" + elog ">>> --- For maintenance ---" + elog ">>> add this to crontab: 0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1 " +} diff --git a/net-mail/dbmail/files/dbmail-2.2.2-messages.patch b/net-mail/dbmail/files/dbmail-2.2.2-messages.patch deleted file mode 100644 index 3d85fc6bd..000000000 --- a/net-mail/dbmail/files/dbmail-2.2.2-messages.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/dbmail-message.c b/dbmail-message.c -index 21d5bcc..2feb35a 100644 ---- a/dbmail-message.c -+++ b/dbmail-message.c -@@ -885,10 +885,14 @@ static int _header_get_id(const struct D - u64_t tmp; - gpointer cacheid; - gchar *safe_header; -+ gchar *tmpheader; - -- if (! (safe_header = dm_strnesc(header,CACHE_WIDTH_NAME))) -+ if (! (tmpheader = dm_strnesc(header,CACHE_WIDTH_NAME))) - return -1; - -+ safe_header = g_ascii_strdown(tmpheader,-1); -+ g_free(tmpheader); -+ - cacheid = g_hash_table_lookup(self->header_dict, (gconstpointer)safe_header); - if (cacheid) { - *id = GPOINTER_TO_UINT(cacheid); -@@ -897,7 +901,7 @@ static int _header_get_id(const struct D - } - - GString *q = g_string_new(""); -- g_string_printf(q, "SELECT id FROM %sheadername WHERE headername='%s'", DBPFX, safe_header); -+ g_string_printf(q, "SELECT id FROM %sheadername WHERE lower(headername)='%s'", DBPFX, safe_header); - if (db_query(q->str) == -1) { - g_string_free(q,TRUE); - g_free(safe_header); diff --git a/net-mail/dbmail/files/dbmail-2.2.2-removeversion.patch b/net-mail/dbmail/files/dbmail-2.2.2-removeversion.patch deleted file mode 100644 index 49d551708..000000000 --- a/net-mail/dbmail/files/dbmail-2.2.2-removeversion.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -ru dbmail-2.2.2.orig/imap4.c dbmail-2.2.2/imap4.c ---- dbmail-2.2.2.orig/imap4.c 2007-01-10 09:17:20.000000000 +0100 -+++ dbmail-2.2.2/imap4.c 2007-02-01 18:31:11.000000000 +0100 -@@ -116,8 +116,8 @@ - - /* greet user */ - if (dbmail_imap_session_printf(session, -- "* OK dbmail imap (protocol version 4r1) server %s " -- "ready to run\r\n", IMAP_SERVER_VERSION) < 0) { -+ "* OK imap (protocol version 4r1) server " -+ "ready \r\n", IMAP_SERVER_VERSION) < 0) { - dbmail_imap_session_delete(session); - return EOF; - } -Only in dbmail-2.2.2: imap4.c.orig -diff -ru dbmail-2.2.2.orig/imapcommands.c dbmail-2.2.2/imapcommands.c ---- dbmail-2.2.2.orig/imapcommands.c 2006-12-10 22:36:03.000000000 +0100 -+++ dbmail-2.2.2/imapcommands.c 2007-02-01 18:31:11.000000000 +0100 -@@ -111,7 +111,7 @@ - dbmail_imap_session_set_state(self,IMAPCS_LOGOUT); - TRACE(TRACE_MESSAGE, "user (id:%llu) logging out @ [%s]", ud->userid, timestring); - -- dbmail_imap_session_printf(self, "* BYE dbmail imap server kisses you goodbye\r\n"); -+ dbmail_imap_session_printf(self, "* BYE\r\n"); - - return 0; - } -Only in dbmail-2.2.2: imapcommands.c.orig -diff -ru dbmail-2.2.2.orig/lmtp.c dbmail-2.2.2/lmtp.c ---- dbmail-2.2.2.orig/lmtp.c 2006-11-06 09:32:31.000000000 +0100 -+++ dbmail-2.2.2/lmtp.c 2007-02-01 18:31:11.000000000 +0100 -@@ -134,7 +134,7 @@ - - if (ci->tx) { - /* sending greeting */ -- ci_write(ci->tx, "220 %s DBMail LMTP service ready to rock\r\n", myhostname); -+ ci_write(ci->tx, "220 %s LMTP service ready\r\n", myhostname); - fflush(ci->tx); - } else { - TRACE(TRACE_MESSAGE, "TX stream is null!"); -diff -ru dbmail-2.2.2.orig/pop3.c dbmail-2.2.2/pop3.c ---- dbmail-2.2.2.orig/pop3.c 2007-01-20 09:43:22.000000000 +0100 -+++ dbmail-2.2.2/pop3.c 2007-02-01 18:32:11.000000000 +0100 -@@ -97,7 +97,7 @@ - - if (ci->tx) { - /* sending greeting */ -- fprintf(ci->tx, "+OK DBMAIL pop3 server ready to rock %s\r\n", -+ fprintf(ci->tx, "+OK pop3 server ready\r\n", - session.apop_stamp); - fflush(ci->tx); - } else { -@@ -177,7 +177,7 @@ - - /* if everything went well, write down everything and do a cleanup */ - db_update_pop(&session); -- fprintf(ci->tx, "+OK see ya later\r\n"); -+ fprintf(ci->tx, "+OK bye\r\n"); - fflush(ci->tx); - break; - -Only in dbmail-2.2.2: pop3.c.orig diff --git a/net-mail/dbmail/files/dbmail-2.2.3-removeversion.patch b/net-mail/dbmail/files/dbmail-2.2.3-removeversion.patch new file mode 100644 index 000000000..4af96cbf2 --- /dev/null +++ b/net-mail/dbmail/files/dbmail-2.2.3-removeversion.patch @@ -0,0 +1,60 @@ +diff -ru dbmail-2.2.3.orig/imap4.c dbmail-2.2.3/imap4.c +--- dbmail-2.2.3.orig/imap4.c 2007-02-28 11:34:28.000000000 +0100 ++++ dbmail-2.2.3/imap4.c 2007-02-28 18:30:58.000000000 +0100 +@@ -117,8 +117,8 @@ + + /* greet user */ + if (dbmail_imap_session_printf(session, +- "* OK dbmail imap (protocol version 4r1) server %s " +- "ready to run\r\n", IMAP_SERVER_VERSION) < 0) { ++ "* OK imap (protocol version 4r1) server " ++ "ready \r\n", IMAP_SERVER_VERSION) < 0) { + dbmail_imap_session_delete(session); + return EOF; + } +Only in dbmail-2.2.3/: imap4.c.orig +diff -ru dbmail-2.2.3.orig/imapcommands.c dbmail-2.2.3/imapcommands.c +--- dbmail-2.2.3.orig/imapcommands.c 2007-02-08 13:52:22.000000000 +0100 ++++ dbmail-2.2.3/imapcommands.c 2007-02-28 18:30:58.000000000 +0100 +@@ -111,7 +111,7 @@ + dbmail_imap_session_set_state(self,IMAPCS_LOGOUT); + TRACE(TRACE_MESSAGE, "user (id:%llu) logging out @ [%s]", ud->userid, timestring); + +- dbmail_imap_session_printf(self, "* BYE dbmail imap server kisses you goodbye\r\n"); ++ dbmail_imap_session_printf(self, "* BYE\r\n"); + + return 0; + } +diff -ru dbmail-2.2.3.orig/lmtp.c dbmail-2.2.3/lmtp.c +--- dbmail-2.2.3.orig/lmtp.c 2006-11-06 09:32:31.000000000 +0100 ++++ dbmail-2.2.3/lmtp.c 2007-02-28 18:30:58.000000000 +0100 +@@ -134,7 +134,7 @@ + + if (ci->tx) { + /* sending greeting */ +- ci_write(ci->tx, "220 %s DBMail LMTP service ready to rock\r\n", myhostname); ++ ci_write(ci->tx, "220 %s LMTP service ready\r\n", myhostname); + fflush(ci->tx); + } else { + TRACE(TRACE_MESSAGE, "TX stream is null!"); +diff -ru dbmail-2.2.3.orig/pop3.c dbmail-2.2.3/pop3.c +--- dbmail-2.2.3.orig/pop3.c 2007-02-26 09:23:25.000000000 +0100 ++++ dbmail-2.2.3/pop3.c 2007-02-28 18:30:58.000000000 +0100 +@@ -97,7 +97,7 @@ + + if (ci->tx) { + /* sending greeting */ +- fprintf(ci->tx, "+OK DBMAIL pop3 server ready to rock %s\r\n", ++ fprintf(ci->tx, "+OK pop3 server ready\r\n", + session.apop_stamp); + fflush(ci->tx); + } else { +@@ -177,7 +177,7 @@ + + /* if everything went well, write down everything and do a cleanup */ + db_update_pop(&session); +- fprintf(ci->tx, "+OK see ya later\r\n"); ++ fprintf(ci->tx, "+OK bye\r\n"); + fflush(ci->tx); + break; + diff --git a/net-mail/dbmail/files/digest-dbmail-2.2.2-r1 b/net-mail/dbmail/files/digest-dbmail-2.2.2-r1 deleted file mode 100644 index e68d6bb94..000000000 --- a/net-mail/dbmail/files/digest-dbmail-2.2.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7a1a0940d3ec07dc55c7e49412298b0a dbmail-2.2.2.tar.gz 855310 -RMD160 956525839081813d0bfe97b4a82da1d56f86975a dbmail-2.2.2.tar.gz 855310 -SHA256 fdf8327addcd6edb379debffe56584020e7e477a3d101e8c8d0d5d992e00b4c2 dbmail-2.2.2.tar.gz 855310 diff --git a/net-mail/dbmail/files/digest-dbmail-2.2.3 b/net-mail/dbmail/files/digest-dbmail-2.2.3 new file mode 100644 index 000000000..a916076aa --- /dev/null +++ b/net-mail/dbmail/files/digest-dbmail-2.2.3 @@ -0,0 +1,3 @@ +MD5 495c1ed9cc5645f2d4f2ff8aa7b389e7 dbmail-2.2.3.tar.gz 861514 +RMD160 8851e171093cb433faaa22034cf3624942c9589c dbmail-2.2.3.tar.gz 861514 +SHA256 dbbcc9af0ff20aebed956870db5fd499faa08a0486ff755e9d8901885e4d22b8 dbmail-2.2.3.tar.gz 861514 -- cgit v1.2.3-65-gdbad