From aa704b0e38a9fdcd80236485e59b5cc2d7946f91 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 6 Jun 2014 02:16:35 +1100 Subject: [PATCH] New version 1.0.1h, minor spec cleanups --- .abf.yml | 3 +-- openssl-1.0.0i.tar.gz.asc | 11 ----------- openssl-1.0.1c.tar.gz.asc | 11 ----------- openssl-1.0.1h.tar.gz.asc | 17 +++++++++++++++++ openssl.spec | 39 +++++++++++++-------------------------- 5 files changed, 31 insertions(+), 50 deletions(-) delete mode 100644 openssl-1.0.0i.tar.gz.asc delete mode 100644 openssl-1.0.1c.tar.gz.asc create mode 100644 openssl-1.0.1h.tar.gz.asc diff --git a/.abf.yml b/.abf.yml index 315400a..09bf0b7 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,2 @@ sources: - "openssl-1.0.0i.tar.gz": b7aa11cbd7d264c2b1f44e3d55b334fb33f7b674 - "openssl-1.0.1c.tar.gz": 91b684de947cb021ac61b8c51027cc4b63d894ce + openssl-1.0.1h.tar.gz: b2239599c8bf8f7fc48590a55205c26abe560bf8 diff --git a/openssl-1.0.0i.tar.gz.asc b/openssl-1.0.0i.tar.gz.asc deleted file mode 100644 index 412bc9c..0000000 --- a/openssl-1.0.0i.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iQEVAwUAT4/84aLSm3vylcdZAQJM5gf/cq8D8uCwXWPitlxCcUQIeuQlx/bIAqts -vt2jNEWC//m4sZLdcKFIDUjW6MaRXTHBSkJNDJpcuspR04e6zTVsVatS7RA3rLHl -NaXZsMmEwjk3z9490elCa1CpT9lRvIZAelfXbcea/iCq+i1sEEcrKiOgc+OtXaf2 -PvGaEoqm4Om+kquFAChvzeH0PYVKXWdI0FTdGfOIfzpSrytiK6uYpVkTzXMHOgX5 -GOR3J2d7t1HzI8gmVhabeyEkRPOcQr+va2fVDmHNuOUdf6kyBjNOoHaQ0Q4CYEMr -yZ7nEzHYm0Ongj+ygYKaGLoE3Yq0iY42kbVQ3iB2U3NtazKrZL0+BA== -=/ywD ------END PGP SIGNATURE----- diff --git a/openssl-1.0.1c.tar.gz.asc b/openssl-1.0.1c.tar.gz.asc deleted file mode 100644 index aea9f7e..0000000 --- a/openssl-1.0.1c.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iQEVAwUAT6vcSqLSm3vylcdZAQLlbgf/ZLcvRLHoZh1yHKxC1ucBSw+yYFutOmGq -SpZBfUU5y7DIA2VK6sgILBx8OCyOYA1s+6dgeCxny+Cdh/fW6RbBSo7K3efRUhdo -gOlQm+t9Ns5+FsdgUMZLnYdQ81mMYbZfndO4nEZnkqQ0qKkdaYVz12yHkwLtn+6A -IW2sUTXUESHOdzEIzAyF08RsFVsQbzrLvqgcHWxY1494OhaxEJP5JvcjWAgMC2hw -kDoQbrEsOoleX/IodDydXGHspdez9BVzgSsg0QPUwk6TxB6+9/VUSHxrqaj9Pys0 -2ddXYj4SlohsunHmXhKsFSyxf31lvMyn2gGAf44nuD7Mmt8U3OVqLQ== -=4PCl ------END PGP SIGNATURE----- diff --git a/openssl-1.0.1h.tar.gz.asc b/openssl-1.0.1h.tar.gz.asc new file mode 100644 index 0000000..14e383b --- /dev/null +++ b/openssl-1.0.1h.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iQIcBAABCAAGBQJTkDweAAoJENNXdQf6QOnizlMQAJ/tw6A4s/TMQjiLTapBAJzJ +b5W2/nOD87oa0HL2aKvTHb0R7RKuvqGR71kgWaPOPJUwyLEWG1SinTeYR0J+yl0K +5y8TE8p4AwnAEp1JcMfbljl3tkyRXOVqS1idkvcBKBawurL68jfyWWkzZ1D2wZtE +LEmVm0diQIDSACuisnonE2Q8YvtqV4/imuX4BEZlZ+iNNdL0+NEuLB+xIWSl84lb +YqM0cXQ09SIZZL+nvO0t5PBNJcQM/6w9TPKDFReQxvhVkdqoWa/o2FfeSgRLNDIu +gGPTe0cEGUpOYyeC/SbLUOppCsRNBbzWjdRotEOV1GO2dMihZaMZZedJDhAhh5q6 +Z1wctpZGxq/vMIQ669Wayj2OxAtluCjW8GwlaJRi7XfB/fCk1NDFezTL4hhWRhIh +mvI4oKO7TC2/OhJ2YvNGqYeqNzsIJbszn7bipvbF5KNf0eNtrUoRWsNPia9nRlca +2yzAxCCx2QtR0PV52/c5Xbfm/Ljxta9ZKgQgAjApz5+YMsap9LyQhklc+r7tETij +yv3Vf3Xft6n4VtKxHsecebl9VZXsz/hCjHN3PmYI0SLZDZOFBdIYoju2ttspH1pH +aBXTitvmBUsDIss2fjJJQLX22TgTpTS3FyPb9zlN+ecE/0HJcGIJUAi80i1gldzH +DQhyf3Qf17vW5g28E7Iv +=oxkH +-----END PGP SIGNATURE----- diff --git a/openssl.spec b/openssl.spec index 53068bc..8461c05 100644 --- a/openssl.spec +++ b/openssl.spec @@ -13,11 +13,11 @@ Summary: Secure Sockets Layer communications libs & utils Name: openssl -Version: 1.0.1g +Version: 1.0.1h Release: 1 License: BSD-like Group: System/Libraries -URL: http://www.openssl.org/ +Url: http://www.openssl.org/ Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz Source1: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz.asc Source2: Makefile.certificate @@ -33,19 +33,19 @@ Patch8: openssl-0.9.8a-link-krb5.patch Patch12: openssl-0.9.6-x509.patch Patch13: openssl-0.9.7-beta5-version-add-engines.patch # http://qa.mandriva.com/show_bug.cgi?id=32621 -Patch15: openssl-0.9.8e-crt.patch +Patch15: openssl-0.9.8e-crt.patch # MIPS and ARM support Patch300: openssl-1.0.0-mips.patch Patch301: openssl-1.0.0-arm.patch Patch302: openssl-1.0.0-enginesdir.patch Patch303: openssl-0.9.8a-no-rpath.patch Patch304: openssl-1.0.1-test-use-localhost.diff -Requires: %{engines_name} = %{version}-%{release} +Requires: %{engines_name} = %{EVRD} Requires: perl-base Requires: rootcerts Provides: /usr/bin/openssl %{?_with_krb5:BuildRequires: krb5-devel} -BuildRequires: zlib-devel +BuildRequires: pkgconfig(zlib) # (tv) for test suite: BuildRequires: bc BuildRequires: sctp-devel @@ -58,8 +58,7 @@ RSA and SSL. %package -n %{engines_name} Summary: Engines for openssl Group: System/Libraries -Obsoletes: openssl-engines < 1.0.0a-5 -Provides: openssl-engines = %{version}-%{release} +Provides: openssl-engines = %{EVRD} %description -n %{engines_name} This package provides engines for openssl. @@ -67,7 +66,6 @@ This package provides engines for openssl. %package -n %{libname} Summary: Secure Sockets Layer communications libs Group: System/Libraries -Provides: %{libname} = %{version}-%{release} %description -n %{libname} The libraries files are needed for various cryptographic algorithms @@ -76,13 +74,10 @@ and protocols, including DES, RC4, RSA and SSL. %package -n %{develname} Summary: Secure Sockets Layer communications libs & headers & utils Group: Development/Other -Requires: %{libname} = %{version}-%{release} +Requires: %{libname} = %{EVRD} Provides: libopenssl-devel -Provides: openssl-devel = %{version}-%{release} -Obsoletes: openssl-devel -Obsoletes: %{conflict2}-devel -Obsoletes: %{mklibname openssl 1.0.0}-devel -Provides: %{name}-devel = %{version}-%{release} +Provides: openssl-devel = %{EVRD} +Provides: %{name}-devel = %{EVRD} %description -n %{develname} The libraries and include files needed to compile apps with support @@ -92,20 +87,17 @@ and SSL. %package -n %{staticname} Summary: Secure Sockets Layer communications static libs Group: Development/Other -Requires: %{develname} = %{version}-%{release} +Requires: %{develname} = %{EVRD} Provides: libopenssl-static-devel -Provides: openssl-static-devel = %{version}-%{release} -Obsoletes: %{conflict2}-static-devel -Obsoletes: %{mklibname openssl 1.0.0}-static-devel -Provides: %{name}-static-devel = %{version}-%{release} +Provides: openssl-static-devel = %{EVRD} +Provides: %{name}-static-devel = %{EVRD} %description -n %{staticname} The static libraries needed to compile apps with support for various cryptographic algorithms and protocols, including DES, RC4, RSA and SSL. %prep - -%setup -q -n %{name}-%{version} +%setup -q %patch2 -p0 -b .optflags %patch6 -p0 -b .icpbrasil %patch7 -p1 -b .defaults @@ -315,8 +307,3 @@ perl -pi -e "s|\./demoCA|%{_sysconfdir}/pki/tls|g" %{buildroot}%{_sysconfdir}/pk %files -n %{staticname} %attr(0644,root,root) %{_libdir}/lib*.a - -%changelog -* Fri May 11 2012 Oden Eriksson 1.0.1c-1 -+ Revision: 798177 -- 1.0.1c