From 6db53091a36311e217188cb4ede6a2add82070c2 Mon Sep 17 00:00:00 2001
From: Erik Kapfer <erik.kapfer@ipfire.org>
Date: Mon, 23 Dec 2013 17:38:41 +0100
Subject: [PATCH] fetchmail: Update to 6.3.26.

---
 lfs/fetchmail | 21 ++++++++++++++-------
 lfs/git       |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lfs/fetchmail b/lfs/fetchmail
index 33b9f9caae..66b9a65b02 100644
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 6.3.16
+VER        = 6.3.26
 
 THISAPP    = fetchmail-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = fetchmail
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1a40acb371376c7d54fe468c99dfc216
+$(DL_FILE)_MD5 = 61b66faad044afa26e142bb1791aa2b3
 
 install : $(TARGET)
 
@@ -76,10 +76,15 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --with-ssl --disable-nls
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--with-ssl \
+		--disable-nls
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
 	echo "set logfile /var/log/fetchmail.log" > ~/.fetchmailrc
 	echo "set no bouncemail" >> ~/.fetchmailrc
 	echo "set postmaster root" >> ~/.fetchmailrc
@@ -87,7 +92,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	echo "#poll SERVERNAME :" >> ~/.fetchmailrc
 	echo "#    user <username> pass <password>;" >> ~/.fetchmailrc
 	echo "#    mda "/usr/bin/procmail -f %F -d %T";" >> ~/.fetchmailrc
+
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/fetchmail \
 		/var/ipfire/backup/addons/includes/fetchmail
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/git b/lfs/git
index 2b8e8682d0..23838e4e54 100644
--- a/lfs/git
+++ b/lfs/git
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 65b84be7298a4b9585a888410777f02e
+$(DL_FILE)_MD5 = df8519044f9880f3687d863d99245282
 
 install : $(TARGET)
 
-- 
2.39.5