diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-05-07 19:11:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-05-07 19:11:26 +0000 |
| commit | ccd33cf361e82785356a0257cee78a8b2bed8e5a (patch) | |
| tree | 07f5fdbea53453a87a7b5a8519a81d068385127d /sys-apps/shadow/files | |
| parent | marked 8.24.8 for ~amd64 and ~x86 (diff) | |
| download | gentoo-2-ccd33cf361e82785356a0257cee78a8b2bed8e5a.tar.gz gentoo-2-ccd33cf361e82785356a0257cee78a8b2bed8e5a.tar.bz2 gentoo-2-ccd33cf361e82785356a0257cee78a8b2bed8e5a.zip | |
Dont export MAIL if MAIL_CHECK_ENAB is disabled.
(Portage version: 2.1_pre10-r3)
Diffstat (limited to 'sys-apps/shadow/files')
| -rw-r--r-- | sys-apps/shadow/files/digest-shadow-4.0.15-r1 | 3 | ||||
| -rw-r--r-- | sys-apps/shadow/files/shadow-4.0.15-no-default-MAIL.patch | 30 |
2 files changed, 33 insertions, 0 deletions
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.15-r1 b/sys-apps/shadow/files/digest-shadow-4.0.15-r1 new file mode 100644 index 000000000000..13dd58252a59 --- /dev/null +++ b/sys-apps/shadow/files/digest-shadow-4.0.15-r1 @@ -0,0 +1,3 @@ +MD5 a0452fa989f8ba45023cc5a08136568e shadow-4.0.15.tar.bz2 1294860 +RMD160 b7b9ee9469561205037a1eacaa8791f069ba124c shadow-4.0.15.tar.bz2 1294860 +SHA256 e486bdb083df453c2d15ac58887ef45a3006182c0cdb1c6092058ea588be538d shadow-4.0.15.tar.bz2 1294860 diff --git a/sys-apps/shadow/files/shadow-4.0.15-no-default-MAIL.patch b/sys-apps/shadow/files/shadow-4.0.15-no-default-MAIL.patch new file mode 100644 index 000000000000..f7972933aabe --- /dev/null +++ b/sys-apps/shadow/files/shadow-4.0.15-no-default-MAIL.patch @@ -0,0 +1,30 @@ +if MAIL_CHECK_ENAB is disabled, then don't export the MAIL envvar + +--- libmisc/setupenv.c ++++ libmisc/setupenv.c +@@ -265,16 +265,18 @@ + * knows the prefix. + */ + +- if ((cp = getdef_str ("MAIL_DIR"))) +- addenv_path ("MAIL", cp, info->pw_name); +- else if ((cp = getdef_str ("MAIL_FILE"))) +- addenv_path ("MAIL", info->pw_dir, cp); +- else { ++ if (getdef_bool ("MAIL_CHECK_ENAB")) { ++ if ((cp = getdef_str ("MAIL_DIR"))) ++ addenv_path ("MAIL", cp, info->pw_name); ++ else if ((cp = getdef_str ("MAIL_FILE"))) ++ addenv_path ("MAIL", info->pw_dir, cp); ++ else { + #if defined(MAIL_SPOOL_FILE) +- addenv_path ("MAIL", info->pw_dir, MAIL_SPOOL_FILE); ++ addenv_path ("MAIL", info->pw_dir, MAIL_SPOOL_FILE); + #elif defined(MAIL_SPOOL_DIR) +- addenv_path ("MAIL", MAIL_SPOOL_DIR, info->pw_name); ++ addenv_path ("MAIL", MAIL_SPOOL_DIR, info->pw_name); + #endif ++ } + } + + /* |