commit 2b9a3c1450669ed7af9b7ff0c2355d21145ee2a8
Author: Jakub Bogusz <[email protected]>
Date: Fri Oct 7 17:57:41 2022 +0200
- updated to 0.10.4
- dropped outdated openssl3 patch (wasn't it cmake issue?)
libssh.spec | 15 ++++++---------
openssl3.patch | 11 -----------
2 files changed, 6 insertions(+), 20 deletions(-)
---
diff --git a/libssh.spec b/libssh.spec
index f5e9cc8..4db7be1 100644
--- a/libssh.spec
+++ b/libssh.spec
@@ -1,18 +1,17 @@
Summary: Library implementing the SSH protocol
Summary(pl.UTF-8): Biblioteka implementująca protokół SSH
Name: libssh
-Version: 0.9.6
+Version: 0.10.4
Release: 1
Epoch: 1
License: LGPL v2.1+; parts are BSD-licensed
Group: Libraries
-Source0: https://www.libssh.org/files/0.9/%{name}-%{version}.tar.xz
-# Source0-md5: 0174df377361221a31a9576afbaba330
-Patch0: openssl3.patch
+Source0: https://www.libssh.org/files/0.10/%{name}-%{version}.tar.xz
+# Source0-md5: cb2e47ac2de59eefa31a57ae53b44363
URL: http://www.libssh.org/
BuildRequires: cmake >= 3.3.0
BuildRequires: heimdal-devel
-BuildRequires: openssl-devel >= 0.9.8
+BuildRequires: openssl-devel >= 1.0.1
BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: zlib-devel >= 1.2
Requires: zlib >= 1.2
@@ -51,7 +50,6 @@ Pliki nagłówkowe biblioteki libssh.
%prep
%setup -q
-%patch0 -p1
%build
install -d build
@@ -66,8 +64,7 @@ cd build
rm -rf $RPM_BUILD_ROOT
%{__make} -C build install \
- DESTDIR=$RPM_BUILD_ROOT \
- libdir=%{_libdir}
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -77,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS BSD ChangeLog README
+%doc AUTHORS BSD CHANGELOG README
%attr(755,root,root) %{_libdir}/libssh.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libssh.so.4
diff --git a/openssl3.patch b/openssl3.patch
deleted file mode 100644
index b461a9d..0000000
--- a/openssl3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libssh-0.9.6/src/CMakeLists.txt.orig 2021-08-26 14:27:44.000000000
+0200
-+++ libssh-0.9.6/src/CMakeLists.txt 2021-09-29 21:52:22.046826365 +0200
-@@ -225,7 +225,7 @@
- external/sc25519.c
- )
- endif (NOT HAVE_OPENSSL_ED25519)
-- if(OPENSSL_VERSION VERSION_LESS "1.1.0")
-+ if((OPENSSL_VERSION AND OPENSSL_VERSION VERSION_LESS "1.1.0") OR
(_OPENSSL_VERSION AND _OPENSSL_VERSION VERSION_LESS "1.1.0"))
- set(libssh_SRCS ${libssh_SRCS} libcrypto-compat.c)
- endif()
- endif (WITH_GCRYPT)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libssh.git/commitdiff/2b9a3c1450669ed7af9b7ff0c2355d21145ee2a8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
