From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] readline: add forgotten patches 1-3 Date: Wed, 07 Jun 2017 10:04:38 +0100 Message-ID: <1496826278.4077.12.camel@ipfire.org> In-Reply-To: <20170606084139.23692-1-marcel.lorenz@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4014649422147131738==" List-Id: --===============4014649422147131738== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable If things like this happen, please re-send the entire patch and not a fix to = the patch. Again, this makes it hard to track changes. -Michael On Tue, 2017-06-06 at 10:41 +0200, Marcel Lorenz wrote: > Signed-off-by: Marcel Lorenz > --- > =C2=A0lfs/readline | 10 ++++------ > =C2=A01 file changed, 4 insertions(+), 6 deletions(-) >=20 > diff --git a/lfs/readline b/lfs/readline > index 5f88228..dcacb6d 100644 > --- a/lfs/readline > +++ b/lfs/readline > @@ -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) 2016=C2=A0=C2=A0IPFire Team=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) 2017=C2=A0=C2=A0IPFire Team=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=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# > @@ -31,8 +31,6 @@ DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.gz > =C2=A0DL_FROM=C2=A0=C2=A0=C2=A0=C2=A0=3D $(URL_IPFIRE) > =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP) > =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_INFO)/$(THISAPP) > -PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D readline > -PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 1 > =C2=A0 > =C2=A0#####################################################################= ######## > ## > =C2=A0# Top-level Rules > @@ -76,9 +74,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > =C2=A0 @$(PREBUILD) > =C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) > =C2=A0 > - #for i in $$(seq 1 6); do \ > - # cd $(DIR_APP) && patch -Np0 < > $(DIR_SRC)/src/patches/readline/readline63-$$(printf "%03d" "$${i}") || exit > 1; \ > - #done > + for i in $$(seq 1 3); do \ > + cd $(DIR_APP) && patch -Np0 < > $(DIR_SRC)/src/patches/readline/readline70-$$(printf "%03d" "$${i}") || exit > 1; \ > + done > =C2=A0 > =C2=A0 # prevent in some cases to trigger a linking bug in ldconfig > =C2=A0 cd $(DIR_APP) &&sed -i '/MV.*old/d' Makefile.in --===============4014649422147131738== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlpOOEdtQUFvSkVJQjU4UDl2a0FrSElpa1AvanY5OFFlMEJKZGQvUFhXK3VzQzduWWIK SzAvM3djdXNyMTgyMmVzd2V5azNlOFo3VXNDRzMvMWpUU3E5bnYrNFU5dU1IODJhTXZ4UjY2M0RC U0Y2c3RJZApIMkUxa1FBMWZkWmx5N3VjSTBuWVdEK3pMNzJ4dE5icS95czlXdW5UZUtNWjluV3V6 MGtpTU5wK3d5TnVHRUhhCjJzYW1tQmZVTmV1dEdUdTZ5b3oyZWpGZVF2NHZoRUloaTZ3L3NPWndK amlBb2h2WnAzMkhXcklzT1BrSDcyL3oKekx4cGh6SlRDSXpTc0NaVGxOTFRVWGtmR0VRRXNha0s1 T3djaXdTSktDNlVpM2ZzUUhCNmJzNFBzdEY4Z0NYdgpJV2pwZEptRTV4WGc0dlFGMVBtZjRhU2Y3 L0hsR2g5Z2VadXZWVGxiYXJBMnBFRTNPZzJhQkRWTk14T0RFRkNWCjYrUGpiMWs0YU5HUmd4aFMw QmZoS2g1N3YxbG84WXlWdW1yVGRoZ3pXeFFBZW1kNlNlbU1BdXFHME1INkE2cEsKdEVEaGljbjBL eVQrcmhEUmdYeSt1U3JqUGc1TUkzVG9JcVZSVUdhVnJJb1hQN0JFMWgyNDFLMnRoUmRvMUVsTgpC OTg0OE9RK1dRVWlUY2xEaFpmWDF0Tm5iMmlwTDZCV2NiWTR3V0ZDRytUUnI2WXp4OWQ1OWFqbUUx Z1Zyc2xSCkFreU9lWVozcnBLYi9UTjkzWnE0VFlSQWpEdy91RjdDTUtaSzU1a1FyTDNnMFZ0SCtL VUVxaURwUUEzWUVBZTYKN0NkM1hkQkNaWXA3MWx5NWtzSGg2cjlpQm81OTNZTlJaRENBWFE5dllu ODZSMlg3eWdRN25EVFNlUG1Ub0hILwpNYlAralJVNTNaK0lVcXYzajVTVwo9U2cxVwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============4014649422147131738==--