From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 5D3BE3858D32 for ; Mon, 16 Jan 2023 09:58:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5D3BE3858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 385513539C; Mon, 16 Jan 2023 09:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1673863125; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=gsUZXeYWFMuaR8FDbite/7hrRRSisl7EXrc9XJVBqkY=; b=f8Up6SdS/4dOe4YIdjA4UT93k09/1hOw4m3vOnjzTXWm1E7aPJLLXSR8MQaWDBxJxTBGe+ WHDgWvw546AmrdzWjyYVrNM444IUu7GuDSUTNTM2BvDJQgxlCsDaaoVXKxNiM96m40cSVT /zjsMWERuxbIQhwc+fh0O14HUXyYHWc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1673863125; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=gsUZXeYWFMuaR8FDbite/7hrRRSisl7EXrc9XJVBqkY=; b=v1k+sFUJK7iHJiKaTt8sVci+Zx2ZYMLomErNMMLJCl8rGp7MmUpZnXkZV6EzkCGKbATZNK jjpFcY73HkDnVmCQ== Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 312B62C146; Mon, 16 Jan 2023 09:58:45 +0000 (UTC) Date: Mon, 16 Jan 2023 09:58:45 +0000 (UTC) From: Richard Biener To: Jakub Jelinek cc: =?ISO-8859-15?Q?Martin_Li=A8ka?= , Gaius Mulley , gcc-patches@gcc.gnu.org Subject: Re: [PATCH] contrib: Partial fix for failed update-copyright --this year [PR108413] In-Reply-To: Message-ID: References: User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 List-Id: On Mon, 16 Jan 2023, Jakub Jelinek wrote: > Hi! > > As mentioned on IRC or in PR108413, the last update-copyright.py --this year > failed and that is why we are in a strange state where some copyrights have > been updated and others have not. > The full list of errors I got was I think: > gcc/m2/mc-boot/GmcOptions.c: unrecognised copyright: comment (f, (const char *) "Copyright (C) ''2021'' Free Software Foundation, Inc.", 53); > gcc/m2/mc-boot/GmcOptions.c: unrecognised copyright: comment (f, (const char *) "Copyright (C) ''2021'' Free Software Foundation, Inc.", 53); > gcc/testsuite/gm2/switches/pedantic-params/pass/Strings.mod: unrecognised copyright holder: Faculty of Information Technology, > gcc/testsuite/gm2/switches/pedantic-params/pass/Strings2.mod: unrecognised copyright holder: Faculty of Information Technology, > libphobos/libdruntime/__builtins.di: unrecognised copyright: * Copyright: Copyright Digital Mars 2022 > libstdc++-v3/src/c++17/fast_float/fast_float.h: unrecognised copyright holder: The fast_float authors > libstdc++-v3/include/c_compatibility/stdatomic.h: unrecognised copyright holder: The GCC developers > > The following patch deals with the gcc/testsuite/gm2 ones and > with the fast_float.h one, ok for trunk? OK > Not really sure what we should do in the GmcOptions.c case > (perhaps obfuscate it in the source somehow by splitting > the string literals into different substrings > Perhaps "Copy" "right (" "C) ''..." would do it? Or do we want > to bump there each year (manually or by the script)? > E.g. in gcc.cc we have > printf ("Copyright %s 2023 Free Software Foundation, Inc.\n", > _("(C)")); > which also prints (C) nicer in Unicode if possible and is updated > by hand each year. > > I have no idea about the libphobos case, we have tons of > libphobos/src/std/format/spec.d:Copyright: Copyright The D Language Foundation 2000-2013. > libphobos/src/std/random.d:Copyright: Copyright Andrei Alexandrescu 2008 - 2009, Joseph Rushton Wakeling 2012. > etc. lines and those aren't reported as errors. > > And the last one is that I think for The GCC developers we should treat it > similarly like FSF and bump copyright on it. > Would > canon_gcc = 'The GCC developers' > self.add_package_author ('The GCC developers', canon_gcc) > self.add_package_author ('The GCC Developers', canon_gcc) > or something similar do the trick? > > 2023-01-16 Jakub Jelinek > > PR other/108413 > * update-copyright.py (TestsuiteFilter): Add .mod and .rs extensions. > (GCCCopyright): Add 'The fast_float authors' as external author. > > --- contrib/update-copyright.py.jj 2023-01-06 10:01:50.217579023 +0100 > +++ contrib/update-copyright.py 2023-01-16 10:39:08.786185284 +0100 > @@ -596,6 +596,8 @@ class TestsuiteFilter (GenericFilter): > '.go', > '.inc', > '.java', > + '.mod', > + '.rs' > ]) > > def skip_file (self, dir, filename): > @@ -733,6 +735,7 @@ class GCCCopyright (Copyright): > self.add_external_author ('Stephen L. Moshier') > self.add_external_author ('Sun Microsystems, Inc. All rights reserved.') > self.add_external_author ('The D Language Foundation, All Rights Reserved') > + self.add_external_author ('The fast_float authors') > self.add_external_author ('The Go Authors. All rights reserved.') > self.add_external_author ('The Go Authors. All rights reserved.') > self.add_external_author ('The Go Authors.') > > Jakub > > -- Richard Biener SUSE Software Solutions Germany GmbH, Frankenstrasse 146, 90461 Nuernberg, Germany; GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman; HRB 36809 (AG Nuernberg)