From aabf01e1f9f421e71981504c7ddd57fea52d026b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aur=C3=A9lien=20Larcher?= Date: Mon, 27 Nov 2017 15:01:10 +0100 Subject: [PATCH] Bump gawk to 4.2.0 --- components/text/gawk/Makefile | 6 +- components/text/gawk/gawk.p5m | 8 ++- components/text/gawk/manifests/sample-manifest.p5m | 10 +++- components/text/gawk/test/results-64.master | 67 +++++++++++++++++++--- 4 files changed, 75 insertions(+), 16 deletions(-) diff --git a/components/text/gawk/Makefile b/components/text/gawk/Makefile index f37257a58..d4aae84c8 100644 --- a/components/text/gawk/Makefile +++ b/components/text/gawk/Makefile @@ -24,7 +24,7 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= gawk -COMPONENT_VERSION= 4.1.4 +COMPONENT_VERSION= 4.2.0 COMPONENT_FMRI= text/gawk COMPONENT_SUMMARY= GNU awk COMPONENT_CLASSIFICATION= Applications/System Utilities @@ -32,7 +32,7 @@ COMPONENT_PROJECT_URL= http://www.gnu.org/software/gawk/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= \ - sha256:53e184e2d0f90def9207860531802456322be091c7b48f23fdc79cda65adc266 + sha256:d4f3cd31c001fd0ed52832d4fbfbdfeaa38ad541c182f80ff8fdf87324a6a9f2 COMPONENT_ARCHIVE_URL= http://ftp.gnu.org/gnu/gawk/$(COMPONENT_ARCHIVE) COMPONENT_LICENSE= GPLv3, FDLv1.3 @@ -40,7 +40,7 @@ include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk -CFLAGS+= -std=c89 +CFLAGS+= -std=c99 $(CPP_XPG6MODE) CFLAGS+= -I$(USRINCDIR)/mpfr -I$(USRINCDIR)/gmp CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR) diff --git a/components/text/gawk/gawk.p5m b/components/text/gawk/gawk.p5m index 042237b40..8232c13f3 100644 --- a/components/text/gawk/gawk.p5m +++ b/components/text/gawk/gawk.p5m @@ -23,7 +23,6 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file usr/bin/gawk path=usr/gnu/bin/awk -file path=usr/bin/igawk file path=usr/include/gawkapi.h file path=usr/lib/$(MACH64)/awk/grcat mode=0555 file path=usr/lib/$(MACH64)/awk/pwcat mode=0555 @@ -31,13 +30,13 @@ file path=usr/lib/$(MACH64)/gawk/filefuncs.so file path=usr/lib/$(MACH64)/gawk/fnmatch.so file path=usr/lib/$(MACH64)/gawk/fork.so file path=usr/lib/$(MACH64)/gawk/inplace.so +file path=usr/lib/$(MACH64)/gawk/intdiv.so file path=usr/lib/$(MACH64)/gawk/ordchr.so file path=usr/lib/$(MACH64)/gawk/readdir.so file path=usr/lib/$(MACH64)/gawk/readfile.so file path=usr/lib/$(MACH64)/gawk/revoutput.so file path=usr/lib/$(MACH64)/gawk/revtwoway.so file path=usr/lib/$(MACH64)/gawk/rwarray.so -file path=usr/lib/$(MACH64)/gawk/testext.so file path=usr/lib/$(MACH64)/gawk/time.so file path=usr/share/awk/assert.awk file path=usr/share/awk/bits2str.awk @@ -47,7 +46,9 @@ file path=usr/share/awk/ftrans.awk file path=usr/share/awk/getopt.awk file path=usr/share/awk/gettime.awk file path=usr/share/awk/group.awk +file path=usr/share/awk/have_mpfr.awk file path=usr/share/awk/inplace.awk +file path=usr/share/awk/intdiv0.awk file path=usr/share/awk/join.awk file path=usr/share/awk/libintl.awk file path=usr/share/awk/noassign.awk @@ -65,6 +66,7 @@ file path=usr/share/awk/walkarray.awk file path=usr/share/awk/zerofile.awk file path=usr/share/info/gawk.info file path=usr/share/info/gawkinet.info +file path=usr/share/info/gawkworkflow.info file path=usr/share/locale/ca/LC_MESSAGES/gawk.mo file path=usr/share/locale/da/LC_MESSAGES/gawk.mo file path=usr/share/locale/de/LC_MESSAGES/gawk.mo @@ -77,11 +79,11 @@ file path=usr/share/locale/ja/LC_MESSAGES/gawk.mo file path=usr/share/locale/ms/LC_MESSAGES/gawk.mo file path=usr/share/locale/nl/LC_MESSAGES/gawk.mo file path=usr/share/locale/pl/LC_MESSAGES/gawk.mo +file path=usr/share/locale/pt_BR/LC_MESSAGES/gawk.mo file path=usr/share/locale/sv/LC_MESSAGES/gawk.mo file path=usr/share/locale/vi/LC_MESSAGES/gawk.mo file path=usr/share/locale/zh_CN/LC_MESSAGES/gawk.mo file usr/share/man/man1/gawk.1 path=usr/gnu/share/man/man1/awk.1 -file path=usr/share/man/man1/igawk.1 # Compatibility links link path=usr/bin/gawk target=../gnu/bin/awk facet.compat.gnulinks=true diff --git a/components/text/gawk/manifests/sample-manifest.p5m b/components/text/gawk/manifests/sample-manifest.p5m index a33234d67..ba4c547f5 100644 --- a/components/text/gawk/manifests/sample-manifest.p5m +++ b/components/text/gawk/manifests/sample-manifest.p5m @@ -25,7 +25,8 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' link path=usr/bin/awk target=gawk hardlink path=usr/bin/gawk target=gawk-$(COMPONENT_VERSION) file path=usr/bin/gawk-$(COMPONENT_VERSION) -file path=usr/bin/igawk +file path=usr/etc/profile.d/gawk.csh +file path=usr/etc/profile.d/gawk.sh file path=usr/include/gawkapi.h file path=usr/lib/$(MACH64)/awk/grcat file path=usr/lib/$(MACH64)/awk/pwcat @@ -33,13 +34,13 @@ file path=usr/lib/$(MACH64)/gawk/filefuncs.so file path=usr/lib/$(MACH64)/gawk/fnmatch.so file path=usr/lib/$(MACH64)/gawk/fork.so file path=usr/lib/$(MACH64)/gawk/inplace.so +file path=usr/lib/$(MACH64)/gawk/intdiv.so file path=usr/lib/$(MACH64)/gawk/ordchr.so file path=usr/lib/$(MACH64)/gawk/readdir.so file path=usr/lib/$(MACH64)/gawk/readfile.so file path=usr/lib/$(MACH64)/gawk/revoutput.so file path=usr/lib/$(MACH64)/gawk/revtwoway.so file path=usr/lib/$(MACH64)/gawk/rwarray.so -file path=usr/lib/$(MACH64)/gawk/testext.so file path=usr/lib/$(MACH64)/gawk/time.so file path=usr/share/awk/assert.awk file path=usr/share/awk/bits2str.awk @@ -49,7 +50,9 @@ file path=usr/share/awk/ftrans.awk file path=usr/share/awk/getopt.awk file path=usr/share/awk/gettime.awk file path=usr/share/awk/group.awk +file path=usr/share/awk/have_mpfr.awk file path=usr/share/awk/inplace.awk +file path=usr/share/awk/intdiv0.awk file path=usr/share/awk/join.awk file path=usr/share/awk/libintl.awk file path=usr/share/awk/noassign.awk @@ -68,6 +71,7 @@ file path=usr/share/awk/zerofile.awk file path=usr/share/info/dir file path=usr/share/info/gawk.info file path=usr/share/info/gawkinet.info +file path=usr/share/info/gawkworkflow.info file path=usr/share/locale/ca/LC_MESSAGES/gawk.mo file path=usr/share/locale/da/LC_MESSAGES/gawk.mo file path=usr/share/locale/de/LC_MESSAGES/gawk.mo @@ -80,11 +84,11 @@ file path=usr/share/locale/ja/LC_MESSAGES/gawk.mo file path=usr/share/locale/ms/LC_MESSAGES/gawk.mo file path=usr/share/locale/nl/LC_MESSAGES/gawk.mo file path=usr/share/locale/pl/LC_MESSAGES/gawk.mo +file path=usr/share/locale/pt_BR/LC_MESSAGES/gawk.mo file path=usr/share/locale/sv/LC_MESSAGES/gawk.mo file path=usr/share/locale/vi/LC_MESSAGES/gawk.mo file path=usr/share/locale/zh_CN/LC_MESSAGES/gawk.mo file path=usr/share/man/man1/gawk.1 -file path=usr/share/man/man1/igawk.1 file path=usr/share/man/man3/filefuncs.3am file path=usr/share/man/man3/fnmatch.3am file path=usr/share/man/man3/fork.3am diff --git a/components/text/gawk/test/results-64.master b/components/text/gawk/test/results-64.master index 58228ac09..ef3f17690 100644 --- a/components/text/gawk/test/results-64.master +++ b/components/text/gawk/test/results-64.master @@ -10,8 +10,11 @@ Locale environment: ======== Starting basic tests ======== addcomma anchgsub +anchor argarray arrayind1 +arrayind2 +arrayind3 arrayparm arrayprm2 arrayprm3 @@ -33,6 +36,7 @@ aryprm7 aryprm8 aryprm9 arysubnm +aryunasgn asgext awkpath back89 @@ -50,6 +54,7 @@ concat1 concat2 concat3 concat4 +concat5 convfmt datanonl defref @@ -69,6 +74,7 @@ fcall_exit fcall_exit2 fldchg fldchgnf +fldterm fnamedat fnarray fnarray2 @@ -119,6 +125,7 @@ longwrds manglprm math membug1 +memleak messages minusstr mmap8k @@ -173,15 +180,18 @@ prdupval prec printf0 printf1 +printfchar prmarscl prmreuse prt1eval prtoeval rand +randtest range1 readbuf rebrackloc rebt8b1 +rebuild redfilnm regeq regexpbrack @@ -214,8 +224,10 @@ splitarr splitdef splitvar splitwht +status-close strcat1 strnum1 +strnum2 strtod subamp subback @@ -279,20 +291,27 @@ clos1way2 clos1way3 clos1way4 clos1way5 +clos1way6 crlf dbugeval +dbugeval2 +dbugtypedre1 +dbugtypedre2 delsub devfd devfd1 devfd2 dumpvars +errno exit fieldwdth +forcenum fpat1 fpat2 fpat3 fpat4 fpat5 +fpat6 fpatnull fsfwfs funlen @@ -302,19 +321,27 @@ functab3 fwtest fwtest2 fwtest3 +fwtest4 +fwtest5 +fwtest6 +fwtest7 +fwtest8 genpot gensub gensub2 +gensub3 getlndir gnuops2 gnuops3 gnureops +gsubind icasefs icasers id igncdym igncfs ignrcas2 +ignrcas4 ignrcase incdupe incdupe2 @@ -328,10 +355,17 @@ include2 indirectbuiltin indirectcall indirectcall2 +intarray lint +lintexp +lintindex +lintint +lintlength lintold +lintset lintwarn mixed1 +mktime manyfiles match1 match2 @@ -344,6 +378,9 @@ negtime next nondec nondec2 +nonfatal1 +nonfatal2 +nonfatal3 patsplit posix printfbad1 @@ -361,6 +398,8 @@ profile5 profile6 profile7 profile8 +profile9 +profile10 pty1 rebuf regnul1 @@ -376,13 +415,17 @@ rsstart2 rsstart3 rstest6 shadow +shadowbuiltin sortfor sortfor2 sortu +sourcesplit split_after_fpat splitarg4 strftime +strftfld strtonum +strtonum1 switch2 symtab1 symtab2 @@ -394,7 +437,17 @@ symtab7 symtab8 symtab9 symtab10 +typedregex1 +typedregex2 +typedregex3 +typeof1 +typeof2 +typeof3 +typeof4 +typeof5 +timeout watchpoint1 +gawk is not compiled to support the array debug tests ======== Done with gawk extension tests ======== ======== Starting machine-specific tests ======== double1 @@ -406,8 +459,8 @@ intformat ************************************************************************** * Some or all of these tests may fail if you have inadequate or missing * * locale support. At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are * -* needed. However, if you see this message, the Makefile thinks you have * -* what you need ... * +* needed. The el_GR.iso88597 is optional but helpful. However, if you * +* see this message, the Makefile thinks you have what you need ... * ************************************************************************** asort asorti @@ -425,24 +478,28 @@ mbprintf1 mbprintf2 mbprintf3 mbprintf4 +mbprintf5 rebt8b2 rtlenmb sort1 sprintfc ======== Done with tests that can vary based on character set or locale support ======== ======== Starting shared library tests ======== -fnmatch +apiterm filefuncs +fnmatch fork fork2 fts functab4 +getfile inplace1 inplace2 inplace3 ordchr ordchr2 readdir +readdir_test readfile readfile2 revout @@ -458,10 +515,6 @@ mpfrmemok1 mpfrrem mpfrrnd mpfrieee -mpfrexprange -mpfrsort -mpfrsqrt -mpfrbigint ======== Done with MPFR tests ======== 1 TESTS FAILED for i in _* ; \ -- 2.11.4.GIT