Drop UTF-8 patch, which breaks things rather than fixes them
This commit is contained in:
parent
2d448ce083
commit
f9f6b45015
|
@ -1,14 +0,0 @@
|
||||||
NEWS | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
--- libssh2/NEWS
|
|
||||||
+++ libssh2/NEWS
|
|
||||||
@@ -3552,7 +3552,7 @@ Simon Josefsson (16 Nov 2009)
|
|
||||||
- support arcfour128 cipher per RFC 4345
|
|
||||||
|
|
||||||
Daniel Stenberg (21 Oct 2009)
|
|
||||||
-- [Cristian Rodríguez brought this change]
|
|
||||||
+- [Cristian RodrÃguez brought this change]
|
|
||||||
|
|
||||||
add support for GCC visibility features
|
|
||||||
|
|
|
@ -12,13 +12,12 @@
|
||||||
|
|
||||||
Name: libssh2
|
Name: libssh2
|
||||||
Version: 1.7.0
|
Version: 1.7.0
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: A library implementing the SSH2 protocol
|
Summary: A library implementing the SSH2 protocol
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.libssh2.org/
|
URL: http://www.libssh2.org/
|
||||||
Source0: http://libssh2.org/download/libssh2-%{version}.tar.gz
|
Source0: http://libssh2.org/download/libssh2-%{version}.tar.gz
|
||||||
Patch0: libssh2-1.4.2-utf8.patch
|
|
||||||
Patch2: CVE-2016-0787.patch
|
Patch2: CVE-2016-0787.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
|
@ -75,9 +74,6 @@ developing applications that use libssh2.
|
||||||
# between 32-bit and 64-bit builds running on a single build-host
|
# between 32-bit and 64-bit builds running on a single build-host
|
||||||
sed -i s/4711/47%{?__isa_bits}/ tests/ssh2.{c,sh}
|
sed -i s/4711/47%{?__isa_bits}/ tests/ssh2.{c,sh}
|
||||||
|
|
||||||
# Make sure things are UTF-8...
|
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
# diffie_hellman_sha1: Convert bytes to bits (additional fix for CVE-2016-0787)
|
# diffie_hellman_sha1: Convert bytes to bits (additional fix for CVE-2016-0787)
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
|
||||||
|
@ -158,6 +154,9 @@ rm -rf %{buildroot}
|
||||||
%{_libdir}/pkgconfig/libssh2.pc
|
%{_libdir}/pkgconfig/libssh2.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 24 2016 Paul Howarth <paul@city-fan.org> - 1.7.0-3
|
||||||
|
- Drop UTF-8 patch, which breaks things rather than fixes them
|
||||||
|
|
||||||
* Wed Feb 24 2016 Kamil Dudka <kdudka@redhat.com> - 1.7.0-2
|
* Wed Feb 24 2016 Kamil Dudka <kdudka@redhat.com> - 1.7.0-2
|
||||||
- diffie_hellman_sha1: Convert bytes to bits (additional fix for CVE-2016-0787)
|
- diffie_hellman_sha1: Convert bytes to bits (additional fix for CVE-2016-0787)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue