From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 030743858D39 for ; Thu, 3 Mar 2022 11:40:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 030743858D39 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-168-Ox4FXmsvMBWc-lPipt8-IQ-1; Thu, 03 Mar 2022 06:39:59 -0500 X-MC-Unique: Ox4FXmsvMBWc-lPipt8-IQ-1 Received: by mail-ej1-f69.google.com with SMTP id lf15-20020a170906ae4f00b006da86a43346so1447073ejb.14 for ; Thu, 03 Mar 2022 03:39:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=neFrTNEKlj6oi0MFsRW09RrP+9yoZJeu19rsVCLLNYs=; b=ZiHhi7nSbU6EkOD99xjzaoop629afwurYuujMPXkyuuwewdpl29TWuU6uH2L50N3zz Z1sy1efPDucIIfRrey7bi66FIJlWuqe2TjU9KBqcJ9Aj06ll/mnTXgBYxyH110mI4AHQ Lr+h/AxXy/Fdp+u1cYtdwBDoajnwbndb8+xqK1istTaCsEsYHu43+PDMw8e8llJV2o+u HyCIRqKTnEri0qydRzS+sdtVKoKV68jSw324C7vC59MqOD0vdQFByGW1dbw4X5P/ngKs BU1m/P0S6eW2PBWLzHSi1oj1QU/NlOZxZPWKA+zbdtF96wzpWAADRLwIuASgAkDKI7yo wkUA== X-Gm-Message-State: AOAM533eiadugl2rl6rBY2eN6u3MouXz4+H6AP8ceMMoWdIXndHIAI4F 0q5h1np11gNxnEm/LHlijjJOqi98jW2JbSssjBnV1BdV3SJ0hlqeCUPuY2Xw0Wh8FlDoWShjaTa 5hsDHbANbLsceODWtxKlA20ndXSBwjZtpJRI2jA== X-Received: by 2002:a50:fa95:0:b0:413:8489:b483 with SMTP id w21-20020a50fa95000000b004138489b483mr26909866edr.34.1646307598082; Thu, 03 Mar 2022 03:39:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyL4RX+2AUqNtkiwV1qWhHr9MqU7L3DjFtGrUQ2rYi4ujF78LcdUJdvFYsl4I+x8FUq+wtUX3HhA484YtFDhEY= X-Received: by 2002:a50:fa95:0:b0:413:8489:b483 with SMTP id w21-20020a50fa95000000b004138489b483mr26909861edr.34.1646307597947; Thu, 03 Mar 2022 03:39:57 -0800 (PST) MIME-Version: 1.0 From: Arjun Shankar Date: Thu, 3 Mar 2022 12:39:47 +0100 Message-ID: Subject: [COMMITTED 2.34] localedef: Handle symbolic links when generating locale-archive To: libc-stable@sourceware.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="0000000000009147aa05d94edbba" X-Spam-Status: No, score=-12.7 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_LOW, 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-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2022 11:40:02 -0000 --0000000000009147aa05d94edbba Content-Type: text/plain; charset="UTF-8" Whenever locale data for any locale included symbolic links, localedef would throw the error "incomplete set of locale files" and exclude it from the generated locale archive. This commit fixes that. Co-authored-by: Florian Weimer Reviewed-by: Carlos O'Donell (cherry picked from commit ea89d5bbd9e5e514b606045d909e6ab87d851c88) --0000000000009147aa05d94edbba Content-Type: text/x-patch; charset="US-ASCII"; name="glibc-2.34-localedef-handle-symlinks.patch" Content-Disposition: attachment; filename="glibc-2.34-localedef-handle-symlinks.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l0ax0kd50 RnJvbSA4NTIzNjFiNWEzMmZhZmIxYWFmYjY0NjdjN2M1NjcwNjNmZDk5ZDQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBcmp1biBTaGFua2FyIDxhcmp1bkByZWRoYXQuY29tPgpEYXRl OiBUaHUsIDI0IEZlYiAyMDIyIDIxOjQzOjA5ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gbG9jYWxl ZGVmOiBIYW5kbGUgc3ltYm9saWMgbGlua3Mgd2hlbiBnZW5lcmF0aW5nCiBsb2NhbGUtYXJjaGl2 ZQoKV2hlbmV2ZXIgbG9jYWxlIGRhdGEgZm9yIGFueSBsb2NhbGUgaW5jbHVkZWQgc3ltYm9saWMg bGlua3MsIGxvY2FsZWRlZgp3b3VsZCB0aHJvdyB0aGUgZXJyb3IgImluY29tcGxldGUgc2V0IG9m IGxvY2FsZSBmaWxlcyIgYW5kIGV4Y2x1ZGUgaXQKZnJvbSB0aGUgZ2VuZXJhdGVkIGxvY2FsZSBh cmNoaXZlLiAgVGhpcyBjb21taXQgZml4ZXMgdGhhdC4KCkNvLWF1dGhvcmVkLWJ5OiBGbG9yaWFu IFdlaW1lciA8ZndlaW1lckByZWRoYXQuY29tPgoKUmV2aWV3ZWQtYnk6IENhcmxvcyBPJ0RvbmVs bCA8Y2FybG9zQHJlZGhhdC5jb20+CihjaGVycnkgcGlja2VkIGZyb20gY29tbWl0IGVhODlkNWJi ZDllNWU1MTRiNjA2MDQ1ZDkwOWU2YWI4N2Q4NTFjODgpCi0tLQogbG9jYWxlL3Byb2dyYW1zL2xv Y2FyY2hpdmUuYyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxl dGlvbigtKQoKZGlmZiAtLWdpdCBhL2xvY2FsZS9wcm9ncmFtcy9sb2NhcmNoaXZlLmMgYi9sb2Nh bGUvcHJvZ3JhbXMvbG9jYXJjaGl2ZS5jCmluZGV4IGYzOGU4MzVjNTIuLmQ3OTI3OGI2ZWQgMTAw NjQ0Ci0tLSBhL2xvY2FsZS9wcm9ncmFtcy9sb2NhcmNoaXZlLmMKKysrIGIvbG9jYWxlL3Byb2dy YW1zL2xvY2FyY2hpdmUuYwpAQCAtMTM5MSw3ICsxMzkxLDcgQEAgYWRkX2xvY2FsZXNfdG9fYXJj aGl2ZSAoc2l6ZV90IG5saXN0LCBjaGFyICpsaXN0W10sIGJvb2wgcmVwbGFjZSkKIAkJICAgIHsK IAkJICAgICAgY2hhciBmdWxsbmFtZVtmbmFtZWxlbiArIDIgKiBzdHJsZW4gKGQtPmRfbmFtZSkg KyA3XTsKIAotCQkgICAgICBpZiAoZF90eXBlID09IERUX1VOS05PV04pCisJCSAgICAgIGlmIChk X3R5cGUgPT0gRFRfVU5LTk9XTiB8fCBkX3R5cGUgPT0gRFRfTE5LKQogCQkJewogCQkJICBzdHJj cHkgKHN0cGNweSAoc3RwY3B5IChmdWxsbmFtZSwgZm5hbWUpLCAiLyIpLAogCQkJCSAgZC0+ZF9u YW1lKTsKLS0gCjIuMzQuMQoK --0000000000009147aa05d94edbba--