Hello community, here is the log from the commit of package mawk for openSUSE:Factory checked in at 2012-01-10 14:51:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mawk (Old) and /work/SRC/openSUSE:Factory/.mawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mawk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mawk/mawk.changes 2011-09-23 02:12:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mawk.new/mawk.changes 2012-01-10 14:51:10.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Jan 10 10:00:25 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) +- specfile cleanup + +------------------------------------------------------------------- New: ---- mawk-1.3.4-fix-regex-matching.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mawk.spec ++++++ --- /var/tmp/diff_new_pack.0mxkV6/_old 2012-01-10 14:51:13.000000000 +0100 +++ /var/tmp/diff_new_pack.0mxkV6/_new 2012-01-10 14:51:13.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package mawk (Version 1.3.4) +# spec file for package mawk # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -16,20 +16,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: mawk Summary: Implementation of New/POSIX AWK -Version: 1.3.4 -Release: 1 License: GPL-2.0 Group: Productivity/Text/Utilities +Version: 1.3.4 +Release: 0 BuildRequires: update-alternatives -AutoReqProv: on Requires(post): update-alternatives Requires(preun): update-alternatives Source: ftp://invisible-island.net/mawk/mawk-%{version}.tgz +# PATCH-FIX-UPSTREAM mawk-1.3.4-fix-make-check-path-handling.patch [email protected] -- Modifies makefile and mawktest to use relative paths 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 @@ -40,16 +40,10 @@ 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 @@ -67,9 +61,6 @@ 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 @@ -87,11 +78,9 @@ %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 ++++++ 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]
