Update the Debian packaging for stunnel-5.39.

5 files changed, 9 insertions, 44 deletions

diff --git a/debian/patches/02-rename-binary.patch b/debian/patches/02-rename-binary.patch
index 073cad0..3957e7c 100644
--- a/debian/patches/02-rename-binary.patch
+++ b/debian/patches/02-rename-binary.patch
@@ -34,7 +34,7 @@ Last-Update: 2016-07-18
 +DEFAULTPIDFILE="/var/run/stunnel4.pid"
 +DAEMON=@bindir@/stunnel4
  NAME=stunnel
- DESC="SSL tunnels"
+ DESC="TLS tunnels"
  OPTIONS=""
 @@ -49,9 +49,9 @@
  startdaemons() {
@@ -95,9 +95,9 @@ Last-Update: 2016-07-18
  .\" ========================================================================
  .\"
 -.IX Title "stunnel 8"
--.TH stunnel 8 "2016.11.26" "5.38" "stunnel TLS Proxy"
+-.TH stunnel 8 "2016.12.13" "5.39" "stunnel TLS Proxy"
 +.IX Title "stunnel4 8"
-+.TH stunnel 8 "2016.11.26" "5.38" "stunnel4 TLS Proxy"
++.TH stunnel 8 "2016.12.13" "5.39" "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/04-restore-pidfile-default.patch b/debian/patches/04-restore-pidfile-default.patch
index 1d07d6c..a92c40c 100644
--- a/debian/patches/04-restore-pidfile-default.patch
+++ b/debian/patches/04-restore-pidfile-default.patch
@@ -17,11 +17,11 @@ Last-Update: 2015-12-02
  stunnel_CPPFLAGS += -DCONFDIR='"$(sysconfdir)/stunnel"'
 +stunnel_CPPFLAGS += -DPIDFILE='"$(localstatedir)/run/stunnel4.pid"'
  
- # SSL library
+ # TLS library
  stunnel_LDFLAGS = -L$(SSLDIR)/lib64 -L$(SSLDIR)/lib -lssl -lcrypto
 --- a/src/options.c
 +++ b/src/options.c
-@@ -936,7 +936,7 @@
+@@ -945,7 +945,7 @@
  #ifndef USE_WIN32
      switch(cmd) {
      case CMD_BEGIN:
@@ -30,7 +30,7 @@ Last-Update: 2015-12-02
          break;
      case CMD_EXEC:
          if(strcasecmp(opt, "pid"))
-@@ -951,9 +951,10 @@
+@@ -960,9 +960,10 @@
      case CMD_FREE:
          break;
      case CMD_DEFAULT:
diff --git a/debian/patches/07-path-max.patch b/debian/patches/07-path-max.patch
index 56e437d..1f541a1 100644
--- a/debian/patches/07-path-max.patch
+++ b/debian/patches/07-path-max.patch
@@ -16,7 +16,7 @@ Last-Update: 2016-06-27
  #define _CRT_NONSTDC_NO_DEPRECATE
 --- a/src/options.c
 +++ b/src/options.c
-@@ -202,7 +202,7 @@
+@@ -211,7 +211,7 @@
  NOEXPORT char **argalloc(char *);
  #endif
  
@@ -25,7 +25,7 @@ Last-Update: 2016-06-27
  
  GLOBAL_OPTIONS global_options;
  SERVICE_OPTIONS service_options;
-@@ -280,17 +280,27 @@
+@@ -289,17 +289,27 @@
      }
  
  #ifdef HAVE_REALPATH
@@ -60,7 +60,7 @@ Last-Update: 2016-06-27
  
 --- a/src/prototypes.h
 +++ b/src/prototypes.h
-@@ -431,7 +431,7 @@
+@@ -435,7 +435,7 @@
  
  /**************************************** prototypes for options.c */
  
diff --git a/debian/patches/08-dh-openssl-1.1.patch b/debian/patches/08-dh-openssl-1.1.patch
deleted file mode 100644
index c4e983f..0000000
--- a/debian/patches/08-dh-openssl-1.1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Restore the invocation of DH_set0_pqg().
- It is needed for OpenSSL 1.1.
- .
- This patch actually restores the upstream code introduced in
- stunnel-5.32 and removed in stunnel-5.39.
-Forwarded: yes
-Author: Michal Trojnara <Michal.Trojnara@stunnel.org>
-Last-Update: 2016-11-27
-
---- a/src/dhparam.c
-+++ b/src/dhparam.c
-@@ -34,12 +34,18 @@
- 		0x02,
- 		};
- 	DH *dh;
-+	BIGNUM *dhp_bn, *dhg_bn;
- 
- 	if ((dh=DH_new()) == NULL) return(NULL);
--	dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
--	dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
--	if ((dh->p == NULL) || (dh->g == NULL))
--		{ DH_free(dh); return(NULL); }
-+	dhp_bn=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-+	dhg_bn=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
-+	if ((dhp_bn == NULL) || (dhg_bn == NULL)
-+	    || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) {
-+		DH_free(dh);
-+		BN_free(dhp_bn);
-+		BN_free(dhg_bn);
-+		return(NULL);
-+	}
- 	return(dh);
- 	}
- #endif /* OPENSSL_NO_DH */
diff --git a/debian/patches/series b/debian/patches/series
index 0aa312e..29fd08d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 04-restore-pidfile-default.patch
 05-author-tests.patch
 07-path-max.patch
-08-dh-openssl-1.1.patch