From patchwork Wed Jan 3 11:41:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 184713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4964604dyb; Wed, 3 Jan 2024 03:42:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IGc5TL0SwSpIRzZl++aoflHruJeY+NvJu9XPhxg0ic3DTntqoaU/w4SKp8Ndwg3+aSvpWn3 X-Received: by 2002:a05:6808:6493:b0:3bb:d739:9cac with SMTP id fh19-20020a056808649300b003bbd7399cacmr12065519oib.35.1704282124549; Wed, 03 Jan 2024 03:42:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704282124; cv=pass; d=google.com; s=arc-20160816; b=M5+9oleRJ4Gxt3gRnqEeClg578d5FozlhYk9JsxlFpc9MCG2e2QG+QnJVB89Xc2C+R 42GdmbDKeu4RnneNSYrASMst/1cQSLigCfCxjL3k36nNNg+sUvLo0cuPiKtNIFnFNFAZ xku3GuKFp8swepNtDEPxSjbkKkHq/fT6EzY8KihexFI1raNGoi+GZwwQfPObZM4xn/G3 mcW6njsNLF70CI47mEJ0aICFDneEh11Y/AOLbfjNPr5iCzIkXiJ0feRvRDZYiVoWl2Tb e74Dh4zwf4hbklFJZA+jGx4o+GOezeeam0MwkXo6K42TEBVS/2W5RJr6j670rqY4ogH0 YxlA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition :mime-version:message-id:subject:to:from:date:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=RXE0T/nfc4gbTge6Ga3wAhlc+0sVfZfVC06lpxPWoQg=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=pgZQM1Q9av0f4UwsIYtnGiYUSnwuPzgEWzpE9WXel8/KCx57Vkq+TiTA3yBOT2EU4I IB6nVpKw1urYtGLIRbtePACwBo6jWqqwppU/vcpBaEenQCUpipsot8rOontrF+Wl23P4 vGnxuW6Uol/1g9R+UAVr8X7utcW7i0yQFJvlAT11kYfhNNj+Exw8J+7LoMJlGLCfVLIM al0FQGKiQ3QYY1p2BHKnB9nYJULvsnRaoYxg0zIfYywUC43ujLLVPaC9JxfirtwQX91K oFKQpmprrmijeR+6o0QaPbiBrxS8Zf7YQ3jSfcOnOhFdaQWamij2mTUQpoMdMVBHwznH zdcQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Tp/RGtoK"; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id n19-20020a0cdc93000000b0067f9fd8e2afsi24908914qvk.376.2024.01.03.03.42.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 03:42:04 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Tp/RGtoK"; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 40C863858C2C for ; Wed, 3 Jan 2024 11:42:04 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.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 B0FA13858D28 for ; Wed, 3 Jan 2024 11:41:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B0FA13858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B0FA13858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704282084; cv=none; b=PrgXA5WwpQOIT8Rsm1941kNBGjkTHmy22BEMi61cHBY46TtsUno4dmn+iqCl717+QWnqQa8BUmRuw9llqJQ2qba2eA5zDOCUi4aGx3/tyryGOK9rc9zpfxeJxHarXPDNZpd0DZhlaMNfvBIUpR9fgIU9PVKqC6/yzEkmQIDETK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704282084; c=relaxed/simple; bh=T87mZwTRjqHxYiQfI0yeValIIw/BQZkeRwOr9XlxJJY=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=a5f1docHEnM6+OP8y5+rATp/cH+Kpo5/4a4y2gkHKo/vm9c5Am1CV7TUxfrWXt8bIeib8IjvaPyUdPgy+roZKsBRUjpISAlY6roljMlsdyx26mzAFBHVWu8tiWjTpX0yuMNLSEvlRjoEIZQcYSleDLfo4QU18KVUSgb8Ww5GLuc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704282082; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type; bh=RXE0T/nfc4gbTge6Ga3wAhlc+0sVfZfVC06lpxPWoQg=; b=Tp/RGtoKo2/P/MIkFEDUlwFcE6TpdRAneLlDFROby/lPd74jV0MJxs3OQZ/TbjY67l1C7x qLm1WUoOgbD8u9dZYpv6J+PlxtfJjbya/RyHrML8Z5D/EUtciKrRzccKjMgVP9vOOuYlxv Kzu0GQVk2uRT/bBGGAX1NdBANAaMK0Q= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-595-_AQ1OyzHNbiZ8x5sSqK4Bg-1; Wed, 03 Jan 2024 06:41:21 -0500 X-MC-Unique: _AQ1OyzHNbiZ8x5sSqK4Bg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E245E185A787 for ; Wed, 3 Jan 2024 11:41:20 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.92]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A6D3A2166B31 for ; Wed, 3 Jan 2024 11:41:20 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 403BfInN1137662 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Wed, 3 Jan 2024 12:41:18 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 403BfHKl1137661 for gcc-patches@gcc.gnu.org; Wed, 3 Jan 2024 12:41:17 +0100 Date: Wed, 3 Jan 2024 12:41:17 +0100 From: Jakub Jelinek To: gcc-patches@gcc.gnu.org Subject: [committed] Small tweaks for update-copyright.py Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787069333110749562 X-GMAIL-MSGID: 1787069333110749562 Hi! update-copyright.py --this-year FAILs on two spots in the modula2 directories. One is gpl_v3_without_node.texi, I think that is similar to other license files which we already exclude from updates. And the other is GmcOptions.cc, which has lines like mcPrintf_printf0 ((const char *) "Copyright ", 10); mcPrintf_printf1 ((const char *) "Copyright (C) %d Free Software Foundation, Inc.\\n", 49, (const unsigned char *) &year, (sizeof (year)-1)); mcPrintf_printf1 ((const char *) "Copyright (C) %d Free Software Foundation, Inc.\\n", 49, (const unsigned char *) &year, (sizeof (year)-1)); which update-copyhright.py obviously can't grok. The file is generated and doesn't contain normal Copyright year which should be updated, so I think it is also ok to skip it. Committed as obvious to trunk, together with rotation of ChangeLog and manual and automatic copyright year updates as done every year. 2024-01-03 Jakub Jelinek * update-copyright.py (GenericFilter): Skip gpl_v3_without_node.texi. (GCCFilter): Skip GmcOptions.cc. Jakub --- contrib/update-copyright.py +++ contrib/update-copyright.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2013-2023 Free Software Foundation, Inc. +# Copyright (C) 2013-2024 Free Software Foundation, Inc. # # This script is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -83,6 +83,7 @@ class GenericFilter: 'gpl_v3.texi', 'fdl-1.3.xml', 'gpl-3.0.xml', + 'gpl_v3_without_node.texi', # Skip auto- and libtool-related files 'aclocal.m4', @@ -556,6 +557,9 @@ class GCCFilter (GenericFilter): self.skip_files |= set ([ # Not part of GCC 'math-68881.h', + + # Weird ways to compose copyright year + 'GmcOptions.cc', ]) self.skip_dirs |= set ([