summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorPeter Pentchev <roam@debian.org>2019-07-15 13:40:25 +0300
committerPeter Pentchev <roam@debian.org>2019-07-15 13:40:25 +0300
commita137273b4640bd5bb69ee872e01353250ae7b92e (patch)
tree8c51082fe049f882e9366ec2f84776b0c72acbe2 /debian/patches
parente3f22d2f55b8275781b7903a961a9155bc8051a6 (diff)
Update the Debian packaging for stunnel-5.54.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/02-rename-binary.patch4
-rw-r--r--debian/patches/05-typos.patch42
2 files changed, 23 insertions, 23 deletions
diff --git a/debian/patches/02-rename-binary.patch b/debian/patches/02-rename-binary.patch
index 69f11bd..c5bf8c4 100644
--- a/debian/patches/02-rename-binary.patch
+++ b/debian/patches/02-rename-binary.patch
@@ -92,9 +92,9 @@ Last-Update: 2018-12-06
.\" ========================================================================
.\"
-.IX Title "stunnel 8"
--.TH stunnel 8 "2019.04.30" "5.54" "stunnel TLS Proxy"
+-.TH stunnel 8 "2019.05.15" "5.54" "stunnel TLS Proxy"
+.IX Title "stunnel4 8"
-+.TH stunnel 8 "2019.04.30" "5.54" "stunnel4 TLS Proxy"
++.TH stunnel 8 "2019.05.15" "5.54" "stunnel4 TLS Proxy"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/debian/patches/05-typos.patch b/debian/patches/05-typos.patch
index bb911e1..3594d0a 100644
--- a/debian/patches/05-typos.patch
+++ b/debian/patches/05-typos.patch
@@ -1,38 +1,38 @@
-Description: Correct a typographical error.
+Description: Drop a duplicate word.
Forwarded: no
Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2019-04-30
+Last-Update: 2019-07-15
--- a/doc/stunnel.8.in
+++ b/doc/stunnel.8.in
-@@ -414,7 +414,7 @@
- .IX Item "ciphersuites = CIPHERSUITES_LIST"
- select permitted TLSv1.3 ciphersuites
+@@ -998,7 +998,7 @@
+ session state.
.Sp
--A colon-delimited list of TLSv1.3 ciphersuites names in order of perference.
-+A colon-delimited list of TLSv1.3 ciphersuites names in order of preference.
- .Sp
- This option requires OpenSSL 1.1.1 or later.
+ Combining \fIticketKeySecret\fR and \fIticketMacSecret\fR options allow to resume a
+-negotiated session on other cluster nodes, or to resume resume a negotiated
++negotiated session on other cluster nodes, or to resume a negotiated
+ session after server restart.
.Sp
+ The key is required to be either 16 or 32 bytes long, which implies exactly 32
--- a/doc/stunnel.html.in
+++ b/doc/stunnel.html.in
-@@ -504,7 +504,7 @@
+@@ -1174,7 +1174,7 @@
- <p>select permitted TLSv1.3 ciphersuites</p>
+ <p>Session tickets defined in RFC 5077 provide an enhanced session resumption capability, where the server-side caching is not required to maintain per session state.</p>
--<p>A colon-delimited list of TLSv1.3 ciphersuites names in order of perference.</p>
-+<p>A colon-delimited list of TLSv1.3 ciphersuites names in order of preference.</p>
+-<p>Combining <i>ticketKeySecret</i> and <i>ticketMacSecret</i> options allow to resume a negotiated session on other cluster nodes, or to resume resume a negotiated session after server restart.</p>
++<p>Combining <i>ticketKeySecret</i> and <i>ticketMacSecret</i> options allow to resume a negotiated session on other cluster nodes, or to resume a negotiated session after server restart.</p>
- <p>This option requires OpenSSL 1.1.1 or later.</p>
+ <p>The key is required to be either 16 or 32 bytes long, which implies exactly 32 or 64 hexadecimal digits. Colons may optionally be used between two-character hexadecimal bytes.</p>
--- a/doc/stunnel.pod.in
+++ b/doc/stunnel.pod.in
-@@ -438,7 +438,7 @@
-
- select permitted TLSv1.3 ciphersuites
-
--A colon-delimited list of TLSv1.3 ciphersuites names in order of perference.
-+A colon-delimited list of TLSv1.3 ciphersuites names in order of preference.
+@@ -1065,7 +1065,7 @@
+ session state.
- This option requires OpenSSL 1.1.1 or later.
+ Combining I<ticketKeySecret> and I<ticketMacSecret> options allow to resume a
+-negotiated session on other cluster nodes, or to resume resume a negotiated
++negotiated session on other cluster nodes, or to resume a negotiated
+ session after server restart.
+ The key is required to be either 16 or 32 bytes long, which implies exactly 32