Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

[people/mfischer/ipfire-2.x.git] / lfs / fetchmail

diff --git a/lfs/fetchmail b/lfs/fetchmail
index e60c30beabbb6cd7acaf69c51ce4dec3bc2cfc1e..00ee6a634fbee6ca3544aa93eafa2f7c0d2daeb1 100644 (file)
--- 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-2018  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,17 +24,21 @@
 
 include Config
 
-VER        = 6.3.9
+SUMMARY    = Full-Featured POP and IMAP Mail Retrieval Daemon
+
+VER        = 6.4.19
 
 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    = 3
+PAK_VER    = 11
+
+DEPS       =
 
-DEPS       = ""
+SERVICES   = fetchmail
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 72c20ad2b9629f1a109668b05a84d823
+$(DL_FILE)_BLAKE2 = 679d2c49698dd368d32439a8276412e3f32c0a0f6f0e7607bc323c0294c987307469451b4b085fe521f2d5dd4869d59b4841762b6a57b3c654b992e9de8ba87c
 
 install : $(TARGET)
 
@@ -52,13 +56,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
-dist: 
+dist:
        $(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -67,8 +71,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -76,10 +80,17 @@ $(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)
+       $(UPDATE_AUTOMAKE)
+       cd $(DIR_APP) && PYTHON=python3 \
+               ./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,6 +98,13 @@ $(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
+
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/fetchmail \
+               /var/ipfire/backup/addons/includes/fetchmail
+
+       #install initscripts
+       $(call INSTALL_INITSCRIPTS,$(SERVICES))
+
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)