Accepting request 103121 from network:synchronization:files
- Ensure pkgconfig symbols are provided - Remove redundant tags/sections per specfile guideline suggestions - Parallel building using %_smp_mflags - Make pkgconfig provides available - Add patch to work around compilation problems on SLES11SP1 - Update to version 0.5.2 * Increased window size x10. * Fixed SSHv1. * Fixed bugged lists. * Fixed use-after-free + inconsistent callbacks call in poll. * Fixed scp documentation. * Fixed possible infinite loop in channel_read(). * Fixed handling of short reads of sftp_async_read(). * Fixed handling request service timeout in blocking mode. * Fixed ssh_auth_list() documentation. * Fixed incorrect return values in ssh_channel_write(). * Fixed an infinite loop in the termination callback. * Fixed handling of SSH_AGAIN in channel_open(). * Fixed "status -5 inflating zlib packet" OBS-URL: https://build.opensuse.org/request/show/103121 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libssh?expand=0&rev=22
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
228d37e550
commit
db8591d418
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3da3635742cf8dda08677d0397b64bc87ebdb69fdf9a2081c08045825a368f16
|
||||
size 235773
|
||||
3
libssh-0.5.2.tar.bz2
Normal file
3
libssh-0.5.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ffed38b947d9affd995d1d43fb9b7eaa6a13d929526cba0c24e23e278af9d43c
|
||||
size 236827
|
||||
@ -1,3 +1,34 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 7 13:34:00 UTC 2012 - jengelh@medozas.de
|
||||
|
||||
- Ensure pkgconfig symbols are provided
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 31 10:36:26 UTC 2012 - jengelh@medozas.de
|
||||
|
||||
- Remove redundant tags/sections per specfile guideline suggestions
|
||||
- Parallel building using %_smp_mflags
|
||||
- Make pkgconfig provides available
|
||||
- Add patch to work around compilation problems on SLES11SP1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 17 07:00:53 UTC 2011 - asn@cryptomilk.org
|
||||
|
||||
- Update to version 0.5.2
|
||||
* Increased window size x10.
|
||||
* Fixed SSHv1.
|
||||
* Fixed bugged lists.
|
||||
* Fixed use-after-free + inconsistent callbacks call in poll.
|
||||
* Fixed scp documentation.
|
||||
* Fixed possible infinite loop in channel_read().
|
||||
* Fixed handling of short reads of sftp_async_read().
|
||||
* Fixed handling request service timeout in blocking mode.
|
||||
* Fixed ssh_auth_list() documentation.
|
||||
* Fixed incorrect return values in ssh_channel_write().
|
||||
* Fixed an infinite loop in the termination callback.
|
||||
* Fixed handling of SSH_AGAIN in channel_open().
|
||||
* Fixed "status -5 inflating zlib packet"
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 6 03:36:48 UTC 2011 - crrodriguez@opensuse.org
|
||||
|
||||
|
||||
74
libssh.spec
74
libssh.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libssh
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -15,20 +15,23 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
Url: http://www.libssh.org
|
||||
|
||||
Name: libssh
|
||||
BuildRequires: cmake doxygen gcc-c++ openssl-devel
|
||||
License: LGPL v2.1 or later
|
||||
Group: System/Libraries
|
||||
Version: 0.5.1
|
||||
Release: 1
|
||||
BuildRequires: cmake
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkgconfig
|
||||
Version: 0.5.2
|
||||
Release: 0
|
||||
Summary: SSH library
|
||||
License: LGPL-2.1+
|
||||
Group: System/Libraries
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Patch1: remove-pedantic-errors.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%define debug_package_requires libssh4 = %{version}-%{release}
|
||||
|
||||
%description
|
||||
The ssh library was designed to be used by programmers needing a
|
||||
@ -43,18 +46,9 @@ This package provides libssh from http://www.libssh.org that should not
|
||||
be confused with libssh2 available from http://www.libssh2.org (libssh2
|
||||
package)
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Aris Adamantiadis <aris@0xbadc0de.be>
|
||||
Andreas Schneider <mail@cynapses.org>
|
||||
Nick Zitzmann <seiryu@comcast.net>
|
||||
|
||||
%package -n libssh4
|
||||
License: LGPL v2.1 or later
|
||||
Group: System/Libraries
|
||||
Summary: SSH library
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libssh4
|
||||
The ssh library was designed to be used by programmers needing a
|
||||
@ -69,49 +63,26 @@ This package provides libssh from http://www.libssh.org that should not
|
||||
be confused with libssh2 available from http://www.libssh2.org (libssh2
|
||||
package)
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Aris Adamantiadis <aris@0xbadc0de.be>
|
||||
Andreas Schneider <mail@cynapses.org>
|
||||
Nick Zitzmann <seiryu@comcast.net>
|
||||
|
||||
%package devel
|
||||
License: LGPL v2.1 or later
|
||||
Group: Development/Libraries/C and C++
|
||||
Summary: SSH library development headers
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libssh4 = %{version}
|
||||
|
||||
%description devel
|
||||
Development headers for the SSH library.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Aris Adamantiadis <aris@0xbadc0de.be>
|
||||
Andreas Schneider <mail@cynapses.org>
|
||||
Nick Zitzmann <seiryu@comcast.net>
|
||||
|
||||
%package devel-doc
|
||||
License: LGPL v2.1 or later
|
||||
Group: Development/Languages/C and C++
|
||||
Summary: SSH library api documentation
|
||||
Group: Development/Languages/C and C++
|
||||
|
||||
%description devel-doc
|
||||
Documentation for libssh development.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Aris Adamantiadis <aris@0xbadc0de.be>
|
||||
Andreas Schneider <mail@cynapses.org>
|
||||
Nick Zitzmann <seiryu@comcast.net>
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%if "%{?sles_version}" == "11"
|
||||
%patch -P 1 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
if test ! -e "build"; then
|
||||
@ -128,7 +99,7 @@ cmake \
|
||||
%endif
|
||||
%{_builddir}/%{name}-%{version}
|
||||
|
||||
%__make %{?jobs:-j%jobs} VERBOSE=1
|
||||
make %{?_smp_mflags} VERBOSE=1
|
||||
%__make doc
|
||||
popd build
|
||||
|
||||
@ -141,14 +112,9 @@ pushd build
|
||||
%endif
|
||||
popd build
|
||||
|
||||
%post -n libssh4
|
||||
/sbin/ldconfig
|
||||
%post -n libssh4 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libssh4
|
||||
/sbin/ldconfig
|
||||
|
||||
%clean
|
||||
%{__rm} -rf %{buildroot}
|
||||
%postun -n libssh4 -p /sbin/ldconfig
|
||||
|
||||
%files -n libssh4
|
||||
%defattr(-,root,root)
|
||||
|
||||
34
remove-pedantic-errors.diff
Normal file
34
remove-pedantic-errors.diff
Normal file
@ -0,0 +1,34 @@
|
||||
From: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: 2012-02-06 00:00:21.707276910 +0100
|
||||
|
||||
The header file /usr/include/asm/sigcontext.h uses an unnamed
|
||||
aggregate (inside struct _fpstate), which is not permitted by ISO
|
||||
C99. gcc's -pedantic-errors flag causes this to be flagged.
|
||||
|
||||
gcc has an exception that system header files are exempt from
|
||||
pedantic-error reporting, but somehow this fails to work in SLES 11
|
||||
SP 1 and only SP1, even though
|
||||
|
||||
- both SP0 and SP1 have gcc-4.3.4
|
||||
- the unnamed aggregate is in both SP0 and SP1
|
||||
|
||||
Just like -Werror is a common nuisance, rip out -pedantic-errors
|
||||
occurences as well.
|
||||
|
||||
---
|
||||
cmake/Modules/DefineCompilerFlags.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: libssh-0.5.1/cmake/Modules/DefineCompilerFlags.cmake
|
||||
===================================================================
|
||||
--- libssh-0.5.1.orig/cmake/Modules/DefineCompilerFlags.cmake
|
||||
+++ libssh-0.5.1/cmake/Modules/DefineCompilerFlags.cmake
|
||||
@@ -9,7 +9,7 @@ if (UNIX AND NOT WIN32)
|
||||
#
|
||||
if (${CMAKE_C_COMPILER_ID} MATCHES GNU)
|
||||
# add -Wconversion ?
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")
|
||||
Loading…
Reference in New Issue
Block a user