[Pkg-openssl-changes] r658 - in openssl/branches/1.0.1/debian: . patches source
Kurt Roeckx
kroeckx at moszumanska.debian.org
Mon May 12 21:10:05 UTC 2014
Author: kroeckx
Date: 2014-05-12 21:10:05 +0000 (Mon, 12 May 2014)
New Revision: 658
Added:
openssl/branches/1.0.1/debian/source/include-binaries
Modified:
openssl/branches/1.0.1/debian/changelog
openssl/branches/1.0.1/debian/patches/fix-pod-errors.patch
openssl/branches/1.0.1/debian/patches/series
openssl/branches/1.0.1/debian/rules
Log:
New upstream version.
Modified: openssl/branches/1.0.1/debian/changelog
===================================================================
--- openssl/branches/1.0.1/debian/changelog 2014-05-12 21:05:05 UTC (rev 657)
+++ openssl/branches/1.0.1/debian/changelog 2014-05-12 21:10:05 UTC (rev 658)
@@ -1,3 +1,12 @@
+openssl (1.0.1g-1) unstable; urgency=high
+
+ * New upstream release
+ - Fixes CVE-2014-0160
+ - Fixes CVE-2014-0076
+ - Drop patches applied upstream
+
+ -- Kurt Roeckx <kurt at roeckx.be> Mon, 07 Apr 2014 23:17:42 +0200
+
openssl (1.0.1f-1) unstable; urgency=high
* New upstream version
Modified: openssl/branches/1.0.1/debian/patches/fix-pod-errors.patch
===================================================================
--- openssl/branches/1.0.1/debian/patches/fix-pod-errors.patch 2014-05-12 21:05:05 UTC (rev 657)
+++ openssl/branches/1.0.1/debian/patches/fix-pod-errors.patch 2014-05-12 21:10:05 UTC (rev 658)
@@ -7,10 +7,10 @@
Bug-Debian: http://bugs.debian.org/723954
Bug: http://rt.openssl.org/Ticket/Display.html?id=3146&user=guest&pass=guest
-Index: openssl-1.0.1e/doc/apps/smime.pod
+Index: openssl-1.0.1g/doc/apps/smime.pod
===================================================================
---- openssl-1.0.1e.orig/doc/apps/smime.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/apps/smime.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/apps/smime.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/apps/smime.pod 2014-04-07 23:21:03.985184135 +0200
@@ -308,28 +308,28 @@
=over 4
@@ -46,10 +46,10 @@
the message was verified correctly but an error occurred writing out
the signers certificates.
-Index: openssl-1.0.1e/doc/apps/cms.pod
+Index: openssl-1.0.1g/doc/apps/cms.pod
===================================================================
---- openssl-1.0.1e.orig/doc/apps/cms.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/apps/cms.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/apps/cms.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/apps/cms.pod 2014-04-07 23:21:03.985184135 +0200
@@ -450,28 +450,28 @@
=over 4
@@ -85,10 +85,10 @@
the message was verified correctly but an error occurred writing out
the signers certificates.
-Index: openssl-1.0.1e/doc/ssl/SSL_clear.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_clear.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_clear.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_clear.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_clear.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_clear.pod 2014-04-07 23:21:03.985184135 +0200
@@ -56,12 +56,12 @@
=over 4
@@ -104,10 +104,10 @@
The SSL_clear() operation was successful.
-Index: openssl-1.0.1e/doc/ssl/SSL_session_reused.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_session_reused.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_session_reused.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_session_reused.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_session_reused.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_session_reused.pod 2014-04-07 23:21:03.985184135 +0200
@@ -27,11 +27,11 @@
=over 4
@@ -122,10 +122,10 @@
A session was reused.
-Index: openssl-1.0.1e/doc/ssl/SSL_set_session.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_set_session.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_set_session.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_set_session.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_set_session.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_set_session.pod 2014-04-07 23:21:03.985184135 +0200
@@ -37,11 +37,11 @@
=over 4
@@ -140,10 +140,10 @@
The operation succeeded.
-Index: openssl-1.0.1e/doc/ssl/SSL_connect.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_connect.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_connect.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_connect.pod 2013-12-22 17:22:42.956402467 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_connect.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_connect.pod 2014-04-07 23:21:03.985184135 +0200
@@ -41,13 +41,13 @@
=over 4
@@ -160,10 +160,10 @@
The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
established.
-Index: openssl-1.0.1e/doc/ssl/SSL_shutdown.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_shutdown.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_shutdown.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_shutdown.pod 2013-12-22 17:23:49.347031915 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_shutdown.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_shutdown.pod 2014-04-07 23:21:03.985184135 +0200
@@ -92,14 +92,14 @@
=over 4
@@ -181,10 +181,10 @@
The shutdown was successfully completed. The "close notify" alert was sent
and the peer's "close notify" alert was received.
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_client_CA_list.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod 2013-12-22 17:24:41.985942861 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_set_client_CA_list.pod 2014-04-07 23:21:03.985184135 +0200
@@ -66,13 +66,13 @@
=over 4
@@ -201,10 +201,10 @@
The operation succeeded.
-Index: openssl-1.0.1e/doc/ssl/SSL_accept.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_accept.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_accept.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_accept.pod 2013-12-22 17:24:17.466450402 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_accept.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_accept.pod 2014-04-07 23:21:03.985184135 +0200
@@ -44,13 +44,13 @@
=over 4
@@ -221,10 +221,10 @@
The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
established.
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_session_id_context.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_session_id_context.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_set_session_id_context.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_set_session_id_context.pod 2014-04-07 23:21:03.985184135 +0200
@@ -64,13 +64,13 @@
=over 4
@@ -241,10 +241,10 @@
The operation succeeded.
-Index: openssl-1.0.1e/doc/ssl/SSL_write.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_write.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_write.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_write.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_write.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_write.pod 2014-04-07 23:21:03.985184135 +0200
@@ -79,7 +79,7 @@
The write operation was successful, the return value is the number of
bytes actually written to the TLS/SSL connection.
@@ -254,10 +254,10 @@
The write operation was not successful. Probably the underlying connection
was closed. Call SSL_get_error() with the return value B<ret> to find out,
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_load_verify_locations.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_load_verify_locations.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_load_verify_locations.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_load_verify_locations.pod 2014-04-07 23:21:03.985184135 +0200
@@ -100,13 +100,13 @@
=over 4
@@ -274,10 +274,10 @@
The operation succeeded.
-Index: openssl-1.0.1e/doc/ssl/SSL_set_fd.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_set_fd.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_set_fd.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_set_fd.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_set_fd.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_set_fd.pod 2014-04-07 23:21:03.985184135 +0200
@@ -35,11 +35,11 @@
=over 4
@@ -292,10 +292,10 @@
The operation succeeded.
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2014-04-07 23:21:03.985184135 +0200
@@ -96,7 +96,7 @@
connection will fail with decryption_error before it will be finished
completely.
@@ -305,10 +305,10 @@
PSK identity was not found. An "unknown_psk_identity" alert message
will be sent and the connection setup fails.
-Index: openssl-1.0.1e/doc/ssl/SSL_read.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_read.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_read.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_read.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_read.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_read.pod 2014-04-07 23:21:03.985184135 +0200
@@ -86,7 +86,7 @@
The read operation was successful; the return value is the number of
bytes actually read from the TLS/SSL connection.
@@ -318,23 +318,10 @@
The read operation was not successful. The reason may either be a clean
shutdown due to a "close notify" alert sent by the peer (in which case
-Index: openssl-1.0.1e/doc/ssl/SSL_set_shutdown.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_add_session.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_set_shutdown.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_set_shutdown.pod 2013-12-22 17:21:52.909435656 +0100
-@@ -24,7 +24,7 @@
-
- =over 4
-
--=item 0
-+=item C<0>
-
- No shutdown setting, yet.
-
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod
-===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_add_session.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_add_session.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_add_session.pod 2014-04-07 23:21:03.985184135 +0200
@@ -52,13 +52,13 @@
=over 4
@@ -351,10 +338,10 @@
The operation succeeded.
-Index: openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_do_handshake.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_do_handshake.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod 2013-12-22 17:23:09.503854843 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_do_handshake.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_do_handshake.pod 2014-04-07 23:21:03.985184135 +0200
@@ -45,13 +45,13 @@
=over 4
@@ -371,10 +358,10 @@
The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
established.
-Index: openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_COMP_add_compression_method.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_COMP_add_compression_method.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_COMP_add_compression_method.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_COMP_add_compression_method.pod 2014-04-07 23:21:03.985184135 +0200
@@ -53,11 +53,11 @@
=over 4
@@ -389,10 +376,10 @@
The operation failed. Check the error queue to find out the reason.
-Index: openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod
+Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_ssl_version.pod
===================================================================
---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_ssl_version.pod 2013-12-22 17:21:52.913435572 +0100
-+++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod 2013-12-22 17:21:52.909435656 +0100
+--- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_set_ssl_version.pod 2014-04-07 23:21:03.985184135 +0200
++++ openssl-1.0.1g/doc/ssl/SSL_CTX_set_ssl_version.pod 2014-04-07 23:21:03.985184135 +0200
@@ -42,11 +42,11 @@
=over 4
Modified: openssl/branches/1.0.1/debian/patches/series
===================================================================
--- openssl/branches/1.0.1/debian/patches/series 2014-05-12 21:05:05 UTC (rev 657)
+++ openssl/branches/1.0.1/debian/patches/series 2014-05-12 21:10:05 UTC (rev 658)
@@ -15,15 +15,6 @@
version-script.patch
gnu_source.patch
c_rehash-compat.patch
-libdoc-manpgs-pod-spell.patch
-libssl-misspell.patch
-openssl-pod-misspell.patch
-pod_req_misspell2.patch
-pod_pksc12.misspell.patch
-pod_s_server.misspell.patch
-pod_x509setflags.misspell.patch
-pod_ec.misspell.patch
-pkcs12-doc.patch
dgst_hmac.patch
block_diginotar.patch
block_digicert_malaysia.patch
@@ -31,4 +22,3 @@
defaults.patch
openssl_fix_for_x32.patch
fix-pod-errors.patch
-req_bits.patch
Modified: openssl/branches/1.0.1/debian/rules
===================================================================
--- openssl/branches/1.0.1/debian/rules 2014-05-12 21:05:05 UTC (rev 657)
+++ openssl/branches/1.0.1/debian/rules 2014-05-12 21:10:05 UTC (rev 658)
@@ -20,6 +20,12 @@
DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_HOST_ARCH_CPU=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+ export CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)-
+endif
+
CONFARGS = --prefix=/usr --openssldir=/usr/lib/ssl --libdir=lib/$(DEB_HOST_MULTIARCH) no-idea no-mdc2 no-rc5 no-zlib enable-tlsext no-ssl2
OPT_alpha = ev4 ev5
OPT_i386 = i586 i686/cmov
Added: openssl/branches/1.0.1/debian/source/include-binaries
===================================================================
--- openssl/branches/1.0.1/debian/source/include-binaries (rev 0)
+++ openssl/branches/1.0.1/debian/source/include-binaries 2014-05-12 21:10:05 UTC (rev 658)
@@ -0,0 +1 @@
+debian/upstream-signing-key.pgp
More information about the Pkg-openssl-changes
mailing list