From 56642f75b1974ae8cb2fec6c7c9ca881d2c8c4dc Mon Sep 17 00:00:00 2001 From: Tomáš Mráz Date: Jun 30 2010 12:36:47 +0000 Subject: - openssl man page fix (#609484) --- diff --git a/openssl-1.0.0a-manfix.patch b/openssl-1.0.0a-manfix.patch new file mode 100644 index 0000000..0d3dc04 --- /dev/null +++ b/openssl-1.0.0a-manfix.patch @@ -0,0 +1,21 @@ +diff -up openssl-1.0.0a/doc/apps/openssl.pod.manfix openssl-1.0.0a/doc/apps/openssl.pod +--- openssl-1.0.0a/doc/apps/openssl.pod.manfix 2010-01-21 19:46:28.000000000 +0100 ++++ openssl-1.0.0a/doc/apps/openssl.pod 2010-06-30 14:24:50.000000000 +0200 +@@ -287,8 +287,6 @@ SHA Digest + + SHA-1 Digest + +-=back +- + =item B + + SHA-224 Digest +@@ -305,6 +303,8 @@ SHA-384 Digest + + SHA-512 Digest + ++=back ++ + =head2 ENCODING AND CIPHER COMMANDS + + =over 10 diff --git a/openssl.spec b/openssl.spec index 0c7b888..58a13e9 100644 --- a/openssl.spec +++ b/openssl.spec @@ -21,7 +21,7 @@ Summary: A general purpose cryptography library with TLS implementation Name: openssl Version: 1.0.0a -Release: 1%{?dist} +Release: 2%{?dist} # We remove certain patented algorithms from the openssl source tarball # with the hobble-openssl script which is included below. Source: openssl-%{version}-usa.tar.bz2 @@ -43,6 +43,7 @@ Patch7: openssl-1.0.0-timezone.patch # Bug fixes Patch23: openssl-1.0.0-beta4-default-paths.patch Patch24: openssl-0.9.8j-bad-mime.patch +Patch25: openssl-1.0.0a-manfix.patch # Functionality changes Patch32: openssl-0.9.8g-ia64.patch Patch33: openssl-1.0.0-beta4-ca-dir.patch @@ -124,6 +125,7 @@ from other formats to the formats used by the OpenSSL toolkit. %patch23 -p1 -b .default-paths %patch24 -p1 -b .bad-mime +%patch25 -p1 -b .manfix %patch32 -p1 -b .ia64 %patch33 -p1 -b .ca-dir @@ -391,6 +393,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.* %postun -p /sbin/ldconfig %changelog +* Wed Jun 30 2010 Tomas Mraz 1.0.0a-2 +- openssl man page fix (#609484) + * Fri Jun 4 2010 Tomas Mraz 1.0.0a-1 - new upstream patch release, fixes CVE-2010-0742 (#598738) and CVE-2010-1633 (#598732)