Accepting request 343281 from home:posophe:branches:Base:System
update OBS-URL: https://build.opensuse.org/request/show/343281 OBS-URL: https://build.opensuse.org/package/show/Base:System/mawk?expand=0&rev=16
This commit is contained in:
Git OBS Bridge
parent
8f3176ecd6
commit
54c55f6ed5
3
mawk-1.3.4-20150503.tgz
Normal file
3
mawk-1.3.4-20150503.tgz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:461673c7c4572e1e67e69e7bf7582e02d3c175b814485f2aa52c2c28099b3c6f
|
||||||
|
size 468794
|
||||||
@ -2,7 +2,7 @@
|
|||||||
Version: GnuPG v1.4.10 (GNU/Linux)
|
Version: GnuPG v1.4.10 (GNU/Linux)
|
||||||
Comment: See http://invisible-island.net/public/public.html for info
|
Comment: See http://invisible-island.net/public/public.html for info
|
||||||
|
|
||||||
iEYEABECAAYFAksugtcACgkQcCNT4Pfkjtt22gCgnCLoSugv56JBWUPhmAyR2FDi
|
iEYEABECAAYFAlVGrTwACgkQcCNT4PfkjtuI2ACdFkJaV6sZ49TNusQy5lZcS84Q
|
||||||
3rUAmgKQj26u30jYXbfoB1ryDHotZMqW
|
wBgAn1f6aWTamXVY76nb92XyhRmuMiIp
|
||||||
=RlnI
|
=9XDb
|
||||||
-----END PGP SIGNATURE-----
|
-----END PGP SIGNATURE-----
|
||||||
@ -1,62 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,49 +0,0 @@
|
|||||||
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) {
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:2f2ab8831c441a5793ad333193c888c9ba29c900f009aa23c9fffc100c405925
|
|
||||||
size 283167
|
|
||||||
16
mawk.changes
16
mawk.changes
@ -1,3 +1,19 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Nov 9 23:13:17 UTC 2015 - p.drouand@gmail.com
|
||||||
|
|
||||||
|
- Update to version 1.3.4-20150503
|
||||||
|
* add --with-man2html configure option
|
||||||
|
* improve description of -W options and how they can be combined into
|
||||||
|
a comma-separated list (adapted from Leif LeBaron).
|
||||||
|
* modify parsing for -Wexec to permit its value to be separated by '='
|
||||||
|
in addition to a space, for consistency with the other -W options.
|
||||||
|
* cosmetic changes to configure script macros, from work on xterm.
|
||||||
|
* update config.guess and config.sub
|
||||||
|
For previous changes, please read the CHANGES file
|
||||||
|
- Remove patches; fixed on upstream release
|
||||||
|
* mawk-1.3.4-fix-make-check-path-handling.patch
|
||||||
|
* mawk-1.3.4-fix-regex-matching.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Apr 4 16:06:58 UTC 2015 - mpluskal@suse.com
|
Sat Apr 4 16:06:58 UTC 2015 - mpluskal@suse.com
|
||||||
|
|
||||||
|
|||||||
16
mawk.spec
16
mawk.spec
@ -17,20 +17,18 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%define _upver 1.3.4
|
||||||
|
%define _datever 20150503
|
||||||
Name: mawk
|
Name: mawk
|
||||||
Version: 1.3.4
|
Version: %{_upver}.%{_datever}
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Implementation of New/POSIX AWK
|
Summary: Implementation of New/POSIX AWK
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: Productivity/Text/Utilities
|
Group: Productivity/Text/Utilities
|
||||||
Url: http://invisible-island.net/mawk/mawk.html
|
Url: http://invisible-island.net/mawk/mawk.html
|
||||||
Source0: ftp://invisible-island.net/mawk/mawk-%{version}.tgz
|
Source0: ftp://invisible-island.net/mawk/mawk-%{_upver}-%{_datever}.tgz
|
||||||
Source1: ftp://invisible-island.net/mawk/mawk-%{version}.tgz.asc
|
Source1: ftp://invisible-island.net/mawk/mawk-%{_upver}-%{_datever}.tgz.asc
|
||||||
Source2: %{name}.keyring
|
Source2: %{name}.keyring
|
||||||
# PATCH-FIX-UPSTREAM mawk-1.3.4-fix-make-check-path-handling.patch gber@opensuse.org -- 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 gber@opensuse.org -- 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
|
|
||||||
BuildRequires: update-alternatives
|
BuildRequires: update-alternatives
|
||||||
Requires(post): update-alternatives
|
Requires(post): update-alternatives
|
||||||
Requires(preun): update-alternatives
|
Requires(preun): update-alternatives
|
||||||
@ -44,9 +42,7 @@ POSIX 1003.2 (draft 11.3) definition of the AWK language and additionally
|
|||||||
provides a small number of extensions.
|
provides a small number of extensions.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q -n mawk-%{_upver}-%{_datever}
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p1
|
|
||||||
chmod 755 examples/*
|
chmod 755 examples/*
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user