diff options
Diffstat (limited to '9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch')
| -rw-r--r-- | 9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch | 108 |
1 files changed, 108 insertions, 0 deletions
diff --git a/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch b/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch new file mode 100644 index 0000000..13ff145 --- /dev/null +++ b/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch @@ -0,0 +1,108 @@ +From dbe134e9eed77bfbbbbf80fa97f2b02b869bcf9c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Mon, 22 Oct 2018 22:34:13 +0200 +Subject: [PATCH 3/5] Adapt to Gentoo-specific /etc/mail/aliases +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Patch by pacho2 + +Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> +(cherry picked from commit 4e616cda056f471b799beba2b1cedc787ad4ecc0) +--- + nss/nss_files/files-alias.c | 2 +- + nss/tst-nss-files-alias-leak.c | 18 +++++++++--------- + support/support_chroot.c | 8 +++++++- + 3 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c +index 6aff7b4c10..bb6d9b5765 100644 +--- a/nss/nss_files/files-alias.c ++++ b/nss/nss_files/files-alias.c +@@ -49,7 +49,7 @@ internal_setent (FILE **stream) + + if (*stream == NULL) + { +- *stream = fopen ("/etc/aliases", "rce"); ++ *stream = fopen ("/etc/mail/aliases", "rce"); + + if (*stream == NULL) + status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; +diff --git a/nss/tst-nss-files-alias-leak.c b/nss/tst-nss-files-alias-leak.c +index daebbf4ed4..095bb753a6 100644 +--- a/nss/tst-nss-files-alias-leak.c ++++ b/nss/tst-nss-files-alias-leak.c +@@ -45,27 +45,27 @@ prepare (int argc, char **argv) + chroot_env = support_chroot_create + ((struct support_chroot_configuration) { } ); + +- char *path = xasprintf ("%s/etc/aliases", chroot_env->path_chroot); ++ char *path = xasprintf ("%s/etc/mail/aliases", chroot_env->path_chroot); + add_temp_file (path); + support_write_file_string + (path, +- "user1: :include:/etc/aliases.user1\n" +- "user2: :include:/etc/aliases.user2\n" +- "comment: comment1, :include:/etc/aliases.comment\n" +- "many: :include:/etc/aliases.many\n"); ++ "user1: :include:/etc/mail/aliases.user1\n" ++ "user2: :include:/etc/mail/aliases.user2\n" ++ "comment: comment1, :include:/etc/mail/aliases.comment\n" ++ "many: :include:/etc/mail/aliases.many\n"); + free (path); + +- path = xasprintf ("%s/etc/aliases.user1", chroot_env->path_chroot); ++ path = xasprintf ("%s/etc/mail/aliases.user1", chroot_env->path_chroot); + add_temp_file (path); + support_write_file_string (path, "alias1\n"); + free (path); + +- path = xasprintf ("%s/etc/aliases.user2", chroot_env->path_chroot); ++ path = xasprintf ("%s/etc/mail/aliases.user2", chroot_env->path_chroot); + add_temp_file (path); + support_write_file_string (path, "alias1a, alias2\n"); + free (path); + +- path = xasprintf ("%s/etc/aliases.comment", chroot_env->path_chroot); ++ path = xasprintf ("%s/etc/mail/aliases.comment", chroot_env->path_chroot); + add_temp_file (path); + support_write_file_string + (path, +@@ -75,7 +75,7 @@ prepare (int argc, char **argv) + "comment2\n"); + free (path); + +- path = xasprintf ("%s/etc/aliases.many", chroot_env->path_chroot); ++ path = xasprintf ("%s/etc/mail/aliases.many", chroot_env->path_chroot); + add_temp_file (path); + FILE *fp = xfopen (path, "w"); + for (int i = 0; i < many_aliases; ++i) +diff --git a/support/support_chroot.c b/support/support_chroot.c +index 4f435c1ac1..e7ca2c714b 100644 +--- a/support/support_chroot.c ++++ b/support/support_chroot.c +@@ -52,13 +52,19 @@ support_chroot_create (struct support_chroot_configuration conf) + xmkdir (path_etc, 0777); + add_temp_file (path_etc); + ++ /* Create the /etc/mail directory in the chroot environment. */ ++ char *path_etc_mail = xasprintf ("%s/etc/mail", chroot->path_chroot); ++ xmkdir (path_etc_mail, 0777); ++ add_temp_file (path_etc_mail); ++ + write_file (path_etc, "resolv.conf", conf.resolv_conf, + &chroot->path_resolv_conf); + write_file (path_etc, "hosts", conf.hosts, &chroot->path_hosts); + write_file (path_etc, "host.conf", conf.host_conf, &chroot->path_host_conf); +- write_file (path_etc, "aliases", conf.aliases, &chroot->path_aliases); ++ write_file (path_etc_mail, "aliases", conf.aliases, &chroot->path_aliases); + + free (path_etc); ++ free (path_etc_mail); + + /* valgrind needs a temporary directory in the chroot. */ + { +-- +2.26.2 + |