X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgnupg;h=29835e0825430f892a1d3b88c57a35cb8736d209;hb=27957a3f2b770c6a46d958cd72af41096275687c;hp=70df62f2c976ecac0bfd1b42cc5439932f5b37d3;hpb=40b0879d8fc50864d5a5aec242ac1143ba05fa1a;p=ipfire-2.x.git

diff --git a/lfs/gnupg b/lfs/gnupg
index 70df62f2c9..29835e0825 100644
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -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) 2014  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.5
+VER        = 1.4.18
 
 THISAPP    = gnupg-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 811525965b4c0987e6418a7729a6444d
+$(DL_FILE)_MD5 = 54db1be9588b11afbbdd8b82d4ea883a
 
 install : $(TARGET)
 
@@ -73,11 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@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 --enable-minimal --disable-nls \
-		--disable-dns-srv --disable-dns-pka --disable-dns-cert
+	cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	gpg --import $(DIR_SRC)/config/cfgroot/ipfire.gpg
-	gpg --import $(DIR_SRC)/config/cfgroot/cacert.asc
+	chmod -v 4755 /usr/bin/gpg
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)