net-mail/dbmail: glib deps, removed banner

svn path=/sunrise/; revision=2013

4 files changed, 57 insertions, 9 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index ff0ea54c7..41f25a006 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Nov 2006; Martin Hierling <mad@cc.fh-luh.de> dbmail-2.2.1.ebuild:
+  changed deps to glib-2.8
+  added a patch to remove the version strings (security reason)
+
   07 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
   dbmail-2.1.7-r1.ebuild:
   removed ~amd64 because mail-filter/libsieve has no amd64 keyword in Portage,
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 7acc61e8d..ae593f57f 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -14,20 +14,24 @@ 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
+AUX removeversion-2.2.1.patch 1420 RMD160 1732cd3e038707a395e435850e78772e1660e24e SHA1 c40d4af1a1be102f7c0696b152a41a5d27f31a46 SHA256 2012a6c700e2b2f81e034bf59071d12c4a306a0cfe8a4915f6e3ffdb03ea8b4f
+MD5 7fe04bb30f94fb61d6dfd9f7a8cda21b files/removeversion-2.2.1.patch 1420
+RMD160 1732cd3e038707a395e435850e78772e1660e24e files/removeversion-2.2.1.patch 1420
+SHA256 2012a6c700e2b2f81e034bf59071d12c4a306a0cfe8a4915f6e3ffdb03ea8b4f files/removeversion-2.2.1.patch 1420
 DIST dbmail-2.1.7.tar.gz 842237 RMD160 65e470501c6cc5e5ef50d8da736e2792168cbe8b SHA1 16c383dcd095ba2544b1f7ad1fabe40d551b7e9e SHA256 f46272083fcf4a30cd79a4c97ef19d3e4abc047dbea39eb137eab66c1b6ae133
 DIST dbmail-2.2.1.tar.gz 848546 RMD160 41c08eaaf3033d5006cd74a6c106c64716421baf SHA1 5747d2af512d4dae73c055676fc9b60cea29fdaf SHA256 dd783cc7cb344a64a34e73721cfc4d95b0458d5465167ff07a592767e9b02074
 EBUILD dbmail-2.1.7-r1.ebuild 2476 RMD160 d55cf8f2456af46e3cd4fe2ec8566567001a14b5 SHA1 13b04f56bcaf5105d9c6d2047fe6ae9c751e8f30 SHA256 2b5c8022c8b518bd77b495b8b41a200a8f78e5f9ab34f9e4a558f7369b15b3fa
 MD5 8cb6c0efb87b0047701df915b1ac1119 dbmail-2.1.7-r1.ebuild 2476
 RMD160 d55cf8f2456af46e3cd4fe2ec8566567001a14b5 dbmail-2.1.7-r1.ebuild 2476
 SHA256 2b5c8022c8b518bd77b495b8b41a200a8f78e5f9ab34f9e4a558f7369b15b3fa dbmail-2.1.7-r1.ebuild 2476
-EBUILD dbmail-2.2.1.ebuild 2617 RMD160 11710b8461b11274caae6cec1e177c9767fde9bb SHA1 9e74f3a75c14c64a49346b262382d22cd228845f SHA256 5b201813bbbe73e6252cfb7b9d870503f843a9f65a814428f25e35ff144a0176
-MD5 2b28336bac6185723a205c2864cea7fa dbmail-2.2.1.ebuild 2617
-RMD160 11710b8461b11274caae6cec1e177c9767fde9bb dbmail-2.2.1.ebuild 2617
-SHA256 5b201813bbbe73e6252cfb7b9d870503f843a9f65a814428f25e35ff144a0176 dbmail-2.2.1.ebuild 2617
-MISC ChangeLog 1496 RMD160 2a5e13506b1f6c4325668621543aa3b7187712b8 SHA1 88ddb7d26255d08396d9d164d0add18d73d75d1c SHA256 3adf48692d52e786312eba4c8f2c397185f79a9ad2b50dff43da615a24ed7c2e
-MD5 c0c09727488bf6d8f77a969858f5b692 ChangeLog 1496
-RMD160 2a5e13506b1f6c4325668621543aa3b7187712b8 ChangeLog 1496
-SHA256 3adf48692d52e786312eba4c8f2c397185f79a9ad2b50dff43da615a24ed7c2e ChangeLog 1496
+EBUILD dbmail-2.2.1.ebuild 2664 RMD160 3c67ce33fe706bedd497ffcb1a396e0170511143 SHA1 cd72d9c834e4682fc8b5c80fc0dc71a3b077a464 SHA256 1c2078d91ed481224c5b0c03cfd88692af1e46307eeb422cf0d7c08fe06f1069
+MD5 15c3aca091228c961aa73a768ef9a521 dbmail-2.2.1.ebuild 2664
+RMD160 3c67ce33fe706bedd497ffcb1a396e0170511143 dbmail-2.2.1.ebuild 2664
+SHA256 1c2078d91ed481224c5b0c03cfd88692af1e46307eeb422cf0d7c08fe06f1069 dbmail-2.2.1.ebuild 2664
+MISC ChangeLog 1659 RMD160 d6b0a3c414f7a0bb9794567b190c7718e297a11f SHA1 667e2cd2f6abde1bceef44839410a1f828d69a7c SHA256 bd85e323e7a36e816e5c1c69e4ac27e428ee299cac1d646a6eec8e2b0728f500
+MD5 bebaecf158b7e548b0ab95cf8225cec2 ChangeLog 1659
+RMD160 d6b0a3c414f7a0bb9794567b190c7718e297a11f ChangeLog 1659
+SHA256 bd85e323e7a36e816e5c1c69e4ac27e428ee299cac1d646a6eec8e2b0728f500 ChangeLog 1659
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
diff --git a/net-mail/dbmail/dbmail-2.2.1.ebuild b/net-mail/dbmail/dbmail-2.2.1.ebuild
index e31f2300f..e05da0ca6 100644
--- a/net-mail/dbmail/dbmail-2.2.1.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.1.ebuild
@@ -22,7 +22,7 @@ DEPEND="ssl? ( dev-libs/openssl )
 	app-text/xmlto
 	sys-libs/zlib
 	>=dev-libs/gmime-2.1
-	>=dev-libs/glib-2.6"
+	>=dev-libs/glib-2.8"
 
 pkg_setup() {
 	enewgroup dbmail
@@ -30,6 +30,8 @@ pkg_setup() {
 }
 
 src_compile() {
+	epatch ${FILESDIR}/removeversion-${PV}.patch
+
 	use sqlite3 && myconf="--with-sqlite"
 	use ldap && myconf=${myconf}" --with-auth-ldap"
 
diff --git a/net-mail/dbmail/files/removeversion-2.2.1.patch b/net-mail/dbmail/files/removeversion-2.2.1.patch
new file mode 100644
index 000000000..cbe7a0c0c
--- /dev/null
+++ b/net-mail/dbmail/files/removeversion-2.2.1.patch
@@ -0,0 +1,38 @@
+diff -ru dbmail-2.2.1.orig/imap4.c dbmail-2.2.1/imap4.c
+--- dbmail-2.2.1.orig/imap4.c	2006-11-16 12:21:49.000000000 +0100
++++ dbmail-2.2.1/imap4.c	2006-11-22 08:21:49.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;
+ 	}
+diff -ru dbmail-2.2.1.orig/lmtp.c dbmail-2.2.1/lmtp.c
+--- dbmail-2.2.1.orig/lmtp.c	2006-11-06 09:32:31.000000000 +0100
++++ dbmail-2.2.1/lmtp.c	2006-11-22 08:22:06.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.1.orig/pop3.c dbmail-2.2.1/pop3.c
+--- dbmail-2.2.1.orig/pop3.c	2006-11-06 09:32:31.000000000 +0100
++++ dbmail-2.2.1/pop3.c	2006-11-22 08:22:20.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 {