From 3e927d97d850e816b26384e7c3371e0a0258f26f Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Tue, 17 Jun 2008 16:40:27 +0000
Subject: fetchmail: updated to latest release with security patch. Now also
 creates the fetchmailconf package.

---
 packages/fetchmail/fetchmail-6.3.8/.mtn2git_empty    |  0
 .../fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch    | 11 +++++++++++
 packages/fetchmail/fetchmail_6.3.8.bb                | 20 ++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 packages/fetchmail/fetchmail-6.3.8/.mtn2git_empty
 create mode 100644 packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch
 create mode 100644 packages/fetchmail/fetchmail_6.3.8.bb

diff --git a/packages/fetchmail/fetchmail-6.3.8/.mtn2git_empty b/packages/fetchmail/fetchmail-6.3.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch b/packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch
new file mode 100644
index 0000000000..d0926848c2
--- /dev/null
+++ b/packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch
@@ -0,0 +1,11 @@
+--- 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/packages/fetchmail/fetchmail_6.3.8.bb b/packages/fetchmail/fetchmail_6.3.8.bb
new file mode 100644
index 0000000000..c3037665c2
--- /dev/null
+++ b/packages/fetchmail/fetchmail_6.3.8.bb
@@ -0,0 +1,20 @@
+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 = "r1"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
+	   file://CVE-2007-4565.patch;patch=1 \
+	   "
+
+inherit autotools gettext
+
+# Special handling for the fetchmailconf python scripts
+PACKAGES += "${PN}conf"
+FILES_${PN}conf = "${libdir}/python2.5/site-packages/fetchmailconf.py*"
+rdepends_${PN}conf = "${PN}"
-- 
cgit v1.2.3


From b3ed7e14f5a4f6f94a417fa2c8fe54dc9ebe30b2 Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Tue, 17 Jun 2008 16:42:16 +0000
Subject: SlugOS Package Feeds: promote fetchmail back into the feeds

---
 packages/meta/slugos-packages.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 525521402f..946b51b210 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r56"
+PR = "r57"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -81,6 +81,7 @@ SLUGOS_PACKAGES = "\
 	expat \
 	ez-ipupdate \
 	fconfig \
+	fetchmail \
 	file \
 	findutils \
 	fis \
@@ -256,7 +257,6 @@ SLUGOS_BROKEN_PACKAGES = "\
 	ctorrent \
 	dsniff \
 	eciadsl \
-	fetchmail \
 	gspcav1 \
 	linphone \
 	lirc-modules lirc \
-- 
cgit v1.2.3


From 9e91c092f40330291187709d2c70b2a5e360e55d Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Tue, 17 Jun 2008 16:54:56 +0000
Subject: Fetchmail: Correct packaging oversite

---
 packages/fetchmail/fetchmail_6.3.8.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/fetchmail/fetchmail_6.3.8.bb b/packages/fetchmail/fetchmail_6.3.8.bb
index c3037665c2..9b789aae25 100644
--- a/packages/fetchmail/fetchmail_6.3.8.bb
+++ b/packages/fetchmail/fetchmail_6.3.8.bb
@@ -6,7 +6,7 @@ SECTION = "console/network"
 
 LICENSE = "GPL"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
 	   file://CVE-2007-4565.patch;patch=1 \
@@ -14,7 +14,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
 
 inherit autotools gettext
 
-# Special handling for the fetchmailconf python scripts
+FILES_${PN} = "${bindir}/fetchmail"
 PACKAGES += "${PN}conf"
-FILES_${PN}conf = "${libdir}/python2.5/site-packages/fetchmailconf.py*"
+FILES_${PN}conf = "${libdir}/python2.5/site-packages/fetchmailconf.py* ${bindir}/fetchmailconf"
 rdepends_${PN}conf = "${PN}"
-- 
cgit v1.2.3