From patchwork Mon Aug 21 20:56:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53093 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F26DC27BBEA; Mon, 21 Aug 2023 21:58:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2B37F27BBE2 for ; Mon, 21 Aug 2023 21:58:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYByM-0001Ry-TO; Mon, 21 Aug 2023 16:58:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYByM-0001Rk-AM for guix-patches@gnu.org; Mon, 21 Aug 2023 16:58:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYByL-0005vB-9K; Mon, 21 Aug 2023 16:58:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYByL-00066M-S6; Mon, 21 Aug 2023 16:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65444] [PATCH] gnu-maintenance: Improve check for disabled host names. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 21 Aug 2023 20:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65444 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65444@debbugs.gnu.org, maxim.cournoyer@gmail.com Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org, maxim.cournoyer@gmail.com X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.169265143123389 (code B ref -1); Mon, 21 Aug 2023 20:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Aug 2023 20:57:11 +0000 Received: from localhost ([127.0.0.1]:58010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYBxW-00065B-KX for submit@debbugs.gnu.org; Mon, 21 Aug 2023 16:57:10 -0400 Received: from lists.gnu.org ([2001:470:142::17]:53304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYBxV-00064x-BA for submit@debbugs.gnu.org; Mon, 21 Aug 2023 16:57:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYBxN-0001NE-Ac for guix-patches@gnu.org; Mon, 21 Aug 2023 16:57:01 -0400 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYBxL-0005kO-0i for guix-patches@gnu.org; Mon, 21 Aug 2023 16:57:01 -0400 Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-64ccdf8820dso10103576d6.1 for ; Mon, 21 Aug 2023 13:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692651417; x=1693256217; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=20fV0aSxBc34/EwO3B34njn8yrcDAcTzWY7W92KU1Yk=; b=K2xirM0LTAImuKc5mMeEOCLZ2wCz8AEZ6NVH3eEJ5eW51Fhe12UFxs9MYlBmpYyCTz JzGuXwXx7UcPrHtzWbKqhq0Hi1jPjLcySmF8puE1JlQy8zoF7+2yYfvk+L2zk+3myh2m R7P1A8xtU0gGUjQx54zVA5vmsmko1tus8eR8sey+bdB6R57JndKycc/Bv3N9KRsIZ7Y3 bmo+6/U5/GZMma/35choPO0ZnG9DL+xKrU6Q6Gg9UR4NC7/WXpse1mg6WBkwm9SLp7oP KP6OEPhiNUcm+UIFczSI5RROkCanLnLxUn85LO9sYxbQL/XlWFY0K51OTe1hjzQnVSGy kI9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692651417; x=1693256217; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=20fV0aSxBc34/EwO3B34njn8yrcDAcTzWY7W92KU1Yk=; b=JC+Y2qz+luHuSLUF6T7iTfA31md/LLxDwPdSDbBkMoqsKVv0RzWFQ+3s3tD+AO1B2E RDofMksF9GBhcd0bqsCMm58I3ohUKBhY5pHH2IkMWxRrD3E8mqsOkdb8c4M+WjhlPM5Z BRnY2il9cm3xofHaF6WfNdEr+PiE1vKn++D6LvQe4fugjJduOjOXaojyefCN/pOoMkAM /EQTUK7rFO9pHsLqLgVP+yADgW6l4swBgCWJVQwShgoURjqiPDZxIyTqmZr+UKuXuqrV /PiDd1XBgeFsax3lmKSDOPcdFzuzDMIimVgl7AU5B7KlnwsuEuYzTJw4vSAiZTuhcRDV XgkA== X-Gm-Message-State: AOJu0YwEeBfJ9H0POudLyZ4HAKQiB//kP2aYSfUIvirMrqMuuaLDOuOn i+FQN7TgC3LFuIx/HclRSF8qimlTJqw= X-Google-Smtp-Source: AGHT+IHDy/Tl+l6hLe2omN+ZWK0nNI+x/pVIcKDrYtE3F3Qc6Km8q2VNLoZiOtFQUcd7LlWYuWU09A== X-Received: by 2002:a05:6214:d87:b0:62d:ddeb:3770 with SMTP id e7-20020a0562140d8700b0062dddeb3770mr9668130qve.0.1692651416949; Mon, 21 Aug 2023 13:56:56 -0700 (PDT) Received: from localhost.localdomain (dsl-10-148-105.b2b2c.ca. [72.10.148.105]) by smtp.gmail.com with ESMTPSA id p6-20020a0ce186000000b0063f88855ef2sm3137015qvl.101.2023.08.21.13.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 13:56:56 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 21 Aug 2023 16:56:21 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f2d; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf2d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Found while investigating . * guix/gnu-maintenance.scm (html-updatable-package?): Tighten predicate. --- guix/gnu-maintenance.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) base-commit: 4c7627dfec88350f9a1705e9527c38dd41506f8b diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 32712f7218..5c16a7617d 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -846,7 +846,11 @@ (define html-updatable-package? (let ((scheme (uri-scheme uri)) (host (uri-host uri))) (and (memq scheme '(http https)) - (not (member host hosting-sites))))))))) + ;; HOST may contain prefixes, + ;; e.g. "profanity-im.github.io", hence the + ;; suffix-based test below. + (not (any (cut string-suffix? <> host) + hosting-sites))))))))) (lambda (package) (or (assoc-ref (package-properties package) 'release-monitoring-url)