From ea3b46d4fcd686abb1692638e3b9583efe94da5d Mon Sep 17 00:00:00 2001
From: swalker <swalker@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 3 Jul 2011 21:07:51 +0000
Subject: [PATCH] [packages] fetchmail: update to 6.3.20 (CVE-2011-1947), drop
 obsolete patch

git-svn-id: svn://svn.openwrt.org/openwrt/packages@27422 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 mail/fetchmail/Makefile                       |  6 ++---
 .../patches/001-Fixup-MD5-transition.patch    | 25 -------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 mail/fetchmail/patches/001-Fixup-MD5-transition.patch

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index a85ec05e6..7702f4ea4 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fetchmail
-PKG_VERSION:=6.3.19
+PKG_VERSION:=6.3.20
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://download.berlios.de/fetchmail
-PKG_MD5SUM:=64519711c8533f5a34d20c9ff620d880
+PKG_MD5SUM:=76406dbb37471f911cbb483830afe068
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
diff --git a/mail/fetchmail/patches/001-Fixup-MD5-transition.patch b/mail/fetchmail/patches/001-Fixup-MD5-transition.patch
deleted file mode 100644
index e96b1769e..000000000
--- a/mail/fetchmail/patches/001-Fixup-MD5-transition.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/fm_md5.h
-+++ b/fm_md5.h
-@@ -5,16 +5,8 @@
- 
- #include <sys/types.h>
- 
--#ifdef HAVE_MD5_H
--#include <md5.h>
--#else
- #include "fetchmail.h"
--#ifndef HEADER_MD5_H
--/* Try to avoid clashes with OpenSSL */
--#define HEADER_MD5_H 
--#endif
- 
--
- #if SIZEOF_INT == 4
- typedef unsigned int uint32;
- #else
-@@ -37,6 +29,5 @@
-  */
- typedef struct MD5Context MD5_CTX;
- 
--#endif
- #endif /* !MD5_H */