Update the Debian patches for stunnel-5.27.

5 files changed, 8 insertions, 36 deletions

diff --git a/debian/patches/02-rename-binary.patch b/debian/patches/02-rename-binary.patch
index 3a764ef..9e9aaec 100644
--- a/debian/patches/02-rename-binary.patch
+++ b/debian/patches/02-rename-binary.patch
@@ -2,7 +2,7 @@ Description: Change references to the binary from stunnel to stunnel4
 Forwarded: not-needed
 Author: Julien Lemoine <speedblue@debian.org>
 Author: Luis Rodrigo Gallardo Cruz <rodrigo@debian.org>
-Last-Update: 2015-11-19
+Last-Update: 2015-12-02
 
 --- a/src/stunnel3.in
 +++ b/src/stunnel3.in
@@ -95,9 +95,9 @@ Last-Update: 2015-11-19
  .\" ========================================================================
  .\"
 -.IX Title "stunnel 8"
--.TH stunnel 8 "2015.11.02" "5.26" "stunnel TLS Proxy"
+-.TH stunnel 8 "2015.11.06" "5.27" "stunnel TLS Proxy"
 +.IX Title "stunnel4 8"
-+.TH stunnel 8 "2015.11.02" "5.26" "stunnel4 TLS Proxy"
++.TH stunnel 8 "2015.11.06" "5.27" "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/10-no-zlib-compression.patch b/debian/patches/10-no-zlib-compression.patch
index 0a89ea3..2c067f7 100644
--- a/debian/patches/10-no-zlib-compression.patch
+++ b/debian/patches/10-no-zlib-compression.patch
@@ -3,11 +3,11 @@ Description: Do not look for zlib at all.
  compression since version 1.0.1e-5.
 Forwarded: not-needed
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2015-11-19
+Last-Update: 2015-12-02
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -183,10 +183,9 @@
+@@ -185,10 +185,9 @@
  AC_SEARCH_LIBS([yp_get_default_domain], [nsl])
  AC_SEARCH_LIBS([socket], [socket])
  AC_SEARCH_LIBS([openpty], [util])
diff --git a/debian/patches/12-restore-pidfile-default.patch b/debian/patches/12-restore-pidfile-default.patch
index f6ff141..8a2a728 100644
--- a/debian/patches/12-restore-pidfile-default.patch
+++ b/debian/patches/12-restore-pidfile-default.patch
@@ -8,7 +8,7 @@ Description: Temporarily restore the pid file creation by default.
 Forwarded: not-needed
 Author: Peter Pentchev <roam@ringlet.net>
 Bug-Debian: http://bugs.debian.org/744851
-Last-Update: 2015-11-19
+Last-Update: 2015-12-02
 
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
@@ -22,7 +22,7 @@ Last-Update: 2015-11-19
  stunnel_LDFLAGS = -L$(SSLDIR)/lib64 -L$(SSLDIR)/lib -lssl -lcrypto
 --- a/src/options.c
 +++ b/src/options.c
-@@ -908,7 +908,7 @@
+@@ -906,7 +906,7 @@
  #ifndef USE_WIN32
      switch(cmd) {
      case CMD_BEGIN:
@@ -31,7 +31,7 @@ Last-Update: 2015-11-19
          break;
      case CMD_EXEC:
          if(strcasecmp(opt, "pid"))
-@@ -923,9 +923,10 @@
+@@ -921,9 +921,10 @@
      case CMD_FREE:
          break;
      case CMD_DEFAULT:
diff --git a/debian/patches/19-typos.patch b/debian/patches/19-typos.patch
deleted file mode 100644
index b3c8967..0000000
--- a/debian/patches/19-typos.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix some typos.
-Forwarded: http://www.stunnel.org/pipermail/stunnel-users/2015-November/005313.html
-Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2015-11-19
-
---- a/src/options.c
-+++ b/src/options.c
-@@ -2488,7 +2488,7 @@
-         section->option.sessiond=1;
- #ifdef SSL_OP_NO_TICKET
-         /* disable RFC4507 support introduced in OpenSSL 0.9.8f */
--        /* this prevents session callbacks from beeing executed */
-+        /* this prevents session callbacks from being executed */
-         section->ssl_options_set|=SSL_OP_NO_TICKET;
- #endif
-         if(!name2addr(&section->sessiond_addr, arg, 0))
---- a/src/ssl.c
-+++ b/src/ssl.c
-@@ -38,7 +38,7 @@
- #include "common.h"
- #include "prototypes.h"
- 
--    /* global OpenSSL initalization: compression, engine, entropy */
-+    /* global OpenSSL initialization: compression, engine, entropy */
- NOEXPORT void cb_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-     int idx, long argl, void *argp);
- #ifndef OPENSSL_NO_COMP
diff --git a/debian/patches/series b/debian/patches/series
index d88e30f..0109ccb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@
 03-runas-user.patch
 10-no-zlib-compression.patch
 12-restore-pidfile-default.patch
-19-typos.patch
 21-author-tests.patch