From 0b6933a8468c8db4f05355e91878cae0c0a753444f1b2220ea24fa673060d86f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 27 Dec 2018 09:23:03 +0000 Subject: [PATCH] Accepting request 660583 from home:AndreasStieger:branches:Base:System sed 4.7 OBS-URL: https://build.opensuse.org/request/show/660583 OBS-URL: https://build.opensuse.org/package/show/Base:System/sed?expand=0&rev=36 --- sed-4.5.tar.xz | 3 --- sed-4.5.tar.xz.sig | 16 ---------------- sed-4.7.tar.xz | 3 +++ sed-4.7.tar.xz.sig | 16 ++++++++++++++++ sed-dont_close_twice.patch | 12 ++++++------ sed.changes | 23 +++++++++++++++++++++++ sed.spec | 10 +++++----- 7 files changed, 53 insertions(+), 30 deletions(-) delete mode 100644 sed-4.5.tar.xz delete mode 100644 sed-4.5.tar.xz.sig create mode 100644 sed-4.7.tar.xz create mode 100644 sed-4.7.tar.xz.sig diff --git a/sed-4.5.tar.xz b/sed-4.5.tar.xz deleted file mode 100644 index e0679b6..0000000 --- a/sed-4.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7aad73c8839c2bdadca9476f884d2953cdace9567ecd0d90f9959f229d146b40 -size 1274252 diff --git a/sed-4.5.tar.xz.sig b/sed-4.5.tar.xz.sig deleted file mode 100644 index 906b802..0000000 --- a/sed-4.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAlrAOPUACgkQf9n8ywAL -7u5udA/8C9M2sic0kwf1E8WjiiPCwGysFFwkYKDtG5qC15jc5QoX+NzwmAGHfRiM -PKRGlmQKCZpLZdd6wPdwDC2qzRgLR9KVOGS4lHWLpdcrYr2LNlWY4j1sux6+T6M1 -/RoQinIN9HWb3YHPHrmafaBsDLodCKKxSXPVJcasf177OC1/17fnZ7uDtxet19vy -pN8tP8xCFYL5E2Pxub4y95x18Zxk4s8XgLU7IANXE9PgfP0zr4F7nt5ZJl54FKnU -5A/xAvzwFW8fxmnCXHW1XzzR1poRIWTeNJ9mrHpL0vxEd4bLSqcu+ut5QwX3TLhH -BHc5UI08t9ZcyrJZc+rKUuKgXkpK/geOYHw0XHM/cPjMMHeAoSwToYNu6OqaLYQW -UeaVaXTctH28Mr6SLgEUDFi2B9G+JexRHY6CGeocWrwPhUQmfL/8rZfDxzy/9LQp -qgLeK1yaXC52kZW8DWrNwkz9jy/xpY+CXcc1nSpcFl2J869fySYtpBjUNtjc7u+E -Omowy1PxjnRhXCW6EsoiSu2GzkosbJWCDl1lPcoypZGKToqTNJKfpTuj997PCNXz -lmJKAWDY68V5iqPxp8Vsh6xKLo1tCBxZCX892BjaHEHACBld/Je9ugqa0DiZGq75 -A+JDDxLnLleWJvXgzJtnlKHmS+BLPA1fZbSTGKHokPhgBGdDALU= -=DEV2 ------END PGP SIGNATURE----- diff --git a/sed-4.7.tar.xz b/sed-4.7.tar.xz new file mode 100644 index 0000000..cf4df0f --- /dev/null +++ b/sed-4.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a +size 1298316 diff --git a/sed-4.7.tar.xz.sig b/sed-4.7.tar.xz.sig new file mode 100644 index 0000000..772e712 --- /dev/null +++ b/sed-4.7.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAlwcgnQACgkQf9n8ywAL +7u4SXRAArgoIS1j1lfOAFuSCx5akRrvDu/np/F8QsvOyeQxJ7xybY+BnaInlnpcT +ADVP2NwlKvvbWY/jrZSysoHCW2Z3Lr/dvMvq66KAVMDPKUhane0L0x2b8ExQmuOR +HSJM3TqgVeEBDX5uuGaulaN0zMrTEsza8iaUfenvAkmd6z0S3vxLNCfcs/tBQRKa +TAB71TlC4WbKL9P5xWmryqRcNVfCQFJSpKlnI8lhSK27w7cV9TX0jkFj4zWLVkak +SU3z+JhwCWfdrIWzwL+0eGJwvGaH5Gxh10x4fLGBh3QEri+1UPvcGUDKroVSeWtD +KWa3gi2qGxjCiPDa+unHBAbIVNb/NDhTPeqxLfQvA+ng4kNjKBI16rBmqqXqVDHJ +D0uFNRAgYYMDGtb6QT9+jQfNIg9ZkYapeJqNBfmPquICAyBVqWEENHShODKjIWii +nmr7GORFMFL+mMsos4Bh+PyssmvRPk5suDzUxJxnIPgPxiCPBZSQdZ9TzT+UFerE +IdgzA9n2ysG2zDOqSzSOGoTfHzpnqIdEiX9E64vVCIrdMkR17MRKUYC2m5qlOXlD +2tGFGSJEV+CHbAXAO0Y5X9KOeOnrQzzsBkIGfd1jpc0CiVHhv23EYDaLyoZztH04 +9ES0L5PdlJZMZWSilZln0RL+1LcYIaQCfTSptMm6nlHW3oYy9hM= +=3J3U +-----END PGP SIGNATURE----- diff --git a/sed-dont_close_twice.patch b/sed-dont_close_twice.patch index ea3db76..75e12fe 100644 --- a/sed-dont_close_twice.patch +++ b/sed-dont_close_twice.patch @@ -1,16 +1,16 @@ http://lists.gnu.org/archive/html/bug-gnu-utils/2014-06/msg00000.html -Index: sed/utils.c +Index: sed-4.6/sed/utils.c =================================================================== ---- sed/utils.c.orig -+++ sed/utils.c -@@ -252,8 +252,8 @@ ck_fclose(FILE *stream) +--- sed-4.6.orig/sed/utils.c ++++ sed-4.6/sed/utils.c +@@ -267,8 +267,8 @@ ck_fclose (FILE *stream) { if (!stream || stream == cur->fp) { - do_ck_fclose (cur->fp); prev->link = cur->link; + do_ck_fclose (cur->fp); - free(cur->name); - free(cur); + free (cur->name); + free (cur); } diff --git a/sed.changes b/sed.changes index b10c083..7d14689 100644 --- a/sed.changes +++ b/sed.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Dec 21 17:36:06 UTC 2018 - astieger@suse.com + +- GNU sed 4.7: + * Fix some fails with \b in the C locale and with the DFA matcher + + ------------------------------------------------------------------- +Thu Dec 20 15:27:41 UTC 2018 - Martin Pluskal + +- Update to version 4.6: + * sed now prints a clear error message when r/R/w/W (and s///w) + commands are missing a filename. + * sed now uses fully-buffered output (instead of line-buffered) + when writing to files. + * sed no longer accesses invalid memory (heap overflow) when + given invalid backreferences in 's' command + * sed no longer adds extraneous NUL when given s/$//n command. + * sed no longer accesses invalid memory (heap overflow) with + s/$//n regexes. + * New option, --debug: print the input sed script in canonical + form and annotate program execution. +- Refresh sed-dont_close_twice.patch + ------------------------------------------------------------------- Sat Apr 14 03:42:05 UTC 2018 - bwiedemann@suse.com diff --git a/sed.spec b/sed.spec index 7ec4dae..a8607b5 100644 --- a/sed.spec +++ b/sed.spec @@ -12,17 +12,17 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: sed -Version: 4.5 +Version: 4.7 Release: 0 Summary: A Stream-Oriented Non-Interactive Text Editor -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Base -Url: https://www.gnu.org/software/sed/ +URL: https://www.gnu.org/software/sed/ Source0: https://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.xz.sig Source2: %{name}.keyring @@ -45,7 +45,7 @@ occurrences of a string within a file. %prep %setup -q -%patch0 +%patch0 -p1 %build %define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security