From patchwork Sun Mar 26 20:00:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Geissler X-Patchwork-Id: 66915 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6752E385F029 for ; Sun, 26 Mar 2023 20:01:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6752E385F029 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679860900; bh=eVKP5Ip4naklry3vuStuqUCXQdBjDo0fELPG3JTTzSg=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=CZmaNa85rpdDHLzJSrZe/9o5v0VcAsb0p3gdYLcfigQoNfvzqb2ItyRj6jPiMAiXX Ndv+ycURJi39jT033sP7inw9L7iZWsntO3cme4aJLYmjl1n3lEGcMDSyXYWPB67yPD kvAcleQTgJGvUoRcEmqCOH8+hL1vpPD2hyR8LRhU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id EC1FE385842B for ; Sun, 26 Mar 2023 20:00:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EC1FE385842B Received: by mail-wm1-x329.google.com with SMTP id u1so3855317wmn.5 for ; Sun, 26 Mar 2023 13:00:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679860840; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eVKP5Ip4naklry3vuStuqUCXQdBjDo0fELPG3JTTzSg=; b=MKESngNxlDNCLLKCgF7lU6y/pxrDhcy+zv80t60ixvwTQKzQ8ZoM6RoO4DWszBtZhV ayF85UkC4t7qZ/gHMaLGCjJioM/axZmbJwn0XfYVf7KTfsH37+QPBbuufZsicVylGmAK LEfQAEGN8Rx3Xd8em/2jZVKu3czgd7Yhcioi3/g/N9g6WDQ7wymrcrQavO3yJg/NAE/b x195/WCdPCl5lHuM9UOqZ9+28GZvD7glvvLNsxh57+jkJu071AxgjRiULEzMlG0bx91X 8WCSQum5uwL733YAXfI+hnXnqurRMQTbKTlJ9W2p7v6GjtXVsqJp1NZlwf8jFGfgekHu UcmQ== X-Gm-Message-State: AO0yUKVXfc52rW3FjJyl5SkjN78+OZsDd3aopuLB6Dqqi8CgZz8t8++j ZA6MmQRWsx6PCchhjtHf3ZCXZBNoNVjw1A== X-Google-Smtp-Source: AK7set9XK/B3Qmw3cegfq3nm9yaexSSWMdhUdPe2RN+VLDdtoyUR98mrLCwxOKEcsVuSI3vU9PzSKQ== X-Received: by 2002:a05:600c:1e86:b0:3ed:ebcb:e2c6 with SMTP id be6-20020a05600c1e8600b003edebcbe2c6mr7838753wmb.3.1679860840544; Sun, 26 Mar 2023 13:00:40 -0700 (PDT) Received: from localhost ([82.66.26.140]) by smtp.gmail.com with ESMTPSA id l1-20020a1c7901000000b003eae73f0fc1sm11352133wme.18.2023.03.26.13.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 13:00:40 -0700 (PDT) X-Google-Original-From: Romain Geissler To: libc-alpha@sourceware.org Cc: romain.geissler@amadeus.com Subject: [PATCH 1/3] support: introduce support_sysconfdir_prefix Date: Sun, 26 Mar 2023 20:00:14 +0000 Message-Id: <20230326200016.219-2-romain.geissler@amadeus.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230326200016.219-1-romain.geissler@amadeus.com> References: <20230326200016.219-1-romain.geissler@amadeus.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Romain Geissler via Libc-alpha From: Romain Geissler Reply-To: Romain Geissler Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- support/Makefile | 3 ++- support/support.h | 2 ++ support/support_paths.c | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) Reviewed-by: Adhemerval Zanella diff --git a/support/Makefile b/support/Makefile index 05b31159ea5..71d51485132 100644 --- a/support/Makefile +++ b/support/Makefile @@ -231,7 +231,8 @@ CFLAGS-support_paths.c = \ -DSBINDIR_PATH=\"$(sbindir)\" \ -DSLIBDIR_PATH=\"$(slibdir)\" \ -DROOTSBINDIR_PATH=\"$(rootsbindir)\" \ - -DCOMPLOCALEDIR_PATH=\"$(complocaledir)\" + -DCOMPLOCALEDIR_PATH=\"$(complocaledir)\" \ + -DSYSCONFDIR_PATH=\"$(sysconfdir)\" # In support_timespec_check_in_range we may be passed a very tight # range for which we should produce a correct result for expected diff --git a/support/support.h b/support/support.h index 525ff1ebcec..b7f76bf0809 100644 --- a/support/support.h +++ b/support/support.h @@ -144,6 +144,8 @@ extern const char support_slibdir_prefix[]; extern const char support_install_rootsbindir[]; /* Corresponds to the install's compiled locale directory. */ extern const char support_complocaledir_prefix[]; +/* Corresponds to the install's etc/ directory. */ +extern const char support_sysconfdir_prefix[]; /* Copies the file at the path FROM to TO. If TO does not exist, it is created. If TO is a regular file, it is truncated before diff --git a/support/support_paths.c b/support/support_paths.c index f9d75998cf2..0710bcd4122 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -92,3 +92,10 @@ const char support_complocaledir_prefix[] = COMPLOCALEDIR_PATH; #else # error please -DCOMPLOCALEDIR_PATH=something in the Makefile #endif + +#ifdef SYSCONFDIR_PATH +/* Corresponds to the install's etc/ directory. */ +const char support_sysconfdir_prefix[] = SYSCONFDIR_PATH; +#else +# error please -DSYSCONFDIR_PATH=something in the Makefile +#endif From patchwork Sun Mar 26 20:00:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Geissler X-Patchwork-Id: 66913 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 424B038582BD for ; Sun, 26 Mar 2023 20:01:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 424B038582BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679860870; bh=en+2Q6laHdDutxZFJ6R3C9rPxVUOAQP4utUJ8Jy927g=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=MkNlpddQVdTTibI++L4i6hTHBgbZOroFHGkcNiF6N6J1wmDotH3sLcP4q+p/2tiMf Z5vCp4Mwn+lJbc9HpkYX3RugdfIWV7kpB6dmpc5VPYFHyPRNIUoSr10QzSMhDGu2Be ITNmkIVMUIt6UbD4I2sIJt+VmfEB3/pgWQMgxi/4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id 80CAA3858C00 for ; Sun, 26 Mar 2023 20:00:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 80CAA3858C00 Received: by mail-wr1-x429.google.com with SMTP id j24so6626860wrd.0 for ; Sun, 26 Mar 2023 13:00:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679860843; x=1682452843; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=en+2Q6laHdDutxZFJ6R3C9rPxVUOAQP4utUJ8Jy927g=; b=UxDcPtBuXwM2TSAd2e/zCcYESj8n1m0V77YdLwkOaQs9v3/0H+iV4xS0braEb8thGC rah5wZbQwqeLFBUD25Xgz30qXRQKx9nK+4rDiaeirT1v6UhfVruQ2PxhXEk3Enaxwx7S G40ZzCHbfbl/aq6isO9I6xkEZGJRNZuJ+qg0Tl61W5vVIrAd1dxF1XjjodycJTZdIlLN 6bYnBwzc3bIEXxk8WLoDPvq6ylhv6AtIoNj1UC4krccUBFeffK5CkaWedLYvlRS0m6z1 R6H1hKK9519t/hAocck5MG4SaT8OTNKHm6QscqmaY6KcchQ13FkvUq7fTIPrUlryx2i4 DFnQ== X-Gm-Message-State: AAQBX9ePMp+atJ0YzrpP1o3Wep8k4sK/AO9RywpuIXR2x2HSN0cN4eyR W/4hOWAcUTNp6jo7SeyRjmJUjXU/cMypMQ== X-Google-Smtp-Source: AKy350YW9fpB5s21DwaQLcpkqHLobYHNK2M1EJdmvJ8gVZEnS7cSepNZ6b0U2ntGLR7mzmm3C0JJWw== X-Received: by 2002:adf:e6cc:0:b0:2c7:d80:ffc4 with SMTP id y12-20020adfe6cc000000b002c70d80ffc4mr5636863wrm.7.1679860842890; Sun, 26 Mar 2023 13:00:42 -0700 (PDT) Received: from localhost ([82.66.26.140]) by smtp.gmail.com with ESMTPSA id z6-20020a056000110600b002c557f82e27sm23176361wrw.99.2023.03.26.13.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 13:00:42 -0700 (PDT) X-Google-Original-From: Romain Geissler To: libc-alpha@sourceware.org Cc: romain.geissler@amadeus.com Subject: [PATCH 2/3] Fix tst-ldconfig-ld_so_conf-update with custom configure prefix value Date: Sun, 26 Mar 2023 20:00:15 +0000 Message-Id: <20230326200016.219-3-romain.geissler@amadeus.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230326200016.219-1-romain.geissler@amadeus.com> References: <20230326200016.219-1-romain.geissler@amadeus.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Romain Geissler via Libc-alpha From: Romain Geissler Reply-To: Romain Geissler Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- elf/tst-ldconfig-ld_so_conf-update.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) Reviewed-by: Adhemerval Zanella diff --git a/elf/tst-ldconfig-ld_so_conf-update.c b/elf/tst-ldconfig-ld_so_conf-update.c index 503afb3211e..2c5c48615d8 100644 --- a/elf/tst-ldconfig-ld_so_conf-update.c +++ b/elf/tst-ldconfig-ld_so_conf-update.c @@ -33,7 +33,6 @@ #define DSO "libldconfig-ld-mod.so" #define DSO_DIR "/tmp/tst-ldconfig" -#define CONF "/etc/ld.so.conf" static void @@ -64,6 +63,8 @@ do_test (void) { struct support_capture_subprocess result; + char *conf_path = xasprintf ("%s/ld.so.conf", support_sysconfdir_prefix); + /* Create the needed directories. */ xmkdirp ("/var/cache/ldconfig", 0777); xmkdirp (DSO_DIR, 0777); @@ -82,9 +83,9 @@ do_test (void) is not searched. */ TEST_VERIFY_EXIT (dlopen (DSO, RTLD_NOW | RTLD_GLOBAL) == NULL); - FILE *fp = xfopen (CONF, "a+"); + FILE *fp = xfopen (conf_path, "a+"); if (!fp) - FAIL_EXIT1 ("creating /etc/ld.so.conf failed: %m"); + FAIL_EXIT1 ("creating %s failed: %m", conf_path); xfclose (fp); /* Run ldconfig. */ @@ -95,9 +96,9 @@ do_test (void) TEST_VERIFY_EXIT (dlopen (DSO, RTLD_NOW | RTLD_GLOBAL) == NULL); /* Add tst-ldconfig directory to /etc/ld.so.conf. */ - fp = xfopen (CONF, "w"); + fp = xfopen (conf_path, "w"); if (!(fwrite (DSO_DIR, 1, sizeof (DSO_DIR), fp))) - FAIL_EXIT1 ("updating /etc/ld.so.conf failed: %m"); + FAIL_EXIT1 ("updating %s failed: %m", conf_path); xfclose (fp); /* Try to dlopen the same DSO again, we expect this to still fail. */ @@ -111,6 +112,8 @@ do_test (void) /* Finally, we expect dlopen to pass now. */ TEST_VERIFY_EXIT (dlopen (DSO, RTLD_NOW | RTLD_GLOBAL) != NULL); + free (conf_path); + return 0; } From patchwork Sun Mar 26 20:00:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Geissler X-Patchwork-Id: 66914 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5F02638515FD for ; Sun, 26 Mar 2023 20:01:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5F02638515FD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679860871; bh=jgK73cIRJEX3ZQ5eavL37O5eM1HE+fJZF2ES9F34TDs=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=UCXUdEF25tFM/p9a4UTQHw+aZZKNRNqpop2k+gBePakP2Podr2/ASh5M3EtmoeAYn 561L6w2heBI312ZhL7cLlyToJiYfYsrrFEW0ZOFZWYMxPJtUmvydyO5MOHQCEksfk2 cUttQnaKigcV4TvSv5IbD38s3bnP3FPCJ+o4G+gU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 72B123858D39 for ; Sun, 26 Mar 2023 20:00:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 72B123858D39 Received: by mail-wm1-x329.google.com with SMTP id d11-20020a05600c3acb00b003ef6e6754c5so623742wms.5 for ; Sun, 26 Mar 2023 13:00:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679860845; x=1682452845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jgK73cIRJEX3ZQ5eavL37O5eM1HE+fJZF2ES9F34TDs=; b=2KBxQAJ80FlfhD6hyTTvoUPhzDLUgl3IimIAcQ1xcrE8miMuhYdg9julNgpyxARbz6 Lj5dbHq3bkTHAV+gRDnhhh5hopF5UIMgWj3xsNj1c1yOpDyIbIqcGbbXBf1s05kS5jmK cJApIYPM2aaBngB2XWG27O8RFgcXvWKiTyIl/+9dt9hGtQGg4hLuLnGdignBwxqPUUXw 1vxdxpCnFetSHQx3Agw0UgHIvpi8KXW1Myyh99p8xJYWhvHGpZhqsC22gQvQ+QL0atvc ixjX6YQdE9pvbPxPDdrq/IM0BWF4DOqiSz8NzDtWZ/K7dTR2J/rxiOI+A51LN3XFf9g+ Tp1w== X-Gm-Message-State: AO0yUKXW+knqoVtR+KNoP2jb9/dI53snGqpaCtfvwIBBmBmj/HbyJHkh sZtkWq/XL2uVzX3Q570Q4Gh5xoYy0dJs5Q== X-Google-Smtp-Source: AK7set94QEtvWpWsdXjW6w6XvS/frgF2WjMc6d8IRtI1TVWXgYGgXHoxw+BSRxgN+vuzjJokqhi1sg== X-Received: by 2002:a05:600c:470c:b0:3ee:7d85:e0d1 with SMTP id v12-20020a05600c470c00b003ee7d85e0d1mr8171642wmo.2.1679860844895; Sun, 26 Mar 2023 13:00:44 -0700 (PDT) Received: from localhost ([82.66.26.140]) by smtp.gmail.com with ESMTPSA id h21-20020a05600c315500b003ebff290a52sm6432173wmo.28.2023.03.26.13.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 13:00:44 -0700 (PDT) X-Google-Original-From: Romain Geissler To: libc-alpha@sourceware.org Cc: romain.geissler@amadeus.com Subject: [PATCH 3/3] Fix tst-glibc-hwcaps-prepend-cache with custom configure prefix value Date: Sun, 26 Mar 2023 20:00:16 +0000 Message-Id: <20230326200016.219-4-romain.geissler@amadeus.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230326200016.219-1-romain.geissler@amadeus.com> References: <20230326200016.219-1-romain.geissler@amadeus.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Romain Geissler via Libc-alpha From: Romain Geissler Reply-To: Romain Geissler Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- elf/tst-glibc-hwcaps-prepend-cache.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) Reviewed-by: Adhemerval Zanella diff --git a/elf/tst-glibc-hwcaps-prepend-cache.c b/elf/tst-glibc-hwcaps-prepend-cache.c index 2a448423495..fe074b28028 100644 --- a/elf/tst-glibc-hwcaps-prepend-cache.c +++ b/elf/tst-glibc-hwcaps-prepend-cache.c @@ -44,9 +44,13 @@ do_test (void) if (dlopen (SONAME, RTLD_NOW) != NULL) FAIL_EXIT1 (SONAME " is already on the search path"); - /* Install the default implementation of libmarkermod1.so. */ - xmkdirp ("/etc", 0777); - support_write_file_string ("/etc/ld.so.conf", "/glibc-test/lib\n"); + { + /* Install the default implementation of libmarkermod1.so. */ + char *conf_path = xasprintf ("%s/ld.so.conf", support_sysconfdir_prefix); + xmkdirp (support_sysconfdir_prefix, 0777); + support_write_file_string (conf_path, "/glibc-test/lib\n"); + free (conf_path); + } xmkdirp ("/glibc-test/lib/glibc-hwcaps/prepend2", 0777); xmkdirp ("/glibc-test/lib/glibc-hwcaps/prepend3", 0777); {