Browse code
Enable curl sftp support (1772649)
Change-Id: Ibe591d4b5ed536835e0025bd7446f1fa3bffb4f0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1799
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>
xiaolin-vmware authored on 2016/12/03 09:34:18Showing 3 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: An URL retrieval utility and library |
| 2 | 2 |
Name: curl |
| 3 | 3 |
Version: 7.51.0 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: MIT |
| 6 | 6 |
URL: http://curl.haxx.se |
| 7 | 7 |
Group: System Environment/NetworkingLibraries |
| ... | ... |
@@ -9,12 +9,14 @@ Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
|
| 11 | 11 |
%define sha1 curl=19bf2c1e60a513910355cc9769c6371ea2ff5d1f |
| 12 |
-Requires: ca-certificates |
|
| 13 | 12 |
BuildRequires: ca-certificates |
| 14 |
-Requires: openssl |
|
| 15 |
-Requires: krb5 |
|
| 16 | 13 |
BuildRequires: openssl-devel |
| 17 | 14 |
BuildRequires: krb5-devel |
| 15 |
+BuildRequires: libssh2-devel |
|
| 16 |
+Requires: ca-certificates |
|
| 17 |
+Requires: openssl |
|
| 18 |
+Requires: krb5 |
|
| 19 |
+Requires: libssh2 |
|
| 18 | 20 |
%description |
| 19 | 21 |
The cURL package contains an utility and a library used for |
| 20 | 22 |
transferring files with URL syntax to any of the following |
| ... | ... |
@@ -22,6 +24,7 @@ protocols: FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, |
| 22 | 22 |
DICT, LDAP, LDAPS and FILE. Its ability to both download and |
| 23 | 23 |
upload files can be incorporated into other programs to support |
| 24 | 24 |
functions like streaming media. |
| 25 |
+ |
|
| 25 | 26 |
%prep |
| 26 | 27 |
%setup -q |
| 27 | 28 |
sed -i '/--static-libs)/{N;s#echo .*#echo #;}' curl-config.in
|
| ... | ... |
@@ -37,6 +40,7 @@ sed -i '/--static-libs)/{N;s#echo .*#echo #;}' curl-config.in
|
| 37 | 37 |
--enable-threaded-resolver \ |
| 38 | 38 |
--with-ssl \ |
| 39 | 39 |
--with-gssapi \ |
| 40 |
+ --with-libssh2 \ |
|
| 40 | 41 |
--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt |
| 41 | 42 |
make %{?_smp_mflags}
|
| 42 | 43 |
%install |
| ... | ... |
@@ -65,6 +69,8 @@ rm -rf %{buildroot}/*
|
| 65 | 65 |
%{_docdir}/%{name}-%{version}
|
| 66 | 66 |
|
| 67 | 67 |
%changelog |
| 68 |
+* Wed Nov 30 2016 Xiaolin Li <xiaolinl@vmware.com> 7.51.0-3 |
|
| 69 |
+- Enable sftp support. |
|
| 68 | 70 |
* Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 7.51.0-2 |
| 69 | 71 |
- Required krb5-devel. |
| 70 | 72 |
* Wed Nov 02 2016 Anish Swaminathan <anishs@vmware.com> 7.51.0-1 |
| 71 | 73 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,59 @@ |
| 0 |
+Summary: libssh2 is a library implementing the SSH2 protocol. |
|
| 1 |
+Name: libssh2 |
|
| 2 |
+Version: 1.8.0 |
|
| 3 |
+Release: 1%{?dist}
|
|
| 4 |
+License: BSD |
|
| 5 |
+URL: https://www.libssh2.org/ |
|
| 6 |
+Group: System Environment/NetworkingLibraries |
|
| 7 |
+Vendor: VMware, Inc. |
|
| 8 |
+Distribution: Photon |
|
| 9 |
+Source0: https://www.libssh2.org/download/libssh2-%{version}.tar.gz
|
|
| 10 |
+%define sha1 libssh2=baf2d1fb338eee531ba9b6b121c64235e089e0f5 |
|
| 11 |
+BuildRequires: openssl-devel |
|
| 12 |
+BuildRequires: zlib-devel |
|
| 13 |
+ |
|
| 14 |
+Requires: openssl |
|
| 15 |
+Requires: zlib |
|
| 16 |
+ |
|
| 17 |
+%description |
|
| 18 |
+libssh2 is a client-side C library implementing the SSH2 protocol. |
|
| 19 |
+ |
|
| 20 |
+%package devel |
|
| 21 |
+Summary: Header files for libssh2 |
|
| 22 |
+Group: System Environment/NetworkingLibraries |
|
| 23 |
+Requires: libssh2 |
|
| 24 |
+%description devel |
|
| 25 |
+These are the header files of libssh2. |
|
| 26 |
+ |
|
| 27 |
+%prep |
|
| 28 |
+%setup -q |
|
| 29 |
+ |
|
| 30 |
+%build |
|
| 31 |
+./configure --prefix=%{_prefix} \
|
|
| 32 |
+ --bindir=%{_bindir} \
|
|
| 33 |
+ --libdir=%{_libdir} \
|
|
| 34 |
+ --mandir=%{_mandir} \
|
|
| 35 |
+ --disable-static \ |
|
| 36 |
+ --enable-shared |
|
| 37 |
+make |
|
| 38 |
+ |
|
| 39 |
+%install |
|
| 40 |
+make DESTDIR=%{buildroot} install
|
|
| 41 |
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|
| 42 |
+ |
|
| 43 |
+%files |
|
| 44 |
+%defattr(-,root,root) |
|
| 45 |
+%{_libdir}/libssh2.so.*
|
|
| 46 |
+ |
|
| 47 |
+%files devel |
|
| 48 |
+%defattr(-,root,root) |
|
| 49 |
+%{_includedir}/*
|
|
| 50 |
+%{_libdir}/libssh2.so
|
|
| 51 |
+%{_libdir}/pkgconfig/*
|
|
| 52 |
+%{_mandir}/man3/*
|
|
| 53 |
+ |
|
| 54 |
+%changelog |
|
| 55 |
+* Wed Nov 30 2016 Xiaolin Li <xiaolinl@vmware.com> 1.8.0-1 |
|
| 56 |
+- Add libssh2 1.8.0 package. |
|
| 57 |
+ |
|
| 58 |
+ |