[Pkg-openssl-changes] r879 - openssl/branches/1.1.0/debian/patches
Sebastian Andrzej Siewior
bigeasy at moszumanska.debian.org
Fri Jan 20 12:22:28 UTC 2017
Author: bigeasy
Date: 2017-01-20 12:22:28 +0000 (Fri, 20 Jan 2017)
New Revision: 879
Modified:
openssl/branches/1.1.0/debian/patches/0001-Add-missing-zdelete-for-some-linux-arches.patch
openssl/branches/1.1.0/debian/patches/c_rehash-compat.patch
openssl/branches/1.1.0/debian/patches/man-section.patch
openssl/branches/1.1.0/debian/patches/revert_ssl_read.patch
Log:
refresh patches
Modified: openssl/branches/1.1.0/debian/patches/0001-Add-missing-zdelete-for-some-linux-arches.patch
===================================================================
--- openssl/branches/1.1.0/debian/patches/0001-Add-missing-zdelete-for-some-linux-arches.patch 2017-01-19 22:00:12 UTC (rev 878)
+++ openssl/branches/1.1.0/debian/patches/0001-Add-missing-zdelete-for-some-linux-arches.patch 2017-01-20 12:22:28 UTC (rev 879)
@@ -1,18 +1,19 @@
-From 1e904478f0abcd4a6aed4b2b100568f5cafaf861 Mon Sep 17 00:00:00 2001
From: Kurt Roeckx <kurt at roeckx.be>
Date: Mon, 21 Nov 2016 22:15:11 +0100
-Subject: [PATCH] Add missing -zdelete for some linux arches
+Subject: Add missing -zdelete for some linux arches
-b6d5ba1a9f004d637acac18ae3519fe063b6b5e1 forgot to update some linux arches.
+Bug-Debian: https://bugs.debian.org/844715
+Applied-Upstream: https://github.com/openssl/openssl/commit/e9a86d6b4951a1c536d5536d1217e6be6455858a
+Description: Upstream commit b6d5ba1a9f00 ("Link using -znodelete") forgot to
+ update some linux arches.
+
---
- Configurations/10-main.conf | 4 ++--
+ Configurations/10-main.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index 6b0f368..59234a8 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
-@@ -701,7 +701,7 @@ sub vms_info {
+@@ -702,7 +702,7 @@ sub vms_info {
cflags => add("-mabi=ilp32"),
bn_ops => "SIXTY_FOUR_BIT RC4_CHAR",
perlasm_scheme => "linux64",
@@ -21,7 +22,7 @@
},
"linux-mips32" => {
-@@ -784,7 +784,7 @@ sub vms_info {
+@@ -767,7 +767,7 @@ sub vms_info {
cflags => add("-mx32 -DL_ENDIAN"),
bn_ops => "SIXTY_FOUR_BIT",
perlasm_scheme => "elf32",
@@ -30,6 +31,3 @@
multilib => "x32",
},
---
-2.10.2
-
Modified: openssl/branches/1.1.0/debian/patches/c_rehash-compat.patch
===================================================================
--- openssl/branches/1.1.0/debian/patches/c_rehash-compat.patch 2017-01-19 22:00:12 UTC (rev 878)
+++ openssl/branches/1.1.0/debian/patches/c_rehash-compat.patch 2017-01-20 12:22:28 UTC (rev 879)
@@ -7,10 +7,8 @@
tools/c_rehash.in | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
-Index: openssl-1.1.0a/tools/c_rehash.in
-===================================================================
---- openssl-1.1.0a.orig/tools/c_rehash.in
-+++ openssl-1.1.0a/tools/c_rehash.in
+--- a/tools/c_rehash.in
++++ b/tools/c_rehash.in
@@ -17,8 +17,6 @@ my $prefix = {- quotify1($config{prefix}
my $errorcount = 0;
my $openssl = $ENV{OPENSSL} || "openssl";
Modified: openssl/branches/1.1.0/debian/patches/man-section.patch
===================================================================
--- openssl/branches/1.1.0/debian/patches/man-section.patch 2017-01-19 22:00:12 UTC (rev 878)
+++ openssl/branches/1.1.0/debian/patches/man-section.patch 2017-01-20 12:22:28 UTC (rev 879)
@@ -4,7 +4,7 @@
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
-@@ -160,7 +160,8 @@ HTMLDIR=$(DOCDIR)/html
+@@ -164,7 +164,8 @@ HTMLDIR=$(DOCDIR)/html
# MANSUFFIX is for the benefit of anyone who may want to have a suffix
# appended after the manpage file section number. "ssl" is popular,
# resulting in files such as config.5ssl rather than config.5.
@@ -14,7 +14,7 @@
HTMLSUFFIX=html
-@@ -635,7 +636,7 @@ UNINSTALL_DOCS=\
+@@ -630,7 +631,7 @@ UNINSTALL_DOCS=\
@\
OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \
OUTTOP="$(DESTDIR)$(MANDIR)"; \
Modified: openssl/branches/1.1.0/debian/patches/revert_ssl_read.patch
===================================================================
--- openssl/branches/1.1.0/debian/patches/revert_ssl_read.patch 2017-01-19 22:00:12 UTC (rev 878)
+++ openssl/branches/1.1.0/debian/patches/revert_ssl_read.patch 2017-01-20 12:22:28 UTC (rev 879)
@@ -1,5 +1,19 @@
-diff --git a/doc/ssl/SSL_get_error.pod b/doc/ssl/SSL_get_error.pod
-index ddd72f7..47d2358 100644
+Subject: Revert behaviour of SSL_read() and SSL_write(), and update documentation.
+
+Author: Kurt Roeckx <kurt at roeckx.be>
+Bug: https://github.com/openssl/openssl/issues/1903
+Bug-Debian: https://bugs.debian.org/844234
+Forwarded: no
+Description: This is a revert of upstream commit 4880672a9b41 ("A zero return
+ from BIO_read()/BIO_write() could be retryable").
+---
+ doc/ssl/SSL_get_error.pod | 22 +++++++---------
+ doc/ssl/SSL_read.pod | 31 +++++++++--------------
+ doc/ssl/SSL_write.pod | 21 ++++++---------
+ ssl/record/rec_layer_s3.c | 14 +++-------
+ test/asynciotest.c | 61 +++++++++++++++++++++++++++++++++-------------
+ 5 files changed, 79 insertions(+), 70 deletions(-)
+
--- a/doc/ssl/SSL_get_error.pod
+++ b/doc/ssl/SSL_get_error.pod
@@ -38,12 +38,13 @@ if and only if B<ret E<gt> 0>.
@@ -38,11 +52,9 @@
=item SSL_ERROR_SSL
-diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod
-index 8dff244..20ccf40 100644
--- a/doc/ssl/SSL_read.pod
+++ b/doc/ssl/SSL_read.pod
-@@ -81,28 +81,21 @@ The following return values can occur:
+@@ -81,28 +81,21 @@ with the same arguments.
=over 4
@@ -67,26 +79,25 @@
-incomplete. Call SSL_get_error() with the return value B<ret> to find out,
-whether an error occurred or the connection was shut down cleanly
-(SSL_ERROR_ZERO_RETURN).
-+The read operation was not successful, because either the connection was closed,
-+an error occurred or action must be taken by the calling process.
-+Call L<SSL_get_error(3)> with the return value B<ret> to find out the reason.
-
+-
-=item E<lt>0
-
-The read operation was not successful, because either an error occurred
-or action must be taken by the calling process. Call SSL_get_error() with the
-return value B<ret> to find out the reason.
++The read operation was not successful, because either the connection was closed,
++an error occurred or action must be taken by the calling process.
++Call L<SSL_get_error(3)> with the return value B<ret> to find out the reason.
++
+Old documentation indicated a difference between 0 and -1, and that -1 was
+retryable.
+You should instead call SSL_get_error() to find out if it's retryable.
=back
-diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod
-index 5ab0790..ef3b92a 100644
--- a/doc/ssl/SSL_write.pod
+++ b/doc/ssl/SSL_write.pod
-@@ -74,23 +74,20 @@ The following return values can occur:
+@@ -74,23 +74,20 @@ undefined.
=over 4
@@ -103,26 +114,25 @@
-was closed. Call SSL_get_error() with the return value B<ret> to find out,
-whether an error occurred or the connection was shut down cleanly
-(SSL_ERROR_ZERO_RETURN).
-+The write operation was not successful, because either the connection was
-+closed, an error occurred or action must be taken by the calling process.
-+Call SSL_get_error() with the return value B<ret> to find out the reason.
-
+-
-=item E<lt>0
-
-The write operation was not successful, because either an error occurred
-or action must be taken by the calling process. Call SSL_get_error() with the
-return value B<ret> to find out the reason.
++The write operation was not successful, because either the connection was
++closed, an error occurred or action must be taken by the calling process.
++Call SSL_get_error() with the return value B<ret> to find out the reason.
++
+Old documentation indicated a difference between 0 and -1, and that -1 was
+retryable.
+You should instead call SSL_get_error() to find out if it's retryable.
=back
-diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
-index 28de7c3..1270a5f 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
-@@ -178,10 +178,7 @@ const char *SSL_rstate_string(const SSL *s)
+@@ -178,10 +178,7 @@ const char *SSL_rstate_string(const SSL
}
/*
@@ -134,7 +144,7 @@
*/
int ssl3_read_n(SSL *s, int n, int max, int extend, int clearold)
{
-@@ -312,7 +309,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend, int clearold)
+@@ -312,7 +309,7 @@ int ssl3_read_n(SSL *s, int n, int max,
if (s->mode & SSL_MODE_RELEASE_BUFFERS && !SSL_IS_DTLS(s))
if (len + left == 0)
ssl3_release_read_buffer(s);
@@ -143,7 +153,7 @@
}
left += i;
/*
-@@ -882,10 +879,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
+@@ -882,10 +879,7 @@ int do_ssl3_write(SSL *s, int type, cons
/* if s->s3->wbuf.left != 0, we need to call this
*
@@ -155,7 +165,7 @@
*/
int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
unsigned int len)
-@@ -936,7 +930,7 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
+@@ -936,7 +930,7 @@ int ssl3_write_pending(SSL *s, int type,
*/
SSL3_BUFFER_set_left(&wb[currbuf], 0);
}
@@ -164,8 +174,6 @@
}
SSL3_BUFFER_add_offset(&wb[currbuf], i);
SSL3_BUFFER_add_left(&wb[currbuf], -i);
-diff --git a/test/asynciotest.c b/test/asynciotest.c
-index 23d0907..133e3d5 100644
--- a/test/asynciotest.c
+++ b/test/asynciotest.c
@@ -85,7 +85,7 @@ static int async_free(BIO *bio)
@@ -177,7 +185,7 @@
BIO *next = BIO_next(bio);
if (outl <= 0)
-@@ -120,7 +120,7 @@ static int async_read(BIO *bio, char *out, int outl)
+@@ -120,7 +120,7 @@ static int async_read(BIO *bio, char *ou
static int async_write(BIO *bio, const char *in, int inl)
{
struct async_ctrs *ctrs;
More information about the Pkg-openssl-changes
mailing list