From e14196a1da4d4fe99a7306452c2a648d60f9d83416cbd6b94fa840dc2d422f9f Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 22 Jan 2013 17:57:26 +0000 Subject: [PATCH 1/2] Accepting request 149589 from home:sbrabec:branches:Base:System - 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. OBS-URL: https://build.opensuse.org/request/show/149589 OBS-URL: https://build.opensuse.org/package/show/Base:System/sed?expand=0&rev=15 --- sed-4.2.1.tar.bz2 | 3 --- sed-4.2.2.tar.bz2 | 3 +++ sed-4.2.2.tar.bz2.sig | Bin 0 -> 72 bytes sed.changes | 17 ++++++++++++++++ sed.keyring | 44 ++++++++++++++++++++++++++++++++++++++++++ sed.spec | 34 +++++++++++++++++++------------- 6 files changed, 85 insertions(+), 16 deletions(-) delete mode 100644 sed-4.2.1.tar.bz2 create mode 100644 sed-4.2.2.tar.bz2 create mode 100644 sed-4.2.2.tar.bz2.sig create mode 100644 sed.keyring diff --git a/sed-4.2.1.tar.bz2 b/sed-4.2.1.tar.bz2 deleted file mode 100644 index 595470c..0000000 --- a/sed-4.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ac3b36ca37bfeb43c4ef4025778cd66d89c77abb843d90552a515a7c9d2948f -size 899091 diff --git a/sed-4.2.2.tar.bz2 b/sed-4.2.2.tar.bz2 new file mode 100644 index 0000000..11d90a3 --- /dev/null +++ b/sed-4.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7 +size 1059414 diff --git a/sed-4.2.2.tar.bz2.sig b/sed-4.2.2.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..5ac5b61601ff4106a908316b34148c61614ae47bda27410fa716a31e72ea9ccc GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0#Mc2RsaeK5GI8Atfx>`ZzH7uoC)hcq+i8SJ37Tk2+TFL eC|{|kK>(c+>UH6;*jeatqCX7o@?DZ%U%nH7QylRC literal 0 HcmV?d00001 diff --git a/sed.changes b/sed.changes index 42f3d15..4d5bae6 100644 --- a/sed.changes +++ b/sed.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Jan 22 18:20:25 CET 2013 - sbrabec@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. + ------------------------------------------------------------------- Fri Feb 3 15:20:39 UTC 2012 - rschweikert@suse.com diff --git a/sed.keyring b/sed.keyring new file mode 100644 index 0000000..9e68298 --- /dev/null +++ b/sed.keyring @@ -0,0 +1,44 @@ +pub 1024D/A750566F 2003-10-21 +uid Paolo Bonzini +uid Paolo Bonzini +uid Paolo Bonzini +uid Paolo Bonzini +uid Paolo Bonzini +sub 1024g/FAD12688 2003-10-21 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +mQGiBD+U77wRBAC9sGug59V/lBjYZl1d7LT6lyq4v2K+TJ6HtHWjCNKmvRwPxRDW +TbHfKGgP0+zcEyYJaBUAQBmahNTKj2hwcyOkTcmmS2zhfLYv52AE7uW9cw8Qe8jw +eP7bslMrCo6fm6LS8ukihrQzu0kWv7GWU6Y5mHceeqcZH+3qnv1CUlOagwCgr3rA +bNDK8at4/llgfIVvUr98SCsEAI7DixENH8qwUTwzL43UikZh9zxWhipTtrCd5Cu0 +eojRTL1uSEs9sHEsBqfpVAFNNcgNwUozNLmT95EyaIvmFhuNjSshjGYtN+R2zVQD +sNpRAPIES1ZdsVTiu/lq1avFSdLY1+rVMWI0OILckWkyhY5mGCTYP2MHCZJEjyW5 +Rj4IBACC2qa761p7RbfrWRwvp8n84gAG4pusZt4y8FbUdBC02bUxFVjQFfQH+6TX +o0PeKZUJmdH3yHanlxqgaKL9VIwXhFIuY+pqZsIpzC9yh+OhOaQr1nPEhMmYFc5f +m/T4sdc3JO6NZEZ3i6oq8aLRk+LjKmC40aZ+FoLui7IVlhQ9ibQfUGFvbG8gQm9u +emluaSA8Ym9uemluaUBnbnUub3JnPohhBBMRAgAhAh4BAheAAhkBBQJKBH0qBQsJ +CAcDBRUKCQgLBRYCAwEAAAoJECaE+aynUFZv2XwAn05RHoAilL0i087Xm5j65M3I +cGCeAJ0WEIrSo3KB00EhprgFo19E740odbQjUGFvbG8gQm9uemluaSA8cGJvbnpp +bmlAcmVkaGF0LmNvbT6IYAQTEQIAIAUCSs3n4QIbIwYLCQgHAwIEFQIIAwQWAgMB +Ah4BAheAAAoJECaE+aynUFZvQPIAniGB2bL7Si6LKWUOGz7kytu9U+fMAKCXw5jY +2GQTu2ZxhhXWhWmadh40q7QnUGFvbG8gQm9uemluaSA8cGFvbG8uYm9uemluaUBn +bWFpbC5jb20+iGEEExECACECGyMCHgECF4AFAkoEfSoFCwkIBwMFFQoJCAsFFgID +AQAACgkQJoT5rKdQVm/c6gCfRJahA+UkFkZaT18zpctNcRGqjCcAnRw1Y+cs/CZF +JuYaq7AfGnqa7gbqtCdQYW9sbyBCb256aW5pIDxwYW9sby5ib256aW5pQHBvbGlt +aS5pdD6IYQQTEQIAIQIbIwIeAQIXgAUCSgR9KwULCQgHAwUVCgkICwUWAgMBAAAK +CRAmhPmsp1BWbwlNAJ4xw6TbV4urLJFnmjeburIoOYuNCwCfXKfRJ34JO0PIBI+v +buxMNBUQ1Vi0KVBhb2xvIEJvbnppbmkgPHBhb2xvLmJvbnppbmlAbHUudW5pc2ku +Y2g+iGEEExECACECGyMCHgECF4AFAkoEfSoFCwkIBwMFFQoJCAsFFgIDAQAACgkQ +JoT5rKdQVm/zCgCcCs9cYys9nJGlbnhj9UmlomCaZScAn03/DhCT/iO/CknTzDqf +8sZKHtqCuQENBD+U78EQBADyFJsiTb83ET8+Lh+Ur7jFTx6/+Mtvd/dx1/GSELx5 +jJg7ytnb+n17TdQh1m0fLyFvkRNTrscwRTOXY8OCiBJt6sCrIA+nhvNNWUm18FMT +YWNToardPzRhffSowm0HIM9TZFC8+agoYKW7a5yWBvLOmy9KtGQmAqXZL3ZkW9KR +pwADBQQAodX4sYgvxKApKB4Fy7SnifIlqA69I71aRDgYgRzGnXTSL7GrRXHWxmfJ +g54jrFgYR9z/AUx0ofka0HDmjA/FJxZ9gvlqlxPR5lAUogLw/byBHC39ecR4rr02 +xLt4/lGyLFOc0C3ydNtRcMGd2uXe2kC2Byvru001EPto0XNbfuyITgQYEQIABgUC +P5TvwQASCRAmhPmsp1BWbwdlR1BHAAEBwR4An0SoMqFTGWgsspb+Ql0A+VMIvL9a +AJ4wxTfnHzmzPy/zamWZ/wGDyLMGbA== +=0MCs +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sed.spec b/sed.spec index fab1ea0..49a76cc 100644 --- a/sed.spec +++ b/sed.spec @@ -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: %{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 @@ outputs the modified text. Sed is typically used for extracting parts 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 @@ make %{?_smp_mflags} check 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 From 9ca264324fcd1ca57ba0b401c2c8c540561d30b118bf2a75a90b17e1689f00ce Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 6 Apr 2013 01:03:49 +0000 Subject: [PATCH 2/2] Accepting request 162806 from home:namtrac:bugfix - Add Source URL, see https://en.opensuse.org/SourceUrls OBS-URL: https://build.opensuse.org/request/show/162806 OBS-URL: https://build.opensuse.org/package/show/Base:System/sed?expand=0&rev=16 --- sed.changes | 5 +++++ sed.spec | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sed.changes b/sed.changes index 4d5bae6..3676147 100644 --- a/sed.changes +++ b/sed.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 5 12:08:28 UTC 2013 - idonmez@suse.com + +- Add Source URL, see https://en.opensuse.org/SourceUrls + ------------------------------------------------------------------- Tue Jan 22 18:20:25 CET 2013 - sbrabec@suse.cz diff --git a/sed.spec b/sed.spec index 49a76cc..a3b4118 100644 --- a/sed.spec +++ b/sed.spec @@ -23,7 +23,7 @@ Summary: A Stream-Oriented Non-Interactive Text Editor License: GPL-3.0+ Group: System/Base Url: http://www.gnu.org/software/sed/ -Source: %{name}-%{version}.tar.bz2 +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". @@ -52,10 +52,10 @@ occurrences of a string within a file. %define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security export CFLAGS="%{optflags} %warn_flags" ./configure --prefix=/usr \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --without-included-regex \ - %{_target_cpu}-suse-linux + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ + --without-included-regex \ + %{_target_cpu}-suse-linux %if %do_profiling make %{?_smp_mflags} CFLAGS="$CFLAGS "%cflags_profile_generate make %{?_smp_mflags} check