From owner-svn-src-all@freebsd.org Mon Jul 1 11:47:46 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 657D515D7B6B; Mon, 1 Jul 2019 11:47:46 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0AF8F7291F; Mon, 1 Jul 2019 11:47:46 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D2F82C857; Mon, 1 Jul 2019 11:47:45 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x61BljZo007050; Mon, 1 Jul 2019 11:47:45 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x61BljPK007049; Mon, 1 Jul 2019 11:47:45 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201907011147.x61BljPK007049@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Mon, 1 Jul 2019 11:47:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r349576 - head/kerberos5/usr.bin/krb5-config X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/kerberos5/usr.bin/krb5-config X-SVN-Commit-Revision: 349576 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0AF8F7291F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jul 2019 11:47:46 -0000 Author: arichardson Date: Mon Jul 1 11:47:45 2019 New Revision: 349576 URL: https://svnweb.freebsd.org/changeset/base/349576 Log: Fix generation of krb5-config with LC_CTYPE=*.UTF-8 When building on MacOS with a UTF-8 locale sed will fail when reading krb-config.in due to invalid characters. Forcing the "C" locale fixes this. Reviewed By: emaste, cy Differential Revision: https://reviews.freebsd.org/D16849 Modified: head/kerberos5/usr.bin/krb5-config/Makefile Modified: head/kerberos5/usr.bin/krb5-config/Makefile ============================================================================== --- head/kerberos5/usr.bin/krb5-config/Makefile Mon Jul 1 10:15:52 2019 (r349575) +++ head/kerberos5/usr.bin/krb5-config/Makefile Mon Jul 1 11:47:45 2019 (r349576) @@ -5,8 +5,12 @@ MAN= krb5-config.1 CLEANFILES= krb5-config +# In order for this to work on MacOS we need to set LC_ALL=C since the +# krb5-config.in file contains characters that will be rejected by MacOS with +# a UTF-8 locale (see https://stackoverflow.com/a/23584470/894271) +# TODO: Should we just require LC_ALL=C during the build? krb5-config: krb5-config.in - sed -e "s,@PACKAGE@,FreeBSD heimdal,g" \ + env LC_ALL=C sed -e "s,@PACKAGE@,FreeBSD heimdal,g" \ -e "s,@VERSION@,1.1.0,g" \ -e "s,@prefix@,/usr,g" \ -e "s,@exec_prefix@,/usr,g" \