From 4a63a1c9aefdafbc1b20019d12e521285c01b72410122948a66ddd1cf89e1d9f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 17 Nov 2008 17:03:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libssh?expand=0&rev=2 --- libssh-rpmlintrc | 1 - libssh.changes | 9 +++++++++ libssh.spec | 27 +++++++++++++++++---------- libssh_improve_performance.patch | 15 +++++++++++++++ 4 files changed, 41 insertions(+), 11 deletions(-) delete mode 100644 libssh-rpmlintrc create mode 100644 libssh_improve_performance.patch diff --git a/libssh-rpmlintrc b/libssh-rpmlintrc deleted file mode 100644 index eef92b5..0000000 --- a/libssh-rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter("libssh-2.* shlib-policy-name-error") diff --git a/libssh.changes b/libssh.changes index 0292227..6915b4e 100644 --- a/libssh.changes +++ b/libssh.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Nov 17 17:46:00 CET 2008 - anschneider@suse.de + +- Add 'Provides: libssh' to the library that the debuginfo package + can be installed. +- Fix channel performance by changing the window len. +- Use libssh2 as name for the library package. +- Remove rpmlintrc + ------------------------------------------------------------------- Tue Oct 7 21:19:07 CEST 2008 - aj@suse.de diff --git a/libssh.spec b/libssh.spec index 0341401..4be0003 100644 --- a/libssh.spec +++ b/libssh.spec @@ -24,15 +24,15 @@ BuildRequires: doxygen openssl-devel License: LGPL v2.1 or later Group: System/Libraries Version: 0.2 -Release: 3 +Release: 5 Summary: SSH library Source0: %{name}-%{version}.tar.bz2 -Source1: libssh-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch00: libssh-paths.patch Patch01: 0001-Map-permission-field-to-type-field.patch Patch02: 0002-Add-errno-mapping.patch -%define debug_package_requires libssh-2 = %{version}-%{release} +Patch03: libssh_improve_performance.patch +%define debug_package_requires libssh2 = %{version}-%{release} %description The ssh library was designed to be used by programmers needing a @@ -54,12 +54,12 @@ Authors: Aris Adamantiadis Nick Zitzmann -%package -n libssh-2 +%package -n libssh2 License: LGPL v2.1 or later Group: System/Libraries Summary: SSH library -%description -n libssh-2 +%description -n libssh2 The ssh library was designed to be used by programmers needing a working SSH implementation by the mean of a library. The complete control of the client is made by the programmer. With libssh, you can @@ -83,7 +83,7 @@ Authors: License: LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: SSH library development headers -Requires: libssh-2 = %{version} +Requires: libssh2 = %{version} %description devel Development headers for the SSH library. @@ -115,6 +115,7 @@ Authors: %patch00 %patch01 -p1 %patch02 -p1 +%patch03 -p1 %build autoreconf -fi @@ -129,22 +130,22 @@ autoreconf -fi %{__make} DESTDIR=%{buildroot} install %{__make} DESTDIR=%{buildroot} install-doc -%post -n libssh-2 +%post -n libssh2 /sbin/ldconfig -%postun -n libssh-2 +%postun -n libssh2 /sbin/ldconfig %clean %{__rm} -rf %{buildroot} -%files -n libssh-2 +%files -n libssh2 %defattr(-,root,root) +%doc AUTHORS README CHANGELOG %{_libdir}/libssh.so.* %files devel %defattr(-,root,root) -%doc AUTHORS README CHANGELOG %dir %{_includedir}/libssh/ %attr(0644,root,root) %{_includedir}/libssh/* %{_libdir}/libssh.so @@ -163,6 +164,12 @@ autoreconf -fi %exclude %{_mandir}/man?/deprecated.3* %changelog +* Mon Nov 17 2008 anschneider@suse.de +- Add 'Provides: libssh' to the library that the debuginfo package + can be installed. +- Fix channel performance by changing the window len. +- Use libssh2 as name for the library package. +- Remove rpmlintrc * Tue Oct 07 2008 aj@suse.de - Disable parallel build since it breaks the build. * Tue Sep 30 2008 ro@suse.de diff --git a/libssh_improve_performance.patch b/libssh_improve_performance.patch new file mode 100644 index 0000000..8ec77e5 --- /dev/null +++ b/libssh_improve_performance.patch @@ -0,0 +1,15 @@ +Index: libssh-0.2/libssh/channels.c +=================================================================== +--- libssh-0.2.orig/libssh/channels.c ++++ libssh-0.2/libssh/channels.c +@@ -29,8 +29,8 @@ MA 02111-1307, USA. */ + + #include "libssh/priv.h" + #include "libssh/ssh2.h" +-#define WINDOWLIMIT 1024 +-#define WINDOWBASE 32000 ++#define WINDOWBASE 128000 ++#define WINDOWLIMIT (WINDOWBASE/2) + + /** defgroup ssh_channel + * \brief functions that manage a channel