commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2020-09-04 10:53:42
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new.3399 (New)
Package is "sed"
Fri Sep 4 10:53:42 2020 rev:35 rq:830986 version:4.8
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2020-01-25 13:23:04.032007820
+0100
+++ /work/SRC/openSUSE:Factory/.sed.new.3399/sed.changes2020-09-04
10:53:47.214452186 +0200
@@ -1,0 +2,8 @@
+Mon Aug 31 07:00:11 UTC 2020 - Bernhard Voelker
+
+- gnulib-test-avoid-FP-perror-strerror.patch: Add patch to
+ avoid false-positive error in gnulib tests 'test-perror2' and
+ 'test-strerror_r', visible on armv7l.
+- sed.spec: Reference the patch.
+
+---
New:
gnulib-test-avoid-FP-perror-strerror.patch
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.g1I8Rt/_old 2020-09-04 10:53:48.022452619 +0200
+++ /var/tmp/diff_new_pack.g1I8Rt/_new 2020-09-04 10:53:48.026452621 +0200
@@ -28,6 +28,7 @@
Source2:%{name}.keyring
# PATCH-FIX-SLE sed-dont_close_twice.patch bnc@880817 tc...@suse.cz -- Fix
double close.
Patch0: sed-dont_close_twice.patch
+Patch1: gnulib-test-avoid-FP-perror-strerror.patch
BuildRequires: libacl-devel
BuildRequires: libselinux-devel
Requires(post): %{install_info_prereq}
@@ -45,6 +46,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1
%build
%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security
++ gnulib-test-avoid-FP-perror-strerror.patch ++
Avoid false-positive error in gnulib tests 'test-perror2' and 'test-strerror_r'.
On openSUSE OBS, the above gnulib tests fail on armv7l.
Corresponding report on the gnulib mailing list:
https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
From: Florian Weimer
Date: Thu, 27 Aug 2020 09:41:34 +0200
Subject:Use-after-free in test-perror2, test-strerror_r
The problem is visible with glibc 2.32 under valgrind:
==20== Invalid read of size 1
==20==at 0x483DAB4: strcmp (vg_replace_strmem.c:847)
==20==by 0x109414: main (test-perror2.c:84)
==20== Address 0x4a1a3d0 is 0 bytes inside a block of size 17 free'd
==20==at 0x483A9F5: free (vg_replace_malloc.c:538)
==20==by 0x48E2134: strerror_l (in /usr/lib64/libc-2.32.so)
==20==by 0x109328: main (test-perror2.c:72)
==20== Block was alloc'd at
==20==at 0x4839809: malloc (vg_replace_malloc.c:307)
==20==by 0x48CA03F: __vasprintf_internal (in /usr/lib64/libc-2.32.so)
==20==by 0x48A46F9: asprintf (in /usr/lib64/libc-2.32.so)
==20==by 0x48E2184: strerror_l (in /usr/lib64/libc-2.32.so)
==20==by 0x1092E2: main (test-perror2.c:67)
==20==
==20== Invalid read of size 1
==20==at 0x483DAC8: strcmp (vg_replace_strmem.c:847)
==20==by 0x109414: main (test-perror2.c:84)
==20== Address 0x4a1a3d1 is 1 bytes inside a block of size 17 free'd
==20==at 0x483A9F5: free (vg_replace_malloc.c:538)
==20==by 0x48E2134: strerror_l (in /usr/lib64/libc-2.32.so)
==20==by 0x109328: main (test-perror2.c:72)
==20== Block was alloc'd at
==20==at 0x4839809: malloc (vg_replace_malloc.c:307)
==20==by 0x48CA03F: __vasprintf_internal (in /usr/lib64/libc-2.32.so)
==20==by 0x48A46F9: asprintf (in /usr/lib64/libc-2.32.so)
==20==by 0x48E2184: strerror_l (in /usr/lib64/libc-2.32.so)
==20==by 0x1092E2: main (test-perror2.c:67)
I think it's the test that's invalid.
This was reported as an actual grep test failure (without valgrind) on
32-bit Arm, where glibc malloc happens to return a different buffer
address for the internal allocation (so that msg3 != msg4).
test-strerror_r has the same issue.
Thanks,
Florian
Upstream patch:
https://git.sv.gnu.org/cgit/gnulib.git/commit/?id=175e0bc72808
From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Thu, 27 Aug 2020 17:52:58 -0700
Subject: [PATCH] perror, strerror_r: remove unportable tests
Problem reported by Florian Weimer in:
https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
* tests/test-perror2.c (main):
* tests/test-strerror_r.c (main): Omit unportable tests.
This downstream patch is identical to upstream one modulo the ChangeLog entry.
---
gnulib-tests/test-perror2.c|3 ---
gnulib-tests/test-strerror_r.c |3 ---
2 files changed, 6 deletions(-)
Index: gnulib-tests/test-perror2.c
===
---
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2020-01-25 13:22:50
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new.26092 (New)
Package is "sed"
Sat Jan 25 13:22:50 2020 rev:34 rq:765864 version:4.8
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2019-12-02 11:26:15.246696340
+0100
+++ /work/SRC/openSUSE:Factory/.sed.new.26092/sed.changes 2020-01-25
13:23:04.032007820 +0100
@@ -1,0 +2,9 @@
+Sun Jan 19 09:27:45 UTC 2020 - Andreas Stieger
+
+- GNU sed 4.8:
+ * "sed -i" now creates temporary files with correct umask
+ (limited to u=rwx), to avoid prolems with fuse-like file systems
+ * improved DFA performance through gnulib update
+- drop disable-null-ptr-argument.patch, upstream
+
+---
Old:
disable-null-ptr-argument.patch
sed-4.7.tar.xz
sed-4.7.tar.xz.sig
New:
sed-4.8.tar.xz
sed-4.8.tar.xz.sig
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.IHU64E/_old 2020-01-25 13:23:05.020008252 +0100
+++ /var/tmp/diff_new_pack.IHU64E/_new 2020-01-25 13:23:05.020008252 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sed
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: sed
-Version:4.7
+Version:4.8
Release:0
Summary:A Stream-Oriented Non-Interactive Text Editor
License:GPL-3.0-or-later
@@ -28,7 +28,6 @@
Source2:%{name}.keyring
# PATCH-FIX-SLE sed-dont_close_twice.patch bnc@880817 tc...@suse.cz -- Fix
double close.
Patch0: sed-dont_close_twice.patch
-Patch1: disable-null-ptr-argument.patch
BuildRequires: libacl-devel
BuildRequires: libselinux-devel
Requires(post): %{install_info_prereq}
@@ -46,7 +45,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security
@@ -56,7 +54,7 @@
--without-included-regex
%if 0%{?do_profiling}
make %{?_smp_mflags} CFLAGS="$CFLAGS %{cflags_profile_generate}" V=1
- make CFLAGS="$CFLAGS %{cflags_profile_generate}" check
+ make %{?_smp_mflags} CFLAGS="$CFLAGS %{cflags_profile_generate}" check
make %{?_smp_mflags} clean
make %{?_smp_mflags} CFLAGS="$CFLAGS %{cflags_profile_feedback}" V=1
%else
++ sed-4.7.tar.xz -> sed-4.8.tar.xz ++
77081 lines of diff (skipped)
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2019-12-02 11:26:05
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new.4691 (New)
Package is "sed"
Mon Dec 2 11:26:05 2019 rev:33 rq:749899 version:4.7
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2019-09-26 20:35:50.523406910
+0200
+++ /work/SRC/openSUSE:Factory/.sed.new.4691/sed.changes2019-12-02
11:26:15.246696340 +0100
@@ -1,0 +2,6 @@
+Wed Nov 20 09:09:47 UTC 2019 - Martin Liška
+
+- Add disable-null-ptr-argument.patch in order to fix
+ boo#1157218.
+
+---
New:
disable-null-ptr-argument.patch
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.afNaRQ/_old 2019-12-02 11:26:15.998696056 +0100
+++ /var/tmp/diff_new_pack.afNaRQ/_new 2019-12-02 11:26:16.002696054 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sed
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,7 @@
Source2:%{name}.keyring
# PATCH-FIX-SLE sed-dont_close_twice.patch bnc@880817 tc...@suse.cz -- Fix
double close.
Patch0: sed-dont_close_twice.patch
+Patch1: disable-null-ptr-argument.patch
BuildRequires: libacl-devel
BuildRequires: libselinux-devel
Requires(post): %{install_info_prereq}
@@ -45,6 +46,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security
++ disable-null-ptr-argument.patch ++
diff --git a/gnulib-tests/test-canonicalize-lgpl.c
b/gnulib-tests/test-canonicalize-lgpl.c
index 4cec490..c91aa1f 100644
--- a/gnulib-tests/test-canonicalize-lgpl.c
+++ b/gnulib-tests/test-canonicalize-lgpl.c
@@ -71,9 +71,6 @@ main (void)
ASSERT (result == NULL);
ASSERT (errno == ENOENT);
errno = 0;
-result = canonicalize_file_name (null_ptr ());
-ASSERT (result == NULL);
-ASSERT (errno == EINVAL);
}
/* Check that a non-directory with trailing slash yields NULL. */
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2019-09-26 20:35:49
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new.2352 (New)
Package is "sed"
Thu Sep 26 20:35:49 2019 rev:32 rq:731997 version:4.7
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2019-02-08 12:03:33.245694093
+0100
+++ /work/SRC/openSUSE:Factory/.sed.new.2352/sed.changes2019-09-26
20:35:50.523406910 +0200
@@ -1,0 +2,6 @@
+Thu Sep 19 11:48:38 UTC 2019 - Ludwig Nussel
+
+- Do not recommend lang package. The lang package already has a
+ supplements.
+
+---
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.Ntwgw8/_old 2019-09-26 20:35:51.055405489 +0200
+++ /var/tmp/diff_new_pack.Ntwgw8/_new 2019-09-26 20:35:51.059405479 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sed
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,6 @@
BuildRequires: libselinux-devel
Requires(post): %{install_info_prereq}
Requires(preun): %{install_info_prereq}
-Recommends: %{name}-lang
Provides: base:/bin/sed
%description
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2019-02-08 12:03:28
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new.28833 (New)
Package is "sed"
Fri Feb 8 12:03:28 2019 rev:31 rq:661562 version:4.7
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2018-04-19 15:13:24.189885675
+0200
+++ /work/SRC/openSUSE:Factory/.sed.new.28833/sed.changes 2019-02-08
12:03:33.245694093 +0100
@@ -1,0 +2,23 @@
+Fri Dec 21 17:36:06 UTC 2018 - astie...@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
+
+---
Old:
sed-4.5.tar.xz
sed-4.5.tar.xz.sig
New:
sed-4.7.tar.xz
sed-4.7.tar.xz.sig
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.V2ALLB/_old 2019-02-08 12:03:35.013693289 +0100
+++ /var/tmp/diff_new_pack.V2ALLB/_new 2019-02-08 12:03:35.017693287 +0100
@@ -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 @@
%prep
%setup -q
-%patch0
+%patch0 -p1
%build
%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security
++ sed-4.5.tar.xz -> sed-4.7.tar.xz ++
58759 lines of diff (skipped)
++ sed-dont_close_twice.patch ++
--- /var/tmp/diff_new_pack.V2ALLB/_old 2019-02-08 12:03:35.753692952 +0100
+++ /var/tmp/diff_new_pack.V2ALLB/_new 2019-02-08 12:03:35.753692952 +0100
@@ -1,16 +1,16 @@
http://lists.gnu.org/archive/html/bug-gnu-utils/2014-06/msg0.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);
}
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2018-04-19 15:13:21
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new (New)
Package is "sed"
Thu Apr 19 15:13:21 2018 rev:30 rq:597562 version:4.5
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2018-04-11 13:46:51.463643816
+0200
+++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2018-04-19
15:13:24.189885675 +0200
@@ -1,0 +2,5 @@
+Sat Apr 14 03:42:05 UTC 2018 - bwiedem...@suse.com
+
+- Make package build reproducible (boo#1040589)
+
+---
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.8aWGHU/_old 2018-04-19 15:13:25.445836111 +0200
+++ /var/tmp/diff_new_pack.8aWGHU/_new 2018-04-19 15:13:25.445836111 +0200
@@ -53,9 +53,9 @@
export LDFLAGS="-pie"
%configure \
--without-included-regex
-%if %{do_profiling}
+%if 0%{?do_profiling}
make %{?_smp_mflags} CFLAGS="$CFLAGS %{cflags_profile_generate}" V=1
- make %{?_smp_mflags} CFLAGS="$CFLAGS %{cflags_profile_generate}" check
+ make CFLAGS="$CFLAGS %{cflags_profile_generate}" check
make %{?_smp_mflags} clean
make %{?_smp_mflags} CFLAGS="$CFLAGS %{cflags_profile_feedback}" V=1
%else
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2018-04-11 13:46:49
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new (New)
Package is "sed"
Wed Apr 11 13:46:49 2018 rev:29 rq:593414 version:4.5
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2018-03-07 10:27:51.285245028
+0100
+++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2018-04-11
13:46:51.463643816 +0200
@@ -1,0 +2,16 @@
+Sun Apr 1 11:59:30 UTC 2018 - astie...@suse.com
+
+- GNU sed 4.5:
+ * sed now fails when matching very long input lines (>2GB).
+Before, sed would silently ignore the regex without indicating
+an error
+ * sed no longer rejects comments and closing braces after y///
+commands
+ * sed -E --posix no longer ignores special meaning of '+','?','|'
+ * sed -i now creates selinux context based on the context of the
+symlink instead of the symlink target
+sed -i --follow-symlinks remains unchanged.
+ * sed now treats the sequence '\x5c' (ASCII 92, backslash) as
+literal backslash character, not as an escape prefix character
+
+---
Old:
sed-4.4.tar.xz
sed-4.4.tar.xz.sig
New:
sed-4.5.tar.xz
sed-4.5.tar.xz.sig
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.MfOXbm/_old 2018-04-11 13:46:52.107620510 +0200
+++ /var/tmp/diff_new_pack.MfOXbm/_new 2018-04-11 13:46:52.111620365 +0200
@@ -17,7 +17,7 @@
Name: sed
-Version:4.4
+Version:4.5
Release:0
Summary:A Stream-Oriented Non-Interactive Text Editor
License:GPL-3.0+
@@ -56,7 +56,7 @@
%if %{do_profiling}
make %{?_smp_mflags} CFLAGS="$CFLAGS %{cflags_profile_generate}" V=1
make %{?_smp_mflags} CFLAGS="$CFLAGS %{cflags_profile_generate}" check
- make clean
+ make %{?_smp_mflags} clean
make %{?_smp_mflags} CFLAGS="$CFLAGS %{cflags_profile_feedback}" V=1
%else
make %{?_smp_mflags} V=1
@@ -82,7 +82,6 @@
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
%files
-%defattr(-, root, root)
%license COPYING*
%doc AUTHORS BUGS NEWS README* THANKS
/bin/sed
@@ -91,6 +90,5 @@
%{_infodir}/sed.info*%{ext_info}
%files lang -f %{name}.lang
-%defattr(-,root,root)
%changelog
++ sed-4.4.tar.xz -> sed-4.5.tar.xz ++
89649 lines of diff (skipped)
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2018-03-07 10:27:49
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new (New)
Package is "sed"
Wed Mar 7 10:27:49 2018 rev:28 rq:580527 version:4.4
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2017-03-05 17:48:16.685366837
+0100
+++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2018-03-07
10:27:51.285245028 +0100
@@ -1,0 +2,5 @@
+Thu Feb 22 15:10:45 UTC 2018 - fv...@suse.com
+
+- Use %license (boo#1082318)
+
+---
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.4fSFTM/_old 2018-03-07 10:27:52.241210545 +0100
+++ /var/tmp/diff_new_pack.4fSFTM/_new 2018-03-07 10:27:52.241210545 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sed
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -83,7 +83,8 @@
%files
%defattr(-, root, root)
-%doc AUTHORS BUGS COPYING* NEWS README* THANKS
+%license COPYING*
+%doc AUTHORS BUGS NEWS README* THANKS
/bin/sed
%{_bindir}/sed
%{_mandir}/man*/*%{ext_man}
commit sed for openSUSE:Factory
Hello community, here is the log from the commit of package sed for openSUSE:Factory checked in at 2017-03-05 17:48:15 Comparing /work/SRC/openSUSE:Factory/sed (Old) and /work/SRC/openSUSE:Factory/.sed.new (New) Package is "sed" Sun Mar 5 17:48:15 2017 rev:27 rq:456815 version:4.4 Changes: --- /work/SRC/openSUSE:Factory/sed/sed.changes 2017-02-03 20:01:39.775451811 +0100 +++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2017-03-05 17:48:16.685366837 +0100 @@ -1,0 +2,7 @@ +Wed Feb 8 15:42:56 UTC 2017 - mplus...@suse.com + +- Update to version 4.4: + * sed could segfault when invoked with specific combination of +newlines in the input and regex pattern. + +--- Old: sed-4.3.tar.xz sed-4.3.tar.xz.sig New: sed-4.4.tar.xz sed-4.4.tar.xz.sig Other differences: -- ++ sed.spec ++ --- /var/tmp/diff_new_pack.CrCA0W/_old 2017-03-05 17:48:18.073170413 +0100 +++ /var/tmp/diff_new_pack.CrCA0W/_new 2017-03-05 17:48:18.073170413 +0100 @@ -17,7 +17,7 @@ Name: sed -Version:4.3 +Version:4.4 Release:0 Summary:A Stream-Oriented Non-Interactive Text Editor License:GPL-3.0+ ++ sed-4.3.tar.xz -> sed-4.4.tar.xz ++ 16777 lines of diff (skipped)
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2017-01-29 10:29:08
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new (New)
Package is "sed"
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2015-10-14 16:34:09.0
+0200
+++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2017-02-03
20:01:39.775451811 +0100
@@ -1,0 +2,23 @@
+Wed Jan 4 21:36:07 UTC 2017 - mplus...@suse.com
+
+- Update to version 4.3:
+ * sed's regular expression matching is now typically 10x faster
+ * sed now uses unlocked-io where available, resulting in faster
+I/O operations.
+ * lots of bugfixes (for detailed list see NEWS)
+- Drop patches (all upstreamed):
+ * sed-fix-overlapping-address-ranges.patch
+ * sed-follow-symlinks-hyphen.patch
+ * sed-follow-symlinks-stdin.patch
+ * sed-temp-delete.patch
+ * sed-y-NUL-RHS.patch
+- Spec file cleanups
+ * run spec-cleaner
+ * use macro for configure
+ * execute tests with produced binary as well
+ * use url for signature as well
+ * use https for download links
+ * use xs compressed tarballl
+ * make building verbose
+
+---
Old:
sed-4.2.2.tar.bz2
sed-4.2.2.tar.bz2.sig
sed-fix-overlapping-address-ranges.patch
sed-follow-symlinks-hyphen.patch
sed-follow-symlinks-stdin.patch
sed-temp-delete.patch
sed-y-NUL-RHS.patch
New:
sed-4.3.tar.xz
sed-4.3.tar.xz.sig
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.vH3oQ9/_old 2017-02-03 20:01:40.427360051 +0100
+++ /var/tmp/diff_new_pack.vH3oQ9/_new 2017-02-03 20:01:40.431359489 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sed
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,37 +17,23 @@
Name: sed
-Version:4.2.2
+Version:4.3
Release:0
Summary:A Stream-Oriented Non-Interactive Text Editor
License:GPL-3.0+
Group: System/Base
-Url:http://www.gnu.org/software/sed/
-Source: ftp://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.bz2
-Source1:%{name}-%{version}.tar.bz2.sig
+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
# PATCH-FIX-SLE sed-dont_close_twice.patch bnc@880817 tc...@suse.cz -- Fix
double close.
-Patch: sed-dont_close_twice.patch
-# PATCH-FIX-UPSTREAM sed-follow-symlinks-hyphen.patch bnc933029 gnu20796
sbra...@suse.com -- Make behavior of "sed --follow-symlinks -" consistent again.
-Patch1: sed-follow-symlinks-hyphen.patch
-# PATCH-FIX-UPSTREAM sed-follow-symlinks-stdin.patch bnc933029 gnu20795
sbra...@suse.com -- Fix --follow-symlinks on stdin.
-Patch2: sed-follow-symlinks-stdin.patch
-# PATCH-FIX-UPSTREAM sed-y-NUL-RHS.patch sbra...@suse.com -- Fix y command in
the RHS of a y/LHS/RHS/ transliteration.
-Patch3: sed-y-NUL-RHS.patch
-# PATCH-FIX-UPSTREAM sed-fix-overlapping-address-ranges.patch sbra...@suse.com
-- Fix mishandling of overlapping address ranges.
-Patch4: sed-fix-overlapping-address-ranges.patch
-# PATCH-FIX-UPSTREAM sed-temp-delete.patch sbra...@suse.com -- Fix fail to
remove a temporary file.
-Patch5: sed-temp-delete.patch
-# Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run
one-shot check by "gpg-offline --verify --package=sed sed-*.sig".
-%if 0%{?VERIFY_SIG}
-BuildRequires: gpg-offline
-%endif
+Patch0: sed-dont_close_twice.patch
BuildRequires: libacl-devel
BuildRequires: libselinux-devel
-PreReq: %install_info_prereq
-Provides: base:/bin/sed
+Requires(post): %{install_info_prereq}
+Requires(preun): %{install_info_prereq}
Recommends: %{name}-lang
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Provides: base:/bin/sed
%description
Sed takes text input, performs one or more operations on it, and
@@ -56,59 +42,54 @@
occurrences of a string within a file.
%lang_package
+
%prep
-%if 0%{?VERIFY_SIG}
-%gpg_verify %{S:1}
-%endif
%setup -q
-%patch -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch0
%build
%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security
-export CFLAGS="%{optflags} %warn_flags -fPIE"
+export CFLAGS="%{optflags} %{warn_flags} -fPIE"
export
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2015-10-14 16:34:08
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new (New)
Package is "sed"
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2015-09-08 17:35:14.0
+0200
+++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2015-10-14
16:34:09.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 11 15:32:37 UTC 2015 - sch...@linux-m68k.org
+
+- Build with ACL/SELinux support for in-place editing
+
+---
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.c4ZeEx/_old 2015-10-14 16:34:10.0 +0200
+++ /var/tmp/diff_new_pack.c4ZeEx/_new 2015-10-14 16:34:10.0 +0200
@@ -42,6 +42,8 @@
%if 0%{?VERIFY_SIG}
BuildRequires: gpg-offline
%endif
+BuildRequires: libacl-devel
+BuildRequires: libselinux-devel
PreReq: %install_info_prereq
Provides: base:/bin/sed
Recommends: %{name}-lang
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2015-09-08 17:35:12
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new (New)
Package is "sed"
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2015-01-08 23:00:53.0
+0100
+++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2015-09-08
17:35:14.0 +0200
@@ -1,0 +2,16 @@
+Tue Aug 25 16:54:40 CEST 2015 - sbra...@suse.com
+
+- Cherry picking of the most important fixes from the upstream sed
+ GIT (not backporting testsuite, as it was completely refactored):
+ * Fix y command in the RHS of a y/LHS/RHS/ transliteration
+(sed-y-NUL-RHS.patch).
+ * Fix mishandling of overlapping address ranges
+(sed-fix-overlapping-address-ranges.patch).
+ * Fix fail to remove a temporary file (sed-temp-delete.patch).
+ * Fix behavior of --follow-symlinks when reading from stdin
+(bnc#933029, gnu#20795, sed-follow-symlinks-stdin.patch).
+ * Make "sed --follow-symlinks -" consistent with "sed -" again,
+and process stdin instead of ./-
+(bnc#933029#c6, gnu#20796, sed-follow-symlinks-hyphen.patch).
+
+---
New:
sed-fix-overlapping-address-ranges.patch
sed-follow-symlinks-hyphen.patch
sed-follow-symlinks-stdin.patch
sed-temp-delete.patch
sed-y-NUL-RHS.patch
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.gDUL0f/_old 2015-09-08 17:35:18.0 +0200
+++ /var/tmp/diff_new_pack.gDUL0f/_new 2015-09-08 17:35:18.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sed
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,16 @@
Source2:%{name}.keyring
# PATCH-FIX-SLE sed-dont_close_twice.patch bnc@880817 tc...@suse.cz -- Fix
double close.
Patch: sed-dont_close_twice.patch
+# PATCH-FIX-UPSTREAM sed-follow-symlinks-hyphen.patch bnc933029 gnu20796
sbra...@suse.com -- Make behavior of "sed --follow-symlinks -" consistent again.
+Patch1: sed-follow-symlinks-hyphen.patch
+# PATCH-FIX-UPSTREAM sed-follow-symlinks-stdin.patch bnc933029 gnu20795
sbra...@suse.com -- Fix --follow-symlinks on stdin.
+Patch2: sed-follow-symlinks-stdin.patch
+# PATCH-FIX-UPSTREAM sed-y-NUL-RHS.patch sbra...@suse.com -- Fix y command in
the RHS of a y/LHS/RHS/ transliteration.
+Patch3: sed-y-NUL-RHS.patch
+# PATCH-FIX-UPSTREAM sed-fix-overlapping-address-ranges.patch sbra...@suse.com
-- Fix mishandling of overlapping address ranges.
+Patch4: sed-fix-overlapping-address-ranges.patch
+# PATCH-FIX-UPSTREAM sed-temp-delete.patch sbra...@suse.com -- Fix fail to
remove a temporary file.
+Patch5: sed-temp-delete.patch
# Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run
one-shot check by "gpg-offline --verify --package=sed sed-*.sig".
%if 0%{?VERIFY_SIG}
BuildRequires: gpg-offline
@@ -50,6 +60,11 @@
%endif
%setup -q
%patch -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security
++ sed-fix-overlapping-address-ranges.patch ++
This is a backport of the fix itself.
>From 4c75f64068a7e1446c9aa6ae8f764e0ebddd67ef Mon Sep 17 00:00:00 2001
From: Norihiro Tanaka
Date: Fri, 20 Feb 2015 01:54:35 +0900
Subject: [PATCH 81/92] sed: fix mishandling of overlapping address ranges
When the line number ranges of two or more editing commands overlap,
sed applies all commands but the first to a line that is just beyond
the union of all ranges. E.g., with this command,
seq 9|sed '2,7d;3,6d', sed would mistakenly delete line 8.
* sed/execute.c (match_an_address_p) [ADDR_IS_NUM]: Make this
function work also in this case.
(match_address_p): Move the ADDR_IS_NUM +
...->line_number == ...->addr_number comparison "up" into
match_an_address_p, so we can hoist two similar if/return
blocks out of "if" and "else" branches.
Change so that this function returns false when the current
line number is outside the specified range.
* testsuite/range-overlap.sh: New file, to test for this.
* testsuite/Makefile.am (T): Add it to the list.
* NEWS (Bug fixes): Mention it.
Reported as http://bugs.gnu.org/19899
---
NEWS | 15 +++
sed/execute.c | 16
testsuite/Makefile.am | 3 ++-
testsuite/range-overlap.sh | 34
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2015-01-08 23:00:53
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new (New)
Package is sed
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2014-07-10 09:32:08.0
+0200
+++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2015-01-08
23:00:53.0 +0100
@@ -1,0 +2,5 @@
+Tue Dec 30 11:15:38 UTC 2014 - meiss...@suse.com
+
+- build with PIE
+
+---
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.M7qfCC/_old 2015-01-08 23:00:55.0 +0100
+++ /var/tmp/diff_new_pack.M7qfCC/_new 2015-01-08 23:00:55.0 +0100
@@ -53,7 +53,8 @@
%build
%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security
-export CFLAGS=%{optflags} %warn_flags
+export CFLAGS=%{optflags} %warn_flags -fPIE
+export LDFLAGS=-pie
./configure--prefix=/usr \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2014-07-10 08:24:43
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new (New)
Package is sed
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2013-04-07 14:26:50.0
+0200
+++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2014-07-10
09:32:08.0 +0200
@@ -1,0 +2,7 @@
+Tue Jun 3 09:48:33 UTC 2014 - tc...@suse.cz
+
+- sed-dont_close_twice.patch (bnc#880817)
+ when closing fails, file is attempted to be closed again
+ patch based of Neil Brown's recommendation
+
+---
New:
sed-dont_close_twice.patch
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.JKGBhj/_old 2014-07-10 09:32:09.0 +0200
+++ /var/tmp/diff_new_pack.JKGBhj/_new 2014-07-10 09:32:09.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sed
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,8 @@
Source: ftp://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.bz2
Source1:%{name}-%{version}.tar.bz2.sig
Source2:%{name}.keyring
+# PATCH-FIX-SLE sed-dont_close_twice.patch bnc@880817 tc...@suse.cz -- Fix
double close.
+Patch: sed-dont_close_twice.patch
# Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run
one-shot check by gpg-offline --verify --package=sed sed-*.sig.
%if 0%{?VERIFY_SIG}
BuildRequires: gpg-offline
@@ -47,6 +49,7 @@
%gpg_verify %{S:1}
%endif
%setup -q
+%patch -p1
%build
%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security
++ sed-dont_close_twice.patch ++
http://lists.gnu.org/archive/html/bug-gnu-utils/2014-06/msg0.html
Index: sed-4.2.2/sed/utils.c
===
--- sed-4.2.2.orig/sed/utils.c
+++ sed-4.2.2/sed/utils.c
@@ -298,8 +298,8 @@ ck_fclose(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);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2013-04-07 14:26:50
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new (New)
Package is sed, Maintainer is sbra...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2012-02-10 17:20:07.0
+0100
+++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2013-04-07
14:26:50.0 +0200
@@ -1,0 +2,22 @@
+Fri Apr 5 12:08:28 UTC 2013 - idon...@suse.com
+
+- Add Source URL, see https://en.opensuse.org/SourceUrls
+
+---
+Tue Jan 22 18:20:25 CET 2013 - sbra...@suse.cz
+
+- Update to version 4.2.2:
+ * don't truncate input for lines of length 2^31 and longer
+ * fix endless loop on incomplete multibyte sequences (bnc#743689)
+ * -u also does unbuffered input
+ * New command `F' to print current input file name
+ * sed -i, s///w, and the `w' and `W' commands also obey the
+--binary option
+ * --posix fails for scripts that end in a backslash.
+ * New option -z (--null-data) to separate lines by ASCII NUL.
+ * \x26 (and similar escaped sequences) produces a literal in
+the replacement argument of the s/// command.
+- Split lang package.
+- Option to verify GPG signature.
+
+---
Old:
sed-4.2.1.tar.bz2
New:
sed-4.2.2.tar.bz2
sed-4.2.2.tar.bz2.sig
sed.keyring
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.8leokl/_old 2013-04-07 14:26:52.0 +0200
+++ /var/tmp/diff_new_pack.8leokl/_new 2013-04-07 14:26:52.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sed
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,23 @@
Name: sed
-Version:4.2.1
+Version:4.2.2
Release:0
Summary:A Stream-Oriented Non-Interactive Text Editor
License:GPL-3.0+
Group: System/Base
-Url:http://www.gnu.org/directory/sed.html
-Source: %name-%version.tar.bz2
+Url:http://www.gnu.org/software/sed/
+Source: ftp://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.bz2
+Source1:%{name}-%{version}.tar.bz2.sig
+Source2:%{name}.keyring
+# Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run
one-shot check by gpg-offline --verify --package=sed sed-*.sig.
+%if 0%{?VERIFY_SIG}
+BuildRequires: gpg-offline
+%endif
PreReq: %install_info_prereq
Provides: base:/bin/sed
+Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: automake
%description
Sed takes text input, performs one or more operations on it, and
@@ -35,15 +41,15 @@
of a file using pattern matching or for substituting multiple
occurrences of a string within a file.
+%lang_package
%prep
+%if 0%{?VERIFY_SIG}
+%gpg_verify %{S:1}
+%endif
%setup -q
%build
%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security
-%{?suse_update_config:%{suse_update_config}}
-cp /usr/share/gettext/config.rpath config
-autoreconf --force --install
-test -f po/Makevars.template mv po/Makevars.template po/Makevars
export CFLAGS=%{optflags} %warn_flags
./configure--prefix=/usr \
--mandir=%{_mandir} \
@@ -66,15 +72,17 @@
mkdir -p %{buildroot}/bin
ln -s %{_bindir}/sed %{buildroot}/bin/sed
#EndUserMerge
-%find_lang %name
+%find_lang %{name}
-%files -f %name.lang
+%files
%defattr(-, root, root)
/bin/sed
%{_bindir}/sed
%doc AUTHORS BUGS COPYING* NEWS README* THANKS
-%{_infodir}/sed.info*.gz
-%{_mandir}/man*/*.gz
+%doc %{_infodir}/sed.info*.gz
+%doc %{_mandir}/man*/*.gz
+
+%files lang -f %{name}.lang
%post
%install_info --info-dir=%{_infodir} %{_infodir}/%name.info.gz
++ sed-4.2.1.tar.bz2 - sed-4.2.2.tar.bz2 ++
138683 lines of diff (skipped)
++ sed.keyring ++
pub 1024D/A750566F 2003-10-21
uid Paolo Bonzini bonz...@gnu.org
uid Paolo Bonzini pbonz...@redhat.com
uid Paolo Bonzini paolo.bonz...@gmail.com
uid Paolo Bonzini paolo.bonz...@polimi.it
uid Paolo Bonzini paolo.bonz...@lu.unisi.ch
sub 1024g/FAD12688 2003-10-21
-BEGIN PGP PUBLIC KEY BLOCK-
Version: GnuPG v2.0.19 (GNU/Linux)
mQGiBD+U77wRBAC9sGug59V/lBjYZl1d7LT6lyq4v2K+TJ6HtHWjCNKmvRwPxRDW
commit sed for openSUSE:Factory
Hello community,
here is the log from the commit of package sed for openSUSE:Factory checked in
at 2012-02-10 17:20:06
Comparing /work/SRC/openSUSE:Factory/sed (Old)
and /work/SRC/openSUSE:Factory/.sed.new (New)
Package is sed, Maintainer is sbra...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sed/sed.changes 2011-12-06 18:02:49.0
+0100
+++ /work/SRC/openSUSE:Factory/.sed.new/sed.changes 2012-02-10
17:20:07.0 +0100
@@ -1,0 +2,5 @@
+Fri Feb 3 15:20:39 UTC 2012 - rschweik...@suse.com
+
+- keep binary in /usr tree (UsrMerge project)
+
+---
Other differences:
--
++ sed.spec ++
--- /var/tmp/diff_new_pack.0MDpwW/_old 2012-02-10 17:20:08.0 +0100
+++ /var/tmp/diff_new_pack.0MDpwW/_new 2012-02-10 17:20:08.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sed
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,13 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: sed
Version:4.2.1
Release:0
-License:GPL-3.0+
Summary:A Stream-Oriented Non-Interactive Text Editor
-Url:http://www.gnu.org/directory/sed.html
+License:GPL-3.0+
Group: System/Base
+Url:http://www.gnu.org/directory/sed.html
Source: %name-%version.tar.bz2
PreReq: %install_info_prereq
Provides: base:/bin/sed
@@ -61,17 +62,17 @@
%install
%makeinstall
-# Move sed to /bin:
+#UsrMerge
mkdir -p %{buildroot}/bin
-mv %{buildroot}%{_bindir}/sed %{buildroot}/bin
-ln -s ../../bin/sed %{buildroot}%{_bindir}/sed
+ln -s %{_bindir}/sed %{buildroot}/bin/sed
+#EndUserMerge
%find_lang %name
%files -f %name.lang
%defattr(-, root, root)
/bin/sed
%{_bindir}/sed
-%doc AUTHORS BUGS COPYING* INSTALL NEWS README* THANKS
+%doc AUTHORS BUGS COPYING* NEWS README* THANKS
%{_infodir}/sed.info*.gz
%{_mandir}/man*/*.gz
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
