From c1f516c7479e4a01499c076cd8c1970467762749 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 5 Jul 2008 12:47:06 +0000
Subject: [PATCH] Upgrade fetchmail to 6.3.9-rc2 (#3677)

SVN-Revision: 11652
---
 mail/fetchmail/Makefile                       | 10 ++---
 .../patches/001-amd64_detection.patch         | 43 -------------------
 mail/fetchmail/patches/002-no_rej.patch       | 21 ---------
 3 files changed, 5 insertions(+), 69 deletions(-)

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 301167913..ce2a01723 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fetchmail
-PKG_VERSION:=6.2.5
+PKG_VERSION:=6.3.9-rc2
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.catb.org/~esr/fetchmail/
-PKG_MD5SUM:=9956b30139edaa4f5f77c4d0dbd80225
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://download.berlios.de/fetchmail
+PKG_MD5SUM:=29f338f6a0dbef027b420344fda34580
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,7 +22,7 @@ define Package/fetchmail
   SECTION:=mail
   CATEGORY:=Mail
   TITLE:=Remote mail retriever
-  URL:=http://www.catb.org/~esr/fetchmail/
+  URL:=http://fetchmail.berlios.de/
 endef
 
 define Package/fetchmail/description
diff --git a/mail/fetchmail/patches/001-amd64_detection.patch b/mail/fetchmail/patches/001-amd64_detection.patch
index 2db43d111..e69de29bb 100644
--- a/mail/fetchmail/patches/001-amd64_detection.patch
+++ b/mail/fetchmail/patches/001-amd64_detection.patch
@@ -1,43 +0,0 @@
-diff -urN fetchmail-6.2.5/config.sub fetchmail-6.2.5.new/config.sub
---- fetchmail-6.2.5/config.sub	2003-07-17 03:03:20.000000000 +0200
-+++ fetchmail-6.2.5.new/config.sub	2006-03-30 00:36:11.000000000 +0200
-@@ -176,7 +176,7 @@
- 		| 580 | i960 | h8300 \
- 		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
- 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
--		| hppa64 \
-+		| hppa64 | x86_64 \
- 		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
- 		| alphaev6[78] \
- 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-@@ -194,7 +194,7 @@
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
- 	# (2) the word "unknown" tends to confuse beginning users.
--	i[34567]86)
-+	i*86 | x86_64)
- 	  basic_machine=$basic_machine-pc
- 	  ;;
- 	# Object if more than one company name word.
-@@ -209,7 +209,7 @@
- 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
- 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
- 	      | xmp-* | ymp-* \
--	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
-+	      | x86-* | x86_64-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
- 	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
- 	      | hppa2.0n-* | hppa64-* \
- 	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-@@ -256,6 +256,12 @@
- 		basic_machine=a29k-none
- 		os=-bsd
- 		;;
-+	amd64)
-+		basic_machine=x86_64-pc
-+		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	amdahl)
- 		basic_machine=580-amdahl
- 		os=-sysv
diff --git a/mail/fetchmail/patches/002-no_rej.patch b/mail/fetchmail/patches/002-no_rej.patch
index 64cc7cb7d..e69de29bb 100644
--- a/mail/fetchmail/patches/002-no_rej.patch
+++ b/mail/fetchmail/patches/002-no_rej.patch
@@ -1,21 +0,0 @@
-diff -ruN fetchmail-6.2.5-old/po/fr.po.rej fetchmail-6.2.5-new/po/fr.po.rej
---- fetchmail-6.2.5-old/po/fr.po.rej	2003-07-17 03:23:26.000000000 +0200
-+++ fetchmail-6.2.5-new/po/fr.po.rej	1970-01-01 01:00:00.000000000 +0100
-@@ -1,17 +0,0 @@
--***************
--*** 2166,2172 ****
--  #: rcfile_y.y:433
--  #, fuzzy, c-format
--  msgid "File %s must be a regular file.\n"
--- msgstr "Le fichier %s doit etre un lien symbolique.\n"
--  
--  #: rcfile_y.y:440
--  #, c-format
----- 2166,2172 ----
--  #: rcfile_y.y:433
--  #, fuzzy, c-format
--  msgid "File %s must be a regular file.\n"
--+ msgstr "Le fichier %s doit être un fichier normal.\n"
--  
--  #: rcfile_y.y:440
--  #, c-format
-- 
2.30.2