X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Ffetchmail;h=66b9a65b02159b4c0a0f58590f3e0daaf6577620;hb=62ff8d9627a6dfe242b9b628df05a5eaeea88e47;hp=fbaa749baba23a8330b5674b75d43635fc99951d;hpb=93dc5548f4a05bd643b11f4839d14991e050110a;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/fetchmail b/lfs/fetchmail
index fbaa749ba..66b9a65b0 100644
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,13 +24,17 @@
 
 include Config
 
-VER        = 6.3.4
+VER        = 6.3.26
 
 THISAPP    = fetchmail-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = http://download2.berlios.de/fetchmail
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = fetchmail
+PAK_VER    = 7
+
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 35ded0414fcff79b492d6ade2ce48911
+$(DL_FILE)_MD5 = 61b66faad044afa26e142bb1791aa2b3
 
 install : $(TARGET)
 
@@ -53,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh fetchmail $(THISAPP)-ipfire-beta-1
+	$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -74,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 # --enable-fallback=procmail
-	cd $(DIR_APP) && make
+	@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
@@ -85,5 +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)