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] gawk: update to 4.1.4
Date: Wed, 07 Jun 2017 10:03:22 +0100
Message-ID: <1496826202.4077.11.camel@ipfire.org>
In-Reply-To: <20170606083200.23516-1-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0159684948696024299=="
List-Id: <development.lists.ipfire.org>

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

I appreciate it when you clean up things (indentation here), but please break
that down into two patches each time.

So we can merge the cleanup things first and then merge the changes. That will
give us smaller patches to review. Here it is now rather difficult to spot
changes in many lines of the patch.

-Michael

On Tue, 2017-06-06 at 10:32 +0200, Marcel Lorenz wrote:
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
> =C2=A0config/rootfiles/common/gawk=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 46 +++++++++++++++=
+++++++----
> ---
> =C2=A0lfs/gawk=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0| 35 ++++++++--------------
> =C2=A0src/patches/gawk-3.1.5-segfault_fix-1.patch | 43 --------------------=
-------
> =C2=A03 files changed, 48 insertions(+), 76 deletions(-)
> =C2=A0delete mode 100644 src/patches/gawk-3.1.5-segfault_fix-1.patch
>=20
> diff --git a/config/rootfiles/common/gawk b/config/rootfiles/common/gawk
> index 2a39be6..d4d068c 100644
> --- a/config/rootfiles/common/gawk
> +++ b/config/rootfiles/common/gawk
> @@ -1,18 +1,24 @@
> =C2=A0usr/bin/awk
> =C2=A0usr/bin/gawk
> -#usr/bin/gawk-3.1.5
> +usr/bin/gawk-4.1.4
> =C2=A0#usr/bin/igawk
> -#usr/bin/pgawk
> -#usr/bin/pgawk-3.1.5
> -#usr/info/dir
> -#usr/info/gawk.info
> -#usr/info/gawkinet.info
> +#usr/include/gawkapi.h
> =C2=A0#usr/lib/awk
> =C2=A0#usr/lib/awk/grcat
> =C2=A0#usr/lib/awk/pwcat
> -#usr/man/man1/gawk.1
> -#usr/man/man1/igawk.1
> -#usr/man/man1/pgawk.1
> +#usr/lib/gawk
> +usr/lib/gawk/filefuncs.so
> +usr/lib/gawk/fnmatch.so
> +usr/lib/gawk/fork.so
> +usr/lib/gawk/inplace.so
> +usr/lib/gawk/ordchr.so
> +usr/lib/gawk/readdir.so
> +usr/lib/gawk/readfile.so
> +usr/lib/gawk/revoutput.so
> +usr/lib/gawk/revtwoway.so
> +usr/lib/gawk/rwarray.so
> +usr/lib/gawk/testext.so
> +usr/lib/gawk/time.so
> =C2=A0#usr/share/awk
> =C2=A0#usr/share/awk/assert.awk
> =C2=A0#usr/share/awk/bits2str.awk
> @@ -22,14 +28,34 @@ usr/bin/gawk
> =C2=A0#usr/share/awk/getopt.awk
> =C2=A0#usr/share/awk/gettime.awk
> =C2=A0#usr/share/awk/group.awk
> +#usr/share/awk/inplace.awk
> =C2=A0#usr/share/awk/join.awk
> =C2=A0#usr/share/awk/libintl.awk
> -#usr/share/awk/nextfile.awk
> =C2=A0#usr/share/awk/noassign.awk
> =C2=A0#usr/share/awk/ord.awk
> =C2=A0#usr/share/awk/passwd.awk
> +#usr/share/awk/processarray.awk
> +#usr/share/awk/quicksort.awk
> =C2=A0#usr/share/awk/readable.awk
> +#usr/share/awk/readfile.awk
> =C2=A0#usr/share/awk/rewind.awk
> =C2=A0#usr/share/awk/round.awk
> +#usr/share/awk/shellquote.awk
> =C2=A0#usr/share/awk/strtonum.awk
> +#usr/share/awk/walkarray.awk
> =C2=A0#usr/share/awk/zerofile.awk
> +#usr/share/info/gawk.info
> +#usr/share/info/gawkinet.info
> +#usr/share/man/man1/gawk.1
> +#usr/share/man/man1/igawk.1
> +#usr/share/man/man3/filefuncs.3am
> +#usr/share/man/man3/fnmatch.3am
> +#usr/share/man/man3/fork.3am
> +#usr/share/man/man3/inplace.3am
> +#usr/share/man/man3/ordchr.3am
> +#usr/share/man/man3/readdir.3am
> +#usr/share/man/man3/readfile.3am
> +#usr/share/man/man3/revoutput.3am
> +#usr/share/man/man3/revtwoway.3am
> +#usr/share/man/man3/rwarray.3am
> +#usr/share/man/man3/time.3am
> diff --git a/lfs/gawk b/lfs/gawk
> index c8cb892..62bad01 100644
> --- a/lfs/gawk
> +++ b/lfs/gawk
> @@ -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) 2007-2016=C2=A0=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#
> +# Copyright (C) 2007-2015=C2=A0=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# 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#
> @@ -18,35 +18,29 @@
> =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0
> =C2=A0#
> =C2=A0#####################################################################=
########
> ##
> =C2=A0
> +
> =C2=A0#####################################################################=
########
> ##
> =C2=A0# Definitions
> =C2=A0#####################################################################=
########
> ##
> =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 3.1.5
> +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 4.1.4
> =C2=A0
> =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D gawk-$(VER)
> -DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.bz2
> +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
> =C2=A0# Normal build or /tools build.
> -#
> =C2=A0ifeq "$(ROOT)" ""
> -=C2=A0=C2=A0TARGET =3D $(DIR_INFO)/$(THISAPP)
> -=C2=A0=C2=A0EXTRA_CONFIG =3D --prefix=3D/usr --libexecdir=3D/usr/lib --dis=
able-nls
> -=C2=A0=C2=A0EXTRA_MAKE =3D
> -=C2=A0=C2=A0EXTRA_INSTALL =3D
> +	TARGET =3D $(DIR_INFO)/$(THISAPP)
> +	EXTRA_CONFIG =3D --prefix=3D/usr --libexecdir=3D/usr/lib --disable-nls
> =C2=A0else
> -=C2=A0=C2=A0TARGET =3D $(DIR_INFO)/$(THISAPP)-tools
> -=C2=A0=C2=A0EXTRA_CONFIG =3D --prefix=3D/tools --disable-nls --build=3D$(B=
UILDTARGET)
> -=C2=A0=C2=A0EXTRA_MAKE =3D=C2=A0
> -=C2=A0=C2=A0EXTRA_INSTALL =3D=C2=A0
> +	TARGET =3D $(DIR_INFO)/$(THISAPP)-tools
> +	EXTRA_CONFIG =3D --prefix=3D/tools --disable-nls
> =C2=A0endif
> =C2=A0
> -EXTRA_CONFIG +=3D ac_cv_func_working_mktime=3Dyes
> -
> =C2=A0#####################################################################=
########
> ##
> =C2=A0# Top-level Rules
> =C2=A0#####################################################################=
########
> ##
> @@ -55,7 +49,7 @@ objects =3D $(DL_FILE)
> =C2=A0
> =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> =C2=A0
> -$(DL_FILE)_MD5 =3D 5703f72d0eea1d463f735aad8222655f
> +$(DL_FILE)_MD5 =3D 4e7dbc81163e60fd4f0b52496e7542c9
> =C2=A0
> =C2=A0install : $(TARGET)
> =C2=A0
> @@ -84,14 +78,9 @@ $(subst %,%_MD5,$(objects)) :
> =C2=A0
> =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> =C2=A0	@$(PREBUILD)
> -	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
> -ifeq "$(ROOT)" ""
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-
> segfault_fix-1.patch
> -endif
> +	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> =C2=A0	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
> -	cd $(DIR_APP) && echo "#define HAVE_LANGINFO_CODESET 1"	>>
> config.h
> -	cd $(DIR_APP) && echo "#define HAVE_LC_MESSAGES 1"		>>
> config.h
> -	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
> -	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
> +	cd $(DIR_APP) && make $(MAKETUNING)
> +	cd $(DIR_APP) && make install
> =C2=A0	@rm -rf $(DIR_APP)
> =C2=A0	@$(POSTBUILD)
> diff --git a/src/patches/gawk-3.1.5-segfault_fix-1.patch b/src/patches/gawk-
> 3.1.5-segfault_fix-1.patch
> deleted file mode 100644
> index aa2f17b..0000000
> --- a/src/patches/gawk-3.1.5-segfault_fix-1.patch
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -Submitted By: Matthew Burgess <matthew(a)linuxfromscratch.org>
> -Date: 2005-09-24
> -Initial Package Version: 3.1.5
> -Upstream Status: From Upstream
> -Origin: http://lists.gnu.org/archive/html/bug-gnu-utils/2005-08/msg00047.h=
tml
> -Description: Fixes a bug which causes gawk to segfault when operating on a
> non-existent file.
> -
> -diff -Naur gawk-3.1.5.orig/io.c gawk-3.1.5/io.c
> ---- gawk-3.1.5.orig/io.c	2005-07-26 18:07:43.000000000 +0000
> -+++ gawk-3.1.5/io.c	2005-09-24 14:43:13.771380264 +0000
> -@@ -2480,9 +2480,12 @@
> - {
> -=C2=A0	struct stat sbuf;
> -=C2=A0	struct open_hook *oh;
> -+	int iop_malloced =3D FALSE;
> -=C2=A0
> --	if (iop =3D=3D NULL)
> -+	if (iop =3D=3D NULL) {
> -=C2=A0		emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc");
> -+		iop_malloced =3D TRUE;
> -+	}
> -=C2=A0	memset(iop, '\0', sizeof(IOBUF));
> -=C2=A0	iop->flag =3D 0;
> -=C2=A0	iop->fd =3D fd;
> -@@ -2495,7 +2498,8 @@
> -=C2=A0	}
> -=C2=A0
> -=C2=A0	if (iop->fd =3D=3D INVALID_HANDLE) {
> --		free(iop);
> -+		if (iop_malloced)
> -+			free(iop);
> -=C2=A0		return NULL;
> -=C2=A0	}
> -=C2=A0	if (isatty(iop->fd))
> -@@ -2503,7 +2507,7 @@
> -=C2=A0	iop->readsize =3D iop->size =3D optimal_bufsize(iop->fd, & sbuf);
> -=C2=A0	iop->sbuf =3D sbuf;
> -=C2=A0	if (do_lint && S_ISREG(sbuf.st_mode) && sbuf.st_size =3D=3D 0)
> --			lintwarn(_("data file `%s' is empty"), name);
> -+		lintwarn(_("data file `%s' is empty"), name);
> -=C2=A0	errno =3D 0;
> -=C2=A0	iop->count =3D iop->scanoff =3D 0;
> -=C2=A0	emalloc(iop->buf, char *, iop->size +=3D 2, "iop_alloc");

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

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlpOOEZhQUFvSkVJQjU4UDl2a0FrSFVTY1AvMFBaL0JCUEozamVsL3NYcm9LZWVBR2kK
NzltbEdPQytUWkI3QlFEYTBwWFdwWDNpcFlXUVhlcnZwV3oxMzNKUk5WU09qdndkUU9GYzBaR2FN
LzgxT2tDcwoyTHgzUXhhUmtOZk9NYU9kMkRKUkxsZGN3TFhXUE5rSWo3QkNza2FtNGdsY3J6YWpZ
OVM1eGY0MmczK1lVNWttCitzdU80Y1RtQkxyenlSaVIzdXpQOFE1eGliZTYyaTdaOGdFcUpjRWp6
aHlLcUdVOG5DNm1EZFlDRUo2ZkVvRXoKSzJZWXFsWldIQ0NGQytWRXNQMXlzRXlOWFkweTYxdThM
R1pydkhHcXFrbFA4dTJYVVFEVWp3WE9kcHllZVRCcApkb2tLSDdLSkt2TCtNWW9CSDNFeWZzL2dL
QjJnOGl5eG5JMlkwM1NsWWZkQUlxYlpNQ0lNR2ozc01pYnlhQmxOCjR5M2hscGdET1p1VERTU0ha
RlN4RkVBRFBSc1VzeWRQU2R2ZmJ4aUxVZ09RRlZoKzBWZzB3MWljM0dEYnBJLzMKM0RBczNjU3Jl
Q3hwVzdiTVlDWEdPOGxCY2h5NllBY3dEYVg5T05sQ3BKVmNEVGxMRUE1WEdVcHNSOVpuTmhOSQp5
L00vRWVLYVpKdWZRZk1HV0FjbGk2RzdoUWVoQi9JZjlwUUlVcjhsYzl2aldNZFlNOXNtUDdyZ1JD
WlZod2lLCjBCbFdETWZnMzB6UTFwL1ZtdCt6Rm9XdnNOenEvNmRUMmc3WXdJa0NGVHY3ZmRzMndP
NU56UngydVNHbTlkc2kKUG80aHNIQ2VwN0ZTQXplaGkzWmIxTzU5T2lTbVdobVRwaTU5VHRwVFZ3
Ti9Ic1RhOEozV08xd0JiVXpBMGMzcQp3K3FiZ0lub254ekV2WWNqYWNCbwo9S2pnSAotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============0159684948696024299==--