Accepting request 232396 from Base:System

GNU awk 4.1.1, please review. I am dropping patches and fixes, some of which are are 10 years old. (forwarded request 232107 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/232396
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gawk?expand=0&rev=31
This commit is contained in:
Stephan Kulow 2014-05-03 14:51:36 +00:00 committed by Git OBS Bridge
commit 71f1ed2767
10 changed files with 135 additions and 136 deletions

View File

@ -1,75 +0,0 @@
Index: gawk-4.1.0/builtin.c
===================================================================
--- gawk-4.1.0.orig/builtin.c
+++ gawk-4.1.0/builtin.c
@@ -29,7 +29,6 @@
#include <fcntl.h>
#endif
#include <math.h>
-#include "random.h"
#include "floatmagic.h"
#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);
-/* Can declare these, since we always use the random shipped with gawk */
-extern char *initstate(unsigned long seed, char *state, long n);
-extern char *setstate(char *state);
-extern long random(void);
-extern void srandom(unsigned long seed);
-
extern NODE **args_array;
extern int max_args;
extern NODE **fields_arr;
Index: gawk-4.1.0/doc/gawk.texi
===================================================================
--- gawk-4.1.0.orig/doc/gawk.texi
+++ gawk-4.1.0/doc/gawk.texi
@@ -1718,7 +1718,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.
@@ -33767,7 +33767,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
Index: gawk-4.1.0/Makefile.am
===================================================================
--- gawk-4.1.0.orig/Makefile.am
+++ gawk-4.1.0/Makefile.am
@@ -115,11 +115,7 @@ base_sources = \
node.c \
profile.c \
protos.h \
- random.c \
- random.h \
re.c \
- regex.c \
- regex.h \
replace.c \
str_array.c \
symbol.c \
Index: gawk-4.1.0/po/POTFILES.in
===================================================================
--- gawk-4.1.0.orig/po/POTFILES.in
+++ gawk-4.1.0/po/POTFILES.in
@@ -36,7 +36,6 @@ profile.c
random.c
re.c
regcomp.c
-regex.c
regex_internal.c
regexec.c
replace.c

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa2c93485e50a6fde8162c4a079c8ef721d700ff21ede7f71e8fb33b4f6a8b4c
size 14264

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79f81b09bc3cce50e083f78acc0f91783821ad30866615d30dd1731f17ec440b
size 3995528

View File

@ -0,0 +1,31 @@
From e3282563daa30a621cfd57ac424b36dd9fd4dbe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik@redhat.com>
Date: Mon, 21 Apr 2014 11:59:54 +0200
Subject: Fix build failure because of missing destdir in extension Makefile
References: http://pkgs.fedoraproject.org/cgit/gawk.git/commit/?id=e3282563daa30a621cfd57ac424b36dd9fd4dbe4
Upstream: yes
diff -urNp gawk-4.1.1-bak/extension/Makefile.am gawk-4.1.1/extension/Makefile.am
--- gawk-4.1.1-bak/extension/Makefile.am 2014-02-20 19:42:25.000000000 +0100
+++ gawk-4.1.1/extension/Makefile.am 2014-04-21 11:56:49.227755196 +0200
@@ -100,7 +100,7 @@ testext_la_LIBADD = $(MY_LIBS)
install-data-hook:
for i in $(pkgextension_LTLIBRARIES) ; do \
- $(RM) $(pkgextensiondir)/$$i ; \
+ $(RM) ${DESTDIR}$(pkgextensiondir)/$$i ; \
done
# Keep the uninstall check working:
diff -urNp gawk-4.1.1-bak/extension/Makefile.in gawk-4.1.1/extension/Makefile.in
--- gawk-4.1.1-bak/extension/Makefile.in 2014-04-08 18:13:03.000000000 +0200
+++ gawk-4.1.1/extension/Makefile.in 2014-04-21 11:57:54.884756674 +0200
@@ -1231,7 +1231,7 @@ uninstall-man: uninstall-man3
install-data-hook:
for i in $(pkgextension_LTLIBRARIES) ; do \
- $(RM) $(pkgextensiondir)/$$i ; \
+ $(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \
done
# Keep the uninstall check working:

3
gawk-4.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:efd4c6aafb1ce996309fc903ceb625e7012221c464eb72483dbb23adef1ee8db
size 2196904

11
gawk-4.1.1.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEcBAABAgAGBQJTREZiAAoJEN9ZeBWTfsDSSO8H+wYNmqQVcJnZxzxw37PJ11ll
itVeghvOVgHHnrKpEDmf+PEZYRnYkTXzNPvqm3U7Ywr1lXsNGDdni7yrfNdbSRou
cukULkQArXx9RDdUV0cUDwI4GRKrZowUnkPrOSuEWJQbnkMC05nAzEagKSqZ2kKN
qC0cpBQGCYETLtXNd4f6cQE/dgn4PDWtXwkPzxxJLqOTU+9qgEj6KztNROdYOIV9
fQ09QKV3GaDKutKmBjW9G/JG0XAVqb6EElxInTlUY3sMtQnnykH7DA5MHaV0A+tT
qbf3lxb1vwdVkqPwmLOd2ubgv4tmRUOo8Kj4dzuxJy9aaIW3+0iU2AXv+dRvab8=
=9S+j
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Tue Apr 29 20:28:42 UTC 2014 - andreas.stieger@gmx.de
- GNU awk 4.1.1:
* The "stat" extension now includes a "devbsize" element which
indicates the units for the "nblocks" element.
* A number of bugs in the pretty-printing / profiling code have
been fixed.
* The -O option now works again.
* The --include option, documented since 4.0, now actually works.
* Infrastructure updated to automake 1.13.4, bison 3.0.2, and
libtool 2.4.2.418.
* The configure script now accepts a --disable-extensions option,
which disables checking for and building the extensions.
* The API now provides functions pointers for malloc(), calloc(),
realloc() and free(), to insure that the same memory allocation
functions are always used. This bumps the minor version by one.
* The printf quote flag now works correctly in locales with
a different decimal point character but without a thousands
separator character. If the thousands separator is a string,
it will be correctly added to decimal numbers.
* The readfile extension now has an input parser that will read
whole files as a single record.
- packaging changes:
* remove added German po file and scanning of translations
* remove profiling, fixing warning make-check-outside-check-section
* remove autoreconf call
* drop gawk-3.1.8.diff
* drop older-automake.diff, not required for factory
* build with libsigsegv
* no not regenerate info pages
* add gawk-4.1.1-build-baddest.patch required for install
* switch to xz tarball
* verify source signature
-------------------------------------------------------------------
Sat Feb 8 12:02:23 UTC 2014 - gber@opensuse.org

30
gawk.keyring Normal file
View File

@ -0,0 +1,30 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.10 (GNU/Linux)
mQENBE4C5DQBCADS6t7ycHXHD0WR5FSekc3n6DGvDqfOhQvZ+6nyoYUW/LKhQkem
ZdjyJYFkHBFNWkrWTp9r4uc9H17L/o27DmRDfFhuyjI/zksTApWk5TdVb4M9yV4X
PJxjqjrSGL/iP5ZRDea0TvkG3FeDLbHq9IdAM9Mzw9t38xjpPN/sLzw7I5P3rTl4
ua9PQOY8TrpNmDxxc1VFAjr7meRInvrZwOOhO9i46v5UK7+0NXFd1pgQPbKeufMv
by3UyhGvS5BMuxpp8+22/5PvNrdY1OdY4SGoIGFw9itJkGFGOROPQ46PkdKtS1b8
DWtviNef5AxwCC30cA5f8+xUjbSCVO09QCD3ABEBAAG0IkFybm9sZCBSb2JiaW5z
IDxhcm5vbGRAc2tlZXZlLmNvbT6JATgEEwECACIFAk4C5DQCGwMGCwkIBwMCBhUI
AgkKCwQWAgMBAh4BAheAAAoJEN9ZeBWTfsDS69IH/1f3/cA9/9d4USNtN37xQXG+
wi9NY6DD+UhxJ0DEUWxUUzgwzSx5UahRCrEx2wFPtWq5QsksYUmDJJKAyOTkC0eZ
f5kEJOA7m+Q8kkxdDWgEYOb1XmyjYr3qY8V1xUCuY8DLJn4NLHTDKycSDM/9RWEd
4c45CaVvUDAzMpL44XuUzHIvlPPGYJOisCfj4y50/BaDo6Xw9V1DtajyN21sEzrR
H0E37F+6AnvyHjp8Drgwm2i3U4min1lT+gIeiFL2T7wqEyLQfF0dZMLG/6bTMHSe
solzYJcQYfdoGjNOm1sBFMv9MHKguJdrLFvxnupu9d7TYtm5RMCyNVSNzxF/5Bm5
AQ0ETgLkNAEIALNCBYvHzR04K084hOdNELDscGGcvCILFkn3IqXafz4FNEqeeIP5
sxi9iGoUoGSqfW6GnRiYCu9Uz8jqZ5Hefgy94n95K1WJXOnXtHfKfj69xP6ic1vp
N7hbWBZFdRA1GYNhWQV0/FRF9tGSIM8fOs3/XkKW53eoy0yPekNDvW9VcsOHOYWC
wxghFi4h8GpLm9KYEFu0/2kbD94QBDheJXvGkn1S0oq1g69fJY8efpIMveoZr1aA
Q8X2KzQ+Jt+uNggGxyMRj4UCa8tjEnIkbD0KFUFAhFgZxoB2LHcz2jopBI3nBToT
RAAXPwEUE2M+Q1HV9LTKbvgxOSoT+5cZUE8AEQEAAYkBHwQYAQIACQUCTgLkNAIb
DAAKCRDfWXgVk37A0rcIB/4hXCFJIiDeBMl/+njwLTvqFyDEmSeNqDF156O3elkd
vBlVxV+LbCxKz1Dx0mNj3AIO4zus6hwFRm/iCpgQz7m53pVZkZm4QOe37peAIYdc
w2OgMRgzhwZKAjbI1B3VOs03Aev0rTcer5Pf+v85zqY/fVdzOedMyDSc1jHHwlpT
dVmhGfd8cjJQpZ7GWo2ETRfA66UbJcVTBhQGsTeGQ1SixIoN0kktdgibsnT+JVMj
9CoNV3Yfl1NIscgBfB1VDfyQY88GjGieE9ZDF8X21u4UgtWD9kcnZHhn9e75n5e0
MvBiILvtYMfp+zeB2FuQ9FOb2+Ld05aJqNfBRRwUfvk3
=jNjb
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -17,24 +17,23 @@
Name: gawk
Url: http://www.gnu.org/software/gawk/
Provides: awk
BuildRequires: automake
BuildRequires: libtool
BuildRequires: update-alternatives
%if 0%{suse_version} > 1220
BuildRequires: makeinfo
%endif
PreReq: %{install_info_prereq} update-alternatives
Version: 4.1.0
Version: 4.1.1
Release: 0
Summary: GNU awk
License: GPL-3.0+
Group: Productivity/Text/Utilities
Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
Source1: gawk-4.0.0h.de.po.bz2
Patch1: gawk-3.1.8.diff
Patch2: older-automake.diff
Url: http://www.gnu.org/software/gawk/
Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
Source3: http://savannah.gnu.org/people/viewgpg.php?user_id=80653#/gawk.keyring
Patch1: gawk-4.1.1-build-baddest.patch
BuildRequires: libsigsegv-devel
BuildRequires: update-alternatives
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: %{install_info_prereq}
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: update-alternatives
Provides: awk
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -44,46 +43,30 @@ almost completely POSIX 1003.2 compliant.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
bunzip2 -c %{S:1} > po/de.po
rm -f regex.[ch]
chmod -x COPYING
# force rebuild with non-broken makeinfo
rm -f doc/*.info
%build
AUTOPOINT=true autoreconf --force --install
%configure --libexecdir=%{_libdir}
%if %do_profiling
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS %cflags_profile_generate"
make check
make clean
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS %cflags_profile_feedback"
%else
make %{?_smp_mflags}
%endif
make -C po update-po
%check
make check
make check %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
make DESTDIR=%{buildroot} install %{?_smp_mflags}
#UsrMerge
install -d $RPM_BUILD_ROOT/bin
ln -sf %{_bindir}/gawk $RPM_BUILD_ROOT/bin
ln -s %{_sysconfdir}/alternatives/awk $RPM_BUILD_ROOT/bin/awk
install -d %{buildroot}/bin
ln -sf %{_bindir}/gawk %{buildroot}/bin
ln -s %{_sysconfdir}/alternatives/awk %{buildroot}/bin/awk
#EndUsrMerge
rm -f $RPM_BUILD_ROOT/usr/bin/*-%{version} $RPM_BUILD_ROOT/usr/bin/awk
rm -f %{buildroot}%{_bindir}/*-%{version} %{buildroot}%{_bindir}/awk
# create symlinks for update-alternatives
ln -s %{_sysconfdir}/alternatives/usr-bin-awk $RPM_BUILD_ROOT%{_bindir}/awk
ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} $RPM_BUILD_ROOT%{_mandir}/man1/awk.1%{?ext_man}
ln -s %{_sysconfdir}/alternatives/usr-bin-awk %{buildroot}%{_bindir}/awk
ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/awk.1%{?ext_man}
%find_lang %name
%find_lang %{name}
%post
%{_sbindir}/update-alternatives \
@ -102,7 +85,7 @@ fi
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gawk.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz
%files -f %name.lang
%files -f %{name}.lang
%defattr(-,root,root)
#UsrMerge
/bin/awk
@ -112,7 +95,7 @@ fi
%ghost %{_sysconfdir}/alternatives/awk
%ghost %{_sysconfdir}/alternatives/usr-bin-awk
%ghost %{_sysconfdir}/alternatives/awk.1%{?ext_man}
%doc AUTHORS COPYING NEWS POSIX.STD README
%doc AUTHORS COPYING NEWS POSIX.STD README ChangeLog*
#UsrMerge
/bin/gawk
#EndUsrMerge

View File

@ -1,13 +0,0 @@
Index: gawk-4.1.0/configure.ac
===================================================================
--- gawk-4.1.0.orig/configure.ac
+++ gawk-4.1.0/configure.ac
@@ -40,7 +40,7 @@ then
fi
AC_PREREQ(2.69)
-AM_INIT_AUTOMAKE([1.13 dist-xz])
+AM_INIT_AUTOMAKE([1.12 dist-xz])
AC_CONFIG_MACRO_DIR([m4])