Merge branch 'rosa2014.1' into rosa2012.1

This commit is contained in:
Andrey Bondrov 2015-07-18 16:40:14 +10:00
commit a9cfff8475
4 changed files with 16 additions and 16 deletions

View file

@ -1,2 +1,2 @@
sources:
openssl-1.0.1n.tar.gz: 2f6ea1e0f2724aca1805392e4387df8361442ace
openssl-1.0.1p.tar.gz: 9d1977cc89242cd11471269ece2ed4650947c046

View file

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJVeZWaAAoJENnE0m0OYESRhl4H/0dnMZGeqGcRhCUIMJMqOvHG
qAtSpb5Tit7K5rozYX+jE3ZNnN+CJReYHy82pX7cepDxTh9Lw2tjrrul7XIDZ9DJ
8uOae1cYu5fOTzXoACFFz9+FGRllEN1RjsZYz1DyzV8Y+Akw6siQUcGTA3EbZT+c
OYSBMT2nNiF4t3F78HDfVeuTtvwHYuV+9Yz7VAz+XJmKtESbkqwQwIxdclJs5gLK
doe3+ntJqqwzzWRwsIBNCxyvKPNwsDVHQNAZKs8W496u4jThcl5eyvcDF82kt6Yy
Turtk9IUvpofGpDCmlaJL7yP3fSIneRGIpRVdF6MNIoX0atFuSDv6uQuEZ8dkbw=
=ku/F
-----END PGP SIGNATURE-----

11
openssl-1.0.1p.tar.gz.asc Normal file
View file

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJVnmeCAAoJENnE0m0OYESRtHMH/2ql/EUqZl9hdsLe3jbmqXA5
mhcbpcLm6001RTwgSGhc3CQncMTULLzher9qBwHLFm6iFbYf1ExVYw//Ho6bmo+T
Xu0hg7kO+RFcxqRh0Sp5QsHz9xEJ4VLmVqrdMFsUMQTSHBjfcS045oiMNfIRZLtF
dSgperJl6aL/TVODtuTgC54Ignh5mRBlI4FDbmHM4fFjNOE7qEPRgCzQ3w5nHZDt
S4dQChM04556RibktwqQUxogAI76rLFZpwrMmadmF1Ij36OP2u4QrYl15WXY92B5
MYqoAVEH2RwcXmZiFK/GvwhW4t+Lu7uT+ZaJ+rT/4c6GdrR3VwSoLGLOxvWTPac=
=7Yxo
-----END PGP SIGNATURE-----

View file

@ -14,7 +14,7 @@
Summary: Secure Sockets Layer communications libs & utils
Name: openssl
Version: 1.0.1n
Version: 1.0.1p
Release: 1
License: BSD-like
Group: System/Libraries
@ -90,7 +90,7 @@ This package provides engines for openssl.
%package -n %{libcrypto}
Summary: Secure Sockets Layer communications libs
Group: System/Libraries
Conflicts: libopenssl1.0.0 < 1.0.1n
Conflicts: %{_lib}openssl1.0.0 < 1.0.1n
%description -n %{libcrypto}
The libraries files are needed for various cryptographic algorithms
@ -105,8 +105,8 @@ and protocols, including DES, RC4, RSA and SSL.
%package -n %{libssl}
Summary: Secure Sockets Layer communications libs
Group: System/Libraries
Conflicts: libopenssl1.0.0 < 1.0.1n
Obsoletes: libopenssl1.0.0 < 1.0.1n
Conflicts: %{_lib}openssl1.0.0 < 1.0.1n
Obsoletes: %{_lib}openssl1.0.0 < 1.0.1n
%description -n %{libssl}
The libraries files are needed for various cryptographic algorithms