components/sysutils/stunnel/patches/01-syslog-authpriv.patch

   1
   2 Updated version of an earlier patch to make stunnel default to the
   3 'authpriv' syslog facility, instead of daemon.
   4
   5 diff -ur stunnel-5.60.orig/doc/stunnel.8.in stunnel-5.60/doc/stunnel.8.in
   6 --- stunnel-5.60.orig/doc/stunnel.8.in  2021-05-30 15:19:48.000000000 +0000
   7 +++ stunnel-5.60/doc/stunnel.8.in       2021-11-19 00:11:36.690601036 +0000
   8 @@ -204,7 +204,7 @@
   9  all levels numerically less than it will be shown.  Use \fIdebug = debug\fR or
  10  \&\fIdebug = 7\fR for greatest debugging output.  The default is notice (5).
  11  .Sp
  12 -The syslog facility 'daemon' will be used unless a facility name is supplied.
  13 +The syslog facility 'authpriv' will be used unless a facility name is supplied.
  14  (Facilities are not supported on Win32.)
  15  .Sp
  16  Case is ignored for both facilities and levels.
  17 diff -ur stunnel-5.60.orig/doc/stunnel.html.in stunnel-5.60/doc/stunnel.html.in
  18 --- stunnel-5.60.orig/doc/stunnel.html.in       2021-05-30 15:19:48.000000000 +0000
  19 +++ stunnel-5.60/doc/stunnel.html.in    2021-11-19 00:12:08.301695748 +0000
  20 @@ -244,7 +244,7 @@
  21
  22  <p>Level is one of the syslog level names or numbers emerg (0), alert (1), crit (2), err (3), warning (4), notice (5), info (6), or debug (7). All logs for the specified level and all levels numerically less than it will be shown. Use <i>debug = debug</i> or <i>debug = 7</i> for greatest debugging output. The default is notice (5).</p>
  23
  24 -<p>The syslog facility &#39;daemon&#39; will be used unless a facility name is supplied. (Facilities are not supported on Win32.)</p>
  25 +<p>The syslog facility &#39;authpriv&#39; will be used unless a facility name is supplied. (Facilities are not supported on Win32.)</p>
  26
  27  <p>Case is ignored for both facilities and levels.</p>
  28
  29 diff -ur stunnel-5.60.orig/src/options.c stunnel-5.60/src/options.c
  30 --- stunnel-5.60.orig/src/options.c     2021-08-05 02:19:52.000000000 +0000
  31 +++ stunnel-5.60/src/options.c  2021-11-19 00:16:58.778393825 +0000
  32 @@ -1865,7 +1865,9 @@
  33      switch(cmd) {
  34      case CMD_SET_DEFAULTS:
  35          section->log_level=LOG_NOTICE;
  36 -#if !defined (USE_WIN32) && !defined (__vms)
  37 +#if defined(__sun) && defined(__SVR4) && defined(LOG_AUTHPRIV)
  38 +        new_global_options.log_facility=LOG_AUTHPRIV;
  39 +#elif !defined (USE_WIN32) && !defined (__vms)
  40          new_global_options.log_facility=LOG_DAEMON;
  41  #endif
  42          break;
  43 @@ -1881,14 +1883,18 @@
  44      case CMD_INITIALIZE:
  45          break;
  46      case CMD_PRINT_DEFAULTS:
  47 -#if !defined (USE_WIN32) && !defined (__vms)
  48 +#if defined(__sun) && defined(__SVR4) && defined(LOG_AUTHPRIV)
  49 +        s_log(LOG_NOTICE, "%-22s = %s", "debug", "authpriv.notice");
  50 +#elif !defined (USE_WIN32) && !defined (__vms)
  51          s_log(LOG_NOTICE, "%-22s = %s", "debug", "daemon.notice");
  52  #else
  53          s_log(LOG_NOTICE, "%-22s = %s", "debug", "notice");
  54  #endif
  55          break;
  56      case CMD_PRINT_HELP:
  57 -#if !defined (USE_WIN32) && !defined (__vms)
  58 +#if defined(__sun) && defined(__SVR4) && defined(LOG_AUTHPRIV)
  59 +        s_log(LOG_NOTICE, "%-22s = [facility].level (e.g. authpriv.info)", "debug");
  60 +#elif !defined (USE_WIN32) && !defined (__vms)
  61          s_log(LOG_NOTICE, "%-22s = [facility].level (e.g. daemon.info)", "debug");
  62  #else
  63          s_log(LOG_NOTICE, "%-22s = level (e.g. info)", "debug");