From 37c9a1eaabffb8f5aa2471b93c443a7a7e5dd561 Mon Sep 17 00:00:00 2001 From: Tiziano Müller Date: Thu, 8 Feb 2007 16:13:41 +0000 Subject: net-mail/dbmail: Added patch to fix an issue with postgresql: http://www.gossamer-threads.com/lists/dbmail/users/19762?nohighlight=1#19762 svn path=/sunrise/; revision=2966 --- net-mail/dbmail/ChangeLog | 5 ++ net-mail/dbmail/Manifest | 26 +++--- net-mail/dbmail/dbmail-2.2.2-r1.ebuild | 96 +++++++++++++++++++++++ net-mail/dbmail/dbmail-2.2.2.ebuild | 90 --------------------- net-mail/dbmail/files/dbmail-2.2.2-messages.patch | 29 +++++++ net-mail/dbmail/files/digest-dbmail-2.2.2 | 3 - net-mail/dbmail/files/digest-dbmail-2.2.2-r1 | 3 + 7 files changed, 148 insertions(+), 104 deletions(-) create mode 100644 net-mail/dbmail/dbmail-2.2.2-r1.ebuild delete mode 100644 net-mail/dbmail/dbmail-2.2.2.ebuild create mode 100644 net-mail/dbmail/files/dbmail-2.2.2-messages.patch delete mode 100644 net-mail/dbmail/files/digest-dbmail-2.2.2 create mode 100644 net-mail/dbmail/files/digest-dbmail-2.2.2-r1 (limited to 'net-mail') diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog index b5145db86..1332bac38 100644 --- a/net-mail/dbmail/ChangeLog +++ b/net-mail/dbmail/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 08 Feb 2007; Tiziano Müller -dbmail-2.2.2.ebuild, + +dbmail-2.2.2-r1.ebuild, +files/dbmail-2.2.2-messages.patch: + Added patch to fix an issue with postgresql: + http://www.gossamer-threads.com/lists/dbmail/users/19762?nohighlight=1#19762 + 01 Feb 2007; Markus Ullmann -dbmail-2.2.1.ebuild, -files/removeversion-2.2.1.patch, dbmail-2.2.2.ebuild, +files/dbmail-2.2.2-removeversion.patch, -files/removeversion-2.2.2.patch: diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest index af8a0bd8c..01c94ace4 100644 --- a/net-mail/dbmail/Manifest +++ b/net-mail/dbmail/Manifest @@ -1,3 +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 @@ -19,18 +23,18 @@ 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.ebuild 2663 RMD160 ac3c7acb9b5e0c6d56b83c5d800b3c4e6c804c09 SHA1 a3c721754c280414192c28cdeee3529163629e5b SHA256 eca7df43ccccd56f9208ecc435b045d2241a834938e0ec7687a6bdb03ea8e851 -MD5 d6583399fcbd05a4d855caa53c18a0a4 dbmail-2.2.2.ebuild 2663 -RMD160 ac3c7acb9b5e0c6d56b83c5d800b3c4e6c804c09 dbmail-2.2.2.ebuild 2663 -SHA256 eca7df43ccccd56f9208ecc435b045d2241a834938e0ec7687a6bdb03ea8e851 dbmail-2.2.2.ebuild 2663 -MISC ChangeLog 2404 RMD160 91b5262955aeabc4722165c6501f09bb1755f594 SHA1 3bf59ffad28991f41697f49cd87ad122623a6eea SHA256 0de2fe77622c6357244701052eaaad3bc4a8c8eb7c748cda59f400d77f83be26 -MD5 abf262aa07c36c5f649dcdb254c49c79 ChangeLog 2404 -RMD160 91b5262955aeabc4722165c6501f09bb1755f594 ChangeLog 2404 -SHA256 0de2fe77622c6357244701052eaaad3bc4a8c8eb7c748cda59f400d77f83be26 ChangeLog 2404 +EBUILD dbmail-2.2.2-r1.ebuild 2747 RMD160 fbdd35d85c1f5fff4fe27df9ac4448b695f92113 SHA1 dda3edd52555ba7512ac8abdb019910c51005b29 SHA256 72a9870e333e584f4254e3308994522f5925abf30b8857b5691da93c2fe1c9db +MD5 f768c0859ab7fe0271a43565d860d8c9 dbmail-2.2.2-r1.ebuild 2747 +RMD160 fbdd35d85c1f5fff4fe27df9ac4448b695f92113 dbmail-2.2.2-r1.ebuild 2747 +SHA256 72a9870e333e584f4254e3308994522f5925abf30b8857b5691da93c2fe1c9db dbmail-2.2.2-r1.ebuild 2747 +MISC ChangeLog 2669 RMD160 7ad7b7169166e070054faa36f2efbbccf8de14b7 SHA1 3ecb8ead61c708c9ae6adbf081581d01d5bc4cb4 SHA256 539e53186abebac3e2c569e322387dc857dc6a62ce50564e1989ed720c347db4 +MD5 afa1db53fb27840cbf1b1772c99bb87a ChangeLog 2669 +RMD160 7ad7b7169166e070054faa36f2efbbccf8de14b7 ChangeLog 2669 +SHA256 539e53186abebac3e2c569e322387dc857dc6a62ce50564e1989ed720c347db4 ChangeLog 2669 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 238 -RMD160 22e610bf69823bc5dcb2a07781a19467b1c09707 files/digest-dbmail-2.2.2 238 -SHA256 bc6a03dd8a741abb35402dfc1fc46755bb100527b2bd4066c7384803b57c941b files/digest-dbmail-2.2.2 238 +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 diff --git a/net-mail/dbmail/dbmail-2.2.2-r1.ebuild b/net-mail/dbmail/dbmail-2.2.2-r1.ebuild new file mode 100644 index 000000000..db609d80a --- /dev/null +++ b/net-mail/dbmail/dbmail-2.2.2-r1.ebuild @@ -0,0 +1,96 @@ +# 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" +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) \ + $(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.2.ebuild b/net-mail/dbmail/dbmail-2.2.2.ebuild deleted file mode 100644 index 7875425fd..000000000 --- a/net-mail/dbmail/dbmail-2.2.2.ebuild +++ /dev/null @@ -1,90 +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" -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_compile() { - epatch "${FILESDIR}/${P}-removeversion.patch" - - 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) \ - $(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 new file mode 100644 index 000000000..3d85fc6bd --- /dev/null +++ b/net-mail/dbmail/files/dbmail-2.2.2-messages.patch @@ -0,0 +1,29 @@ +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/digest-dbmail-2.2.2 b/net-mail/dbmail/files/digest-dbmail-2.2.2 deleted file mode 100644 index e68d6bb94..000000000 --- a/net-mail/dbmail/files/digest-dbmail-2.2.2 +++ /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.2-r1 b/net-mail/dbmail/files/digest-dbmail-2.2.2-r1 new file mode 100644 index 000000000..e68d6bb94 --- /dev/null +++ b/net-mail/dbmail/files/digest-dbmail-2.2.2-r1 @@ -0,0 +1,3 @@ +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 -- cgit v1.2.3-65-gdbad