From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 Jan 2009 21:24:06 +0000 (+0100)
Subject: Updated gnupg to 2.0.8.
X-Git-Tag: v3.0-alpha1~85^2^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9af85f307e6d84dff56a32019dab0322f21226f;p=ipfire-3.x.git

Updated gnupg to 2.0.8.
---

diff --git a/lfs/gnupg b/lfs/gnupg
index fc5c0c69a..d770bf9ed 100644
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 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        #
@@ -25,7 +25,8 @@
 include Config
 
 PKG_NAME   = gnupg
-VER        = 1.4.7
+VER        = 2.0.8
+PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,37 +34,58 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+MAINTAINER =
+GROUP      = Security/Tools
+EXTRA      = no
+DEBUG      = no
+DEPS       = libassuan libgcrypt libksba pinentry pth
+
+URL        = http://www.gnupg.org/
+LICENSE    = GPLv3+
+SHORT_DESC = Utility for secure communication and data storage.
+
+define LONG_DESC
+	The GnuPG 2 package is GNU's tool for secure communication and data \
+	storage. It can be used to encrypt data and to create digital signatures. \
+	It includes an advanced key management facility and is compliant with the \
+	proposed OpenPGP Internet standard as described in RFC2440 and the S/MIME \
+	standard as described by several RFCs.
+endef
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = $(DL_FILE)
 
+download: $(objects)
+
 info:
 	$(DO_PKG_INFO)
 
 install: $(OBJECT)
 
-download : $(objects)
+package:
+	@$(DO_PACKAGE)
 
-$(objects) :
+$(objects):
 	@$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
 	@rm -rf /home/nobody/.gnupg /root/.gnupg
 	cd $(DIR_APP) && \
 		./configure \
 			$(CONFIGURE_ARCH) \
 			--prefix=/usr \
-			--libexecdir=/usr/lib
+			--libexecdir=/usr/lib/gnupg2
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
-	chmod -v 4755 /usr/bin/gpg
+	#chmod -v 4755 /usr/bin/gpg2 --- We don't do this anymore
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)