From c512d0fcf434dd74c1fc6fc7752da829453edd7f Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Thu, 4 Mar 2010 21:48:55 +0100
Subject: 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
---
 .../fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch  | 11 -----------
 recipes/fetchmail/fetchmail_6.3.14.bb              | 22 ++++++++++++++++++++++
 recipes/fetchmail/fetchmail_6.3.8.bb               | 20 --------------------
 3 files changed, 22 insertions(+), 31 deletions(-)
 delete mode 100644 recipes/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch
 create mode 100644 recipes/fetchmail/fetchmail_6.3.14.bb
 delete mode 100644 recipes/fetchmail/fetchmail_6.3.8.bb

(limited to 'recipes/fetchmail')

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 d0926848c2..0000000000
--- 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.14.bb b/recipes/fetchmail/fetchmail_6.3.14.bb
new file mode 100644
index 0000000000..1934f74690
--- /dev/null
+++ b/recipes/fetchmail/fetchmail_6.3.14.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Fetchmail is a free, full-featured, robust, \
+well-documented remote-mail retrieval and forwarding utility \
+intended to be used over on-demand TCP/IP links \
+(such as SLIP or PPP connections)."
+SECTION = "console/network"
+
+LICENSE = "GPL"
+
+PR = "r2"
+
+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}/python*/site-packages/fetchmailconf.py* ${bindir}/fetchmailconf"
+rdepends_${PN}conf = "${PN}"
diff --git a/recipes/fetchmail/fetchmail_6.3.8.bb b/recipes/fetchmail/fetchmail_6.3.8.bb
deleted file mode 100644
index 9b789aae25..0000000000
--- a/recipes/fetchmail/fetchmail_6.3.8.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Fetchmail is a free, full-featured, robust, \
-well-documented remote-mail retrieval and forwarding utility \
-intended to be used over on-demand TCP/IP links \
-(such as SLIP or PPP connections)."
-SECTION = "console/network"
-
-LICENSE = "GPL"
-
-PR = "r2"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
-	   file://CVE-2007-4565.patch;patch=1 \
-	   "
-
-inherit autotools gettext
-
-FILES_${PN} = "${bindir}/fetchmail"
-PACKAGES += "${PN}conf"
-FILES_${PN}conf = "${libdir}/python2.5/site-packages/fetchmailconf.py* ${bindir}/fetchmailconf"
-rdepends_${PN}conf = "${PN}"
-- 
cgit 1.2.3-korg