Accepting request 112725 from Base:System
update to version 4.0.1 (forwarded request 112418 from tabraham1) OBS-URL: https://build.opensuse.org/request/show/112725 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gawk?expand=0&rev=22
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
9cc346529e
@ -1,25 +1,6 @@
|
||||
--- doc/gawk.texi.orig
|
||||
+++ doc/gawk.texi
|
||||
@@ -1549,7 +1549,7 @@ and
|
||||
Chuck Toporek.
|
||||
|
||||
@cindex Berry, Karl
|
||||
-@cindex Chassell, Robert J.@:
|
||||
+@cindex Chassell, Robert J.
|
||||
@c @cindex Texinfo
|
||||
Robert J.@: Chassell provided much valuable advice on
|
||||
the use of Texinfo.
|
||||
@@ -27180,7 +27180,7 @@ did the initial work to convert @command
|
||||
GNU Automake and GNU @code{gettext}.
|
||||
|
||||
@item
|
||||
-@cindex Broder, Alan J.@:
|
||||
+@cindex Broder, Alan J.
|
||||
Alan J.@: Broder
|
||||
provided the initial version of the @code{asort()} function
|
||||
as well as the code for the optional third argument to the
|
||||
--- builtin.c.orig
|
||||
+++ builtin.c
|
||||
diff -aur gawk-4.0.1.orig/builtin.c gawk-4.0.1/builtin.c
|
||||
--- gawk-4.0.1.orig/builtin.c 2012-03-28 15:54:55.000000000 -0400
|
||||
+++ gawk-4.0.1/builtin.c 2012-04-03 21:03:30.156093525 -0400
|
||||
@@ -29,7 +29,6 @@
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
@ -27,8 +8,8 @@
|
||||
-#include "random.h"
|
||||
#include "floatmagic.h"
|
||||
|
||||
#ifndef CHAR_BIT
|
||||
@@ -60,11 +59,6 @@
|
||||
#if defined(HAVE_POPEN_H)
|
||||
@@ -64,12 +63,6 @@
|
||||
static size_t mbc_byte_count(const char *ptr, size_t numchars);
|
||||
static size_t mbc_char_count(const char *ptr, size_t numbytes);
|
||||
|
||||
@ -37,12 +18,35 @@
|
||||
-extern char *setstate(char *state);
|
||||
-extern long random(void);
|
||||
-extern void srandom(unsigned long seed);
|
||||
|
||||
-
|
||||
extern NODE **args_array;
|
||||
extern int max_args;
|
||||
--- Makefile.am.orig
|
||||
+++ Makefile.am
|
||||
@@ -103,11 +103,7 @@ base_sources = \
|
||||
extern NODE **fields_arr;
|
||||
diff -aur gawk-4.0.1.orig/doc/gawk.texi gawk-4.0.1/doc/gawk.texi
|
||||
--- gawk-4.0.1.orig/doc/gawk.texi 2012-03-28 15:47:54.000000000 -0400
|
||||
+++ gawk-4.0.1/doc/gawk.texi 2012-04-03 21:02:52.242567511 -0400
|
||||
@@ -1511,7 +1511,7 @@
|
||||
Chuck Toporek.
|
||||
|
||||
@cindex Berry, Karl
|
||||
-@cindex Chassell, Robert J.@:
|
||||
+@cindex Chassell, Robert J.
|
||||
@c @cindex Texinfo
|
||||
Robert J.@: Chassell provided much valuable advice on
|
||||
the use of Texinfo.
|
||||
@@ -27272,7 +27272,7 @@
|
||||
GNU Automake and GNU @code{gettext}.
|
||||
|
||||
@item
|
||||
-@cindex Broder, Alan J.@:
|
||||
+@cindex Broder, Alan J.
|
||||
Alan J.@: Broder
|
||||
provided the initial version of the @code{asort()} function
|
||||
as well as the code for the optional third argument to the
|
||||
diff -aur gawk-4.0.1.orig/Makefile.am gawk-4.0.1/Makefile.am
|
||||
--- gawk-4.0.1.orig/Makefile.am 2012-03-28 15:47:53.000000000 -0400
|
||||
+++ gawk-4.0.1/Makefile.am 2012-04-03 21:03:52.165818367 -0400
|
||||
@@ -106,11 +106,7 @@
|
||||
msg.c \
|
||||
node.c \
|
||||
protos.h \
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:60ade732b46c6318acd183cfee843e00167e22d8f119889012f1c77d613e5a6b
|
||||
size 2063647
|
||||
3
gawk-4.0.1.tar.bz2
Normal file
3
gawk-4.0.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:30b741fe74dae7e4f551dcbed833f6d6b85bd0b640f53bef92738a78416d795f
|
||||
size 2077749
|
||||
@ -1,101 +0,0 @@
|
||||
commit 16de770359370224129f23df745178efe518c02c
|
||||
Author: Arnold D. Robbins <arnold@skeeve.com>
|
||||
Date: Thu Jul 28 22:12:48 2011 +0300
|
||||
|
||||
Revert sub/gsub behavior to that of gawk 3.x.
|
||||
|
||||
diff --git a/builtin.c b/builtin.c
|
||||
index 8685d29..4d87592 100644
|
||||
--- a/builtin.c
|
||||
+++ b/builtin.c
|
||||
@@ -2546,13 +2546,30 @@ set_how_many:
|
||||
repllen--;
|
||||
scan++;
|
||||
}
|
||||
- } else {
|
||||
+ } else if (do_posix) {
|
||||
/* \& --> &, \\ --> \ */
|
||||
if (scan[1] == '&' || scan[1] == '\\') {
|
||||
repllen--;
|
||||
scan++;
|
||||
} /* else
|
||||
leave alone, it goes into the output */
|
||||
+ } else {
|
||||
+ /* gawk default behavior since 1996 */
|
||||
+ if (strncmp(scan, "\\\\\\&", 4) == 0) {
|
||||
+ /* \\\& --> \& */
|
||||
+ repllen -= 2;
|
||||
+ scan += 3;
|
||||
+ } else if (strncmp(scan, "\\\\&", 3) == 0) {
|
||||
+ /* \\& --> \<string> */
|
||||
+ ampersands++;
|
||||
+ repllen--;
|
||||
+ scan += 2;
|
||||
+ } else if (scan[1] == '&') {
|
||||
+ /* \& --> & */
|
||||
+ repllen--;
|
||||
+ scan++;
|
||||
+ } /* else
|
||||
+ leave alone, it goes into the output */
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2630,11 +2647,30 @@ set_how_many:
|
||||
scan++;
|
||||
} else /* \q for any q --> q */
|
||||
*bp++ = *++scan;
|
||||
- } else {
|
||||
+ } else if (do_posix) {
|
||||
/* \& --> &, \\ --> \ */
|
||||
if (scan[1] == '&' || scan[1] == '\\')
|
||||
scan++;
|
||||
*bp++ = *scan;
|
||||
+ } else {
|
||||
+ /* gawk default behavior since 1996 */
|
||||
+ if (strncmp(scan, "\\\\\\&", 4) == 0) {
|
||||
+ /* \\\& --> \& */
|
||||
+ *bp++ = '\\';
|
||||
+ *bp++ = '&';
|
||||
+ scan += 3;
|
||||
+ } else if (strncmp(scan, "\\\\&", 3) == 0) {
|
||||
+ /* \\& --> \<string> */
|
||||
+ *bp++ = '\\';
|
||||
+ for (cp = matchstart; cp < matchend; cp++)
|
||||
+ *bp++ = *cp;
|
||||
+ scan += 2;
|
||||
+ } else if (scan[1] == '&') {
|
||||
+ /* \& --> & */
|
||||
+ *bp++ = '&';
|
||||
+ scan++;
|
||||
+ } else
|
||||
+ *bp++ = *scan;
|
||||
}
|
||||
} else
|
||||
*bp++ = *scan;
|
||||
diff --git a/test/Makefile.am b/test/Makefile.am
|
||||
index 82e0834..9780e79 100644
|
||||
--- a/test/Makefile.am
|
||||
+++ b/test/Makefile.am
|
||||
@@ -1376,9 +1376,14 @@ profile3:
|
||||
@sed 1,2d < awkprof.out > _$@; rm awkprof.out
|
||||
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
|
||||
|
||||
+posix2008sub:
|
||||
+ @echo $@
|
||||
+ @$(AWK) --posix -f $(srcdir)/$@.awk > _$@ 2>&1
|
||||
+ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
|
||||
+
|
||||
next:
|
||||
@echo $@
|
||||
- @-AWK="$(AWKPROG)" $(srcdir)/$@.sh > _$@ 2>&1
|
||||
+ @-AWK="$(AWKPROG)" $(srcdir)/$@.sh
|
||||
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
|
||||
|
||||
exit:
|
||||
diff --git a/test/backgsub.ok b/test/backgsub.ok
|
||||
index 2d3f17f..e2e265f 100644
|
||||
--- a/test/backgsub.ok
|
||||
+++ b/test/backgsub.ok
|
||||
@@ -1 +1 @@
|
||||
-\x\y\z
|
||||
+\\x\\y\\z
|
||||
11
gawk.changes
11
gawk.changes
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 4 01:27:28 UTC 2012 - tabraham@novell.com
|
||||
|
||||
- Update to version 4.0.1
|
||||
* completed the implementation of Rational Range Interpretation
|
||||
* failure to get the group set is no longer a fatal error
|
||||
* lots of minor bugs fixed and portability clean-ups
|
||||
|
||||
- refreshed gawk-3.1.8.diff
|
||||
- removed gawk-revert-gsub-gawk3.patch deprecated by this release
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 8 20:59:12 UTC 2012 - rschweikert@suse.com
|
||||
|
||||
|
||||
@ -15,13 +15,14 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: gawk
|
||||
Url: http://www.gnu.org/software/gawk/
|
||||
Provides: awk
|
||||
BuildRequires: automake
|
||||
BuildRequires: update-alternatives
|
||||
PreReq: %{install_info_prereq} update-alternatives
|
||||
Version: 4.0.0
|
||||
Version: 4.0.1
|
||||
Release: 0
|
||||
Summary: GNU awk
|
||||
License: GPL-3.0+
|
||||
@ -29,7 +30,6 @@ Group: Productivity/Text/Utilities
|
||||
Source: gawk-%{version}.tar.bz2
|
||||
Source1: gawk-4.0.0h.de.po.bz2
|
||||
Patch1: gawk-3.1.8.diff
|
||||
Patch2: gawk-revert-gsub-gawk3.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -50,8 +50,7 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch1 -p1
|
||||
bunzip2 -c %{S:1} > po/de.po
|
||||
rm -f regex.[ch]
|
||||
chmod -x COPYING
|
||||
|
||||
Loading…
Reference in New Issue
Block a user