testing/diffutils
SHA256
3
0
Fork 0
forked from pool/diffutils
Code Pull Requests Activity

Accepting request 662776 from home:pluskalm:branches:Base:System

Browse Source 
- Update to version 3.7:
  * bugfix - diff --strip-trailing-cr with a single CR byte in one
    input file would provoke an uninitialized memory read
  * diff --color now produces output compatible with less -R.
- Small packaging cleanups:
  * PIE is now default for whole distribution
  * xz is not needed as build dependency anymore

OBS-URL: https://build.opensuse.org/request/show/662776
OBS-URL: https://build.opensuse.org/package/show/Base:System/diffutils?expand=0&rev=53
This commit is contained in:
Jiri Slaby 2019-01-04 12:53:30 +00:00 committed by Git OBS Bridge
parent 22b0de4ad9
commit 16a2920cf4
6 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diffutils-3.6.tar.xz
View File

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

16
diffutils-3.6.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABCgAGBQJZIfmkAAoJEH/Z/MsAC+7uqLUP/0tj7JXPEO6WN2y76ssw23r5
mrGy3rF8qiy1F8QoM4VymTRMFAdKFjq4oPd0iW5HicYnD8Mb8Vt0v6+TGXa4ysOz
0gkr3qdnRLcRLVEXs2jnTSRyVPUnOPrECQkOgJPseTQI28TbccxCNC8LBwLAsb4H
EKATndnfUPFxy1gntrRIc4O7e6IyjUYfikrzGgPLil4GFTQZMiJ5FJuFkCBoW6+C
hNAWVOLuT/3mCm3AIzLSK7SbUMa2xa6hQ29d7VAtEP/dH3HRDzFEmsw9CVdo8iDE
DVc1vetlUfs+2WoXSuDee7enTBhXJLyV2P1TxxpRU1nX24sLeqWPz8L548BguRnO
yArz5AhZ3ep9nSaSfd+7iKmzxQK4+eO2a5a1OguDzHNDjV1tvqr61A9o7wBWljJU
Wb/aEGkyn3pqQCbA+Ia3SJoXLbIC8i9ASJ1/XaADRplMuq6BOz7ivgNBkP2Opxvh
lISoLbwrR+FJHyJusx2KIHbJsoei6IWj57EaR993ZylTLNnWk5oBAU5X3h4cIVec
mTMxJ0j1lojXEtQBskQ3q8Q8ZXwLWBhDYz2smBQasnvaibNJmsx/WYNTFo5v8jIE
YyvjkQ2SYULnmC/Evzz+nX1EW7hXFLilXeU73mcHlUKl59qwEZ9QCMd4I3i795Wh
udOMJR+url+hCgi3Wifv
=IN0s
-----END PGP SIGNATURE-----

3
diffutils-3.7.tar.xz Normal file
View File

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

16
diffutils-3.7.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAlwqylgACgkQf9n8ywAL
7u6ujBAAh81vOPv2HhDG/DtnI0zLcP2Twr+beAxrhDkFi7hb9szFiAzx88nxlt7L
zmqVh4AF7czMsYsjujHYGmAFxgMFEW5HPbXEbNN2zOFC2lcIOq+5PyGyAN1tPdiG
Zcju/TiLXtmpyPt0aYsAnVx4lY2IBtjVhVRBSQnbZcWEXrZisNid0KoAkFFGQyim
loSgUN7622L8JDZQ+XrtnvPgEcR/wVcLmyGozLouKc1trkO8Pyhjam0UOQEFq12L
eEf5PAV9d3r/DqZQW98YhA5g5XwaAaOdKR7sbc1NDKqbo0qAtRZJ9aBn7TCxiBM/
4SQAu3HAgr14r97Df9yQdd/LbfOiMm47txz0OCWI2+QC5NIK9OVkdnjfPU2D6pRY
xh+9n8Gict5/BYO6NHNE8Zs50ZxQFEHvh0y/GJNTpJHLUBbvA0jWDfIXq1tlg4Gt
DkQz6TmJzltFDgh6TZcmCEWd/8beT81U7u/NZYmCWHUeNx7g6voe1oZeofqcG4EF
LXvBkK/go4l8p7qWQ3ifb7ydY4cOisfIQpddYJCpjEt+OAnVAzsfckpQUXiMzdpS
G7pqbR3DTIqAp1ZQJlV+UV4lcMxgnktg3gSzmtAct7/pfF5OVoch3EylyOWjs4F5
BTtIvn9AcaU0xuO1VogKu9HyZHq0InDV5dCsGgnz8M+9uHEiyf8=
=nbm3
-----END PGP SIGNATURE-----

11
diffutils.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Jan 4 11:28:06 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
- Update to version 3.7:
* bugfix - diff --strip-trailing-cr with a single CR byte in one
input file would provoke an uninitialized memory read
* diff --color now produces output compatible with less -R.
- Small packaging cleanups:
* PIE is now default for whole distribution
* xz is not needed as build dependency anymore
-------------------------------------------------------------------
Thu Feb 22 15:10:30 UTC 2018 - fvogt@suse.com

25
diffutils.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package diffutils
#
# 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
@ -12,21 +12,20 @@
# 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: diffutils
Version: 3.6
Version: 3.7
Release: 0
Summary: GNU diff Utilities
License: GFDL-1.2 and GPL-3.0+
License: GFDL-1.2-only AND GPL-3.0-or-later
Group: Productivity/Text/Utilities
Url: https://www.gnu.org/software/diffutils/
URL: https://www.gnu.org/software/diffutils/
Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
Source2: %{name}.keyring
BuildRequires: xz
Requires(pre): %{install_info_prereq}
Requires(preun): %{install_info_prereq}
Recommends: %{name}-lang = %{version}
@ -43,8 +42,6 @@ make source code patches, for instance.
%setup -q
%build
export CFLAGS="%{optflags} -fPIE"
export LDFLAGS="-pie"
%configure \
--with-packager="openSUSE" \
--with-packager-bug-reports="http://bugs.opensuse.org/"
@ -64,20 +61,18 @@ make %{?_smp_mflags} check
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
%files
%defattr(-,root,root)
%license COPYING
%doc AUTHORS NEWS README THANKS
%{_bindir}/cmp
%{_bindir}/diff
%{_bindir}/diff3
%{_bindir}/sdiff
%{_infodir}/diffutils.info%{ext_info}
%{_mandir}/man1/cmp.1%{ext_man}
%{_mandir}/man1/diff.1%{ext_man}
%{_mandir}/man1/diff3.1%{ext_man}
%{_mandir}/man1/sdiff.1%{ext_man}
%{_infodir}/diffutils.info%{?ext_info}
%{_mandir}/man1/cmp.1%{?ext_man}
%{_mandir}/man1/diff.1%{?ext_man}
%{_mandir}/man1/diff3.1%{?ext_man}
%{_mandir}/man1/sdiff.1%{?ext_man}
%files lang -f %{name}.lang
%defattr(-,root,root,-)
%changelog