diff --git a/libssh2-1.7.0.tar.gz b/libssh2-1.7.0.tar.gz deleted file mode 100644 index bcdb742..0000000 --- a/libssh2-1.7.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584 -size 811714 diff --git a/libssh2-1.7.0.tar.gz.asc b/libssh2-1.7.0.tar.gz.asc deleted file mode 100644 index cf4346f..0000000 --- a/libssh2-1.7.0.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlbMEL8ACgkQeOEcayedXJF5tACfZmguye6QRCNxoPl0Tj7TsfSe -MF8AoPqWRB60bCBUooHAKGtMntfWXVyz -=St5v ------END PGP SIGNATURE----- diff --git a/libssh2-1.8.0.tar.gz b/libssh2-1.8.0.tar.gz new file mode 100644 index 0000000..731d860 --- /dev/null +++ b/libssh2-1.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4 +size 854916 diff --git a/libssh2-1.8.0.tar.gz.asc b/libssh2-1.8.0.tar.gz.asc new file mode 100644 index 0000000..1f51fa9 --- /dev/null +++ b/libssh2-1.8.0.tar.gz.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- + +iQEcBAABCgAGBQJYDv9nAAoJEFzJCP23HhLCab4H/jwSaGTn1DWk8iaHk9P9Zcfe +65UKldQmI2uxd+ZNVl/DOvYU6nEa/0RRQmZ6ljM48gAit1HHOIRGQt6hvmlOSw2n +M00SDWDthftqn0OELD7jyTEEa0qzEgKqcrpGWQqgUvgfMHhuLkBpTCK4eAWLZlSe +nEeV4THdP9nh7AaAz05Ld6rS/B3hT+1TLZmGzxaEYUYRT9YqtCcmZbOf/YMzfojl +tG/5FAP8vMOPw4EzCk+5NLU1pow5Zhu5gOdUdhCaA+5j4LKRCUzMT2g5oESSQ5rg +KIMGM2EFuZ3vCqXcP/1cKPWfpNl2aABwP6zqt2+cAnG0rgYqVd6gPQtbRp99yFI= +=yFIi +-----END PGP SIGNATURE----- diff --git a/libssh2_org.changes b/libssh2_org.changes index 91418b9..280af9c 100644 --- a/libssh2_org.changes +++ b/libssh2_org.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jun 14 10:05:48 UTC 2017 - tchvatal@suse.com + +- Version update to 1.8.0: + * support openssl-1.1 + * many bugfixes +- Fixes bsc#1042660 +- Remove obsolete conditionals that are no longer needed + ------------------------------------------------------------------- Tue Feb 23 13:37:02 UTC 2016 - vcizek@suse.com diff --git a/libssh2_org.keyring b/libssh2_org.keyring index 71ba182..7a83ce7 100644 --- a/libssh2_org.keyring +++ b/libssh2_org.keyring @@ -1,9 +1,14 @@ -pub 1024D/279D5C91 2003-04-28 -uid Daniel Stenberg (Haxx) -sub 1024g/B70B3510 2003-04-28 +pub dsa1024 2003-04-28 [SCA] + 914C533DF9B2ADA2204F586D78E11C6B279D5C91 +uid [ unknown] Daniel Stenberg (Haxx) +sub elg1024 2003-04-28 [E] + +pub rsa2048 2016-04-07 [SC] + 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 +uid [ unknown] Daniel Stenberg +sub rsa2048 2016-04-07 [E] -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.19 (GNU/Linux) mQGiBD6tnnoRBACRPnFBVoapBrTpPrCNZ2rq3DcmW6n/soQJW47+zP+vcrcxQ1WJ QiWSzLGO+QOIUZSYfnliR22r8HkFX9EUSW3IAcRMJMsaO3wMJ0a+78a9QqWLp6RV @@ -14,15 +19,40 @@ f9UxLfo02YQ8diGYeq0u9k1RezC13w4TVUmQfg0Uqn4xM6DNzO1O6yCK8rlNwsvL gHNJA/9m1pfzjpvdxtmJNKRU3C4cRCjXhxNdM7laSEj0/wOGaR2QWWEge51orWwo SLQUIe4BDPvtRStQHC+tI7qr7d12rMMEBXviJC5EkGBOzlgWr9virjM/u/pkGMc2 m5r3pVuWH/JSsHsV952y2kWP64uP4zdLXOpVzX/xs0sYJ9nOPLQnRGFuaWVsIFN0 -ZW5iZXJnIChIYXh4KSA8ZGFuaWVsQGhheHguc2U+iFkEExECABkFAj6tnnoECwcD -AgMVAgMDFgIBAh4BAheAAAoJEHjhHGsnnVyRjngAn1gK6Q0qUTHwYJBAhIDmrRi0 -ebfDAJ4qDSHd6UU2MEkkFCgGfYgEBXKbb7kBDQQ+rZ59EAQAmYsA8gPjJ75gOIPb -XNg9Z31QzIz65qS9XdNsFNAdKxnY4b72nhc0oaS9/7Dcdf2Q+1mDa2p72DWk+9iz -7knmBL++csBP2z9eMe5h8oV53prqNOHDHyL3WLOa25ga9381gZnzWoQME74iSBBM -wDw8vbLEgIZ34JaQ7Oe+9N3+6n8AAwcD/Av+Ms+3gCc5pLp4nx36qqi36fodaG9+ -dwIcMbr9bivEtjmDHeuPsD6X1J9+Y/ikUBIDpMPv33lJxLoubOtpLhEuN2XN/ojT -rueVPDKA1f+GyfHnyfpf/78IgX1hGVqu/3RBWKPpXFwSZA4q8vFR+FaPC5WbU68t -FLJpYuC9ZO/LiEYEGBECAAYFAj6tnn0ACgkQeOEcayedXJGtPQCgxrbd59afemZ9 -OIadZD8kUGC29dUAoJ94aGUkWCwoEiPyEZRGXv9XRlfx -=yTQx +ZW5iZXJnIChIYXh4KSA8ZGFuaWVsQGhheHguc2U+iF4EExECAB4CHgECF4AFAlQU +ki4FCwkIBwMFFQoJCAsFFgIDAQAACgkQeOEcayedXJEOOwCggCsNHdAQPAlPte3w +i2IZEekkM0YAoOXXPFAWjUwIHjZY41l7WgzACbANuQENBD6tnn0QBACZiwDyA+Mn +vmA4g9tc2D1nfVDMjPrmpL1d02wU0B0rGdjhvvaeFzShpL3/sNx1/ZD7WYNranvY +NaT72LPuSeYEv75ywE/bP14x7mHyhXnemuo04cMfIvdYs5rbmBr3fzWBmfNahAwT +viJIEEzAPDy9ssSAhnfglpDs57703f7qfwADBwP8C/4yz7eAJzmkunifHfqqqLfp ++h1ob353Ahwxuv1uK8S2OYMd64+wPpfUn35j+KRQEgOkw+/feUnEui5s62kuES43 +Zc3+iNOu55U8MoDV/4bJ8efJ+l//vwiBfWEZWq7/dEFYo+lcXBJkDiry8VH4Vo8L +lZtTry0Usmli4L1k78uIRgQYEQIABgUCPq2efQAKCRB44RxrJ51cka09AKDGtt3n +1p96Zn04hp1kPyRQYLb11QCgn3hoZSRYLCgSI/IRlEZe/1dGV/GZAQ0EVwaI8QEI +ALuwKdpmpbF9c2AELs/bwFINSz3DjL88QWw6/1umBuBlqBfUWeEbR5XvWebSny/1 +PwF+3V5doF33vsOr2mCTmoo7TFmjx8LymsWoHl1vt8xS89kK4lNNvqUYzPg519Pp +oepS8n4sUXWYqfwSq3VDiyccZIvU8jf/7jfmoNFCxTXkZ1iuPXBo0kqTv1p6z2iC +5ojb85NCrMhw4Urm0mOVI4PWvI4gfV7y8P7kwyka+xHG/exAd5NmR9luTNIsWD8s +qmiJCTKqXX4Es2EFiryhoT+OW9CtMSRsDIqkxJx3IfCaRZYqPJm1dOsC2UKiaeSL +jILaUBX0xcg0ce80kFwhe9UAEQEAAbQgRGFuaWVsIFN0ZW5iZXJnIDxkYW5pZWxA +aGF4eC5zZT6JATcEEwEKACEFAlcGiPECGwMFCwkIBwMFFQoJCAsFFgIDAQACHgEC +F4AACgkQXMkI/bceEsI4qQf/ULKgqI3Y8KBOVahhCym/8ACayP5wXBmhsjXrsqjA +D6jfPFCrGDQxXd2zwb6KKD04i5i6uVAvkmvcJsOW1qJd1a1W15GH9UqnrUTDJerv +u+MlvHzWG865pdZYtKVTQoHfDsePpoP+a3XoOk5xj0DD3SYrK9p9FOowXtNxPsnk +d4afY0vjl0+QCGIwMSASfD3IFPEr/HpShAY+CI5bFJI3sWiPeaFQ5+WnxbSueQts +niJynKbpa4spEwoB58O+TwZWUBa5cBv2CWgvU/q7e40eWWr8g4NHZtlQEjRA0qG+ +3SJKPtYqxz+RqqxyX4AT2N3/qRd3q+FM0VZ3N5yj/aYaVrkBDQRXBojxAQgA7FAA +S8XeJ3FyfzS1tSEmDUn3x8BLsfHdaGUUbvi4CKRlCXUpmumsG7vRFZNvs2bW29l5 +dbrkiVjuSTjZuF9gOzUmsg9Y5Yq9XApYPGgRtiBb/K/LVM65cfbvrNvEuXk4QTyx +C459dmwVJfYg8X2GyA0Zo3Oivwp7tjkG4JAtwZlZbl0sVtspEqNcbwJpaawlWghz +afJcICyzar2gInXdf/nP4SLf3avCLV3c3EBiRKINBqf5+RaQK9kf50eYWNDUA0Mq +J6XFxbVV+KUrWG73OIEEN/xMIS53+rTCggAfuu8h+3iLcKqPKaicHITj86N8fyPg +S15DyqiScwKOPA1WqQARAQABiQEfBBgBCgAJBQJXBojxAhsMAAoJEFzJCP23HhLC +6mMH/1NXhqdtkrnxs3tAnmoadTcY2OW9YVlczDW7XFVztpsMnKqYV4lwniotSS8E +DQ6y+VWcxaZ4KbOxeGVBUzgG/ohbKvskFaCQrmrYJZUHn1Xu/vOd/mRacwYWEMU+ +UuwZvENYsyhkYf4jLzjCEwkWB96vAInLV00P9sdc/O1+G8VeLw02UlQUlrxe2a6C +bvwL6fA0dwWlULvQc+vehrxTU4Ncynsvxb90vd4theZEI13S6seBivMO3pX/N/nK +a8+TnDgcGhyfahEImP8VcqEUBSm2alMTeDXK9hQua4Vw0YCc8ATGYCZ3o2qwKZuP ++rHjK2O3m7G3ombohdX1yvLyLrE= +=sewG -----END PGP PUBLIC KEY BLOCK----- diff --git a/libssh2_org.spec b/libssh2_org.spec index f78ebbd..c491783 100644 --- a/libssh2_org.spec +++ b/libssh2_org.spec @@ -1,7 +1,7 @@ # # spec file for package libssh2_org # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,31 +16,28 @@ # +%define pkg_name libssh2 +Name: libssh2_org +Version: 1.8.0 +Release: 0 Summary: A library implementing the SSH2 protocol License: BSD-3-Clause Group: Development/Libraries/C and C++ - -Name: libssh2_org -Version: 1.7.0 -Release: 0 Url: http://www.libssh2.org/ -%define pkg_name libssh2 Source0: http://www.libssh2.org/download/%{pkg_name}-%{version}.tar.gz Source1: http://www.libssh2.org/download/%{pkg_name}-%{version}.tar.gz.asc Source2: baselibs.conf Source3: libssh2_org.keyring -BuildRequires: openssl-devel -BuildRequires: pkgconfig -BuildRequires: zlib-devel -#for the test suite +Patch0: libssh2-ocloexec.patch BuildRequires: groff BuildRequires: libtool BuildRequires: man BuildRequires: openssh +BuildRequires: openssl-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(zlib) # drops build cycle in Factory #!BuildIgnore: groff-full -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: libssh2-ocloexec.patch %description libssh2 is a library implementing the SSH2 protocol as defined by @@ -72,40 +69,32 @@ SECSH-PUBLICKEY. %prep %setup -q -n %{pkg_name}-%{version} -# problem with sle 11 sp1 target as it has older kernel and as such fail this -%if 0%{?suse_version} > 1110 %patch0 -p1 -%endif %build sed -i -e 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g' configure.ac cp src/libssh2_config.h.in example/libssh2_config.h -# remove m4 macro files for libtool as they should be picked up by -# autoreconf +# remove m4 macro files for libtool as they should be picked up by rm -v m4/libtool.m4 m4/lt* autoreconf -fiv -export CFLAGS="%optflags -DOPENSSL_LOAD_CONF" -%configure \ - --disable-static --with-pic \ - --disable-rpath --with-libz=%{_prefix} \ - --with-openssl=%{_prefix} +export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF" +%configure \ + --disable-silent_rules \ + --disable-static \ + --with-pic \ + --disable-rpath \ + --with-libz=%{_prefix} \ + --with-openssl=%{_prefix} make %{?_smp_mflags} -%if !0%{?sles_version} - %if 0%{?suse_version} >= 1230 - %check -make check - - %endif -%endif +make %{?_smp_mflags} check %install -make install DESTDIR=%{buildroot} +%make_install rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/*.a %post -n libssh2-1 -p /sbin/ldconfig - %postun -n libssh2-1 -p /sbin/ldconfig %files -n libssh2-1