From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] sed: update to 4.3 Date: Wed, 07 Jun 2017 10:08:38 +0100 Message-ID: <1496826518.4077.13.camel@ipfire.org> In-Reply-To: <20170606085325.23837-1-marcel.lorenz@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6280601524361803474==" List-Id: --===============6280601524361803474== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Tue, 2017-06-06 at 10:53 +0200, Marcel Lorenz wrote: > Signed-off-by: Marcel Lorenz > --- > =C2=A0lfs/sed | 12 +++++++----- > =C2=A01 file changed, 7 insertions(+), 5 deletions(-) >=20 > diff --git a/lfs/sed b/lfs/sed > index 77eba0b..8f85a54 100644 > --- a/lfs/sed > +++ b/lfs/sed > @@ -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=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) 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# > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=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,10 +24,10 @@ > =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 4.2.2 > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 4.3 > =C2=A0 > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D sed-$(VER) > -DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.gz > +DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.xz > =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=A0 > @@ -53,7 +53,7 @@ objects =3D $(DL_FILE) > =C2=A0 > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > =C2=A0 > -$(DL_FILE)_MD5 =3D 4111de4faa3b9848a0686b2f260c5056 > +$(DL_FILE)_MD5 =3D 1957fe58dffa4a4106c1f1d7cc8dee18 > =C2=A0 > =C2=A0install : $(TARGET) > =C2=A0 > @@ -82,7 +82,9 @@ $(subst %,%_MD5,$(objects)) : > =C2=A0 > =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > =C2=A0 @$(PREBUILD) > - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) > + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) > + cd $(DIR_APP) && sed -i 's/usr/tools/' build-aux/help2man > + cd $(DIR_APP) && sed -i 's/panic-tests.sh//' Makefile.in We do not run tests, so these lines do not do anything for us. > =C2=A0 cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) > =C2=A0 cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) > =C2=A0 cd $(DIR_APP) && make $(EXTRA_INSTALL) install -Michael --===============6280601524361803474== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlpOOEtXQUFvSkVJQjU4UDl2a0FrSGsrNFAvMlBkQjgwcXkya3BNUUpic1hmS2xvREgK dkxjS1hzT1laZEJNSXlQbzhtR3JCU0p0eWs4SE55bFpmNEgwTDM3S0JxYXcrV1VLbkdyQ2dyS29R SXJlNE1sSQo4NlZmcFhoQWNkc1NzQ0JJWC9xY3B4RStCTUhVcTNmY3d6ajdzL3VkTzlXYmxiR2Yw RHk5M1FpakdITHFYVUQ2CjhMNXh3NGJzdjJOUVdQUzBmZkQwRGQvZ21PN2k5VjNkS29aak9XZGt2 ZTZXaTgrelZrVHREMUdkSldyMVFCcXEKdEZHMUVPeDNSZkdFQnE4bWx2U3VMMmRmZFY0cm9yYjV6 bFBqVmdvZ3NFQTgxNHZiS1RXUi91SVg3Ry95cVdWNwpjMW83N0pLTDV1Q3VBNWVNMVFnRzJVTG9G cTRKWFB4ZWVyN2JMZkJwZTR1VjVxb2R2SzBrN01PMEpFSHkvZGlhCmFIUWxReDFBeWtQQXpwMjNX Z0FHUVR3YmlhaVM5M1dqY2tMcW9yc2dpQjNkazNxUE5BelkvZjlDczJFY1NHazMKSzBuNEcrbEhz K014VEFLZ2ZIVEo5QWxxZ1pzS0tNTHlUMHFDZlB3Rks4WUI4eExrT1RkbVMrellKMzMrN056aQpj K0xEdzhjSGY5bEdsMmhUWkJMN3RkcXk1clNjRmtlNHlEczhwZnp4N3BNcUo1M2hQWllycTljZ0lk MkRCVUYzClZDSVpDUUc1b0o4TWZlb2NYc1V6T0UyZ003V2gxMUJkYjJZNmdIS09jTjJlSi8xU2pL YzdvUHhDalFtYThJeFAKSXNKNkNSNDAwaDQzV0U5eXdQZFFITFFpKyt5dXlSL0U1Y0RGc05jRUVZ aS9FZXNkMjVUNkJ6d1FJbWJiSms3NgpxVXBhOEZ0TnI5U1BCQysrYitrUQo9Y2JxcQotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============6280601524361803474==--