Import Debian changes 4.89-2+deb9u4

[hcoop/debian/exim4.git] / debian / patches / 89_01_only_warn_on_nonempty_environment.diff

diff --git a/debian/patches/89_01_only_warn_on_nonempty_environment.diff b/debian/patches/89_01_only_warn_on_nonempty_environment.diff
deleted file mode 100644 (file)
index 436c77b..0000000
--- a/debian/patches/89_01_only_warn_on_nonempty_environment.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Don't issue env warning if env is empty
- keep_environment needs to be mentioned in the runtime config.
- Setting add_environment isn't enough to suppress the warning.
-
- (cherry picked from commit 8e58ed807c77febfde61d3cf47928302f93cc99c)
-Origin: upstream
-
---- exim4-4.84.2.orig/src/readconf.c
-+++ exim4-4.84.2/src/readconf.c
-@@ -3418,10 +3418,10 @@ if (gnutls_require_kx || gnutls_require_
-       " are obsolete\n");
- #endif        /*SUPPORT_TLS*/
- 
--if ((!add_environment || *add_environment == '\0') && !keep_environment)
-+if (!keep_environment && environ && *environ)
-   log_write(0, LOG_MAIN,
--      "WARNING: purging the environment.\n"
--      " Suggested action: use keep_environment and add_environment.\n");
-+      "Warning: purging the environment.\n"
-+      " Suggested action: use keep_environment.");
- }
- 
- 
---- exim4-4.84.2.orig/doc/spec.txt
-+++ exim4-4.84.2/doc/spec.txt
-@@ -13516,8 +13516,10 @@ having FOO_HOME in your keep_environment
- You may work around this using a regular expression that does not match the
- macro name: ^[F]OO_HOME$.
- 
--Current versions of Exim issue a warning during startupif you do not mention 
--keep_environment or add_environment in your runtime configuration file.
-+Current versions of Exim issue a warning during startup if you do not mention
-+keep_environment in your runtime configuration file and if there is
-+anything in your environment. Future versions may not issue that warning
-+anymore.
- 
- +--------------+---------+----------+-----------+
- |keep_malformed|Use: main|Type: time|Default: 4d|