Hello community, here is the log from the commit of package mawk for openSUSE:12.1:Update:Test checked in at 2012-01-12 15:59:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/mawk (Old) and /work/SRC/openSUSE:12.1:Update:Test/.mawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mawk", Maintainer is "[email protected]" Changes: -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /work/SRC/openSUSE:12.1:Update:Test/.mawk.new/mawk.changes 2012-01-12 15:59:55.000000000 +0100 @@ -0,0 +1,40 @@ +------------------------------------------------------------------- +Wed Jan 11 17:40:07 UTC 2012 - [email protected] + +- added mawk-1.3.4-fix-regex-matching.patch which adds limit-check + after processing match(test, "[^0-9A-Za-z]") to ensure the + internal trailing null of the test-string is not mistaken for + part of the string (backported from development snapshot, + bnc#740484) + +------------------------------------------------------------------- +Mon Feb 22 19:13:57 UTC 2010 - [email protected] + +- use update-alternatives + +------------------------------------------------------------------- +Fri Feb 19 18:44:33 UTC 2010 - [email protected] + +- add copyright note for integration into Factory + +------------------------------------------------------------------- +Fri Feb 19 11:34:39 UTC 2010 - [email protected] + +- cleaned up specfile, added explanatory comment + +------------------------------------------------------------------- +Tue Feb 17 09:35:10 UTC 2010 - [email protected] + +- added check section +- use external changelog +- dropped mawk-1.3.4-fix-gcc-bogus-warning.patch, passing --enable-warnings to + configure correctly marks the affected functions with GCC's noreturn + attribute (thanks to T. Dickey for clarifying) +- added patch fixing path handling issues with the make check target and + associated scripts + +------------------------------------------------------------------- +Tue Dec 23 00:00:00 UTC 2009 - [email protected] + +- initial packaging of mawk + New: ---- _link mawk-1.3.4-fix-make-check-path-handling.patch mawk-1.3.4-fix-regex-matching.patch mawk-1.3.4.tgz mawk.changes mawk.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mawk.spec ++++++ # # spec file for package mawk # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Guido Berhoerster. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: mawk Summary: Implementation of New/POSIX AWK License: GPL-2.0 Group: Productivity/Text/Utilities Version: 1.3.4 Release: 0 BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun): update-alternatives Source: ftp://invisible-island.net/mawk/mawk-%{version}.tgz Patch0: mawk-1.3.4-fix-make-check-path-handling.patch # PATCH-FIX-UPSTREAM mawk-1.3.4-fix-regex-matching.patch bnc#740484 [email protected] -- Adds limit-check after processing match(test, "[^0-9A-Za-z]") to ensure the internal trailing null of the test-string is not mistaken for part of the string Patch1: mawk-1.3.4-fix-regex-matching.patch Url: http://invisible-island.net/mawk/mawk.html BuildRoot: %{_tmppath}/%{name}-%{version}-build %description mawk is an interpreter for the AWK Programming Language. It implements the AWK language as defined in Aho, Kernighan and Weinberger, The AWK Programming Language, Addison-Wesley Publishing, 1988. Furthermore, it conforms to the POSIX 1003.2 (draft 11.3) definition of the AWK language and additionally provides a small number of extensions. Authors: -------- Thomas E. Dickey <[email protected]> Mike Brennan %prep %setup -q %patch0 -p1 %patch1 -p1 %build # without --enable-warnings several functions will not be marked with gcc's # noreturn attribute and produce warnings when $RPM_OPT_FLAGS contains -Wall %configure --enable-warnings make %{?_smp_mflags} %install %make_install # move to /bin and symlink to /usr/bin %__mkdir_p $RPM_BUILD_ROOT/bin %__mv $RPM_BUILD_ROOT/usr/bin/mawk $RPM_BUILD_ROOT/bin %__ln_s ../../bin/mawk $RPM_BUILD_ROOT/usr/bin/mawk # create ghost files touch $RPM_BUILD_ROOT/bin/awk $RPM_BUILD_ROOT/usr/bin/awk \ $RPM_BUILD_ROOT/%{_mandir}/man1/awk.1.gz %clean rm -rf $RPM_BUILD_ROOT %check make check %post /usr/sbin/update-alternatives --install /bin/awk awk /bin/mawk 15 \ --slave /usr/bin/awk usr-bin-awk /bin/mawk \ --slave %{_mandir}/man1/awk.1.gz awk.1.gz %{_mandir}/man1/mawk.1.gz %preun if [ $1 -eq 0 ]; then /usr/sbin/update-alternatives --remove awk /bin/mawk fi %files %defattr(-,root,root,-) %doc CHANGES README ACKNOWLEDGMENT examples/ %doc %{_mandir}/man1/mawk.1* %if %{suse_version} >= 1120 %ghost /bin/awk %ghost %{_bindir}/awk %ghost %{_mandir}/man1/awk.1.gz %endif /usr/bin/mawk /bin/mawk %changelog ++++++ _link ++++++ <link project="openSUSE:12.1" package="mawk" baserev="e5e9d42ebdd0f42129cff02916b64d27"> <patches> <branch/> </patches> </link> ++++++ mawk-1.3.4-fix-make-check-path-handling.patch ++++++ diff -urN mawk-1.3.4.orig/Makefile.in mawk-1.3.4/Makefile.in --- mawk-1.3.4.orig/Makefile.in 2009-12-18 00:14:20.000000000 +0100 +++ mawk-1.3.4/Makefile.in 2010-02-16 11:44:18.000000000 +0100 @@ -67,13 +67,11 @@ $(PROG) : $(OBJS) @ECHO_LD@$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -TESTPATH= PATH=`pwd`:`cd $(srcdir);pwd`/test:/bin:/usr/bin; export PATH - mawk_test : $(PROG) # test that we have a sane mawk - @sh -c '$(TESTPATH); SRCDIR=`cd $(srcdir);pwd`; cd $(srcdir)/test ; echo "** mawktest $$SRCDIR"; mawktest $$SRCDIR' + @sh -c 'cd $(srcdir)/test ; echo "** mawktest"; ./mawktest' fpe_test : $(PROG) # test FPEs are handled OK - @sh -c '$(TESTPATH); cd $(srcdir)/test ; echo "** fpe_test"; fpe_test' + @sh -c 'cd $(srcdir)/test ; echo "** fpe_test"; ./fpe_test' parse.c : parse.y @echo expect 4 shift/reduce conflicts diff -urN mawk-1.3.4.orig/test/fpe_test mawk-1.3.4/test/fpe_test --- mawk-1.3.4.orig/test/fpe_test 2009-12-19 17:18:19.000000000 +0100 +++ mawk-1.3.4/test/fpe_test 2010-02-16 11:45:16.000000000 +0100 @@ -12,11 +12,12 @@ # recognize NAN printed as ? for hpux # -PROG=mawk +PROG="${MAWK:-../mawk}" -echo "testing floating point exception handling" +PATH=/bin:/usr/bin +export PATH -PATH=.:$PATH +echo "testing floating point exception handling" STDOUT=${TMPDIR-/tmp}/mawktest$$ diff -urN mawk-1.3.4.orig/test/mawktest mawk-1.3.4/test/mawktest --- mawk-1.3.4.orig/test/mawktest 2009-12-17 01:21:50.000000000 +0100 +++ mawk-1.3.4/test/mawktest 2010-02-16 11:45:47.000000000 +0100 @@ -9,7 +9,10 @@ # It needs to be run from mawk/test # and mawk needs to be in mawk/test or in PATH -PROG=mawk +PROG="${MAWK:-../mawk}" + +PATH=/bin:/usr/bin +export PATH MAWKBINMODE=7 export MAWKBINMODE @@ -27,8 +30,6 @@ trap 'echo mawk_test failed ; rm -f $STDOUT ; exit 1' 0 -PATH=.:$PATH - # find out which mawk we're testing $PROG -W version ++++++ mawk-1.3.4-fix-regex-matching.patch ++++++ diff -urNp mawk-1.3.4.orig/files.c mawk-1.3.4/files.c --- mawk-1.3.4.orig/files.c 2009-12-17 01:06:51.000000000 +0100 +++ mawk-1.3.4/files.c 2012-01-09 22:07:45.667127645 +0100 @@ -506,7 +506,7 @@ remove_from_child_list(int pid) int wait_for(int pid) { - int exit_status; + int exit_status = 0; struct child *p; int id; diff -urNp mawk-1.3.4.orig/fin.c mawk-1.3.4/fin.c --- mawk-1.3.4.orig/fin.c 2009-12-17 01:06:57.000000000 +0100 +++ mawk-1.3.4/fin.c 2012-01-09 22:07:45.667127645 +0100 @@ -317,7 +317,7 @@ FINgets(FIN * fin, unsigned *len_p) unsigned rr; unsigned amount = (unsigned) (fin->limit - p); - p = (char *) memcpy(fin->buff, p, r = (unsigned) (fin->limit - p)); + p = (char *) memmove(fin->buff, p, r = (unsigned) (fin->limit - p)); q = p + r; rr = fin->nbuffs * BUFFSZ - r; diff -urNp mawk-1.3.4.orig/rexp3.c mawk-1.3.4/rexp3.c --- mawk-1.3.4.orig/rexp3.c 2009-12-15 02:50:07.000000000 +0100 +++ mawk-1.3.4/rexp3.c 2012-01-09 22:07:45.668127668 +0100 @@ -149,7 +149,10 @@ REmatch(char *str, /* string to test */ goto reswitch; case M_STR + U_ON + END_OFF: - if (!(s = str_str(s, str_len, m->s_data.str, m->s_len))) { + if (s >= str_end) { + goto refill; + } + if (!(s = str_str(s, (unsigned) (str_end - s), m->s_data.str, m->s_len))) { goto refill; } if (s >= str + strlen(str)) { @@ -229,6 +232,9 @@ REmatch(char *str, /* string to test */ s++; } } + if (s >= str_end) { + goto refill; + } s++; push(m, s, ss, U_ON); if (!ss) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
