From patchwork Thu Mar 10 12:44:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 51852 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 7A802385800D for ; Thu, 10 Mar 2022 12:44:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7A802385800D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1646916270; bh=1X3nGv8bcbnJtVM2S7pYXg6SZI2WQ1FdzlFXO/xeZoc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=OkfxGaEMhGJsdFpVS7GianHY/3xdhZ3H+myC56DoSKPUN4bvFXUdXdOWsxp9SRgQG +gdWNOTJDmW5JPWqLutuh8A5CrlmYuHh5j+gcsHmCXq9/1NJXNURdB1/lDXlk5Q2WA NvgVm6vVSbtHNOWAl2wiZW5d5O9FxYZWuXqMpTeA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 2F6F53858C20 for ; Thu, 10 Mar 2022 12:44:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2F6F53858C20 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-571-VFcBcWqfOmK81bgGl-QIuQ-1; Thu, 10 Mar 2022 07:44:08 -0500 X-MC-Unique: VFcBcWqfOmK81bgGl-QIuQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80E6E1854E21 for ; Thu, 10 Mar 2022 12:44:07 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.88]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DAE8E8497A for ; Thu, 10 Mar 2022 12:44:06 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 1/2] nss: Do not mention NSS test modules in X-From-Line: 308dcd6582b5aad4446e70db9de9bf675b870471 Mon Sep 17 00:00:00 2001 Message-Id: <308dcd6582b5aad4446e70db9de9bf675b870471.1646916217.git.fweimer@redhat.com> Date: Thu, 10 Mar 2022 13:44:04 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" They are not actually installed. Hard-code the current soname for nss_files instead. --- nss/Makefile | 17 +++++++---------- shlib-versions | 5 ----- 2 files changed, 7 insertions(+), 15 deletions(-) base-commit: d653fd2d9ebe23c2b16b76edf717c5dbd5ce9b77 diff --git a/nss/Makefile b/nss/Makefile index 552e5d03e1..4125d13f87 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -171,24 +171,21 @@ $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps) $(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps) $(build-module) $(objpfx)nss_test2.os : nss_test1.c -ifdef libnss_test1.so-version -$(objpfx)/libnss_test1.so$(libnss_test1.so-version): $(objpfx)/libnss_test1.so +# The .2 suffix comes from the nss_files version in shlib-versions. +$(objpfx)/libnss_test1.so.2: $(objpfx)/libnss_test1.so $(make-link) -endif -ifdef libnss_test2.so-version -$(objpfx)/libnss_test2.so$(libnss_test2.so-version): $(objpfx)/libnss_test2.so +$(objpfx)/libnss_test2.so.2: $(objpfx)/libnss_test2.so $(make-link) -endif $(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \ - $(objpfx)/libnss_test1.so$(libnss_test1.so-version) \ - $(objpfx)/libnss_test2.so$(libnss_test2.so-version) + $(objpfx)/libnss_test1.so.2 \ + $(objpfx)/libnss_test2.so.2 ifeq (yes,$(have-thread-library)) $(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library) endif -$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so -$(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so +$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so.2 +$(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so.2 # Disable DT_RUNPATH on NSS tests so that the glibc internal NSS # functions can load testing NSS modules via DT_RPATH. diff --git a/shlib-versions b/shlib-versions index df6603e699..b87ab50c59 100644 --- a/shlib-versions +++ b/shlib-versions @@ -47,11 +47,6 @@ libnss_ldap=2 libnss_hesiod=2 libnss_db=2 -# Tests for NSS. They must have the same NSS_SHLIB_REVISION number as -# the rest. -libnss_test1=2 -libnss_test2=2 - # Version for libnsl with YP and NIS+ functions. libnsl=1