diff --git a/libssh2-1.2.7.tar.bz2 b/libssh2-1.2.7.tar.bz2 deleted file mode 100644 index fe960de..0000000 --- a/libssh2-1.2.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5f655545d1485ba9dc8fedd1d3bbf2201ca6f083cfcdbbf26a5a25c7681153b -size 464227 diff --git a/libssh2-1.2.9.tar.bz2 b/libssh2-1.2.9.tar.bz2 new file mode 100644 index 0000000..2c423fc --- /dev/null +++ b/libssh2-1.2.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4aad275a20a11352c3e383b89ba389e8f0e373bb41ab52dce2e131654e6e7732 +size 522712 diff --git a/libssh2_org.changes b/libssh2_org.changes index 056b97d..27fafb9 100644 --- a/libssh2_org.changes +++ b/libssh2_org.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Aug 17 21:08:57 UTC 2011 - crrodriguez@opensuse.org + +- Update to version 1.2.9 +* Added libssh2_session_set_timeout() and + libssh2_session_get_timeout() to make blocking calls get a timeout +* userauth_keyboard_interactive: fix buffer overflow + + ------------------------------------------------------------------- Fri Oct 29 17:09:09 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/libssh2_org.spec b/libssh2_org.spec index b70ae00..f3382ac 100644 --- a/libssh2_org.spec +++ b/libssh2_org.spec @@ -1,5 +1,5 @@ # -# spec file for package libssh2_org (Version 1.2.6) +# spec file for package libssh2_org (Version 1.2.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,21 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Summary: A library implementing the SSH2 protocol Name: libssh2_org -Version: 1.2.7 +Version: 1.2.9 Release: 1 +License: BSD3c +Url: http://www.libssh2.org/ %define pkg_name libssh2 Group: Development/Libraries/C and C++ Source: http://heanet.dl.sourceforge.net/sourceforge/libssh2/%{pkg_name}-%{version}.tar.bz2 Source2: baselibs.conf -Url: http://www.libssh2.org/ -License: BSD3c +BuildRequires: openssl-devel +BuildRequires: pkgconfig +BuildRequires: zlib-devel +#for the test suite +BuildRequires: openssh BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: openssl-devel pkgconfig zlib-devel %description libssh2 is a library implementing the SSH2 protocol as defined by @@ -37,8 +40,6 @@ Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS, and SECSH-PUBLICKEY. - - %define debug_package_requires libssh2-1 = %{version}-%{release} %package -n libssh2-1 @@ -52,13 +53,12 @@ Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS, and SECSH-PUBLICKEY. - - %package -n libssh2-devel License: BSD3c Summary: A library implementing the SSH2 protocol Group: Development/Libraries/C and C++ -Requires: libssh2-1 = %{version} glibc-devel +Requires: glibc-devel +Requires: libssh2-1 = %{version} %description -n libssh2-devel libssh2 is a library implementing the SSH2 protocol as defined by @@ -66,27 +66,25 @@ Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS, and SECSH-PUBLICKEY. - - %prep %setup -q -n %{pkg_name}-%{version} %build %configure --enable-hidden-symbols \ --disable-static --with-pic \ - --disable-rpath --with-libz=%{_usr} \ - --with-openssl=%{_usr} -%{__make} %{?jobs:-j%jobs} + --disable-rpath --with-libz=%{_prefix} \ + --with-openssl=%{_prefix} +make %{?_smp_mflags} %install -%{__make} install DESTDIR=%{buildroot} -%{__rm} -f %{buildroot}%{_libdir}/*.la +make install DESTDIR=%{buildroot} +rm -f %{buildroot}%{_libdir}/*.la %check -%{__make} check +make check %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %post -n libssh2-1 -p /sbin/ldconfig