pool/sed
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 239474 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/239474
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sed?expand=0&rev=21
This commit is contained in:
Stephan Kulow 2014-07-10 06:24:43 +00:00 committed by Git OBS Bridge
commit c2195c842c
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sed-dont_close_twice.patch Normal file
View File

@ -0,0 +1,16 @@
http://lists.gnu.org/archive/html/bug-gnu-utils/2014-06/msg00000.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);
}

7
sed.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jun 3 09:48:33 UTC 2014 - tcech@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
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 5 12:08:28 UTC 2013 - idonmez@suse.com Fri Apr 5 12:08:28 UTC 2013 - idonmez@suse.com

5
sed.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package sed # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -26,6 +26,8 @@ Url: http://www.gnu.org/software/sed/
Source: ftp://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.bz2 Source: ftp://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.bz2
Source1: %{name}-%{version}.tar.bz2.sig Source1: %{name}-%{version}.tar.bz2.sig
Source2: %{name}.keyring Source2: %{name}.keyring
# PATCH-FIX-SLE sed-dont_close_twice.patch bnc@880817 tcech@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". # 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} %if 0%{?VERIFY_SIG}
BuildRequires: gpg-offline BuildRequires: gpg-offline
@ -47,6 +49,7 @@ occurrences of a string within a file.
%gpg_verify %{S:1} %gpg_verify %{S:1}
%endif %endif
%setup -q %setup -q
%patch -p1
%build %build
%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security %define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security