[oe-commits] Holger Hans Peter Freyther : fetchmail: Upgrade to 6.3. 14 to fix known security issues

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: c512d0fcf434dd74c1fc6fc7752da829453edd7f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c512d0fcf434dd74c1fc6fc7752da829453edd7f

Author: Holger Hans Peter Freyther <zecke at selfish.org>
Date:   Thu Mar  4 21:48:55 2010 +0100

fetchmail: Upgrade to 6.3.14 to fix known security issues

* 6.3.8 needs two more security patches but the original
  sourcecode is not available anymore.
* Move the sums into the recipe
* The python FILEPATH seems to be broken... I'm not fixing
  this right now but it would require some RDEPENDS fixes

---

 conf/checksums.ini                                 |    4 ----
 .../fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch  |   11 -----------
 .../{fetchmail_6.3.8.bb => fetchmail_6.3.14.bb}    |    8 +++++---
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 513dd1d..b183f48 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6910,10 +6910,6 @@ sha256=c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac
 md5=9956b30139edaa4f5f77c4d0dbd80225
 sha256=c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac
 
-[ftp://ftp.debian.org/debian/pool/main/f/fetchmail/fetchmail_6.3.8.orig.tar.gz]
-md5=1b84621072b4f906b5686a4fbae0b1d7
-sha256=d06e7244dcd2b462c0e7bea0d01edadb54905f4533afc45f971ab9f6ee46497c
-
 [http://projects.openmoko.org/frs/download.php/832/ffalarms-0.2.2.tar.gz]
 md5=6f03b9663245b93e8370e43cc556dba1
 sha256=df0561124faa5c2e64038f5efcf39432c4795829115b86819083ae66b001899a
diff --git a/recipes/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch b/recipes/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch
deleted file mode 100644
index d092684..0000000
--- a/recipes/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fetchmail-6.3.8-orig/sink.c
-+++ fetchmail-6.3.8/sink.c
-@@ -262,7 +262,7 @@
-     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
- 
-     /* don't bounce in reply to undeliverable bounces */
--    if (!msg->return_path[0] ||
-+    if (!msg || !msg->return_path[0] ||
- 	strcmp(msg->return_path, "<>") == 0 ||
- 	strcasecmp(msg->return_path, md1) == 0 ||
- 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
diff --git a/recipes/fetchmail/fetchmail_6.3.8.bb b/recipes/fetchmail/fetchmail_6.3.14.bb
similarity index 54%
rename from recipes/fetchmail/fetchmail_6.3.8.bb
rename to recipes/fetchmail/fetchmail_6.3.14.bb
index 9b789aa..1934f74 100644
--- a/recipes/fetchmail/fetchmail_6.3.8.bb
+++ b/recipes/fetchmail/fetchmail_6.3.14.bb
@@ -8,13 +8,15 @@ LICENSE = "GPL"
 
 PR = "r2"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
-	   file://CVE-2007-4565.patch;patch=1 \
+SRC_URI = "http://download.berlios.de/fetchmail/${PN}-${PV}.tar.bz2;name=src \
 	   "
 
+SRC_URI[src.md5sum] = "86d3cfbce151881d8bf76a1efd5bda6a"
+SRC_URI[src.sha256sum] = "8657f786f5af1857ddb3b50203e6cde2efad43f49828973cbb22f6d431208607"
+
 inherit autotools gettext
 
 FILES_${PN} = "${bindir}/fetchmail"
 PACKAGES += "${PN}conf"
-FILES_${PN}conf = "${libdir}/python2.5/site-packages/fetchmailconf.py* ${bindir}/fetchmailconf"
+FILES_${PN}conf = "${libdir}/python*/site-packages/fetchmailconf.py* ${bindir}/fetchmailconf"
 rdepends_${PN}conf = "${PN}"