|
|
@@ -2,8 +2,8 @@
|
|
|
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}}
|
|
|
-%define version 1.1.1d
|
|
|
-%define release 2%{_dist_release}
|
|
|
+%define version 1.1.1e
|
|
|
+%define release 1%{_dist_release}
|
|
|
# 1.0.0 soversion = 10
|
|
|
# 1.1.0 soversion = 1.1 (same as upstream although presence of some symbols
|
|
|
# depends on build configuration options)
|
|
|
@@ -56,11 +56,9 @@ Patch51: openssl-1.1.1-upstream-sync.patch
|
|
|
Patch52: openssl-1.1.1-s390x-update.patch
|
|
|
Patch53: openssl-1.1.1-fips-crng-test.patch
|
|
|
Patch54: openssl-1.1.1-regression-fixes.patch
|
|
|
-Patch100: BIO_f_zlib.patch
|
|
|
|
|
|
# security fix
|
|
|
-# https://git.openssl.org/gitweb/?p=openssl.git;a=patch;h=419102400a2811582a7a3d4a4e317d72e5ce0a8f
|
|
|
-Patch1000: CVE-2019-1551.patch
|
|
|
+# none
|
|
|
|
|
|
License: BSDish
|
|
|
Group: System Environment/Libraries
|
|
|
@@ -177,16 +175,14 @@ cp %{SOURCE13} test/
|
|
|
%patch50 -p1 -b .ssh-kdf
|
|
|
%patch51 -p1 -b .upstream-sync
|
|
|
%endif
|
|
|
-%patch52 -p1 -b .s390x-update
|
|
|
+#patch52 -p1 -b .s390x-update
|
|
|
%if %{with fips}
|
|
|
%patch53 -p1 -b .crng-test
|
|
|
%endif
|
|
|
%patch54 -p1 -b .regression
|
|
|
|
|
|
-%patch100 -p1 -b .BIO_f_zlib
|
|
|
-
|
|
|
# security fix
|
|
|
-%patch1000 -p1 -b .CVE-2019-1551
|
|
|
+# none
|
|
|
|
|
|
%build
|
|
|
# Figure out which flags we want to use.
|
|
|
@@ -445,6 +441,10 @@ export LD_LIBRARY_PATH
|
|
|
%postun -n compat32-%{name} -p /sbin/ldconfig
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.1e-1
|
|
|
+- new upstream release.
|
|
|
+- dropped Patch100 and 1000: fixed in upstream.
|
|
|
+
|
|
|
* Fri Dec 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.1d-2
|
|
|
- imported Patch1000 from upstream.
|
|
|
|
tomop