From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] gnupg: Update to 1.4.21
Date: Sun, 21 Aug 2016 21:49:21 -0400
Message-ID: <1471830561.14571.9.camel@ipfire.org>
In-Reply-To: <20160820104410.25366-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8869484651719471861=="
List-Id: <development.lists.ipfire.org>

--===============8869484651719471861==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)ipfire.org>
> ---
> =C2=A0config/rootfiles/common/gnupg | 2 --
> =C2=A0lfs/gnupg=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 6 +++---
> =C2=A02 files changed, 3 insertions(+), 5 deletions(-)
>=20
> 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
> =C2=A0#usr/share/info/gnupg1.info
> =C2=A0#usr/share/man/man1/gpg-zip.1
> =C2=A0#usr/share/man/man1/gpg.1
> -#usr/share/man/man1/gpg.ru.1
> =C2=A0#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 @@
> =C2=A0####################################################################
> ###########
> =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#
> =C2=A0# IPFire.org - A linux based
> firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#
> -# Copyright (C) 2015=C2=A0=C2=A0Michael Tremer & Christian
> Schmidt=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#
> +# Copyright (C) 2007-2016=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0<info(a)ipfire=
.org>=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#
> =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#
> =C2=A0# This program is free software: you can redistribute it and/or
> modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#
> =C2=A0# it under the terms of the GNU General Public License as published
> by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#
> @@ -24,7 +24,7 @@
> =C2=A0
> =C2=A0include Config
> =C2=A0
> -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.4.19
> +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.4.21
> =C2=A0
> =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D gnupg-$(VER)
> =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.bz2
> @@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
> =C2=A0
> =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> =C2=A0
> -$(DL_FILE)_MD5 =3D 3af4ab5b3113b3e28d3551ecf9600785
> +$(DL_FILE)_MD5 =3D 9bdeabf3c0f87ff21cb3f9216efdd01d
> =C2=A0
> =C2=A0install : $(TARGET)
> =C2=A0

--===============8869484651719471861==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlh1bG9oQUFvSkVJQjU4UDl2a0FrSGJ2TVAvMjJVNXJGVEsvUkRkTlIrOWE3YlRNNGIK
RTZRa0hTVis2ZXZDd0lFSWJaeXVReVNHVXd4OGtpZlpPN0hkVWpadGtHREVZSHVQSndxcElGLzVj
UzFtSVNkcgpld2V0eHlBTEFYL1lDR21YdEFEMHVLMXFwMFcwWmxTWTlHUmxDS3dTVUgrYlk4WXc3
V2V6WFZVb1UyWGtYQXJrCjhkMUxMM0VVR0x4c0ZRVWNyUW1Pand3WnFiQ2hObUNmUUlZMFhsaUtT
Tk8wZjROdW9aMHRvUmtmOEFiNVltQzcKUS9CSHZ5K3R4WVJnMXJwNEJjQ0ZUY3VFSGhaMTZjbVN0
aUhVaXFaT0x3dVpIK24xYS9lV3dycjFwcXBuaExNQgp5NWh3Y29oOGpaNlNjZWlZRjR2V010bVBp
Mm5PdlJ6QWxVMy9EWVRYTXZXTHY2U2RTc1lyN0pZdjhvOWZ3UW5FCkJoUzByK3dTOXdYN21Mb2lR
aWFjbnk4NmI3czkwOFdUZ1JTQmxRbHFlZEkyNjExeXU4c28zMEdEVlNpTVhrNnQKSnhCNng2ZUZO
b0Voa0F0M1JCNVVCZWFCV3JKUGlXRzVXSUdWZGFaYkNsbWl0b0NBcFF5aG1ibDhibFBJUFgrcwpr
c3VkdExwNlBVOUpPeUFMdFJOajBvODk3OE95MTExSHdvaG9xdEc4cHZKZzl2a1MvY2FTNFFoa3px
TjAvVDgxCjBLTmJSL092SzVIOC9sTUgrMXpNVTFKYXZsVTcybzl3VWZyWU9tazIvRy9MS3FWZmN2
ZVE3MmQwcFBkRmVobngKdWh5TGFLWS9wZ1l1dCtLOGpUWGtadVhXTUw2bUswcTNQQnRmT3NPQWxa
bGJZNGQwSFRBcXZGUU5yZm1SNyt2YQp5NnYyN1JEVXpBVVBEQmc4bC9lRwo9VUI2VAotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============8869484651719471861==--