Update to 1.7.0
- New upstream release 1.7.0 - diffie_hellman_sha256: Convert bytes to bits (CVE-2016-0787); see http://www.libssh2.org/adv_20160223.html - libssh2_session_set_last_error: Add function - See RELEASE-NOTES for details of bug fixes
This commit is contained in:
parent
1ce9bf4210
commit
0587739ebe
|
@ -1,12 +0,0 @@
|
||||||
Remove LDFLAGS from pkg-config --libs output (#1279966)
|
|
||||||
|
|
||||||
--- libssh2.pc.in
|
|
||||||
+++ libssh2.pc.in
|
|
||||||
@@ -12,6 +12,6 @@ URL: http://www.libssh2.org/
|
|
||||||
Description: Library for SSH-based communication
|
|
||||||
Version: @LIBSSH2VER@
|
|
||||||
Requires.private: @LIBSREQUIRED@
|
|
||||||
-Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@
|
|
||||||
+Libs: -L${libdir} -lssh2 @LIBS@
|
|
||||||
Libs.private: @LIBS@
|
|
||||||
Cflags: -I${includedir}
|
|
22
libssh2.spec
22
libssh2.spec
|
@ -11,17 +11,21 @@
|
||||||
%{!?__isa_bits: %global __isa_bits %((echo '#include <bits/wordsize.h>'; echo __WORDSIZE) | cpp - | grep -Ex '32|64')}
|
%{!?__isa_bits: %global __isa_bits %((echo '#include <bits/wordsize.h>'; echo __WORDSIZE) | cpp - | grep -Ex '32|64')}
|
||||||
|
|
||||||
Name: libssh2
|
Name: libssh2
|
||||||
Version: 1.6.0
|
Version: 1.7.0
|
||||||
Release: 4%{?dist}
|
Release: 1%{?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
|
Patch0: libssh2-1.4.2-utf8.patch
|
||||||
Patch1: libssh2-1.6.0-pkgconfig.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
||||||
|
BuildRequires: coreutils
|
||||||
|
BuildRequires: findutils
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: sed
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
BuildRequires: /usr/bin/man
|
BuildRequires: /usr/bin/man
|
||||||
|
|
||||||
|
@ -73,9 +77,6 @@ sed -i s/4711/47%{?__isa_bits}/ tests/ssh2.{c,sh}
|
||||||
# Make sure things are UTF-8...
|
# Make sure things are UTF-8...
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
|
||||||
# Fix pkg-config --libs output (#1279966)
|
|
||||||
%patch1
|
|
||||||
|
|
||||||
# Make sshd transition appropriately if building in an SELinux environment
|
# Make sshd transition appropriately if building in an SELinux environment
|
||||||
%if !(0%{?fedora} >= 17 || 0%{?rhel} >= 7)
|
%if !(0%{?fedora} >= 17 || 0%{?rhel} >= 7)
|
||||||
chcon $(/usr/sbin/matchpathcon -n /etc/rc.d/init.d/sshd) tests/ssh2.sh || :
|
chcon $(/usr/sbin/matchpathcon -n /etc/rc.d/init.d/sshd) tests/ssh2.sh || :
|
||||||
|
@ -84,7 +85,7 @@ chcon $(/usr/sbin/matchpathcon -n /etc/ssh/ssh_host_key) tests/etc/{host,user} |
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static --enable-shared
|
%configure --disable-silent-rules --disable-static --enable-shared
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
# Avoid polluting libssh2.pc with linker options (#947813)
|
# Avoid polluting libssh2.pc with linker options (#947813)
|
||||||
|
@ -153,6 +154,13 @@ rm -rf %{buildroot}
|
||||||
%{_libdir}/pkgconfig/libssh2.pc
|
%{_libdir}/pkgconfig/libssh2.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 23 2016 Paul Howarth <paul@city-fan.org> - 1.7.0-1
|
||||||
|
- Update to 1.7.0
|
||||||
|
- diffie_hellman_sha256: Convert bytes to bits (CVE-2016-0787); see
|
||||||
|
http://www.libssh2.org/adv_20160223.html
|
||||||
|
- libssh2_session_set_last_error: Add function
|
||||||
|
- See RELEASE-NOTES for details of bug fixes
|
||||||
|
|
||||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-4
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue