Update the Debian packaging for stunnel-5.49.

5 files changed, 7 insertions, 71 deletions

diff --git a/debian/patches/02-rename-binary.patch b/debian/patches/02-rename-binary.patch
index 25b34c4..8465422 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: 2018-05-23
+Last-Update: 2018-09-10
 
 --- a/src/stunnel3.in
 +++ b/src/stunnel3.in
@@ -36,7 +36,7 @@ Last-Update: 2018-05-23
  NAME=stunnel
  DESC="TLS tunnels"
  OPTIONS=""
-@@ -49,9 +49,9 @@
+@@ -48,9 +48,9 @@
  startdaemons() {
    local res file args pidfile warn status
  
@@ -49,18 +49,15 @@ Last-Update: 2018-05-23
    fi
    if [ -n "$RLIMITS" ]; then
      ulimit $RLIMITS
-@@ -182,9 +182,9 @@
+@@ -181,7 +181,7 @@
    OPTIONS="-- $OPTIONS"
  fi
  
 -[ -f @sysconfdir@/default/stunnel ] && . @sysconfdir@/default/stunnel
 +[ -f @sysconfdir@/default/stunnel4 ] && . @sysconfdir@/default/stunnel4
- if [ "$ENABLED" = "0" ] ; then
--  echo "$DESC disabled, see @sysconfdir@/default/stunnel"
-+  echo "$DESC disabled, see @sysconfdir@/default/stunnel4"
-   exit 0
- fi
  
+ # If the user want to manage a single tunnel, the conf file's name
+ # is in $2. Otherwise, respect @sysconfdir@/default/stunnel4 setting.
 --- a/tools/script.sh
 +++ b/tools/script.sh
 @@ -2,7 +2,7 @@
diff --git a/debian/patches/04-restore-pidfile-default.patch b/debian/patches/04-restore-pidfile-default.patch
index 370061d..0455b43 100644
--- a/debian/patches/04-restore-pidfile-default.patch
+++ b/debian/patches/04-restore-pidfile-default.patch
@@ -21,7 +21,7 @@ Last-Update: 2017-07-03
  stunnel_LDFLAGS = -L$(SSLDIR)/lib64 -L$(SSLDIR)/lib -lssl -lcrypto
 --- a/src/options.c
 +++ b/src/options.c
-@@ -1029,7 +1029,7 @@
+@@ -1028,7 +1028,7 @@
  #ifndef USE_WIN32
      switch(cmd) {
      case CMD_BEGIN:
@@ -30,7 +30,7 @@ Last-Update: 2017-07-03
          break;
      case CMD_EXEC:
          if(strcasecmp(opt, "pid"))
-@@ -1049,9 +1049,10 @@
+@@ -1048,9 +1048,10 @@
          str_free(tmp);
          break;
      case CMD_DEFAULT:
diff --git a/debian/patches/10-enabled.patch b/debian/patches/10-enabled.patch
deleted file mode 100644
index 3b5482e..0000000
--- a/debian/patches/10-enabled.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Drop the "ENABLED" /etc/defaults/stunnel4 option.
-  On Debian systems, the "disabled by default" state is managed in
-  a different way, common to all init systems, so that the init system
-  is aware of the service's status.
-Forwarded: not-needed
-Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2018-03-30
-
---- a/tools/stunnel.init.in
-+++ b/tools/stunnel.init.in
-@@ -26,7 +26,6 @@
- NAME=stunnel
- DESC="TLS tunnels"
- OPTIONS=""
--ENABLED=0
- 
- get_opt() {
-   sed -e "s;^[[:space:]]*;;" -e "s;[[:space:]]*$;;" \
-@@ -183,10 +182,6 @@
- fi
- 
- [ -f @sysconfdir@/default/stunnel4 ] && . @sysconfdir@/default/stunnel4
--if [ "$ENABLED" = "0" ] ; then
--  echo "$DESC disabled, see @sysconfdir@/default/stunnel4"
--  exit 0
--fi
- 
- # If the user want to manage a single tunnel, the conf file's name
- # is in $2. Otherwise, respect @sysconfdir@/default/stunnel4 setting.
diff --git a/debian/patches/11-killproc.patch b/debian/patches/11-killproc.patch
deleted file mode 100644
index bfdc8a6..0000000
--- a/debian/patches/11-killproc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Actually wait for stunnel to stop.
- Pass an empty signal argument to the killproc LSB function so that
- its retry functionality will be activated.  This makes sure that
- the old stunnel process has died before the new one is started, so
- that the new one will actually be able to open listening sockets.
-Bug-Debian: https://bugs.debian.org/782030
-Forwarded: no
-Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2018-04-07
-
---- a/tools/stunnel.init.in
-+++ b/tools/stunnel.init.in
-@@ -85,7 +85,7 @@
- {
-   local sig file pidfile status
- 
--  sig=${1:-TERM}
-+  sig=$1
-   res=0
-   for file in $FILES; do
-     echo -n " $file: "
-@@ -94,7 +94,7 @@
-       echo -n "no pid file"
-     else
-       status=0
--      killproc -p "$pidfile" "$DAEMON" "$sig" || status=$?
-+      killproc -p "$pidfile" "$DAEMON" ${sig:+"$sig"} || status=$?
-       if [ "$status" -eq 0 ]; then
-         echo -n 'stopped'
-       else
diff --git a/debian/patches/series b/debian/patches/series
index 36157c9..29fd08d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@
 04-restore-pidfile-default.patch
 05-author-tests.patch
 07-path-max.patch
-10-enabled.patch
-11-killproc.patch