From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3166A138359 for ; Thu, 23 Jul 2020 23:20:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F422E07FA; Thu, 23 Jul 2020 23:20:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47CB9E07FA for ; Thu, 23 Jul 2020 23:20:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C369634EE1D for ; Thu, 23 Jul 2020 23:20:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 072BD2E7 for ; Thu, 23 Jul 2020 23:20:17 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1595546402.f56f0822023ff6b66707732d1becc075c111b63e.dilfridge@gentoo> Subject: [gentoo-commits] proj/toolchain/glibc-patches:master commit in: 9999/ X-VCS-Repository: proj/toolchain/glibc-patches X-VCS-Files: 9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch X-VCS-Directories: 9999/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: f56f0822023ff6b66707732d1becc075c111b63e X-VCS-Branch: master Date: Thu, 23 Jul 2020 23:20:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f8bcc365-1922-46bd-85f8-031ac3322a59 X-Archives-Hash: c1e8334ff75d39984c0d2026b491051c commit: f56f0822023ff6b66707732d1becc075c111b63e Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Jul 23 23:19:29 2020 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Jul 23 23:20:02 2020 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=f56f0822 Fix etc-mail-aliases patch after changes in master Signed-off-by: Andreas K. Hüttel gentoo.org> 9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch | 13 +++++-------- 1 file changed, 5 insertions(+), 8 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 index 13ff145..ca428cf 100644 --- a/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch +++ b/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch @@ -1,7 +1,7 @@ From dbe134e9eed77bfbbbbf80fa97f2b02b869bcf9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Mon, 22 Oct 2018 22:34:13 +0200 -Subject: [PATCH 3/5] Adapt to Gentoo-specific /etc/mail/aliases +Subject: Adapt to Gentoo-specific /etc/mail/aliases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -17,15 +17,15 @@ Signed-off-by: Andreas K. Hüttel 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 +index 43fb2c49a5..26b2cc86ad 100644 --- a/nss/nss_files/files-alias.c +++ b/nss/nss_files/files-alias.c -@@ -49,7 +49,7 @@ internal_setent (FILE **stream) +@@ -50,7 +50,7 @@ internal_setent (FILE **stream) if (*stream == NULL) { -- *stream = fopen ("/etc/aliases", "rce"); -+ *stream = fopen ("/etc/mail/aliases", "rce"); +- *stream = __nss_files_fopen ("/etc/aliases"); ++ *stream = __nss_files_fopen ("/etc/mail/aliases"); if (*stream == NULL) status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; @@ -103,6 +103,3 @@ index 4f435c1ac1..e7ca2c714b 100644 /* valgrind needs a temporary directory in the chroot. */ { --- -2.26.2 -