Hi,

this won't apply since we have only 1.4.18 in next.

Why are our trees out of sync?

Best, -Michael

On Sat, 2016-08-20 at 12:44 +0200, Matthias Fischer wrote:

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org

config/rootfiles/common/gnupg | 2 --  lfs/gnupg                     | 6 +++---  2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/common/gnupg b/config/rootfiles/common/gnupg index 9aecc41..edd2bec 100644 --- a/config/rootfiles/common/gnupg +++ b/config/rootfiles/common/gnupg @@ -13,6 +13,4 @@ usr/lib/gnupg/gpgkeys_ldap  #usr/share/info/gnupg1.info  #usr/share/man/man1/gpg-zip.1  #usr/share/man/man1/gpg.1 -#usr/share/man/man1/gpg.ru.1  #usr/share/man/man1/gpgv.1 -#usr/share/man/man7/gnupg.7 diff --git a/lfs/gnupg b/lfs/gnupg index e5e34c1..aa76042 100644 --- a/lfs/gnupg +++ b/lfs/gnupg @@ -1,7 +1,7 @@  #################################################################### ###########  #                                                                              #  # IPFire.org - A linux based firewall                                         # -# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      # +# Copyright (C) 2007-2016  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,7 +24,7 @@    include Config   -VER        = 1.4.19 +VER        = 1.4.21    THISAPP    = gnupg-$(VER)  DL_FILE    = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)    $(DL_FILE) = $(DL_FROM)/$(DL_FILE)   -$(DL_FILE)_MD5 = 3af4ab5b3113b3e28d3551ecf9600785 +$(DL_FILE)_MD5 = 9bdeabf3c0f87ff21cb3f9216efdd01d    install : $(TARGET)