X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fgnupg;h=4fbe821078a8c009b7491417405a3bcf23b41490;hp=a9872d32a9fb674b1b056781dea335f357c2a066;hb=ce56e92709df6aed1e56ac4cda1be420ea57dec8;hpb=43f8b5f17a4d0ff3dcd5d1e77424738b6e517bd2

diff --git a/lfs/gnupg b/lfs/gnupg
index a9872d32a9..4fbe821078 100644
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: gnupg,v 1.5.2.6 2005/07/27 23:12:41 franck78 Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 1.4.2
+VER        = 1.4.5
 
 THISAPP    = gnupg-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://ftp.linux.it/pub/mirrors/gnupg/gnupg
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 09825744d59db5ed87713c5a3487cd9d
+$(DL_FILE)_MD5 = 811525965b4c0987e6418a7729a6444d
 
 install : $(TARGET)
 
@@ -77,10 +71,10 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	rm -rf /home/nobody/.gnupg /root/.gnupg
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --disable-mailto \
-	    --disable-photo-viewers --disable-ldap
+	cd $(DIR_APP) && ./configure --prefix=/usr --enable-minimal --disable-nls \
+		--disable-dns-srv --disable-dns-pka --disable-dns-cert
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	gpg --import $(DIR_SRC)/config/cfgroot/ipcop.gpg